USE_PKGLIBTOOL -> USE_LIBTOOL.

LTCONFIG_OVERRIDE -> one less patch.

4 files changed, 26 insertions, 22 deletions

diff --git a/graphics/gphoto/Makefile b/graphics/gphoto/Makefile
index fdca3dbf040..a7f83734d97 100644
--- a/graphics/gphoto/Makefile
+++ b/graphics/gphoto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2000/06/21 00:44:34 hubertf Exp $
+# $NetBSD: Makefile,v 1.9 2000/08/14 19:00:31 wiz Exp $
 
 DISTNAME=	gphoto-0.4.3
 CATEGORIES=	graphics
@@ -10,7 +10,8 @@ HOMEPAGE=	http://www.gphoto.org/
 DEPENDS+=	imlib>=1.9.8:../../graphics/imlib
 
 USE_X11BASE=		yes
-USE_PKGLIBTOOL=		yes
+USE_LIBTOOL=		yes
+LTCONFIG_OVERRIDE=	${WRKSRC}/ltconfig
 GNU_CONFIGURE=		yes
 CPPFLAGS+=		-I${LOCALBASE}/include
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
diff --git a/graphics/gphoto/files/patch-sum b/graphics/gphoto/files/patch-sum
index d6043319f81..34234098414 100644
--- a/graphics/gphoto/files/patch-sum
+++ b/graphics/gphoto/files/patch-sum
@@ -1,3 +1,6 @@
-$NetBSD: patch-sum,v 1.3 1999/12/08 17:25:21 hubertf Exp $
+$NetBSD: patch-sum,v 1.4 2000/08/14 19:00:32 wiz Exp $
 
-MD5 (patch-af) = 086bb5ec6fe7a344b2c49121589c3c22
+This placeholder file is generated by the ``makepatchsum'' target
+whenever the patches directory is empty or missing. Its purpose
+is to ensure that the presence of any obsolete patches will cause
+the proper error to be emitted at build time.
diff --git a/graphics/gphoto/patches/patch-af b/graphics/gphoto/patches/patch-af
deleted file mode 100644
index cb15422049d..00000000000
--- a/graphics/gphoto/patches/patch-af
+++ /dev/null
@@ -1,17 +0,0 @@
-$NetBSD: patch-af,v 1.2 1999/12/08 17:25:22 hubertf Exp $
-
---- configure.orig	Mon Dec  6 00:12:35 1999
-+++ configure	Wed Dec  8 16:17:50 1999
-@@ -1936,10 +1936,10 @@
- 
- 
- # This can be used to rebuild libtool when needed
--LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
-+#LIBTOOL_DEPS="$ac_aux_dir/ltconfig $ac_aux_dir/ltmain.sh"
- 
- # Always use our own libtool.
--LIBTOOL='$(SHELL) $(top_builddir)/libtool'
-+#LIBTOOL='$(SHELL) $(top_builddir)/libtool'
- 
- # Redirect the config.log output again, so that the ltconfig log is not
- # clobbered by the next message.
diff --git a/graphics/gphoto/pkg/PLIST b/graphics/gphoto/pkg/PLIST
index 2987349c14c..21fb753285f 100644
--- a/graphics/gphoto/pkg/PLIST
+++ b/graphics/gphoto/pkg/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2000/08/01 21:50:11 tron Exp $
+@comment $NetBSD: PLIST,v 1.6 2000/08/14 19:00:32 wiz Exp $
 bin/dc21x_cam
 bin/gphoto
 bin/gphoto-exifdump
@@ -6,38 +6,55 @@ bin/qm100
 bin/qmxxx
 bin/rsony
 lib/libgphoto_canon.a
+lib/libgphoto_canon.la
 lib/libgphoto_canon.so.0.0
 lib/libgphoto_casio_qv.a
+lib/libgphoto_casio_qv.la
 lib/libgphoto_casio_qv.so.0.0
 lib/libgphoto_coolpix600.a
+lib/libgphoto_coolpix600.la
 lib/libgphoto_coolpix600.so.0.0
 lib/libgphoto_dimage_v.a
+lib/libgphoto_dimage_v.la
 lib/libgphoto_dimage_v.so.0.0
 lib/libgphoto_dir.a
+lib/libgphoto_dir.la
 lib/libgphoto_dir.so.0.0
 lib/libgphoto_fuji.a
+lib/libgphoto_fuji.la
 lib/libgphoto_fuji.so.0.0
 lib/libgphoto_kodak_dc2x.a
+lib/libgphoto_kodak_dc2x.la
 lib/libgphoto_kodak_dc2x.so.0.0
 lib/libgphoto_kodak_generic.a
+lib/libgphoto_kodak_generic.la
 lib/libgphoto_kodak_generic.so.0.0
 lib/libgphoto_konica_qm100.a
+lib/libgphoto_konica_qm100.la
 lib/libgphoto_konica_qm100.so.0.0
 lib/libgphoto_konica_qmxxx.a
+lib/libgphoto_konica_qmxxx.la
 lib/libgphoto_konica_qmxxx.so.0.0
 lib/libgphoto_mustek_mdc800.a
+lib/libgphoto_mustek_mdc800.la
 lib/libgphoto_mustek_mdc800.so.1.0
 lib/libgphoto_philips.a
+lib/libgphoto_philips.la
 lib/libgphoto_philips.so.0.5
 lib/libgphoto_photopc.a
+lib/libgphoto_photopc.la
 lib/libgphoto_photopc.so.0.0
 lib/libgphoto_ricoh300z.a
+lib/libgphoto_ricoh300z.la
 lib/libgphoto_ricoh300z.so.0.0
 lib/libgphoto_samsung.a
+lib/libgphoto_samsung.la
 lib/libgphoto_samsung.so.0.0
 lib/libgphoto_sony_dscf1.a
+lib/libgphoto_sony_dscf1.la
 lib/libgphoto_sony_dscf1.so.0.0
 lib/libgphoto_sony_dscf55.a
+lib/libgphoto_sony_dscf55.la
 lib/libgphoto_sony_dscf55.so.0.0
 man/man1/gphoto.1
 share/gnome/apps/Graphics/gphoto.desktop