Update to 0.2.6.

pkgsrc notes:
* I know 0.2.7 is out; it has issues on ubuntu so I'm doing this first.
* patch-ac should perhaps be dropped.

Upstream NEWS content (from web page):

* more than 40 new database entries of lenses and compact cameras
* new CMake based build system for better cross platform compatibility
  and compilation fixes for MSVC
* better integration into hugin for loading and storing lens
  parameters via the lensfun library
* several bug fixes and stability improvements

4 files changed, 27 insertions, 60 deletions

diff --git a/graphics/lensfun/Makefile b/graphics/lensfun/Makefile
index f8616ea4ab9..125d440ea31 100644
--- a/graphics/lensfun/Makefile
+++ b/graphics/lensfun/Makefile
@@ -1,8 +1,7 @@
-# $NetBSD: Makefile,v 1.18 2013/02/16 11:22:16 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2013/03/01 14:33:51 gdt Exp $
 #
 
-DISTNAME=	lensfun-0.2.5
-PKGREVISION=	11
+DISTNAME=	lensfun-0.2.6
 CATEGORIES=	graphics
 MASTER_SITES=	http://download.berlios.de/lensfun/
 EXTRACT_SUFX=	.tar.bz2
@@ -17,8 +16,9 @@ BUILD_DEPENDS+=	makedepend-[0-9]*:../../devel/makedepend
 HAS_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --libdir=${PREFIX}/lib
 CONFIGURE_ARGS+=	--vectorization=
-CONFIG_SHELL=		${PYTHONBIN}
 MAKE_FILE=		GNUmakefile
+
+CONFIG_SHELL=		${PYTHONBIN}
 PYTHON_FOR_BUILD_ONLY=	yes
 REPLACE_PYTHON=		configure
 USE_LANGUAGES=		c c++
@@ -27,8 +27,8 @@ PKGCONFIG_OVERRIDE=	libs/lensfun/lensfun.pc.in
 
 # Why three copys of the file?
 post-install:
-	${RM} -f ${DESTDIR}${PREFIX}/lib/liblensfun.so
-	${RM} -f ${DESTDIR}${PREFIX}/lib/liblensfun.so.0
+	${MV} ${DESTDIR}${PREFIX}/lib/liblensfun.so \
+		${DESTDIR}${PREFIX}/lib/liblensfun.so.${PKGVERSION:C/nb[0-9]*//}
 	${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
 		${DESTDIR}${PREFIX}/lib/liblensfun.so.0
 	${LN} -s liblensfun.so.${PKGVERSION:C/nb[0-9]*//} \
diff --git a/graphics/lensfun/PLIST b/graphics/lensfun/PLIST
index 3f380c45532..5d26f2df539 100644
--- a/graphics/lensfun/PLIST
+++ b/graphics/lensfun/PLIST
@@ -1,13 +1,14 @@
-@comment $NetBSD: PLIST,v 1.7 2012/02/15 08:50:18 sbd Exp $
+@comment $NetBSD: PLIST,v 1.8 2013/03/01 14:33:51 gdt Exp $
 include/lensfun.h
 lib/liblensfun.so
 lib/liblensfun.so.0
 lib/liblensfun.so.${PKGVERSION}
 lib/pkgconfig/lensfun.pc
-share/doc/${PKGNAME}/README
-share/doc/${PKGNAME}/cc-by-sa-3.0.txt
-share/doc/${PKGNAME}/gpl-3.0.txt
-share/doc/${PKGNAME}/lgpl-3.0.txt
+@comment lensfun inexplicably uses an extra .0 in the doc dir
+share/doc/${PKGNAME}.0/README
+share/doc/${PKGNAME}.0/cc-by-sa-3.0.txt
+share/doc/${PKGNAME}.0/gpl-3.0.txt
+share/doc/${PKGNAME}.0/lgpl-3.0.txt
 share/lensfun/6x6.xml
 share/lensfun/compact-canon.xml
 share/lensfun/compact-casio.xml
@@ -23,6 +24,10 @@ share/lensfun/compact-ricoh.xml
 share/lensfun/compact-sigma.xml
 share/lensfun/compact-sony.xml
 share/lensfun/generic.xml
+share/lensfun/mil-olympus.xml
+share/lensfun/mil-panasonic.xml
+share/lensfun/mil-samsung.xml
+share/lensfun/mil-sony.xml
 share/lensfun/rf-leica.xml
 share/lensfun/slr-canon.xml
 share/lensfun/slr-contax.xml
diff --git a/graphics/lensfun/distinfo b/graphics/lensfun/distinfo
index 606b25d7acf..4776228630d 100644
--- a/graphics/lensfun/distinfo
+++ b/graphics/lensfun/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.6 2013/02/16 11:22:16 wiz Exp $
+$NetBSD: distinfo,v 1.7 2013/03/01 14:33:51 gdt Exp $
 
-SHA1 (lensfun-0.2.5.tar.bz2) = 7e8568cb131b6e2090264274483721a959f6b9bc
-RMD160 (lensfun-0.2.5.tar.bz2) = 2f421cefb65d271b937e3d61f41f8536fd078971
-Size (lensfun-0.2.5.tar.bz2) = 470733 bytes
+SHA1 (lensfun-0.2.6.tar.bz2) = 0d7ffbae5c54159308114f69a9e2bc5f4d24d836
+RMD160 (lensfun-0.2.6.tar.bz2) = 03d3513ae2d66464313eb6f0587e8ec8a1c33387
+Size (lensfun-0.2.6.tar.bz2) = 505690 bytes
 SHA1 (patch-aa) = d31dd742f232aa8a75f50f14f782918ba11a8119
 SHA1 (patch-ab) = 5455bda9546dce6cc5b4a73429092afdee04bd23
-SHA1 (patch-ac) = ab8ff0ff327ce313d60e17f187c4bb424c4f6455
+SHA1 (patch-ac) = abaf6c1b6c6de8ed32489f3cbee8de8e495f604c
 SHA1 (patch-ad) = f9d54534d3be809e8517ec262e776c9d1785acd8
 SHA1 (patch-ae) = c7f47ac5081d52244f38d0fc40795c7cb00f40e4
diff --git a/graphics/lensfun/patches/patch-ac b/graphics/lensfun/patches/patch-ac
index 8924d5d0727..b0b38c4b185 100644
--- a/graphics/lensfun/patches/patch-ac
+++ b/graphics/lensfun/patches/patch-ac
@@ -1,52 +1,14 @@
-$NetBSD: patch-ac,v 1.4 2013/02/16 11:22:16 wiz Exp $
+$NetBSD: patch-ac,v 1.5 2013/03/01 14:33:51 gdt Exp $
 
-Fix build with png-1.6.
+Leftover hunk from "Fix build with png-1.6."  (Most were applied upstream.)
 
---- libs/auxfun/image.cpp.orig	2008-05-02 06:56:04.000000000 +0000
-+++ libs/auxfun/image.cpp
+--- libs/auxfun/image.cpp.orig	2012-05-22 05:55:37.000000000 -0400
++++ libs/auxfun/image.cpp	2013-03-01 09:14:37.000000000 -0500
 @@ -7,6 +7,7 @@
  #include <zlib.h>
  #include <png.h>
  #include <stdlib.h>
 +#include <string.h>
- #include <unistd.h>
+ #ifdef _MSC_VER
+ #define _USE_MATH_DEFINES 1
  #include <math.h>
- 
-@@ -94,7 +95,7 @@ bool Image::LoadPNG ()
- 
-     png_init_io (png, file);
- 
--    if (setjmp (png->jmpbuf))
-+    if (setjmp (png_jmpbuf(png)))
-         // If we get here, we had a problem reading the file
-         goto nomem;
- 
-@@ -157,7 +158,7 @@ bool Image::LoadPNG ()
-     row_pointers = new png_bytep [Height];
- 
-     if (!row_pointers
--        || setjmp (png->jmpbuf))             // Set a new exception handler
-+        || setjmp (png_jmpbuf(png)))             // Set a new exception handler
-     {
-         delete [] row_pointers;
-     nomem:
-@@ -214,7 +215,7 @@ bool Image::SavePNG (const char *fName)
-     }
- 
-     /* Catch processing errors */
--    if (setjmp(png->jmpbuf))
-+    if (setjmp(png_jmpbuf(png)))
-         /* If we get here, we had a problem writing the file */
-         goto error2;
- 
-@@ -273,10 +274,6 @@ bool Image::SavePNG (const char *fName)
-     /* It is REQUIRED to call this to finish writing the rest of the file */
-     png_write_end (png, info);
- 
--    /* if you malloced the palette, free it here */
--    if (info->palette)
--        free (info->palette);
--
-     /* clean up after the write, and free any memory allocated */
-     png_destroy_write_struct (&png, &info);
-