5 files changed, 27 insertions, 81 deletions

diff --git a/graphics/libgphoto2/Makefile b/graphics/libgphoto2/Makefile
index bfbd3f2f8f22..c30500e81040 100644
--- a/graphics/libgphoto2/Makefile
+++ b/graphics/libgphoto2/Makefile
@@ -6,26 +6,25 @@
 #
 
 PORTNAME=	libgphoto2
-PORTVERSION=	2.1.99
+PORTVERSION=	2.2.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE}
 MASTER_SITE_SUBDIR=	gphoto
 
-MAINTAINER=	ports@FreeBSD.org
+MAINTAINER=	pav@FreeBSD.org
 COMMENT=	A universal digital camera picture control tool
 
 LIB_DEPENDS=	usb:${PORTSDIR}/devel/libusb \
 		exif:${PORTSDIR}/graphics/libexif
 
 USE_BZIP2=	yes
-USE_GNOME=	gnometarget pkgconfig
+USE_GNOME=	gnometarget pkgconfig ltverhack
 USE_GETOPT_LONG=	yes
 USE_GMAKE=	yes
-GNU_CONFIGURE=	yes
+USE_AUTOTOOLS=	libtool:15
 LIBTOOLFILES=	configure libgphoto2_port/configure
-#CONFIGURE_ENV+=	LIBUSB_CFLAGS="${LIBUSB_CFLAGS}" LIBUSB_LIBS="${LIBUSB_LIBS}"
 INSTALLS_SHLIB=	yes
-PLIST_SUB=	VERSION="${PORTVERSION}"
+PLIST_SUB=	VERSION="${PORTVERSION}" VERSION_PORT=0.6.1
 
 MAN3=		libgphoto2.3 libgphoto2_port.3
 
diff --git a/graphics/libgphoto2/distinfo b/graphics/libgphoto2/distinfo
index f296c4e6ac34..9a36103ddc8f 100644
--- a/graphics/libgphoto2/distinfo
+++ b/graphics/libgphoto2/distinfo
@@ -1,3 +1,3 @@
-MD5 (libgphoto2-2.1.99.tar.bz2) = 3c6d9cb65661915e07491a6f9215d5a9
-SHA256 (libgphoto2-2.1.99.tar.bz2) = 91e4ea98487907fe687aaf540a9022207baaafd76f0d64b1f8d1fdb67ecfee75
-SIZE (libgphoto2-2.1.99.tar.bz2) = 2696897
+MD5 (libgphoto2-2.2.1.tar.bz2) = 69827311733e39fafa9f77bb05e55b77
+SHA256 (libgphoto2-2.2.1.tar.bz2) = fb2ba23957f5892a5ed0b4e346230006bf2a72b5fdf52563b978c78f0bcccd11
+SIZE (libgphoto2-2.2.1.tar.bz2) = 3086807
diff --git a/graphics/libgphoto2/files/patch-libgphoto2-serial-disk.c b/graphics/libgphoto2/files/patch-libgphoto2-serial-disk.c
deleted file mode 100644
index f4b6a5335000..000000000000
--- a/graphics/libgphoto2/files/patch-libgphoto2-serial-disk.c
+++ /dev/null
@@ -1,47 +0,0 @@
-===================================================================
-RCS file: /cvsroot/gphoto/libgphoto2/libgphoto2_port/disk/disk.c,v
-retrieving revision 1.4
-retrieving revision 1.7
-diff -u -r1.4 -r1.7
---- libgphoto2_port/disk/disk.c	2005/08/14 14:01:38	1.4
-+++ libgphoto2_port/disk/disk.c	2006/02/19 10:48:10	1.7
-@@ -33,7 +33,9 @@
- #include <sys/param.h>
- #include <dirent.h>
- #include <string.h>
--#include <mntent.h>
-+#ifdef HAVE_MNTENT_H
-+# include <mntent.h>
-+#endif
- 
- #ifdef HAVE_HAL
- #include <hal/libhal.h>
-@@ -172,10 +174,11 @@
-         }
- 
- 	libhal_free_string_array (volumes);
--	libhal_ctx_free(ctx);
--
--	dbus_connection_unref(dbus_connection);
-+	libhal_ctx_free (ctx);
-+	dbus_connection_disconnect (dbus_connection);
-+	dbus_connection_unref (dbus_connection);
- #else
-+# ifdef HAVE_MNTENT_H
- 	FILE *mnt;
- 	struct mntent *mntent;
- 	char	path[1024];
-@@ -226,7 +229,13 @@
- 		CHECK (gp_port_info_list_append (list, info));
- 	}
- 	endmntent(mnt);
-+# endif
- #endif
-+	/* generic disk:/xxx/ matcher */
-+	info.type = GP_PORT_DISK;
-+	memset (info.name, 0, sizeof(info.name));
-+	snprintf (info.path, sizeof(info.path), "^disk:");
-+	CHECK (gp_port_info_list_append (list, info));
- 	return GP_OK;
- }
- 
diff --git a/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c b/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
deleted file mode 100644
index 42de9512f38c..000000000000
--- a/graphics/libgphoto2/files/patch-libgphoto2_port-serial-unix.c
+++ /dev/null
@@ -1,14 +0,0 @@
---- libgphoto2_port/serial/unix.c.orig	Mon May  2 14:36:52 2005
-+++ libgphoto2_port/serial/unix.c	Mon Mar 13 16:35:59 2006
-@@ -108,7 +108,11 @@
- 
- /* FreeBSD */
- #ifdef __FreeBSD__
-+#if __FreeBSD_version < 600000
- #define GP_PORT_SERIAL_PREFIX   "/dev/cuaa%x"
-+#else
-+#define GP_PORT_SERIAL_PREFIX   "/dev/cuad%x"
-+#endif
- #define GP_PORT_SERIAL_RANGE_LOW        0
- #define GP_PORT_SERIAL_RANGE_HIGH       (0xf)
- #endif
diff --git a/graphics/libgphoto2/pkg-plist b/graphics/libgphoto2/pkg-plist
index 1bf5edea1c48..47a23e6fe673 100644
--- a/graphics/libgphoto2/pkg-plist
+++ b/graphics/libgphoto2/pkg-plist
@@ -36,6 +36,9 @@ lib/libgphoto2/%%VERSION%%/canon.so
 lib/libgphoto2/%%VERSION%%/casio_qv.a
 lib/libgphoto2/%%VERSION%%/casio_qv.la
 lib/libgphoto2/%%VERSION%%/casio_qv.so
+lib/libgphoto2/%%VERSION%%/clicksmart310.a
+lib/libgphoto2/%%VERSION%%/clicksmart310.la
+lib/libgphoto2/%%VERSION%%/clicksmart310.so
 lib/libgphoto2/%%VERSION%%/digita.a
 lib/libgphoto2/%%VERSION%%/digita.la
 lib/libgphoto2/%%VERSION%%/digita.so
@@ -189,15 +192,18 @@ lib/libgphoto2/%%VERSION%%/sx330z.so
 lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.a
 lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.la
 lib/libgphoto2/%%VERSION%%/toshiba_pdrm11.so
-lib/libgphoto2_port/0.5.2/disk.a
-lib/libgphoto2_port/0.5.2/disk.la
-lib/libgphoto2_port/0.5.2/disk.so
-lib/libgphoto2_port/0.5.2/serial.a
-lib/libgphoto2_port/0.5.2/serial.la
-lib/libgphoto2_port/0.5.2/serial.so
-lib/libgphoto2_port/0.5.2/usb.a
-lib/libgphoto2_port/0.5.2/usb.la
-lib/libgphoto2_port/0.5.2/usb.so
+lib/libgphoto2_port/%%VERSION_PORT%%/disk.a
+lib/libgphoto2_port/%%VERSION_PORT%%/disk.la
+lib/libgphoto2_port/%%VERSION_PORT%%/disk.so
+lib/libgphoto2_port/%%VERSION_PORT%%/ptpip.a
+lib/libgphoto2_port/%%VERSION_PORT%%/ptpip.la
+lib/libgphoto2_port/%%VERSION_PORT%%/ptpip.so
+lib/libgphoto2_port/%%VERSION_PORT%%/serial.a
+lib/libgphoto2_port/%%VERSION_PORT%%/serial.la
+lib/libgphoto2_port/%%VERSION_PORT%%/serial.so
+lib/libgphoto2_port/%%VERSION_PORT%%/usb.a
+lib/libgphoto2_port/%%VERSION_PORT%%/usb.la
+lib/libgphoto2_port/%%VERSION_PORT%%/usb.so
 lib/libgphoto2.a
 lib/libgphoto2.la
 lib/libgphoto2.so
@@ -205,7 +211,7 @@ lib/libgphoto2.so.2
 lib/libgphoto2_port.a
 lib/libgphoto2_port.la
 lib/libgphoto2_port.so
-lib/libgphoto2_port.so.5
+lib/libgphoto2_port.so.0
 libdata/pkgconfig/libgphoto2.pc
 %%PORTDOCS%%%%DOCSDIR%%/AUTHORS
 %%PORTDOCS%%%%DOCSDIR%%/NEWS
@@ -237,6 +243,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/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
 %%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2-2.mo
 %%NLS%%share/locale/ru/LC_MESSAGES/libgphoto2_port-0.mo
@@ -255,7 +263,7 @@ libdata/pkgconfig/libgphoto2.pc
 @dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm share/doc/libgphoto2_port
 %%PORTDOCS%%@dirrm %%DOCSDIR%%
-@dirrm lib/libgphoto2_port/0.5.2
+@dirrm lib/libgphoto2_port/%%VERSION_PORT%%
 @dirrm lib/libgphoto2_port
 @dirrm lib/libgphoto2/%%VERSION%%
 @dirrm lib/libgphoto2