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.

11 files changed, 13 insertions, 42 deletions

diff --git a/lang/chicken/Makefile b/lang/chicken/Makefile
index 1d58cd3e312..4c7910d8f4e 100644
--- a/lang/chicken/Makefile
+++ b/lang/chicken/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2003/09/12 10:01:12 itojun Exp $
+# $NetBSD: Makefile,v 1.9 2004/02/14 17:21:43 jlam Exp $
 #
 
 DISTNAME=	chicken-1.17
@@ -12,6 +12,5 @@ COMMENT=	Scheme to C compiler, handling R5RS
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
 TEST_TARGET=	test
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/cilk/Makefile b/lang/cilk/Makefile
index d10cc40c595..594fe4343d1 100644
--- a/lang/cilk/Makefile
+++ b/lang/cilk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2004/01/24 13:51:13 grant Exp $
+# $NetBSD: Makefile,v 1.18 2004/02/14 17:21:43 jlam Exp $
 
 DISTNAME=		cilk-5.3.1
 PKGREVISION=		2
@@ -17,7 +17,6 @@ USE_BUILDLINK2=	 	# defined
 USE_GNU_TOOLS+=		make
 USE_PERL5=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE= 	${WRKSRC}/libtool
 PTHREAD_OPTS+=		require
 
 INFO_FILES=		cilk-faq.info
diff --git a/lang/classpath/Makefile b/lang/classpath/Makefile
index eda6298e831..c762dce5bd8 100644
--- a/lang/classpath/Makefile
+++ b/lang/classpath/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/17 21:44:07 grant Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:43 jlam Exp $
 
 DISTNAME=		classpath-0.05
 CATEGORIES=		devel
@@ -13,6 +13,5 @@ DEPENDS+=		jikes>=1.18:../../lang/jikes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-jikes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/lang/clisp/Makefile b/lang/clisp/Makefile
index 5f084e763b4..1e37bed2efe 100644
--- a/lang/clisp/Makefile
+++ b/lang/clisp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2004/01/20 12:19:16 agc Exp $
+# $NetBSD: Makefile,v 1.32 2004/02/14 17:21:43 jlam Exp $
 
 DISTNAME=		clisp-2.30
 CATEGORIES=		lang
@@ -19,13 +19,6 @@ CONFIGURE_ENV+=		CC="${CC}" CFLAGS="${CFLAGS}" CPPFLAGS="${CPPFLAGS}" \
 GNU_CONFIGURE=		YES
 UNLIMIT_RESOURCES=	stacksize
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/avcall/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/callback/vacall_r/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/callback/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/callback/trampoline_r/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libiconv/libcharset/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libiconv/libtool ${WRKSRC}/sigsegv/libtool
-
 USE_GNU_READLINE=	YES
 
 post-patch:
diff --git a/lang/dylan-interpreter/Makefile.common b/lang/dylan-interpreter/Makefile.common
index ee5e31feb1c..4f9668678ed 100644
--- a/lang/dylan-interpreter/Makefile.common
+++ b/lang/dylan-interpreter/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.12 2004/01/24 13:51:14 grant Exp $
+# $NetBSD: Makefile.common,v 1.13 2004/02/14 17:21:43 jlam Exp $
 #
 
 DISTNAME=		gwydion-dylan-${DYLAN_VERSION}
@@ -19,6 +19,7 @@ COMMENT=		Functional language
 
 USE_BUILDLINK2=		yes
 USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
 MAKEFILE=		GNUmakefile
 ALL_TARGET=		default
 
@@ -30,9 +31,6 @@ DYLAN_VERSION=		2.3.6
 # other architecture changes will be gratefully received
 ONLY_FOR_PLATFORM=	NetBSD-*-i386 NetBSD-*-sparc NetBSD-*-powerpc
 
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 .include "../../mk/bsd.prefs.mk"
 
 .if ${MACHINE_ARCH} == "i386"
diff --git a/lang/guile/Makefile b/lang/guile/Makefile
index 497a3027af5..4360059dc92 100644
--- a/lang/guile/Makefile
+++ b/lang/guile/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2004/02/11 07:16:47 xtraeme Exp $
+# $NetBSD: Makefile,v 1.51 2004/02/14 17:21:43 jlam Exp $
 
 DISTNAME=		guile-1.6.4
 CATEGORIES=		lang
@@ -13,12 +13,7 @@ CONFLICTS=		guile14<1.4.1nb1
 USE_BUILDLINK3=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
-
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/guile-readline/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libltdl/libtool
-
 USE_GNU_READLINE=	YES
 
 USE_MAKEINFO=		YES
diff --git a/lang/guile14/Makefile b/lang/guile14/Makefile
index 8d89a6ebd14..dbaac892e2a 100644
--- a/lang/guile14/Makefile
+++ b/lang/guile14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/01/24 13:51:14 grant Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:43 jlam Exp $
 
 DISTNAME=		guile-1.4.1
 PKGNAME=		guile14-1.4.1
@@ -14,12 +14,7 @@ USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_TOOLS+=		make
 NO_MTREE=		YES
-
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/guile-readline/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libltdl/libtool
-
 USE_GNU_READLINE=	YES
 
 INFO_FILES=		guile.info
diff --git a/lang/ksi/Makefile b/lang/ksi/Makefile
index 43d2abb93b7..b50f89629cc 100644
--- a/lang/ksi/Makefile
+++ b/lang/ksi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/01/12 21:50:07 kristerw Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:43 jlam Exp $
 
 DISTNAME=		ksi-3.4.1
 PKGREVISION=		1
@@ -12,7 +12,6 @@ COMMENT=		Portable, embeddable Scheme implementation written in C
 USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 USE_GNU_READLINE=	# uses rl_event_hook() interface
 CPPFLAGS+=		-Dunix
diff --git a/lang/librep/Makefile b/lang/librep/Makefile
index a70315fee3d..a78a49e848d 100644
--- a/lang/librep/Makefile
+++ b/lang/librep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2004/02/14 00:59:11 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2004/02/14 17:21:43 jlam Exp $
 #
 
 DISTNAME=		librep-${REP_VERS}
@@ -19,7 +19,6 @@ USE_GNU_TOOLS+=		make
 USE_GNU_READLINE=	# uses rl_basic_quote_characters
 
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 REP_LIBTOOL=		${PREFIX}/libexec/rep/${MACHINE_GNU_PLATFORM}/libtool
 
 GNU_CONFIGURE=		yes
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index dd79b7fb8e9..e3a610e7338 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2004/02/03 12:30:11 recht Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:44 jlam Exp $
 #
 
 DISTNAME=	mono-0.30
@@ -23,15 +23,12 @@ NOT_FOR_PLATFORM+=	NetBSD-1.6[A-Z]-* NetBSD-1.6Z[AB]-*
 USE_GNU_TOOLS+=		make
 USE_BUILDLINK3=		yes
 USE_PKGINSTALL=		yes
+USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-gc=included
 CONFIGURE_ARGS+=	--sysconfdir="${PKG_SYSCONFDIR}"
 
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libgc/libtool
-
 PKGCONFIG_OVERRIDE=	mint.pc.in
 PKGCONFIG_OVERRIDE=	mono.pc.in
 PKG_SYSCONFSUBDIR=	mono
diff --git a/lang/smalltalk/Makefile b/lang/smalltalk/Makefile
index 09f64db39c3..2cdce6bdd57 100644
--- a/lang/smalltalk/Makefile
+++ b/lang/smalltalk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/24 13:51:15 grant Exp $
+# $NetBSD: Makefile,v 1.24 2004/02/14 17:21:44 jlam Exp $
 
 DISTNAME=		smalltalk-2.1.4
 CATEGORIES=		lang
@@ -13,9 +13,7 @@ ONLY_FOR_PLATFORM=	*-*-i386 *-*-sparc *-*-powerpc
 USE_BUILDLINK2=		YES
 USE_GNU_TOOLS+=		make
 USE_GNU_READLINE=	YES
-
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 INFO_FILES=		gst-base.info gst-libs.info gst.info