Update to 2.1.1. Rename the package to gphoto2 to match the installed

program. libgphoto2 is split from gphoto2 in this (minor version(!))
release.
Newly supported cameras include:
Ricoh RDC-1, -2, -2E, -100G, -300, -300Z, -4200, -4300, -5000
Philips ESP2, ESP50, ESP60, ESP70, ESP80, ESP80SXG
Canon PowerShot G3, S230, S45, A100, A200
Nikon D100
Mustek gSmart mini, mini2, mini3 and So. Show 301
USB Jenoptik JD350v
RCA CDS1005, FujiFilm @xia ix-100, Oregon Scientific DShot II,
Media-Tech mt-406, and Scott APX 30
Aiptek Pencam and Medion MD 5319
and probably some more

5 files changed, 28 insertions, 230 deletions

diff --git a/graphics/gphoto2/DESCR b/graphics/gphoto2/DESCR
index c6242303eaa..d025c9cb03e 100644
--- a/graphics/gphoto2/DESCR
+++ b/graphics/gphoto2/DESCR
@@ -1,6 +1,7 @@
-gPhoto 2.0 is a set of libraries for accessing digital cameras. The only
-interface that it comes with is a command-line interface. You must
-download graphical applications separately from the gPhoto2 software. 
+gphoto2 is a command line client to for the libgphoto2. It allows
+to use gPhoto software from a terminal or from a script shell to
+perform any camera operation that can be done. This is the main
+user interface.
 
-There is a very large list of supported cameras, and many cameras support
-USB.
+gphoto2 also provide convenient debugging features for camera driver
+developers.
diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 9fddc3b6213..c512d5fcc35 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,34 +1,24 @@
-# $NetBSD: Makefile,v 1.11 2002/12/01 13:49:41 salo Exp $
+# $NetBSD: Makefile,v 1.12 2002/12/24 16:24:07 wiz Exp $
+#
 
-DISTNAME=	gphoto2-2.1.0
-PKGNAME=	gphoto-2.1.0
-PKGREVISION=	1
-CATEGORIES=	graphics
+DISTNAME=	gphoto2-2.1.1
+CATEGORIES=	devel
 MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
+EXTRACT_SUFX=	.tar.bz2
 
-MAINTAINER=	root@garbled.net
-HOMEPAGE=	http://www.gphoto.org/gphoto2/
-COMMENT=	Download and view files from various digital cameras
-
-BUILD_USES_MSGFMT=	# defined
+MAINTAINER=	packages@netbsd.org
+HOMEPAGE=	http://gphoto.sourceforge.net/proj/gphoto2/
+COMMENT=	digital camera access command line client
 
-USE_BUILDLINK2=		# defined
-USE_PKGLOCALEDIR=	# defined
-USE_GMAKE=		# defined
+CONFLICTS=	gphoto-[0-9]*
 
-USE_LIBTOOL=		# defined
+USE_BUILDLINK2=		YES
+USE_LIBTOOL=		YES
 LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libgphoto2_port/libtool
+USE_PKGLOCALEDIR=	YES
+GNU_CONFIGURE=		YES
 
-GNU_CONFIGURE=		# defined
-CONFIGURE_ARGS+=	--with-drivers=all
-CONFIGURE_ARGS+=	--with-doc-dir=${PREFIX}/share/doc/gphoto2
-CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html/gphoto2
-CONFIGURE_ARGS+=	--without-pthread
-CONFIGURE_ARGS+=	--without-pkgconfig
-CONFIGURE_ARGS+=	--without-fig2dev
-CONFIGURE_ARGS+=	--without-xmlto
-CONFIGURE_ARGS+=	--with-aalib
+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}
@@ -37,16 +27,13 @@ CONFIGURE_ARGS+=	--with-jpeg-prefix=${BUILDLINK_PREFIX.jpeg}
 # part of the library check.
 #
 CONFIGURE_ARGS+=	--without-readline
-#USE_GNU_READLINE=	rl_completion_matches
+#USE_GNU_READLINE=	rl_completion_matches, rl_completion_append_character
 #.include "../../devel/readline/buildlink2.mk"
 
-.include "../../converters/libiconv/buildlink2.mk"
 .include "../../devel/cdk/buildlink2.mk"
-.include "../../devel/gettext-lib/buildlink2.mk"
-.include "../../devel/glib/buildlink2.mk"
-.include "../../devel/libusb/buildlink2.mk"
+.include "../../devel/libgphoto2/buildlink2.mk"
+.include "../../devel/ncurses/buildlink2.mk"
+.include "../../devel/popt/buildlink2.mk"
 .include "../../graphics/aalib/buildlink2.mk"
-.include "../../graphics/libexif/buildlink2.mk"
 .include "../../graphics/jpeg/buildlink2.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gphoto2/PLIST b/graphics/gphoto2/PLIST
index 0cf4b728316..774910b6f8b 100644
--- a/graphics/gphoto2/PLIST
+++ b/graphics/gphoto2/PLIST
@@ -1,185 +1,15 @@
-@comment $NetBSD: PLIST,v 1.4 2002/08/25 19:22:49 jlam Exp $
+@comment $NetBSD: PLIST,v 1.5 2002/12/24 16:24:07 wiz Exp $
 bin/gphoto2
-bin/gphoto2-config
-bin/gphoto2-port-config
-include/gphoto2/gphoto2-abilities-list.h
-include/gphoto2/gphoto2-camera.h
-include/gphoto2/gphoto2-context.h
-include/gphoto2/gphoto2-file.h
-include/gphoto2/gphoto2-filesys.h
-include/gphoto2/gphoto2-library.h
-include/gphoto2/gphoto2-list.h
-include/gphoto2/gphoto2-port-info-list.h
-include/gphoto2/gphoto2-port-log.h
-include/gphoto2/gphoto2-port-portability.h
-include/gphoto2/gphoto2-port-result.h
-include/gphoto2/gphoto2-port.h
-include/gphoto2/gphoto2-result.h
-include/gphoto2/gphoto2-setting.h
-include/gphoto2/gphoto2-widget.h
-include/gphoto2/gphoto2.h
-lib/gphoto2/${PKGVERSION}/libgphoto2_agfa.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_agfa.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_agfa.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_barbie.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_barbie.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_barbie.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_canon.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_canon.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_canon.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_casio_qv.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_casio_qv.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_casio_qv.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_digita.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_digita.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_digita.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_dimagev.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_dimagev.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_dimagev.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_dimera3500.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_dimera3500.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_dimera3500.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_directory.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_directory.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_directory.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_fuji.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_fuji.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_fuji.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_jamcam.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_jamcam.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_jamcam.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_jd11.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_jd11.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_jd11.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc120.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc120.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc120.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc240.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc240.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc240.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc3200.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc3200.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_kodak_dc3200.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_konica.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_konica.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_konica.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_mustek.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_mustek.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_mustek.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_coolshot.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_coolshot.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_coolshot.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_dc1000.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_dc1000.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_dc1000.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_dc1580.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_dc1580.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_dc1580.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_l859.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_l859.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_panasonic_l859.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc320.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc320.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc320.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc640.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc640.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc640.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc700.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc700.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_polaroid_pdc700.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_ptp.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_ptp.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_ptp.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_ricoh.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_ricoh.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_ricoh.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_samsung.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_samsung.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_samsung.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_sierra.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_sierra.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sierra.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_sipix.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_sipix.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sipix.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_sony_dscf1.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_sony_dscf1.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sony_dscf1.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_sony_dscf55.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_sony_dscf55.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_sony_dscf55.so
-lib/gphoto2/${PKGVERSION}/libgphoto2_stv0680.a
-lib/gphoto2/${PKGVERSION}/libgphoto2_stv0680.la
-lib/gphoto2/${PKGVERSION}/libgphoto2_stv0680.so
-lib/gphoto2_port/0.5.0/libgphoto2_port_serial.a
-lib/gphoto2_port/0.5.0/libgphoto2_port_serial.la
-lib/gphoto2_port/0.5.0/libgphoto2_port_serial.so
-lib/gphoto2_port/0.5.0/libgphoto2_port_usb.a
-lib/gphoto2_port/0.5.0/libgphoto2_port_usb.la
-lib/gphoto2_port/0.5.0/libgphoto2_port_usb.so
-lib/libgphoto2.a
-lib/libgphoto2.la
-lib/libgphoto2.so
-lib/libgphoto2.so.2
-lib/libgphoto2.so.2.1
-lib/libgphoto2_port.a
-lib/libgphoto2_port.la
-lib/libgphoto2_port.so
-lib/libgphoto2_port.so.5
-lib/libgphoto2_port.so.5.0
-lib/pkgconfig/libgphoto2.pc
 man/man1/gphoto2.1
-man/man3/gphoto2.3
-man/man3/gphoto2_port.3
-share/doc/gphoto2/AUTHORS
-share/doc/gphoto2/COPYING
-share/doc/gphoto2/FAQ
-share/doc/gphoto2/NEWS
-share/doc/gphoto2/README
-share/doc/gphoto2/gphoto2-cli.txt
-share/doc/gphoto2/gphoto2.txt
-share/doc/gphoto2/linux-hotplug/usbcam.console
-share/doc/gphoto2/linux-hotplug/usbcam.group
-share/doc/gphoto2/linux-hotplug/usbcam.user
-share/gphoto2/konica/english
-share/gphoto2/konica/french
-share/gphoto2/konica/german
-share/gphoto2/konica/japanese
-share/gphoto2/konica/korean
-share/gphoto2/konica/spanish
 ${PKGLOCALEDIR}/locale/da/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/da/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/de/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/de/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/es/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/es/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/fr/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/it/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/it/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/ja/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/no/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/no/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/ru/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/sl/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/sv/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/uk/LC_MESSAGES/libgphoto2_port.mo
 ${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/gphoto2.mo
-${PKGLOCALEDIR}/locale/zh_CN/LC_MESSAGES/libgphoto2_port.mo
-@dirrm share/gphoto2/konica
-@dirrm share/gphoto2
-@exec ${MKDIR} %D/share/doc/html/gphoto2/figures
-@dirrm share/doc/html/gphoto2/figures
-@dirrm share/doc/html/gphoto2
-@dirrm share/doc/gphoto2/linux-hotplug
-@dirrm share/doc/gphoto2
-@dirrm lib/gphoto2_port/0.5.0
-@dirrm lib/gphoto2_port
-@dirrm lib/gphoto2/${PKGVERSION}
-@dirrm lib/gphoto2
-@dirrm include/gphoto2
diff --git a/graphics/gphoto2/buildlink2.mk b/graphics/gphoto2/buildlink2.mk
deleted file mode 100644
index 23f142f157f..00000000000
--- a/graphics/gphoto2/buildlink2.mk
+++ /dev/null
@@ -1,20 +0,0 @@
-# $NetBSD: buildlink2.mk,v 1.3 2002/09/10 16:06:42 wiz Exp $
-
-.if !defined(GPHOTO2_BUILDLINK2_MK)
-GPHOTO2_BUILDLINK2_MK=	# defined
-
-BUILDLINK_PACKAGES+=		gphoto2
-BUILDLINK_DEPENDS.gphoto2?=	gphoto>=2.1.0nb1
-BUILDLINK_PKGSRCDIR.gphoto2?=	../../graphics/gphoto2
-
-EVAL_PREFIX+=		BUILDLINK_PREFIX.gphoto2=gphoto2
-BUILDLINK_PREFIX.gphoto2=	${LOCALBASE}
-BUILDLINK_FILES.gphoto2=	include/gphoto2/*.h
-BUILDLINK_FILES.gphoto2+=	lib/libgphoto2.*
-BUILDLINK_FILES.gphoto2+=	lib/libgphoto2_port.*
-
-BUILDLINK_TARGETS+=	gphoto2-buildlink
-
-gphoto2-buildlink: _BUILDLINK_USE
-
-.endif	# GPHOTO2_BUILDLINK2_MK
diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo
index 481d1b065b3..4331533b007 100644
--- a/graphics/gphoto2/distinfo
+++ b/graphics/gphoto2/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.5 2002/08/25 19:22:49 jlam Exp $
+$NetBSD: distinfo,v 1.6 2002/12/24 16:24:07 wiz Exp $
 
-SHA1 (gphoto2-2.1.0.tar.gz) = 3ce3280dd90912d8a72b4d7586cff402e5157450
-Size (gphoto2-2.1.0.tar.gz) = 2137982 bytes
+SHA1 (gphoto2-2.1.1.tar.bz2) = 3eb8f4b6816e786e777f613cb90bdd97d2b6140e
+Size (gphoto2-2.1.1.tar.bz2) = 274275 bytes