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.

18 files changed, 19 insertions, 43 deletions

diff --git a/textproc/aiksaurus/Makefile b/textproc/aiksaurus/Makefile
index c283e76c0cb..eb9fc6c8a5d 100644
--- a/textproc/aiksaurus/Makefile
+++ b/textproc/aiksaurus/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2003/09/26 20:51:41 jmmv Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=	aiksaurus-1.0.1
@@ -13,7 +13,6 @@ USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=		--without-gtk
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/base/aiksaurus-1.0.pc.in
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/aspell/Makefile b/textproc/aspell/Makefile
index 6a0e5268219..1fd83803649 100644
--- a/textproc/aspell/Makefile
+++ b/textproc/aspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2004/02/11 04:35:20 xtraeme Exp $
+# $NetBSD: Makefile,v 1.20 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=		aspell-0.50.4.1
@@ -17,7 +17,6 @@ USE_GCC_SHLIB=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_LANGUAGES=		c c++
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	--enable-doc-dir=${PREFIX}/share/doc/aspell
 CONFIGURE_ARGS+=	--enable-curses=ncurses
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 359ba5269c8..872e806e614 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 15:13:19 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:53 jlam Exp $
 # FreeBSD Id: ports/japanese/eb/Makefile,v 1.21 2000/08/21 03:39:42 kevlo Exp
 #
 
@@ -58,8 +58,6 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 USE_MAKEINFO=	YES
 INFO_FILES=	eb-ja.info ebfont-ja.info ebfont.info ebinfo-ja.info
 INFO_FILES+=	ebinfo.info ebrefile-ja.info ebrefile.info ebzip-ja.info
diff --git a/textproc/enchant/Makefile b/textproc/enchant/Makefile
index 60c43c6d005..2f7637bd1a4 100644
--- a/textproc/enchant/Makefile
+++ b/textproc/enchant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/26 18:19:46 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=		enchant-1.1.3
@@ -12,7 +12,6 @@ COMMENT=		Generic spell checking library
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/enchant.pc.in
 GNU_CONFIGURE=		yes
 
diff --git a/textproc/expat/Makefile b/textproc/expat/Makefile
index b12ba30eb71..9de4cb1ae11 100644
--- a/textproc/expat/Makefile
+++ b/textproc/expat/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/24 15:13:19 grant Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=	expat-1.95.6
@@ -14,7 +14,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		YES
 
diff --git a/textproc/gtkspell/Makefile b/textproc/gtkspell/Makefile
index 3c923b0b230..91922d0cc7f 100644
--- a/textproc/gtkspell/Makefile
+++ b/textproc/gtkspell/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/09 18:26:06 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=		gtkspell-2.0.5
@@ -13,7 +13,6 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/gtkspell-2.0.pc.in
 
 SUBST_CLASSES+=		subdir
diff --git a/textproc/kakasi/Makefile b/textproc/kakasi/Makefile
index 8593465d737..576f2e1463c 100644
--- a/textproc/kakasi/Makefile
+++ b/textproc/kakasi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $
 # FreeBSD Id: Makefile,v 1.14 1998/04/05 04:46:33 max Exp $
 
 DISTNAME=	kakasi-2.3.4
@@ -14,7 +14,6 @@ USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/doc/kakasi.1 ${PREFIX}/man/ja_JP.EUC/man1
diff --git a/textproc/libcroco/Makefile b/textproc/libcroco/Makefile
index 9436b2382ee..6b69ff289ef 100644
--- a/textproc/libcroco/Makefile
+++ b/textproc/libcroco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/11 06:18:33 xtraeme Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=	libcroco-0.4.0
@@ -17,7 +17,6 @@ USE_LIBTOOL=		yes
 USE_X11=		yes
 GNU_CONFIGURE=		yes
 
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/libcroco.pc.in
 
 CONFIGURE_ARGS+=	--enable-seleng=yes
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index e48a66cca16..183415bc14d 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/02/12 02:41:18 minskim Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:53 jlam Exp $
 
 DISTNAME=	libpathan-1.2-2-src
 PKGNAME=	${DISTNAME:S/-2-src/.2/}
@@ -18,7 +18,6 @@ USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 CONFIGURE_ARGS+=	XERCESCROOT=${LOCALBASE}
 CONFIGURE_ARGS+=	YACC=${LOCALBASE}/bin/bison
diff --git a/textproc/libxml/Makefile b/textproc/libxml/Makefile
index 257da6a0ee9..98068e7d2fd 100644
--- a/textproc/libxml/Makefile
+++ b/textproc/libxml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2003/07/17 22:54:29 grant Exp $
+# $NetBSD: Makefile,v 1.29 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=		libxml-1.8.17
@@ -13,9 +13,7 @@ COMMENT=		XML parser, mainly used by the GNOME project
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libxml.pc.in
 
 .include "../../devel/zlib/buildlink2.mk"
diff --git a/textproc/libxml2/Makefile b/textproc/libxml2/Makefile
index 3f893237472..6bca51540d3 100644
--- a/textproc/libxml2/Makefile
+++ b/textproc/libxml2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2004/02/12 22:18:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.47 2004/02/14 17:21:53 jlam Exp $
 
 DISTNAME=	libxml2-${LIBXML_VERSION}
 CATEGORIES=	textproc
@@ -12,7 +12,6 @@ COMMENT=	XML parser library from the GNOME project
 USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libxml-2.0.pc.in
 
 LIBXML_VERSION=		2.6.6
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index b4d94db2cfc..e1f64810aad 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/02/10 02:56:00 xtraeme Exp $
+# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:53 jlam Exp $
 
 DISTNAME=	libxslt-1.1.2
 PKGNAME=	${DISTNAME}
@@ -15,7 +15,6 @@ USE_BUILDLINK3=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PERL5=		build
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE=	${WRKSRC}/libxslt.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libexslt.pc.in
 
diff --git a/textproc/ndtpd/Makefile b/textproc/ndtpd/Makefile
index 2f1f035c1f3..59f6aafea17 100644
--- a/textproc/ndtpd/Makefile
+++ b/textproc/ndtpd/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2003/08/09 11:27:50 seb Exp $
+# $NetBSD: Makefile,v 1.12 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=	ndtpd-3.1.4
@@ -17,8 +17,6 @@ GNU_CONFIGURE=	YES
 
 INFO_FILES=	ndtpd-ja.info ndtpd.info
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--localstatedir=${NDTPD_RUNDIR}
 CONFIGURE_ARGS+=	--with-logdir=${NDTPD_LOGDIR}
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 7fc23617828..bfd7dfabf18 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2003/07/17 22:54:31 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=	OpenSP-1.5
@@ -15,15 +15,13 @@ CONFLICTS+=     sp-[0-9]*
 
 USE_BUILDLINK2=		yes
 USE_PERL5=		build
+USE_LIBTOOL=		yes
 PTHREAD_OPTS+=		native
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-http \
 			--enable-default-catalog=${PREFIX}/share/sgml/catalog
 
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../mk/pthread.buildlink2.mk"
 
diff --git a/textproc/raptor/Makefile b/textproc/raptor/Makefile
index 8a11ff2950b..8eff8871da1 100644
--- a/textproc/raptor/Makefile
+++ b/textproc/raptor/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/23 21:50:49 jmmv Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=	raptor-1.0.0
@@ -14,7 +14,6 @@ USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/raptor.pc.in
 
 .include "../../devel/glib2/buildlink2.mk"
diff --git a/textproc/regexx/Makefile b/textproc/regexx/Makefile
index ab40009a0f5..c22f4a75ec2 100644
--- a/textproc/regexx/Makefile
+++ b/textproc/regexx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2004/01/24 15:13:20 grant Exp $
+# $NetBSD: Makefile,v 1.6 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=		regexx-0.98.1
@@ -12,7 +12,6 @@ COMMENT=		C++ regular expression library
 USE_BUILDLINK2=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 
 .include "../../devel/pcre/buildlink2.mk"
diff --git a/textproc/sablotron/Makefile b/textproc/sablotron/Makefile
index badb830ace1..0618267b728 100644
--- a/textproc/sablotron/Makefile
+++ b/textproc/sablotron/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2004/02/09 19:57:55 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2004/02/14 17:21:53 jlam Exp $
 
 DISTNAME=		Sablot-1.0.1
 PKGNAME=		${DISTNAME:S/Sablot/sablotron/}
@@ -17,8 +17,6 @@ GNU_CONFIGURE=  	YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 # sablotron needs iconv but assumes it is in libc, so add what
 # buildlink2 finds.
 LIBS+=			${_BLNK_ICONV_LDFLAGS}
diff --git a/textproc/scrollkeeper/Makefile b/textproc/scrollkeeper/Makefile
index 1adc9208f55..a8c8a183c85 100644
--- a/textproc/scrollkeeper/Makefile
+++ b/textproc/scrollkeeper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/02/11 04:35:21 xtraeme Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:53 jlam Exp $
 #
 
 DISTNAME=		scrollkeeper-0.3.14
@@ -21,8 +21,6 @@ USE_LIBTOOL=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS= 	--localstatedir=${SCROLLKEEPER_DATADIR}
 CONFIGURE_ARGS+=	--sharedstatedir=${SCROLLKEEPER_DATADIR}
 CONFIGURE_ARGS+= 	--sysconfdir=${PKG_SYSCONFDIR}