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.

21 files changed, 23 insertions, 48 deletions

diff --git a/databases/db3/Makefile b/databases/db3/Makefile
index a10baba8786..4c0def7ae6d 100644
--- a/databases/db3/Makefile
+++ b/databases/db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/02/14 15:29:15 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:35 jlam Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	db3-3.11.2
@@ -20,7 +20,6 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
-LIBTOOL_OVERRIDE=	${WRKDIR}/${DISTNAME}/build_unix/libtool
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 
diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index fa66274d973..0a8880be3e4 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/02 13:02:49 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:35 jlam Exp $
 
 DISTNAME=		db-4.2.52
 PKGNAME=		${DISTNAME:S/db/db4/}
@@ -15,7 +15,6 @@ WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 USE_BUILDLINK3=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKDIR}/${DISTNAME}/build_unix/libtool
 GNU_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	../dist/configure
 
diff --git a/databases/dbh/Makefile b/databases/dbh/Makefile
index 6c84d6c2e04..2a7cd480bf3 100644
--- a/databases/dbh/Makefile
+++ b/databases/dbh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/22 05:22:58 martti Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:35 jlam Exp $
 
 DISTNAME=		dbh_1.0-15
 PKGNAME=		dbh-1.0.15
@@ -12,7 +12,6 @@ COMMENT=		Library to create disk based Hashtables
 GNU_CONFIGURE=		yes
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/src/dbh-1.0.pc.in
 
 post-install:
diff --git a/databases/dbxml/Makefile b/databases/dbxml/Makefile
index 2c5f7c26756..d7da1952685 100644
--- a/databases/dbxml/Makefile
+++ b/databases/dbxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/13 19:39:35 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:35 jlam Exp $
 
 DISTNAME=	dbxml-1.2.1
 CATEGORIES=	databases
@@ -13,7 +13,6 @@ USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	../dist/configure
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--with-berkeleydb=${BUILDLINK_PREFIX.db4}
 CONFIGURE_ARGS+=	--with-xerces=${BUILDLINK_PREFIX.xerces-c}
diff --git a/databases/edb/Makefile b/databases/edb/Makefile
index 0343e1876de..b607e6ab1a1 100644
--- a/databases/edb/Makefile
+++ b/databases/edb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2003/11/03 11:01:05 gavan Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME=		edb-1.0.3
@@ -15,7 +15,6 @@ USE_LIBTOOL=		YES
 USE_BUILDLINK2=		YES
 USE_GCC_SHLIB=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 CONFIGURE_ARGS+=	--enable-cxx
 
 .include "../../x11/gtk/buildlink2.mk"
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 7d764e0284a..67ecefb5ae2 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/01/22 08:02:15 grant Exp $
+# $NetBSD: Makefile,v 1.19 2004/02/14 17:21:35 jlam Exp $
 
 DISTNAME=	freetds-0.61.2
 CATEGORIES=	databases
@@ -9,6 +9,7 @@ HOMEPAGE=	http://www.freetds.org/
 COMMENT=	LGPL'd implementation of Sybase's db-lib/ct-lib/ODBC libs
 
 USE_BUILDLINK2=		yes
+USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_GNU_TOOLS+=		make
 
@@ -18,9 +19,6 @@ CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--with-libiconv-prefix=${BUILDLINK_PREFIX.iconv}
 CONFIGURE_ARGS+=	--with-tdsver=7.0
 
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 EGDIR=		${PREFIX}/share/examples/freetds
 CONF_FILES=	${EGDIR}/freetds.conf ${PKG_SYSCONFDIR}/freetds.conf
 CONF_FILES+=	${EGDIR}/locales.conf ${PKG_SYSCONFDIR}/locales.conf
diff --git a/databases/gdbm/Makefile b/databases/gdbm/Makefile
index 6187bf7d259..1cd51cf97cb 100644
--- a/databases/gdbm/Makefile
+++ b/databases/gdbm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2004/02/14 00:54:44 grant Exp $
+# $NetBSD: Makefile,v 1.34 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME=	gdbm-1.8.3
@@ -12,7 +12,6 @@ COMMENT=	The GNU database manager
 USE_BUILDLINK3=		yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 INFO_FILES=		gdbm.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/guile-pg/Makefile b/databases/guile-pg/Makefile
index fc8335f3032..1ff5b92a8b8 100644
--- a/databases/guile-pg/Makefile
+++ b/databases/guile-pg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2004/01/22 08:02:15 grant Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME=	guile-pg-0.07
@@ -15,7 +15,6 @@ DEPENDS+=	postgresql-lib>=7.3.1:../../databases/postgresql-lib
 USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
 USE_GNU_TOOLS+=	make
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS+=	--with-libpq-includes=${BUILDLINK_PREFIX.postgresql-lib}/include/postgresql
 
diff --git a/databases/java-db3/Makefile b/databases/java-db3/Makefile
index 304ce3a20a2..fba1189dead 100644
--- a/databases/java-db3/Makefile
+++ b/databases/java-db3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:12:49 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:35 jlam Exp $
 
 DISTNAME=	db-3.3.11
 PKGNAME=	java-db3-3.11.2
@@ -23,7 +23,6 @@ JAVACABS=		${JAVAC}
 WRKSRC=			${WRKDIR}/${DISTNAME}/build_unix
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 
diff --git a/databases/libgda/Makefile.common b/databases/libgda/Makefile.common
index e87edf9989f..65ee15abfe5 100644
--- a/databases/libgda/Makefile.common
+++ b/databases/libgda/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2004/02/11 05:28:58 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.16 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME?=		libgda-1.0.0
@@ -17,8 +17,6 @@ USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir="${PREFIX}/share/doc/html"
diff --git a/databases/libgnomedb/Makefile b/databases/libgnomedb/Makefile
index d5c9e0e8264..30d6663a4ce 100644
--- a/databases/libgnomedb/Makefile
+++ b/databases/libgnomedb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/02/11 05:28:58 xtraeme Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME=		libgnomedb-1.0.0
@@ -21,7 +21,6 @@ USE_BUILDLINK3=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libgnomedb.pc.in
 
 CONFIGURE_ARGS=		--enable-gtk-doc=no
diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile
index bc1c5deae5a..6a2fe355503 100644
--- a/databases/libpqxx/Makefile
+++ b/databases/libpqxx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/02/05 09:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:35 jlam Exp $
 #
 
 .include "../../databases/libpqxx/Makefile.common"
@@ -9,6 +9,7 @@ NOT_FOR_PLATFORM=	NetBSD-*-pc532
 
 USE_LANGUAGES=		c c++
 USE_BUILDLINK2=		yes
+USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libpqxx.pc.in
 
@@ -17,8 +18,5 @@ PG_PREFIX=		${BUILDLINK_PREFIX.postgresql-lib}
 CONFIGURE_ARGS+=	--with-postgres-lib=${PG_PREFIX}/lib
 CONFIGURE_ARGS+=	--with-postgres-include=${PG_PREFIX}/include/postgresql
 
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 .include "../../databases/postgresql-lib/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 07bb61ebfe4..9dc5b4be64c 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/02/09 18:47:36 jmmv Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:35 jlam Exp $
 #
 
 DISTNAME=		mergeant-0.12.1
@@ -20,7 +20,6 @@ USE_GNU_TOOLS+=		make
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../databases/libgnomedb/buildlink2.mk"
 .include "../../devel/pkgconfig/buildlink2.mk"
diff --git a/databases/metakit-lib/Makefile b/databases/metakit-lib/Makefile
index 8cdeb2a438c..fa3554590d2 100644
--- a/databases/metakit-lib/Makefile
+++ b/databases/metakit-lib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/01/20 12:12:49 agc Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:36 jlam Exp $
 #
 
 DISTNAME=	metakit-2.4.8-38
@@ -15,7 +15,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT= ../unix/configure
 CONFIGURE_ARGS+=	--with-tcl=
 USE_LIBTOOL=	yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_BUILDLINK2=	yes
 
 post-install:
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index b59677793d7..bf3a2053f95 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2004/01/22 08:02:16 grant Exp $
+# $NetBSD: Makefile.common,v 1.22 2004/02/14 17:21:36 jlam Exp $
 
 DISTNAME=		mysql-3.23.58
 CATEGORIES=		databases
@@ -60,7 +60,6 @@ CXXFLAGS+=		-DHAVE_CURSES_H
 
 USE_PERL5=		# defined
 USE_LIBTOOL=		# defined
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 LDFLAGS+=		-Wl,${RPATH_FLAG}${LOCALBASE}/lib/mysql
 
 post-extract:
diff --git a/databases/openldap/Makefile b/databases/openldap/Makefile
index 78945750dff..c0d99540c0b 100644
--- a/databases/openldap/Makefile
+++ b/databases/openldap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.67 2004/02/14 11:31:50 jlam Exp $
+# $NetBSD: Makefile,v 1.68 2004/02/14 17:21:36 jlam Exp $
 
 DISTNAME=		openldap-2.1.25
 SVR4_PKGNAME=		oldap
@@ -18,7 +18,6 @@ USE_BUILDLINK3=		YES
 USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PTHREAD_OPTS+=		require
 
 TEST_TARGET=		test
diff --git a/databases/py-metakit/Makefile b/databases/py-metakit/Makefile
index 3df6d5e0b48..2a3776ae6a8 100644
--- a/databases/py-metakit/Makefile
+++ b/databases/py-metakit/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/01/20 12:12:49 agc Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:36 jlam Exp $
 #
 
 DISTNAME=	metakit-2.4.8-38
@@ -15,7 +15,6 @@ GNU_CONFIGURE=	yes
 CONFIGURE_SCRIPT= ../unix/configure
 CONFIGURE_ARGS+=	--with-tcl= --enable-python
 USE_LIBTOOL=	yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_BUILDLINK2=	yes
 ALL_TARGET=	python
 INSTALL_TARGET=	install-python
diff --git a/databases/rrdtool/Makefile b/databases/rrdtool/Makefile
index 5fc3840845a..511b7084551 100644
--- a/databases/rrdtool/Makefile
+++ b/databases/rrdtool/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/02/08 03:47:08 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:36 jlam Exp $
 #
 
 DISTNAME=	rrdtool-1.0.40
@@ -16,8 +16,6 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 
 USE_LIBTOOL=		yes
 USE_BUILDLINK3=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/config/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		yes
 
diff --git a/databases/sqlite/Makefile b/databases/sqlite/Makefile
index 77ecf1d6a08..779a010a3a5 100644
--- a/databases/sqlite/Makefile
+++ b/databases/sqlite/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/22 08:02:16 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:36 jlam Exp $
 
 DISTNAME=		sqlite-2.8.5
 CATEGORIES=		databases
@@ -13,7 +13,6 @@ WRKSRC=			${WRKDIR}/sqlite-build
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 USE_GNU_TOOLS+=		make
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
 CONFIGURE_SCRIPT=	../sqlite/configure
diff --git a/databases/tdb/Makefile b/databases/tdb/Makefile
index 74470e81cb2..84e6728f93d 100644
--- a/databases/tdb/Makefile
+++ b/databases/tdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/22 08:02:16 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:36 jlam Exp $
 #
 
 DISTNAME=	tdb-1.0.6
@@ -13,6 +13,5 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/unixodbc/Makefile.common b/databases/unixodbc/Makefile.common
index adb53ee7cd9..81d82be9ef5 100644
--- a/databases/unixodbc/Makefile.common
+++ b/databases/unixodbc/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.11 2004/01/27 00:53:10 heinz Exp $
+# $NetBSD: Makefile.common,v 1.12 2004/02/14 17:21:36 jlam Exp $
 
 DISTNAME=	unixODBC-${ODBC_DIST_VERS}
 PKGREVISION=	1
@@ -18,7 +18,6 @@ ODBC_BASE_VERS=		${ODBC_DIST_VERS}
 
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}