Changes 2.3.1:

  * Added --hook-script option, including man page update and test-hook.sh.
  * Fix: --get-all-metadata takes no argument.

Changes 2.3.0:
  * Require popt library to parse command line options.
  * Partitioned command line options into groups of related options.
  * Added --debug-logfile=FILENAME option.
  * Only load all camlibs if necessary.
  * (Half-)Fix to make --with-libgphoto2=PREFIX configure parameter work.
  * Preliminary support for lower-case filenames in --filename pattern: %:
  * Added "rmdir" command to gphoto2 --shell.

4 files changed, 30 insertions, 27 deletions

diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 8b4055aa5b3..d4cf6f63a8b 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,9 +1,9 @@
-# $NetBSD: Makefile,v 1.37 2006/03/04 21:29:48 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2007/01/02 18:33:50 adam Exp $
 
-DISTNAME=	gphoto2-2.1.6
-PKGREVISION=	1
+DISTNAME=	gphoto2-2.3.1
 CATEGORIES=	graphics
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
+EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://gphoto.sourceforge.net/proj/gphoto2/
@@ -12,33 +12,18 @@ COMMENT=	Digital camera access command line client
 CONFLICTS=	gphoto-[0-9]*
 
 USE_TOOLS+=		pkg-config
-USE_LIBTOOL=		YES
-USE_PKGLOCALEDIR=	YES
-GNU_CONFIGURE=		YES
-
+USE_LIBTOOL=		yes
+USE_PKGLOCALEDIR=	yes
+GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-aalib-prefix=${BUILDLINK_PREFIX.aalib}
 CONFIGURE_ARGS+=	--with-cdk-prefix=${BUILDLINK_PREFIX.cdk}
 CONFIGURE_ARGS+=	--with-exif-prefix=${BUILDLINK_PREFIX.libexif}
 CONFIGURE_ARGS+=	--with-jpeg-prefix=${BUILDLINK_PREFIX.jpeg}
 
-SUBST_CLASSES+=		libexif-update
-SUBST_STAGE.libexif-update=	pre-configure
-SUBST_MESSAGE.libexif-update=	Fix configure script checks for libexif-0.6.13
-SUBST_FILES.libexif-update=	configure
-SUBST_SED.libexif-update=	s,exif-,libexif/exif-,g
-
-# readline detection is currently broken since -ltermcap isn't passed as
-# part of the library check.
-#
-CONFIGURE_ARGS+=	--without-readline
-#USE_GNU_READLINE=	rl_completion_matches, rl_completion_append_character
-#.include "../../devel/readline/buildlink3.mk"
-
 .include "../../devel/cdk/buildlink3.mk"
 .include "../../devel/libgphoto2/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/popt/buildlink3.mk"
+.include "../../devel/readline/buildlink3.mk"
 .include "../../graphics/aalib/buildlink3.mk"
-.include "../../graphics/jpeg/buildlink3.mk"
-.include "../../graphics/libexif/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gphoto2/PLIST b/graphics/gphoto2/PLIST
index ac9909c8d9a..5621bb87aa2 100644
--- a/graphics/gphoto2/PLIST
+++ b/graphics/gphoto2/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.10 2006/04/17 07:07:21 jlam Exp $
+@comment $NetBSD: PLIST,v 1.11 2007/01/02 18:33:50 adam Exp $
 bin/gphoto2
 man/man1/gphoto2.1
 share/locale/az/LC_MESSAGES/gphoto2.mo
@@ -15,13 +15,17 @@ share/locale/it/LC_MESSAGES/gphoto2.mo
 share/locale/ja/LC_MESSAGES/gphoto2.mo
 share/locale/nb/LC_MESSAGES/gphoto2.mo
 share/locale/nl/LC_MESSAGES/gphoto2.mo
+share/locale/pa/LC_MESSAGES/gphoto2.mo
+share/locale/pl/LC_MESSAGES/gphoto2.mo
 share/locale/pt_BR/LC_MESSAGES/gphoto2.mo
 share/locale/ro/LC_MESSAGES/gphoto2.mo
 share/locale/ru/LC_MESSAGES/gphoto2.mo
+share/locale/rw/LC_MESSAGES/gphoto2.mo
 share/locale/sk/LC_MESSAGES/gphoto2.mo
 share/locale/sl/LC_MESSAGES/gphoto2.mo
 share/locale/sr/LC_MESSAGES/gphoto2.mo
 share/locale/sv/LC_MESSAGES/gphoto2.mo
 share/locale/uk/LC_MESSAGES/gphoto2.mo
+share/locale/vi/LC_MESSAGES/gphoto2.mo
 share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
 share/locale/zh_TW/LC_MESSAGES/gphoto2.mo
diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo
index a86dd30d7ff..7d9509dce48 100644
--- a/graphics/gphoto2/distinfo
+++ b/graphics/gphoto2/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.12 2005/07/19 17:28:13 drochner Exp $
+$NetBSD: distinfo,v 1.13 2007/01/02 18:33:50 adam Exp $
 
-SHA1 (gphoto2-2.1.6.tar.gz) = 73385db3cd90174a8489b61f3c5ff00823ef5781
-RMD160 (gphoto2-2.1.6.tar.gz) = 4b7df21b93a91c45560eaa129a4d92bd4985d770
-Size (gphoto2-2.1.6.tar.gz) = 617432 bytes
+SHA1 (gphoto2-2.3.1.tar.bz2) = 553668806d45d7db5926eb3963863a58da9032c1
+RMD160 (gphoto2-2.3.1.tar.bz2) = 77b4325acbbace03ab5a70251f0b36d6c6d1a586
+Size (gphoto2-2.3.1.tar.bz2) = 553795 bytes
+SHA1 (patch-aa) = 0abe9dcd50f0e6b5065ee7bc3262a3758cd9f113
diff --git a/graphics/gphoto2/patches/patch-aa b/graphics/gphoto2/patches/patch-aa
new file mode 100644
index 00000000000..20a252a98c2
--- /dev/null
+++ b/graphics/gphoto2/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.5 2007/01/02 18:34:33 adam Exp $
+
+--- configure.orig	2007-01-02 17:53:57.000000000 +0100
++++ configure
+@@ -22877,7 +22877,7 @@ echo $ECHO_N "checking for libgphoto2 ve
+ 				_LIBGPHOTO2_REQ_3="1"
+ 				_LIBGPHOTO2_REQ_4=""
+ 				# split installed version number via shell and sed
+-				_LIBGPHOTO2_VERSION="$("${LIBGPHOTO2_CONFIG_PROG}" --version)"
++				_LIBGPHOTO2_VERSION="$("${LIBGPHOTO2_CONFIG_PROG}" --version | sed 's/libgphoto2\ //')"
+ 				_LIBGPHOTO2_VER_1="$(echo "${_LIBGPHOTO2_VERSION}" | sed 's/\([0-9]*\).*/\1/g')"
+ 				_LIBGPHOTO2_VER_2="$(echo "${_LIBGPHOTO2_VERSION}" | sed 's/\([0-9]*\)\.\([0-9]*\).*/\2/g')"
+ 				_LIBGPHOTO2_VER_3="$(echo "${_LIBGPHOTO2_VERSION}" | sed 's/\([0-9]*\)\.\([0-9]*\)\.\([0-9]*\).*/\3/g')"