7 files changed, 47 insertions, 60 deletions

diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index 1d1bf51f6da8..c9f2f5902fd2 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libgphoto2
-PORTVERSION=	2.2.1
-PORTREVISION=	2
+PORTVERSION=	2.3.0
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
@@ -23,15 +22,13 @@ USE_GNOME=	gnometarget pkgconfig ltverhack
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
 USE_AUTOTOOLS=	libtool:15
+CONFIGURE_ARGS=	--mandir=${PREFIX}/man
 LIBTOOLFILES=	configure libgphoto2_port/configure
-INSTALLS_SHLIB=	yes
-PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.6.1
+USE_LDCONFIG=	yes
+PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.7.0
 
 MAN3=		libgphoto2.3 libgphoto2_port.3
 
-#LIBUSB_CFLAGS=	-I${LOCALBASE}/include
-#LIBUSB_LIBS=	-L${LOCALBASE}/lib
-
 .if defined(WITHOUT_NLS)
 CONFIGURE_ARGS+=	--disable-nls
 PLIST_SUB+=	NLS="@comment "
@@ -44,14 +41,11 @@ post-patch:
 .for file in configure libgphoto2_port/configure
 	@${REINPLACE_CMD} -e \
 		's|{libdir}/pkgconfig|{prefix}/libdata/pkgconfig|g ; \
-		 s|-g ||g' ${WRKSRC}/${file}
+		 s|-g -O2||g' ${WRKSRC}/${file}
 .endfor
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
-		's|: install-docDATA|:|g'
 	@${REINPLACE_CMD} -e 's|linux-hotplug ||' ${WRKSRC}/packaging/Makefile.in
-
-pre-build:
-	@cd ${WRKSRC} && ${GMAKE} all-local
+	@${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 9a36103ddc8f..e7d3a79c88a8 100644
--- a/graphics/libgphoto2/distinfo
+++ b/graphics/libgphoto2/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgphoto2-2.2.1.tar.bz2) = 69827311733e39fafa9f77bb05e55b77
-SHA256 (libgphoto2-2.2.1.tar.bz2) = fb2ba23957f5892a5ed0b4e346230006bf2a72b5fdf52563b978c78f0bcccd11
-SIZE (libgphoto2-2.2.1.tar.bz2) = 3086807
+MD5 (libgphoto2-2.3.0.tar.bz2) = 05bc0199e77ea3434fbe934f792ddeee
+SHA256 (libgphoto2-2.3.0.tar.bz2) = b3524805e793606dbad2407e85974eaaea052df60b86191abe1e55520665f99c
+SIZE (libgphoto2-2.3.0.tar.bz2) = 3226923
diff --git a/graphics/libgphoto2/files/patch-camlibs-ptp2-ptpip.c b/graphics/libgphoto2/files/patch-camlibs-ptp2-ptpip.c
deleted file mode 100644
index 27fd74bf6a96..000000000000
--- a/graphics/libgphoto2/files/patch-camlibs-ptp2-ptpip.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- camlibs/ptp2/ptpip.c.orig	Tue Jun 20 04:02:16 2006
-+++ camlibs/ptp2/ptpip.c	Sat Jun 24 00:33:29 2006
-@@ -31,6 +31,7 @@
- #include <stdio.h>
- #include <time.h>
- #include <errno.h>
-+#include <sys/types.h>
- #include <sys/select.h>
- 
- #include <sys/socket.h>
diff --git a/graphics/libgphoto2/files/patch-camlibs-sonix-library.c b/graphics/libgphoto2/files/patch-camlibs-sonix-library.c
deleted file mode 100644
index 3fd26bb7cf71..000000000000
--- a/graphics/libgphoto2/files/patch-camlibs-sonix-library.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- camlibs/sonix/library.c.orig	Wed Apr 19 03:54:18 2006
-+++ camlibs/sonix/library.c	Wed Jun 21 00:12:06 2006
-@@ -41,7 +41,7 @@
- #else
- #  define _(String) (String)
- #  define N_(String) (String)
--#  define ngettext(String1,String2,Count) ((Count==1)?String1:String)
-+#  define ngettext(String1,String2,Count) ((Count==1)?String1:String2)
- #endif
- 
- #include <gphoto2-port.h>
diff --git a/graphics/libgphoto2/files/patch-libgphoto2_port-disk-disk.c b/graphics/libgphoto2/files/patch-libgphoto2_port-disk-disk.c
deleted file mode 100644
index 4bbc2c9240b7..000000000000
--- a/graphics/libgphoto2/files/patch-libgphoto2_port-disk-disk.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgphoto2_port/disk/disk.c.orig	Wed Apr 19 03:54:26 2006
-+++ libgphoto2_port/disk/disk.c	Sun Nov 12 14:23:50 2006
-@@ -175,7 +175,6 @@
- 
- 	libhal_free_string_array (volumes);
- 	libhal_ctx_free (ctx);
--	dbus_connection_disconnect (dbus_connection);
- 	dbus_connection_unref (dbus_connection);
- #else
- # ifdef HAVE_MNTENT_H
diff --git a/graphics/libgphoto2/files/patch-libgphoto2_port-libgphoto2_port-gphoto2-port-info-list.c b/graphics/libgphoto2/files/patch-libgphoto2_port-libgphoto2_port-gphoto2-port-info-list.c
deleted file mode 100644
index 75687cb01988..000000000000
--- a/graphics/libgphoto2/files/patch-libgphoto2_port-libgphoto2_port-gphoto2-port-info-list.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c.orig	Sat Jun  3 17:38:12 2006
-+++ libgphoto2_port/libgphoto2_port/gphoto2-port-info-list.c	Wed Jun 21 00:08:02 2006
-@@ -51,6 +51,7 @@
- #  define dgettext(Domain,Message) (Message)
- #  define dcgettext(Domain,Message,Type) (Message)
- #  define bindtextdomain(Domain,Directory) (Domain)
-+#  define bind_textdomain_codeset(Domain,codeset) (codeset)
- #  define _(String) (String)
- #  define N_(String) (String)
- #endif
diff --git a/graphics/libgphoto2/pkg-plist b/graphics/libgphoto2/pkg-plist
index 483110d17190..5bef9fcf358a 100644
--- a/graphics/libgphoto2/pkg-plist
+++ b/graphics/libgphoto2/pkg-plist
@@ -1,5 +1,6 @@
 bin/gphoto2-config
 bin/gphoto2-port-config
+include/gphoto2/gphoto2
 include/gphoto2/gphoto2-abilities-list.h
 include/gphoto2/gphoto2-camera.h
 include/gphoto2/gphoto2-context.h
@@ -150,9 +151,6 @@ lib/libgphoto2/%%VERSION%%/samsung.so
 lib/libgphoto2/%%VERSION%%/sierra.a
 lib/libgphoto2/%%VERSION%%/sierra.la
 lib/libgphoto2/%%VERSION%%/sierra.so
-lib/libgphoto2/%%VERSION%%/sipix_blink.a
-lib/libgphoto2/%%VERSION%%/sipix_blink.la
-lib/libgphoto2/%%VERSION%%/sipix_blink.so
 lib/libgphoto2/%%VERSION%%/sipix_blink2.a
 lib/libgphoto2/%%VERSION%%/sipix_blink2.la
 lib/libgphoto2/%%VERSION%%/sipix_blink2.so
@@ -214,9 +212,42 @@ lib/libgphoto2_port.la
 lib/libgphoto2_port.so
 lib/libgphoto2_port.so.0
 libdata/pkgconfig/libgphoto2.pc
+libdata/pkgconfig/libgphoto2_port.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
 %%PORTDOCS%%%%DOCSDIR%%/README
+%%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
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.enigma13
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.gsmart300
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.iclick
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.jamcam
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.konica
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.largan-lmini
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.lg_gsm
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mars
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.minolta-dimagev
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.mustek
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-coolshot
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.panasonic-l859
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam300
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.pccam600
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.ptp2
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.smal
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonix
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sonydscf1
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.soundvision
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.spca50x
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.sq905
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.toshiba-pdrm11
+%%PORTDOCS%%%%DOCSDIR%%/camlibs/README.913C
 %%PORTDOCS%%share/doc/libgphoto2_port/AUTHORS
 %%PORTDOCS%%share/doc/libgphoto2_port/NEWS
 %%PORTDOCS%%share/doc/libgphoto2_port/README
@@ -244,6 +275,8 @@ libdata/pkgconfig/libgphoto2.pc
 %%NLS%%share/locale/ja/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/libgphoto2-2.mo
 %%NLS%%share/locale/nb/LC_MESSAGES/libgphoto2_port-0.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2-2.mo
+%%NLS%%share/locale/nl/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2-2.mo
 %%NLS%%share/locale/pl/LC_MESSAGES/libgphoto2_port-0.mo
 %%NLS%%share/locale/pt_BR/LC_MESSAGES/libgphoto2_port-0.mo
@@ -263,6 +296,7 @@ libdata/pkgconfig/libgphoto2.pc
 @dirrm %%DATADIR%%/%%VERSION%%
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm share/doc/libgphoto2_port
+%%PORTDOCS%%@dirrm %%DOCSDIR%%/camlibs
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
 @dirrm lib/libgphoto2_port/%%VERSION_PORT%%
 @dirrm lib/libgphoto2_port