update to 2.4.7

changes:
-bugfixes and improvements to the PTP2 driver
-cleanup
-translation updates

6 files changed, 34 insertions, 33 deletions

diff --git a/devel/libgphoto2/Makefile b/devel/libgphoto2/Makefile
index 7363592fce5..8b4ee17aa48 100644
--- a/devel/libgphoto2/Makefile
+++ b/devel/libgphoto2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.47 2009/08/26 19:57:22 sno Exp $
+# $NetBSD: Makefile,v 1.48 2009/11/20 17:02:23 drochner Exp $
 
-DISTNAME=	libgphoto2-2.4.6
-PKGREVISION=	1
+DISTNAME=	libgphoto2-2.4.7
 CATEGORIES=	devel graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/devel/libgphoto2/distinfo b/devel/libgphoto2/distinfo
index 95625ff9763..9ce81d29b61 100644
--- a/devel/libgphoto2/distinfo
+++ b/devel/libgphoto2/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.20 2009/05/19 07:50:13 obache Exp $
+$NetBSD: distinfo,v 1.21 2009/11/20 17:02:23 drochner Exp $
 
-SHA1 (libgphoto2-2.4.6.tar.bz2) = f9fd10495ababce3cf992b36f3a29359e598aea7
-RMD160 (libgphoto2-2.4.6.tar.bz2) = cca194a6db6658887b1b997838c7d6a5af9e2609
-Size (libgphoto2-2.4.6.tar.bz2) = 5268340 bytes
-SHA1 (patch-ab) = 921eea83471110dd85197a7171278c7d0556536b
+SHA1 (libgphoto2-2.4.7.tar.bz2) = f91aef06204f3b1b0f3e07facba452881bedc2e1
+RMD160 (libgphoto2-2.4.7.tar.bz2) = f5773f3b194f4dcc4a82ddbbf7ecad12e11dae93
+Size (libgphoto2-2.4.7.tar.bz2) = 5279581 bytes
 SHA1 (patch-aj) = 111b26861d59dddf7a8d0998cb7ae6513114fe38
 SHA1 (patch-ak) = b1e9243cf4d4c78995184b357ba36bdfb0471d76
-SHA1 (patch-am) = 57f781b4c7ef9898ba2016645e1b8884ba368a7d
+SHA1 (patch-an) = 4b6db1a50132263294d9b194f84c829c15bd4f71
+SHA1 (patch-ao) = 01e7eea353ef12b97b54aeb34f00abfd1f50c3ff
diff --git a/devel/libgphoto2/patches/patch-ab b/devel/libgphoto2/patches/patch-ab
deleted file mode 100644
index f37d0fd0de3..00000000000
--- a/devel/libgphoto2/patches/patch-ab
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ab,v 1.4 2007/01/02 18:32:47 adam Exp $
-
---- camlibs/ptp2/config.c.orig	2007-01-02 17:01:25.000000000 +0100
-+++ camlibs/ptp2/config.c
-@@ -23,6 +23,7 @@
- #include <string.h>
- #include <stdio.h>
- #include <time.h>
-+#include <netinet/in.h>
- 
- #include <gphoto2/gphoto2-library.h>
- #include <gphoto2/gphoto2-port-log.h>
diff --git a/devel/libgphoto2/patches/patch-am b/devel/libgphoto2/patches/patch-am
deleted file mode 100644
index fb17a65ea27..00000000000
--- a/devel/libgphoto2/patches/patch-am
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-am,v 1.1 2008/11/18 18:05:16 chuck Exp $
-
---- camlibs/smal/ultrapocket.c.orig	2008-11-18 12:45:15.000000000 -0500
-+++ camlibs/smal/ultrapocket.c	2008-11-18 12:45:25.000000000 -0500
-@@ -21,6 +21,7 @@
- #include <stdio.h>
- #include <stdlib.h>
- #include <string.h>
-+#include <locale.h>
- 
- #include <gphoto2/gphoto2-port-log.h>
- #include <gphoto2/gphoto2-library.h>
diff --git a/devel/libgphoto2/patches/patch-an b/devel/libgphoto2/patches/patch-an
new file mode 100644
index 00000000000..c2ae5b58c1a
--- /dev/null
+++ b/devel/libgphoto2/patches/patch-an
@@ -0,0 +1,13 @@
+$NetBSD: patch-an,v 1.1 2009/11/20 17:02:23 drochner Exp $
+
+--- libgphoto2_port/configure.orig	2009-08-11 17:13:11.000000000 +0200
++++ libgphoto2_port/configure
+@@ -18333,7 +18333,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
+   HAVE_UDEV_TRUE=
+   HAVE_UDEV_FALSE='#'
+ else
diff --git a/devel/libgphoto2/patches/patch-ao b/devel/libgphoto2/patches/patch-ao
new file mode 100644
index 00000000000..69911994ee1
--- /dev/null
+++ b/devel/libgphoto2/patches/patch-ao
@@ -0,0 +1,13 @@
+$NetBSD: patch-ao,v 1.1 2009/11/20 17:02:23 drochner Exp $
+
+--- configure.orig	2009-08-17 11:47:39.000000000 +0200
++++ configure
+@@ -22623,7 +22623,7 @@ if test "x${utilsdir}" = "x"; then utils
+ if test "x${udevscriptdir}" = "x"; then	udevscriptdir="\${libdir}/udev"; fi
+ 
+ 
+- if if echo "$host"|grep -i linux >/dev/null ; then true; fi ; then
++ if if echo "$host"|grep -i linux >/dev/null ; then true; else false; fi ; then
+   HAVE_UDEV_TRUE=
+   HAVE_UDEV_FALSE='#'
+ else