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.

10 files changed, 11 insertions, 23 deletions

diff --git a/misc/blccc/Makefile b/misc/blccc/Makefile
index 8935bdbebde..5a3c8c0ab78 100644
--- a/misc/blccc/Makefile
+++ b/misc/blccc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/03 18:49:46 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:44 jlam Exp $
 #
 
 DISTNAME=		blccc-1.99
@@ -13,8 +13,7 @@ COMMENT=		Blinkenlights Chaos Control Center
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
-
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE=	libtool
 
 EGDIR=			${PREFIX}/share/examples/blccc
 
diff --git a/misc/celestia/Makefile.common b/misc/celestia/Makefile.common
index ca9463f5b1a..06f7cbde767 100644
--- a/misc/celestia/Makefile.common
+++ b/misc/celestia/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2004/01/24 14:11:09 grant Exp $
+# $NetBSD: Makefile.common,v 1.4 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=	celestia-${CELESTIA_VERS}
@@ -19,8 +19,6 @@ USE_X11=	YES
 USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include
 CONFIGURE_ARGS+=	--with-lua=${BUILDLINK_PREFIX.lua}
 
diff --git a/misc/dirdiff/Makefile b/misc/dirdiff/Makefile
index 2f4ff9bd98f..2a354b6e9ac 100644
--- a/misc/dirdiff/Makefile
+++ b/misc/dirdiff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/07/24 08:42:29 agc Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=	dirdiff-1.6
@@ -11,7 +11,6 @@ COMMENT=	Displays differences between directories
 
 USE_BUILDLINK2=	yes
 USE_LIBTOOL=	yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../x11/tk/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome2-user-docs/Makefile b/misc/gnome2-user-docs/Makefile
index 8d050a8d541..88d410a62c1 100644
--- a/misc/gnome2-user-docs/Makefile
+++ b/misc/gnome2-user-docs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/11 09:59:23 xtraeme Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=	gnome2-user-docs-2.4.1
@@ -19,8 +19,6 @@ USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
-
 .include "../../textproc/scrollkeeper/omf.mk"
 .include "../../mk/pthread.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gok/Makefile b/misc/gok/Makefile
index 1c01537f4c9..3a86837be31 100644
--- a/misc/gok/Makefile
+++ b/misc/gok/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/09 18:47:37 jmmv Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=		gok-0.8.4
@@ -23,7 +23,6 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 CONFIGURE_ARGS+=	--disable-gtk-doc
 
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/gok-1.0.pc.in
 
 GCONF2_SCHEMAS=		gok.schemas
diff --git a/misc/kdepim3/Makefile b/misc/kdepim3/Makefile
index c300b889994..ef4882bd0dc 100644
--- a/misc/kdepim3/Makefile
+++ b/misc/kdepim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/02/06 10:48:58 markd Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:45 jlam Exp $
 
 DISTNAME=	kdepim-${_KDE_VERSION}
 PKGREVISION=	1
@@ -8,7 +8,6 @@ COMMENT=	Personal Information Management tools for the KDE desktop
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_BUILDLINK2=		YES
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libical/libtool
 
 REPLACE_PERL=	kmail/kmail-3.1-update-new-mail-notification-settings.pl \
 		kmail/kmail-3.1-use-UOID-for-identities.pl \
diff --git a/misc/koffice/Makefile b/misc/koffice/Makefile
index f3603faf8b8..121aa65603f 100644
--- a/misc/koffice/Makefile
+++ b/misc/koffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.37 2004/02/10 21:06:33 markd Exp $
+# $NetBSD: Makefile,v 1.38 2004/02/14 17:21:45 jlam Exp $
 
 DISTNAME=	koffice-1.3
 PKGREVISION=	1
@@ -18,7 +18,6 @@ USE_BUILDLINK2=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GCC_REQD+=		2.95.3
 
diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index 134ccd75826..034ae6e8f89 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/17 14:38:22 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=	libcdio-0.65
@@ -12,7 +12,6 @@ COMMENT=	CD-ROM access library
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libcdio.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libiso9660.pc.in
 GNU_CONFIGURE=		yes
diff --git a/misc/proj/Makefile b/misc/proj/Makefile
index 26aa620099d..ad6feb732b3 100644
--- a/misc/proj/Makefile
+++ b/misc/proj/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/01/24 14:11:10 grant Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:45 jlam Exp $
 
 DISTNAME=		proj-4.4.7
 CATEGORIES=		misc
@@ -13,7 +13,6 @@ USE_BUILDLINK2=		yes
 GNU_CONFIGURE=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 NAD27_FILES=FL.lla MD.lla README.NADUS TN.lla WI.lla WO.lla alaska.lla	\
 	conus.lla hawaii.lla ntv1_can.dat prvi.lla stgeorge.lla		\
diff --git a/misc/yelp/Makefile b/misc/yelp/Makefile
index 9424359231b..bc08e2454b7 100644
--- a/misc/yelp/Makefile
+++ b/misc/yelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/11 07:43:22 xtraeme Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=		yelp-2.4.2
@@ -20,7 +20,6 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--with-html-widget=gtkhtml2