LIBTOOL_OVERRIDE and SHLIBTOOL_OVERRIDE are now lists of shell globs

relative to ${WRKSRC}.  Remove redundant LIBTOOL_OVERRIDE settings that
are automatically handled by the default setting in bsd.pkg.mk.

6 files changed, 6 insertions, 14 deletions

diff --git a/sysutils/fakeroot/Makefile b/sysutils/fakeroot/Makefile
index 990ed07a88b..c3475ce3b37 100644
--- a/sysutils/fakeroot/Makefile
+++ b/sysutils/fakeroot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:26:15 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=	fakeroot_0.5.8
@@ -11,7 +11,6 @@ COMMENT=	Creates a fake root environment
 
 WRKSRC=		${WRKDIR}/fakeroot-0.5.8
 USE_LIBTOOL=	YES
-LIBTOOL_OVERRIDE=${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/fam/Makefile b/sysutils/fam/Makefile
index 9074999f151..f57138c31de 100644
--- a/sysutils/fam/Makefile
+++ b/sysutils/fam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/11 00:39:29 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=		fam-2.6.10
@@ -17,8 +17,6 @@ USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 
 EGDIR=			${PREFIX}/share/examples/fam
diff --git a/sysutils/gnome-vfs/Makefile b/sysutils/gnome-vfs/Makefile
index 829292ab339..1aa7dc6fb68 100644
--- a/sysutils/gnome-vfs/Makefile
+++ b/sysutils/gnome-vfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/02/11 12:20:03 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2004/02/14 17:21:52 jlam Exp $
 
 DISTNAME=		gnome-vfs-1.0.5
 PKGREVISION=		5
@@ -17,9 +17,7 @@ USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
-
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 
diff --git a/sysutils/gnome-vfs2/Makefile b/sysutils/gnome-vfs2/Makefile
index 0d51de05a46..7b142a03b8a 100644
--- a/sysutils/gnome-vfs2/Makefile
+++ b/sysutils/gnome-vfs2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2004/02/12 23:44:09 jmmv Exp $
+# $NetBSD: Makefile,v 1.30 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=		gnome-vfs-2.4.2
@@ -21,7 +21,6 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 USE_PKGINSTALL=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/gnome-vfs-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/gnome-vfs-module-2.0.pc.in
 
diff --git a/sysutils/nautilus/Makefile b/sysutils/nautilus/Makefile
index c082419f79a..d620e086ce7 100644
--- a/sysutils/nautilus/Makefile
+++ b/sysutils/nautilus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2004/02/14 00:23:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.26 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=		nautilus-2.4.2
@@ -18,7 +18,6 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 GNU_CONFIGURE=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libnautilus/libnautilus.pc.in
 
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/sysutils/vcdimager-devel/Makefile b/sysutils/vcdimager-devel/Makefile
index fa1bde639e1..f4e50a2dc3c 100644
--- a/sysutils/vcdimager-devel/Makefile
+++ b/sysutils/vcdimager-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/01/24 15:06:58 grant Exp $
+# $NetBSD: Makefile,v 1.15 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=	vcdimager-0.7.12
@@ -14,7 +14,6 @@ USE_BUILDLINK2=	YES
 USE_GNU_TOOLS+=	make
 GNU_CONFIGURE=	YES
 USE_LIBTOOL=	yes
-LIBTOOL_OVERRIDE= ${WRKSRC}/libtool
 INFO_FILES=	vcdimager.info
 
 .include "../../devel/gettext-lib/buildlink2.mk"