update to 2.4.12

changes:
-support for new cameras
-minor feature additions for Canon and Nikon drivers
-minor cleanup, translation updates

4 files changed, 15 insertions, 13 deletions

diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index a91040609a1..56a8c441180 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.55 2011/11/07 11:03:05 drochner Exp $
+# $NetBSD: Makefile,v 1.56 2012/02/13 12:08:11 drochner Exp $
 
-DISTNAME=	libgphoto2-2.4.11
+DISTNAME=	libgphoto2-2.4.12
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgphoto2/PLIST.common b/devel/libgphoto2/PLIST.common
index f868159c448..c647824ed56 100644
--- a/devel/libgphoto2/PLIST.common
+++ b/devel/libgphoto2/PLIST.common
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST.common,v 1.18 2011/11/07 11:03:05 drochner Exp $
+@comment $NetBSD: PLIST.common,v 1.19 2012/02/13 12:08:11 drochner Exp $
 bin/gphoto2-config
 bin/gphoto2-port-config
 include/gphoto2/gphoto2-abilities-list.h
@@ -82,6 +82,7 @@ lib/libgphoto2/${PKGVERSION}/stv0680.la
 lib/libgphoto2/${PKGVERSION}/sx330z.la
 lib/libgphoto2/${PKGVERSION}/topfield.la
 lib/libgphoto2/${PKGVERSION}/toshiba_pdrm11.la
+lib/libgphoto2/${PKGVERSION}/tp6801.la
 lib/libgphoto2/print-camera-list
 lib/libgphoto2_port.la
 lib/libgphoto2_port/0.8.0/disk.la
@@ -140,6 +141,7 @@ share/doc/libgphoto2/camlibs/README.sq905
 share/doc/libgphoto2/camlibs/README.st2205
 share/doc/libgphoto2/camlibs/README.st2205-compression
 share/doc/libgphoto2/camlibs/README.toshiba-pdrm11
+share/doc/libgphoto2/camlibs/README.tp6801
 share/doc/libgphoto2_port/AUTHORS
 share/doc/libgphoto2_port/NEWS
 share/doc/libgphoto2_port/README
diff --git a/devel/libgphoto2/distinfo b/devel/libgphoto2/distinfo
index f51fe1191b2..db988f9e4ce 100644
--- a/devel/libgphoto2/distinfo
+++ b/devel/libgphoto2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.22 2011/11/07 11:03:05 drochner Exp $
+$NetBSD: distinfo,v 1.23 2012/02/13 12:08:11 drochner Exp $
 
-SHA1 (libgphoto2-2.4.11.tar.bz2) = 615776c8c0201e98bfe158ae8c2cec35f93236f0
-RMD160 (libgphoto2-2.4.11.tar.bz2) = f4978edecd0869f91d15b0c9805dd856b856f14c
-Size (libgphoto2-2.4.11.tar.bz2) = 4396949 bytes
+SHA1 (libgphoto2-2.4.12.tar.bz2) = b199e926424b7544d8877a9cf94b91686b7824ea
+RMD160 (libgphoto2-2.4.12.tar.bz2) = be75a0d0bd29b11b611bc62331120d71ef2997af
+Size (libgphoto2-2.4.12.tar.bz2) = 4430444 bytes
 SHA1 (patch-aj) = 111b26861d59dddf7a8d0998cb7ae6513114fe38
 SHA1 (patch-ak) = b1e9243cf4d4c78995184b357ba36bdfb0471d76
-SHA1 (patch-an) = 4b6db1a50132263294d9b194f84c829c15bd4f71
+SHA1 (patch-an) = 60d109d29834c01cdae29bcebde153e35af17884
 SHA1 (patch-ao) = 01e7eea353ef12b97b54aeb34f00abfd1f50c3ff
diff --git a/devel/libgphoto2/patches/patch-an b/devel/libgphoto2/patches/patch-an
index c2ae5b58c1a..4c1c8882819 100644
--- a/devel/libgphoto2/patches/patch-an
+++ b/devel/libgphoto2/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.1 2009/11/20 17:02:23 drochner Exp $
+$NetBSD: patch-an,v 1.2 2012/02/13 12:08:11 drochner Exp $
 
---- libgphoto2_port/configure.orig	2009-08-11 17:13:11.000000000 +0200
+--- libgphoto2_port/configure.orig	2011-11-29 21:04:51.000000000 +0000
 +++ libgphoto2_port/configure
-@@ -18333,7 +18333,7 @@ fi
+@@ -15422,7 +15422,7 @@ fi
  if test "x${udevscriptdir}" = "x"; then	udevscriptdir="\${libdir}/udev"; fi
  
  
-- if if echo "$host"|grep -i linux >/dev/null ; then test "x$have_LIBUSB" = xyes; fi ; then
-+ if if echo "$host"|grep -i linux >/dev/null ; then test "x$have_LIBUSB" = xyes; else false; fi ; then
+- if if echo "$host"|grep -i linux >/dev/null ; then test "x$have_LIBUSB" = xyes -o "x$have_LIBUSB1" = xyes; fi ; then
++ if if echo "$host"|grep -i linux >/dev/null ; then test "x$have_LIBUSB" = xyes -o "x$have_LIBUSB1" = xyes; else false; fi ; then
    HAVE_UDEV_TRUE=
    HAVE_UDEV_FALSE='#'
  else