Updated gphoto to 2.0 (provided by Amitai Schlair in pkg/15727)

The changelog since the last version of gphoto2 in pkgsrc
(a beta from July) is 150K+. Please note that this is no longer
a beta version!

10 files changed, 237 insertions, 316 deletions

diff --git a/graphics/gphoto2/Makefile b/graphics/gphoto2/Makefile
index 86c5ad7b1e8..f820175e93e 100644
--- a/graphics/gphoto2/Makefile
+++ b/graphics/gphoto2/Makefile
@@ -1,39 +1,40 @@
-# $NetBSD: Makefile,v 1.5 2001/11/29 01:12:35 hubertf Exp $
+# $NetBSD: Makefile,v 1.6 2002/02/26 13:14:54 martti Exp $
+
+DISTNAME=	gphoto2-2.0
+PKGNAME=	gphoto-2.0
 
-DISTNAME=	gphoto-2.0beta1
-PKGNAME=	gphoto-2.0.0.1
-PKGREVISION=	1
 CATEGORIES=	graphics
-MASTER_SITES=	http://www.gphoto.net/dist/
+MASTER_SITES=	${MASTER_SITE_SOURCEFORGE:=gphoto/}
 
 MAINTAINER=	root@garbled.net
 HOMEPAGE=	http://www.gphoto.org/gphoto2/
 COMMENT=	Download and view files from various digital cameras
 
-BUILD_USES_MSGFMT=	yes
+USE_BUILDLINK_ONLY=	# XXX gphoto2 adds unneeded -L${LOCALBASE}/lib etc.
 
-USE_GMAKE=		yes
-USE_LIBTOOL=		yes
-LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
-#LIBTOOL_OVERRIDE=	yes
-GNU_CONFIGURE=		yes
-CONFIGURE_SCRIPT=	${WRKSRC}/build.sh
-CONFIGURE_ARGS+=	--with-html-dir=${LOCALBASE}/share/doc/html/gphoto2
-.include "../../devel/gettext-lib/buildlink.mk"
+BUILD_USES_MSGFMT=	# defined
 
-post-patch:
-	${RM} -f ${LTCONFIG_OVERRIDE} ;                         \
-	${ECHO} "${RM} -f libtool; ${LN} -s ${LIBTOOL} libtool" \
-	        > ${LTCONFIG_OVERRIDE} ;                        \
-	${CHMOD} +x ${LTCONFIG_OVERRIDE} ;                      \
+USE_GMAKE=		# defined
+USE_LIBTOOL=		# defined
+LIBTOOL_OVERRIDE=	${WRKSRC}/ltmain.sh
+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-pkgconfig
+CONFIGURE_ARGS+=	--without-fig2dev
+CONFIGURE_ARGS+=	--with-aalib
+CONFIGURE_ARGS+=	--with-cdk
+CONFIGURE_ARGS+=	--with-exif
+CONFIGURE_ARGS+=	--with-jpeg
 
-pre-configure:
-	for i in `find ${WRKSRC} -name Makefile.in`;		\
-	do							\
-		${CP} $$i $$i.NB;				\
-		${SED} -e 's/\/\.libs//g' < $$i.NB > $$i;		\
-	done							\
+BUILDLINK_DEPENDS.libusb=   libusb>=0.1.5
 
-.include "../../devel/glib/buildlink.mk"
+.include "../../converters/libiconv/buildlink.mk"
+.include "../../devel/cdk/buildlink.mk"
+.include "../../devel/gettext-lib/buildlink.mk"
 .include "../../devel/libusb/buildlink.mk"
+.include "../../graphics/aalib/buildlink.mk"
+.include "../../graphics/libexif/buildlink.mk"
+.include "../../graphics/jpeg/buildlink.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/graphics/gphoto2/PLIST b/graphics/gphoto2/PLIST
index 0c938ddcbae..0b0fea2e6d5 100644
--- a/graphics/gphoto2/PLIST
+++ b/graphics/gphoto2/PLIST
@@ -1,104 +1,171 @@
-@comment $NetBSD: PLIST,v 1.1 2001/10/31 23:51:21 zuntum Exp $
-share/doc/html/gphoto2/gphoto2-api.sgml
-share/doc/gphoto2/AUTHORS
-share/doc/gphoto2/COPYING
-share/locale/de/LC_MESSAGES/gphoto.mo
-lib/gphoto2/libgphoto2_barbie.so
-lib/gphoto2/libgphoto2_barbie.la
-lib/gphoto2/libgphoto2_barbie.a
-lib/gphoto2/libgphoto2_canon.so
-lib/gphoto2/libgphoto2_canon.la
-lib/gphoto2/libgphoto2_canon.a
-lib/gphoto2/libgphoto2_dimera3500.so
-lib/gphoto2/libgphoto2_dimera3500.la
-lib/gphoto2/libgphoto2_dimera3500.a
-lib/gphoto2/libgphoto2_directory.so
-lib/gphoto2/libgphoto2_directory.la
-lib/gphoto2/libgphoto2_directory.a
-lib/gphoto2/libgphoto2_sierra.so
-lib/gphoto2/libgphoto2_sierra.la
-lib/gphoto2/libgphoto2_sierra.a
-lib/gphoto2/libgphoto2_konica.so
-lib/gphoto2/libgphoto2_konica.la
-lib/gphoto2/libgphoto2_konica.a
-lib/gphoto2/libgphoto2_panasonic_dc1000.so
-lib/gphoto2/libgphoto2_panasonic_dc1000.la
-lib/gphoto2/libgphoto2_panasonic_dc1000.a
-lib/gphoto2/libgphoto2_panasonic_dc1580.so
-lib/gphoto2/libgphoto2_panasonic_dc1580.la
-lib/gphoto2/libgphoto2_panasonic_dc1580.a
-lib/gphoto2/libgphoto2_digita.so
-lib/gphoto2/libgphoto2_digita.la
-lib/gphoto2/libgphoto2_digita.a
-lib/gphoto2/libgphoto2_kodak_dc120.so
-lib/gphoto2/libgphoto2_kodak_dc120.la
-lib/gphoto2/libgphoto2_kodak_dc120.a
-lib/gphoto2/libgphoto2_kodak_dc240.so
-lib/gphoto2/libgphoto2_kodak_dc240.la
-lib/gphoto2/libgphoto2_kodak_dc240.a
-lib/gphoto2/libgphoto2_kodak_dc3200.so
-lib/gphoto2/libgphoto2_kodak_dc3200.la
-lib/gphoto2/libgphoto2_kodak_dc3200.a
-lib/gphoto2/libgphoto2_dimagev.so
-lib/gphoto2/libgphoto2_dimagev.la
-lib/gphoto2/libgphoto2_dimagev.a
-lib/gphoto2/libgphoto2_stv0680.so
-lib/gphoto2/libgphoto2_stv0680.la
-lib/gphoto2/libgphoto2_stv0680.a
-lib/gphoto2/libgphoto2_sony_dscf1.so
-lib/gphoto2/libgphoto2_sony_dscf1.a
-lib/gphoto2/libgphoto2_sony_dscf1.la
-lib/libgphoto2_port.so.0.3
-lib/libgphoto2_port.so.0
-lib/libgphoto2_port.so
-lib/libgphoto2_port.la
-lib/libgphoto2_port.a
-lib/gphoto2_port/libgphoto2_port_serial.so.0.3
-lib/gphoto2_port/libgphoto2_port_serial.so.0
-lib/gphoto2_port/libgphoto2_port_serial.so
-lib/gphoto2_port/libgphoto2_port_serial.la
-lib/gphoto2_port/libgphoto2_port_serial.a
-lib/gphoto2_port/libgphoto2_port_usb.so.0.3
-lib/gphoto2_port/libgphoto2_port_usb.so.0
-lib/gphoto2_port/libgphoto2_port_usb.so
-lib/gphoto2_port/libgphoto2_port_usb.la
-lib/gphoto2_port/libgphoto2_port_usb.a
-lib/gphoto2portConf.sh
-lib/libgphoto2.so.0.0
-lib/libgphoto2.so.0
-lib/libgphoto2.so
-lib/libgphoto2.la
-lib/libgphoto2.a
-lib/libgphoto2Conf.sh
-lib/libgphoto2_frontend.so.0.0
-lib/libgphoto2_frontend.so.0
-lib/libgphoto2_frontend.so
-lib/libgphoto2_frontend.la
-lib/libgphoto2_frontend.a
-include/gphoto2/gphoto2-port.h
-include/gphoto2/gphoto2-portability.h
-include/gphoto2/gphoto2-port-serial.h
-include/gphoto2/gphoto2-port-parallel.h
-include/gphoto2/gphoto2-port-usb.h
-include/gphoto2/gphoto2-port-ieee1394.h
-include/gphoto2/gphoto2-port-network.h
-include/gphoto2/gphoto2.h
+@comment $NetBSD: PLIST,v 1.2 2002/02/26 13:14:55 martti Exp $
+bin/gphoto2
+bin/gphoto2-config
+bin/gphoto2-port-config
+include/gphoto2/gphoto2-abilities-list.h
 include/gphoto2/gphoto2-camera.h
-include/gphoto2/gphoto2-core.h
-include/gphoto2/gphoto2-datatypes.h
+include/gphoto2/gphoto2-context.h
 include/gphoto2/gphoto2-file.h
 include/gphoto2/gphoto2-filesys.h
-include/gphoto2/gphoto2-frontend.h
 include/gphoto2/gphoto2-library.h
-include/gphoto2/gphoto2-lists.h
-include/gphoto2/gphoto2-settings.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
-bin/gphoto2
-bin/gphoto2-port-config
-bin/gphoto2-config
-@dirrm share/doc/html/gphoto2/gphoto2
+include/gphoto2/gphoto2.h
+lib/gphoto2/2.0/libgphoto2_agfa.a
+lib/gphoto2/2.0/libgphoto2_agfa.la
+lib/gphoto2/2.0/libgphoto2_agfa.so
+lib/gphoto2/2.0/libgphoto2_barbie.a
+lib/gphoto2/2.0/libgphoto2_barbie.la
+lib/gphoto2/2.0/libgphoto2_barbie.so
+lib/gphoto2/2.0/libgphoto2_canon.a
+lib/gphoto2/2.0/libgphoto2_canon.la
+lib/gphoto2/2.0/libgphoto2_canon.so
+lib/gphoto2/2.0/libgphoto2_casio_qv.a
+lib/gphoto2/2.0/libgphoto2_casio_qv.la
+lib/gphoto2/2.0/libgphoto2_casio_qv.so
+lib/gphoto2/2.0/libgphoto2_digita.a
+lib/gphoto2/2.0/libgphoto2_digita.la
+lib/gphoto2/2.0/libgphoto2_digita.so
+lib/gphoto2/2.0/libgphoto2_dimagev.a
+lib/gphoto2/2.0/libgphoto2_dimagev.la
+lib/gphoto2/2.0/libgphoto2_dimagev.so
+lib/gphoto2/2.0/libgphoto2_dimera3500.a
+lib/gphoto2/2.0/libgphoto2_dimera3500.la
+lib/gphoto2/2.0/libgphoto2_dimera3500.so
+lib/gphoto2/2.0/libgphoto2_directory.a
+lib/gphoto2/2.0/libgphoto2_directory.la
+lib/gphoto2/2.0/libgphoto2_directory.so
+lib/gphoto2/2.0/libgphoto2_jamcam.a
+lib/gphoto2/2.0/libgphoto2_jamcam.la
+lib/gphoto2/2.0/libgphoto2_jamcam.so
+lib/gphoto2/2.0/libgphoto2_jd11.a
+lib/gphoto2/2.0/libgphoto2_jd11.la
+lib/gphoto2/2.0/libgphoto2_jd11.so
+lib/gphoto2/2.0/libgphoto2_kodak_dc120.a
+lib/gphoto2/2.0/libgphoto2_kodak_dc120.la
+lib/gphoto2/2.0/libgphoto2_kodak_dc120.so
+lib/gphoto2/2.0/libgphoto2_kodak_dc240.a
+lib/gphoto2/2.0/libgphoto2_kodak_dc240.la
+lib/gphoto2/2.0/libgphoto2_kodak_dc240.so
+lib/gphoto2/2.0/libgphoto2_kodak_dc3200.a
+lib/gphoto2/2.0/libgphoto2_kodak_dc3200.la
+lib/gphoto2/2.0/libgphoto2_kodak_dc3200.so
+lib/gphoto2/2.0/libgphoto2_konica.a
+lib/gphoto2/2.0/libgphoto2_konica.la
+lib/gphoto2/2.0/libgphoto2_konica.so
+lib/gphoto2/2.0/libgphoto2_panasonic_coolshot.a
+lib/gphoto2/2.0/libgphoto2_panasonic_coolshot.la
+lib/gphoto2/2.0/libgphoto2_panasonic_coolshot.so
+lib/gphoto2/2.0/libgphoto2_panasonic_dc1000.a
+lib/gphoto2/2.0/libgphoto2_panasonic_dc1000.la
+lib/gphoto2/2.0/libgphoto2_panasonic_dc1000.so
+lib/gphoto2/2.0/libgphoto2_panasonic_dc1580.a
+lib/gphoto2/2.0/libgphoto2_panasonic_dc1580.la
+lib/gphoto2/2.0/libgphoto2_panasonic_dc1580.so
+lib/gphoto2/2.0/libgphoto2_panasonic_l859.a
+lib/gphoto2/2.0/libgphoto2_panasonic_l859.la
+lib/gphoto2/2.0/libgphoto2_panasonic_l859.so
+lib/gphoto2/2.0/libgphoto2_polaroid_pdc320.a
+lib/gphoto2/2.0/libgphoto2_polaroid_pdc320.la
+lib/gphoto2/2.0/libgphoto2_polaroid_pdc320.so
+lib/gphoto2/2.0/libgphoto2_polaroid_pdc640.a
+lib/gphoto2/2.0/libgphoto2_polaroid_pdc640.la
+lib/gphoto2/2.0/libgphoto2_polaroid_pdc640.so
+lib/gphoto2/2.0/libgphoto2_polaroid_pdc700.a
+lib/gphoto2/2.0/libgphoto2_polaroid_pdc700.la
+lib/gphoto2/2.0/libgphoto2_polaroid_pdc700.so
+lib/gphoto2/2.0/libgphoto2_ptp.a
+lib/gphoto2/2.0/libgphoto2_ptp.la
+lib/gphoto2/2.0/libgphoto2_ptp.so
+lib/gphoto2/2.0/libgphoto2_ricoh.a
+lib/gphoto2/2.0/libgphoto2_ricoh.la
+lib/gphoto2/2.0/libgphoto2_ricoh.so
+lib/gphoto2/2.0/libgphoto2_samsung.a
+lib/gphoto2/2.0/libgphoto2_samsung.la
+lib/gphoto2/2.0/libgphoto2_samsung.so
+lib/gphoto2/2.0/libgphoto2_sierra.a
+lib/gphoto2/2.0/libgphoto2_sierra.la
+lib/gphoto2/2.0/libgphoto2_sierra.so
+lib/gphoto2/2.0/libgphoto2_sony_dscf1.a
+lib/gphoto2/2.0/libgphoto2_sony_dscf1.la
+lib/gphoto2/2.0/libgphoto2_sony_dscf1.so
+lib/gphoto2/2.0/libgphoto2_sony_dscf55.a
+lib/gphoto2/2.0/libgphoto2_sony_dscf55.la
+lib/gphoto2/2.0/libgphoto2_sony_dscf55.so
+lib/gphoto2/2.0/libgphoto2_stv0680.a
+lib/gphoto2/2.0/libgphoto2_stv0680.la
+lib/gphoto2/2.0/libgphoto2_stv0680.so
+lib/gphoto2_port/0.0.4/libgphoto2_port_serial.a
+lib/gphoto2_port/0.0.4/libgphoto2_port_serial.la
+lib/gphoto2_port/0.0.4/libgphoto2_port_serial.so
+lib/gphoto2_port/0.0.4/libgphoto2_port_usb.a
+lib/gphoto2_port/0.0.4/libgphoto2_port_usb.la
+lib/gphoto2_port/0.0.4/libgphoto2_port_usb.so
+lib/libgphoto2.a
+lib/libgphoto2.la
+lib/libgphoto2.so
+lib/libgphoto2.so.2
+lib/libgphoto2.so.2.0
+lib/libgphoto2_port.a
+lib/libgphoto2_port.la
+lib/libgphoto2_port.so
+lib/libgphoto2_port.so.0
+lib/libgphoto2_port.so.0.4
+lib/pkgconfig/libgphoto2.pc
+man/man1/gphoto2.1
+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/gphoto2/konica/english
+share/gphoto2/konica/french
+share/gphoto2/konica/german
+share/gphoto2/konica/japanese
+share/gphoto2/konica/korean
+share/gphoto2/konica/spanish
+share/locale/da/LC_MESSAGES/gphoto2.mo
+share/locale/da/LC_MESSAGES/libgphoto2_port.mo
+share/locale/de/LC_MESSAGES/gphoto2.mo
+share/locale/de/LC_MESSAGES/libgphoto2_port.mo
+share/locale/fr/LC_MESSAGES/gphoto2.mo
+share/locale/fr/LC_MESSAGES/libgphoto2_port.mo
+share/locale/it/LC_MESSAGES/gphoto2.mo
+share/locale/it/LC_MESSAGES/libgphoto2_port.mo
+share/locale/ja/LC_MESSAGES/gphoto2.mo
+share/locale/ja/LC_MESSAGES/libgphoto2_port.mo
+share/locale/no/LC_MESSAGES/gphoto2.mo
+share/locale/no/LC_MESSAGES/libgphoto2_port.mo
+share/locale/ru/LC_MESSAGES/gphoto2.mo
+share/locale/ru/LC_MESSAGES/libgphoto2_port.mo
+share/locale/sl/LC_MESSAGES/gphoto2.mo
+share/locale/sl/LC_MESSAGES/libgphoto2_port.mo
+share/locale/sv/LC_MESSAGES/gphoto2.mo
+share/locale/sv/LC_MESSAGES/libgphoto2_port.mo
+share/locale/uk/LC_MESSAGES/gphoto2.mo
+share/locale/uk/LC_MESSAGES/libgphoto2_port.mo
+share/locale/zh_CN/LC_MESSAGES/gphoto2.mo
+share/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.0.4
 @dirrm lib/gphoto2_port
+@dirrm lib/gphoto2/2.0
 @dirrm lib/gphoto2
 @dirrm include/gphoto2
diff --git a/graphics/gphoto2/buildlink.mk b/graphics/gphoto2/buildlink.mk
new file mode 100644
index 00000000000..3229c11d30f
--- /dev/null
+++ b/graphics/gphoto2/buildlink.mk
@@ -0,0 +1,46 @@
+# $NetBSD: buildlink.mk,v 1.1 2002/02/26 13:14:55 martti Exp $
+#
+# This Makefile fragment is included by packages that use gphoto2.
+#
+# To use this Makefile fragment, simply:
+#
+# (1) Optionally define BUILDLINK_DEPENDS.gphoto2 to the dependency pattern
+#     for the version of gphoto2 desired.
+# (2) Include this Makefile fragment in the package Makefile.
+
+.if !defined(GPHOTO2_BUILDLINK_MK)
+GPHOTO2_BUILDLINK_MK=	# defined
+
+.include "../../mk/bsd.buildlink.mk"
+
+BUILDLINK_DEPENDS.gphoto2?=	gphoto>=2.0
+DEPENDS+=	${BUILDLINK_DEPENDS.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=	gphoto2-buildlink
+BUILDLINK_TARGETS.gphoto2+=	gphoto2-buildlink-config-wrapper
+BUILDLINK_TARGETS+=	${BUILDLINK_TARGETS.gphoto2}
+
+BUILDLINK_CONFIG.gphoto2=	\
+			${BUILDLINK_PREFIX.gphoto2}/bin/gphoto2-config
+BUILDLINK_CONFIG_WRAPPER.gphoto2=	\
+	 		${BUILDLINK_DIR}/bin/gphoto2-config
+REPLACE_BUILDLINK_SED+=	\
+	-e "s|${BUILDLINK_CONFIG_WRAPPER.gphoto2}|${BUILDLINK_CONFIG.gphoto2}|g"
+
+.if defined(USE_CONFIG_WRAPPER)
+GPHOTO2_CONFIG?=	${BUILDLINK_CONFIG_WRAPPER.gphoto2}
+CONFIGURE_ENV+=		GPHOTO2_CONFIG="${GPHOTO2_CONFIG}"
+MAKE_ENV+=		GPHOTO2_CONFIG="${GPHOTO2_CONFIG}"
+.endif
+
+pre-configure: ${BUILDLINK_TARGETS.gphoto2}
+gphoto2-buildlink: _BUILDLINK_USE
+gphoto2-buildlink-config-wrapper: _BUILDLINK_CONFIG_WRAPPER_USE
+
+.endif	# GPHOTO2_BUILDLINK_MK
diff --git a/graphics/gphoto2/distinfo b/graphics/gphoto2/distinfo
index 3739a26d3e6..53d80ecbc67 100644
--- a/graphics/gphoto2/distinfo
+++ b/graphics/gphoto2/distinfo
@@ -1,10 +1,4 @@
-$NetBSD: distinfo,v 1.2 2001/07/08 21:47:21 veego Exp $
+$NetBSD: distinfo,v 1.3 2002/02/26 13:14:55 martti Exp $
 
-SHA1 (gphoto-2.0beta1.tar.gz) = d217051d373f8b122e133741c0e29fbdc7185963
-Size (gphoto-2.0beta1.tar.gz) = 606938 bytes
-SHA1 (patch-aa) = a1c6ed92407b9fa4809e5340ace8ca7a78a04523
-SHA1 (patch-ab) = 9f72a219e8bbcadc9c178d0686f54ca26ccbcaf1
-SHA1 (patch-ac) = 786f161fd55aa052e9f697886f1756896d2be52a
-SHA1 (patch-ad) = 0cec748d29fb4acf682e715e3cf70b9c97441d2f
-SHA1 (patch-ae) = 4adee9a2a588355178b2c49761bab429aacf2620
-SHA1 (patch-af) = cc864d928086ec15c0ea35267aad44dbd7446408
+SHA1 (gphoto2-2.0.tar.gz) = 17b3a73d5c10504f50e18125e664b23af2f5812e
+Size (gphoto2-2.0.tar.gz) = 1705979 bytes
diff --git a/graphics/gphoto2/patches/patch-aa b/graphics/gphoto2/patches/patch-aa
deleted file mode 100644
index c7d7da06097..00000000000
--- a/graphics/gphoto2/patches/patch-aa
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-aa,v 1.1.1.1 2001/07/08 01:47:41 garbled Exp $
---- build.sh.orig	Fri Jul  6 23:30:54 2001
-+++ build.sh	Fri Jul  6 23:31:03 2001
-@@ -4,8 +4,3 @@
- ./configure "$@" && \
- cd .. && \
- ./configure "$@" &&\
--make
--
--echo 
--echo Now run \"make install\" to install gPhoto 2.0
--echo
diff --git a/graphics/gphoto2/patches/patch-ab b/graphics/gphoto2/patches/patch-ab
deleted file mode 100644
index 03d20722a07..00000000000
--- a/graphics/gphoto2/patches/patch-ab
+++ /dev/null
@@ -1,21 +0,0 @@
-$NetBSD: patch-ab,v 1.1.1.1 2001/07/08 01:47:41 garbled Exp $
---- configure.orig	Sat Mar 31 11:58:21 2001
-+++ configure	Sat Jul  7 02:24:48 2001
-@@ -2709,6 +2709,8 @@
- if { (eval echo configure:2710: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
-   rm -rf conftest*
-   eval "ac_cv_lib_$ac_lib_var=yes"
-+  LIBS="-lintl  $LIBS"
-+  ac_save_LIBS="$LIBS"
- else
-   echo "configure: failed program was:" >&5
-   cat conftest.$ac_ext >&5
-@@ -3972,7 +3974,7 @@
- echo "Using the bundled gphoto2_port library"
- LIBGPHOTO2_PORT_DIR="libgphoto2_port"
- CFLAGS="$CFLAGS -I`pwd`/libgphoto2_port/include";
--LIBS="$LIBS -L`pwd`/libgphoto2_port/libgphoto2_port/.libs -lgphoto2_port";
-+LIBS="$LIBS -L`pwd`/libgphoto2_port/libgphoto2_port -lgphoto2_port";
- 
- LIBGPHOTO2_INCLUDEDIR='-I${includedir}'
- LIBGPHOTO2_LIBDIR='-L${libdir}'
diff --git a/graphics/gphoto2/patches/patch-ac b/graphics/gphoto2/patches/patch-ac
deleted file mode 100644
index 1be53468a3c..00000000000
--- a/graphics/gphoto2/patches/patch-ac
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ac,v 1.1.1.1 2001/07/08 01:47:41 garbled Exp $
---- libgphoto2_port/libgphoto2_port/Makefile.in.NB	Sat Jul  7 01:04:07 2001
-+++ libgphoto2_port/libgphoto2_port/Makefile.in	Sat Jul  7 01:12:24 2001
-@@ -108,7 +108,7 @@
- VERSION_FLAGS = -DLIBGPPORT_VERSION=\"@LIBGPPORT_VERSION@\"
- CFLAGS = @CFLAGS@ @IOLIB_CFLAGS@ 	-DIOLIBS=\"$(prefix)/lib/gphoto2_port\" 	-g
- 
--LDFLAGS = @LDFLAGS@ -g -ldl
-+LDFLAGS = @LDFLAGS@ -g
- 
- lib_LTLIBRARIES = libgphoto2_port.la
- libgphoto2_port_la_LDFLAGS = -version-info @LIBGPPORT_VERSION_INFO@
diff --git a/graphics/gphoto2/patches/patch-ad b/graphics/gphoto2/patches/patch-ad
deleted file mode 100644
index f6d2788313d..00000000000
--- a/graphics/gphoto2/patches/patch-ad
+++ /dev/null
@@ -1,12 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2001/07/08 01:47:41 garbled Exp $
---- Makefile.in.NB	Sat Jul  7 02:31:05 2001
-+++ Makefile.in	Sat Jul  7 02:43:13 2001
-@@ -112,7 +112,7 @@
- 
- EXTRA_DIST = build.sh
- 
--gphotodocdir = $(prefix)/doc/gphoto2
-+gphotodocdir = $(prefix)/share/doc/gphoto2
- gphotodoc_DATA = AUTHORS COPYING
- ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
- mkinstalldirs = $(SHELL) $(top_srcdir)/mkinstalldirs
diff --git a/graphics/gphoto2/patches/patch-ae b/graphics/gphoto2/patches/patch-ae
deleted file mode 100644
index 63fe3e5e29a..00000000000
--- a/graphics/gphoto2/patches/patch-ae
+++ /dev/null
@@ -1,26 +0,0 @@
-$NetBSD: patch-ae,v 1.1 2001/07/08 21:44:27 veego Exp $
-
---- camlibs/kodak/dc240/library.c	2001/01/22 21:25:24	1.3
-+++ camlibs/kodak/dc240/library.c	2001/07/04 08:54:14	1.4
-@@ -378,7 +378,10 @@
-     free(p1);
-     free(p2);
-     x=2;
--    while (x < file->size) {
-+    /* since directory entries are 20 bytes, it is possible that */
-+    /* we find some garbage. Ignore it. TODO: check that there is */
-+    /* not another bug involving reading this info */
-+    while ((x < file->size) && (file->size - x >= 20)) {
-         if ((file->data[x] != '.') &&
-             (attrib == (unsigned char)file->data[x+11]))  {
-             /* Files have attrib 0x00, Folders have attrib 0x10 */
-@@ -448,6 +451,9 @@
- 
-     free(cmd_packet);
-     free(path_packet);
-+
-+    strcpy(file->name, filename);
-+    strcpy(file->type, "image/jpeg");
- 
-     return (retval);
- }
diff --git a/graphics/gphoto2/patches/patch-af b/graphics/gphoto2/patches/patch-af
deleted file mode 100644
index 2e13ec65707..00000000000
--- a/graphics/gphoto2/patches/patch-af
+++ /dev/null
@@ -1,104 +0,0 @@
-$NetBSD: patch-af,v 1.1 2001/07/08 21:45:33 veego Exp $
-
---- camlibs/kodak/dc240/dc240.c	Mon Mar 26 19:25:46 2001
-+++ camlibs/kodak/dc240/dc240.c	Sun Jul  8 23:35:55 2001
-@@ -29,13 +29,33 @@
- 	return (GP_OK);
- }
- 
-+struct camera_to_usb {
-+	char *name;
-+	unsigned short idVendor;
-+	unsigned short idProduct;
-+} camera_to_usb[] = {
-+	{ "Kodak DC240", 0x040A, 0x0120 },
-+	{ "Kodak DC280", 0x040A, 0x0130 },
-+	{ "Kodak DC3400", 0x040A, 0x0132 },
-+	{ "Kodak DC5000", 0x040A, 0x0131 },
-+        { NULL, 0, 0 }
-+};
-+
-+/*
-+  Abilities are based upon what we can do with a DC240.
-+  Later cameras have a superset of the DC240 feature and are not
-+  currently supported.
-+ */
- int camera_abilities (CameraAbilitiesList *list) 
- {
- 	CameraAbilities *a;
-+        int i;
- 
-+        for (i = 0; camera_to_usb[i].name; i++)
-+        {
- 	a = gp_abilities_new();
- 
--	strcpy(a->model, "Kodak DC240");
-+            strcpy(a->model, camera_to_usb[i].name);
- 	a->port     = GP_PORT_SERIAL | GP_PORT_USB;
- 	a->speed[0] = 9600;
- 	a->speed[1] = 19200;
-@@ -43,20 +63,38 @@
- 	a->speed[3] = 57600;
- 	a->speed[4] = 115200;
- 	a->speed[5] = 0;
--        a->usb_vendor  = 0x040A;
--        a->usb_product = 0x0120;
-+            a->usb_vendor  = camera_to_usb[i].idVendor;
-+            a->usb_product = camera_to_usb[i].idProduct;
- 	a->operations        = 	GP_OPERATION_CAPTURE_IMAGE;
- 	a->file_operations   = 	GP_FILE_OPERATION_DELETE | 
- 				GP_FILE_OPERATION_PREVIEW;
- 	a->folder_operations = 	GP_FOLDER_OPERATION_NONE;
- 
- 	gp_abilities_list_append(list, a);
--
-+        }
- 	return (GP_OK);
- }
- 
-+static short find_usb_device_id (const char *model, unsigned short *idVendor, 
-+                             unsigned short *idProduct)
-+{
-+    short i;
-+    for (i = 0; i < sizeof (camera_to_usb) / sizeof (struct camera_to_usb); i++)
-+    {
-+        if (strcmp (model, camera_to_usb[i].name) == 0)
-+        {
-+            *idVendor = camera_to_usb[i].idVendor;
-+            *idProduct = camera_to_usb[i].idProduct;
-+            return 1;
-+        }
-+    }
-+
-+    return 0;
-+}
-+
- int camera_init (Camera *camera) 
- {
-+    unsigned short usb_vendor, usb_product;
-     int ret;
-     gp_port_settings settings;
-     DC240Data *dd;
-@@ -100,7 +138,12 @@
-             free(dd);
-             return (GP_ERROR);
-         }
--        if (gp_port_usb_find_device(dd->dev, 0x040A, 0x0120) == GP_ERROR) {
-+        if (find_usb_device_id (camera->model, &usb_vendor, &usb_product) == 0) {
-+            gp_port_free(dd->dev);
-+            free (dd);
-+            return (GP_ERROR);
-+        }
-+        if (gp_port_usb_find_device(dd->dev, usb_vendor, usb_product) == GP_ERROR) {
-             gp_port_free(dd->dev);
-             free (dd);
-             return (GP_ERROR);
-@@ -260,7 +303,7 @@
- 	strcpy (about->text, 
- 		_("Kodak DC240 Camera Library\n"
- 		"Scott Fritzinger <scottf@gphoto.net>\n"
--		"Camera Library for the Kodak DC240 camera.\n"
-+		"Camera Library for the Kodak DC240, DC260, DC3400 and DC5000 cameras.\n"
- 		"Rewritten and updated for gPhoto2."));
- 
- 	return (GP_OK);