7 files changed, 38 insertions, 21 deletions

diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index b35bd4d3b85f..628bb417f58c 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	gphoto2
-PORTVERSION=	2.3.1
-PORTREVISION=	1
+PORTVERSION=	2.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
@@ -40,12 +39,6 @@ USE_GETTEXT=	yes
 PLIST_SUB+=	NLS=""
 .endif
 
-.include <bsd.port.pre.mk>
-
-.if ${OSVERSION} < 500000
-BROKEN=		does not compile with gcc 2.95
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREADS_LIBS:S/"//g}|g ; \
 		 s|-g -Wall||g' ${WRKSRC}/configure
@@ -58,4 +51,4 @@ post-install:
 .endfor
 .endif
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo
index f3e37e5df2b9..3f2dfa15b3de 100644
--- a/graphics/gphoto2/distinfo
+++ b/graphics/gphoto2/distinfo
@@ -1,3 +1,3 @@
-MD5 (gphoto2-2.3.1.tar.bz2) = 00da102280dd5743d8f8b80173b4dd26
-SHA256 (gphoto2-2.3.1.tar.bz2) = 764d5f030c39a642a6909ac4163abada1d340cee1314768febfb399f118c0f31
-SIZE (gphoto2-2.3.1.tar.bz2) = 553795
+MD5 (gphoto2-2.4.0.tar.bz2) = 5fd1f711ca806adb687b33c55964d898
+SHA256 (gphoto2-2.4.0.tar.bz2) = 8aa5ac34dae18284f3f04db874648a6dc70ecee3045ace674351b7326ae1c4e5
+SIZE (gphoto2-2.4.0.tar.bz2) = 574976
diff --git a/graphics/gphoto2/pkg-plist b/graphics/gphoto2/pkg-plist
index 427604fe58e8..d1b4fe5b15c4 100644
--- a/graphics/gphoto2/pkg-plist
+++ b/graphics/gphoto2/pkg-plist
@@ -2,6 +2,7 @@ bin/gphoto2
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%PORTDOCS%%%%DOCSDIR%%/test-hook.sh
 %%NLS%%share/locale/az/LC_MESSAGES/gphoto2.mo
 %%NLS%%share/locale/cs/LC_MESSAGES/gphoto2.mo
 %%NLS%%share/locale/da/LC_MESSAGES/gphoto2.mo
diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index 8bb1b502c9eb..5079918c9230 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	libgphoto2
-PORTVERSION=	2.3.1
+PORTVERSION=	2.4.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
@@ -21,10 +21,11 @@ USE_BZIP2=	yes
 USE_GNOME=	gnometarget pkgconfig ltverhack
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-USE_AUTOTOOLS=	libtool:15
+USE_AUTOTOOLS=	libtool:15 libltdl:15
 LIBTOOLFILES=	configure libgphoto2_port/configure
 USE_LDCONFIG=	yes
-PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.7.1
+CONFIGURE_ENV=	LTDLINCL="-I${LOCALBASE}/include" LIBLTDL="-L${LOCALBASE}/lib -lltdl"
+PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.8.0
 
 MAN3=		libgphoto2.3 libgphoto2_port.3
 
@@ -43,8 +44,6 @@ post-patch:
 		 s|-g -O2||g' ${WRKSRC}/${file}
 .endfor
 	@${REINPLACE_CMD} -e 's|linux-hotplug ||' ${WRKSRC}/packaging/Makefile.in
-	@${REINPLACE_CMD} -e 's|$$(CPPFLAGS) $$(AM_CPPFLAGS)|$$(AM_CPPFLAGS) $$(CPPFLAGS)|' \
-		${WRKSRC}/camlibs/directory/Makefile.in ${WRKSRC}/camlibs/sierra/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/libgphoto2/distinfo b/graphics/libgphoto2/distinfo
index 8edae252c87f..b8560aa52dfc 100644
--- a/graphics/libgphoto2/distinfo
+++ b/graphics/libgphoto2/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgphoto2-2.3.1.tar.bz2) = 37f85e34e5b6031ddf6cac8b8782ac4f
-SHA256 (libgphoto2-2.3.1.tar.bz2) = b56433ae44e593ea0c55dd4ad69074e59151920f266dc646c1dc7e80ebe3b727
-SIZE (libgphoto2-2.3.1.tar.bz2) = 3230934
+MD5 (libgphoto2-2.4.0.tar.bz2) = a60154772635b693ff08b4f34dea7f61
+SHA256 (libgphoto2-2.4.0.tar.bz2) = 0dc26b7a8568dee7634bebbaf9f7d3e3ab9460424e6297a595e41c4fddbbdb79
+SIZE (libgphoto2-2.4.0.tar.bz2) = 3180009
diff --git a/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c b/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
new file mode 100644
index 000000000000..e40715e05cea
--- /dev/null
+++ b/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
@@ -0,0 +1,24 @@
+--- libgphoto2_port/serial/unix.c.orig	Fri Jul 27 02:36:13 2007
++++ libgphoto2_port/serial/unix.c	Mon Aug 13 17:26:43 2007
+@@ -43,6 +43,7 @@
+ #endif
+ #include <string.h>
+ #include <signal.h>
++#include <sys/select.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
+ #ifdef HAVE_SYS_TIME_H
+@@ -348,11 +349,11 @@
+ 		/* resmgr has its own API, which calls to a server and
+ 		 * communicates over UNIX domain sockets.
+ 		 */
+-		fd = rsm_open_device(path, O_RDONLY | O_NDELAY);
++		fd = rsm_open_device(path, O_RDONLY | O_NONBLOCK);
+ 		/* fall through to standard open if this failed */
+ #endif
+ 		if (fd == -1)
+-			fd = open (path, O_RDONLY | O_NDELAY);
++			fd = open (path, O_RDONLY | O_NONBLOCK);
+ 		if (fd < 0) {
+ 			gp_port_serial_unlock (NULL, path);
+ 			continue;
diff --git a/graphics/libgphoto2/pkg-plist b/graphics/libgphoto2/pkg-plist
index 49cb2db164f9..6464af8387ca 100644
--- a/graphics/libgphoto2/pkg-plist
+++ b/graphics/libgphoto2/pkg-plist
@@ -211,6 +211,7 @@ lib/libgphoto2_port.a
 lib/libgphoto2_port.la
 lib/libgphoto2_port.so
 lib/libgphoto2_port.so.0
+lib/udev/check-mtp-device
 lib/udev/check-ptp-camera
 libdata/pkgconfig/libgphoto2.pc
 libdata/pkgconfig/libgphoto2_port.pc
@@ -221,7 +222,6 @@ libdata/pkgconfig/libgphoto2_port.pc
 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.adc65
 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.agfa-cl20
 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.aox
-%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.barbie
 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.canon
 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.clicksmart310
 %%PORTDOCS%%%%DOCSDIR%%/camlibs/README.digigr8