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.

7 files changed, 9 insertions, 20 deletions

diff --git a/math/cassowary/Makefile b/math/cassowary/Makefile
index 94adf7804d3..315028c51e8 100644
--- a/math/cassowary/Makefile
+++ b/math/cassowary/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2004/01/24 13:58:23 grant Exp $
+# $NetBSD: Makefile,v 1.23 2004/02/14 17:21:44 jlam Exp $
 #
 
 DISTNAME=		cassowary-0.60
@@ -15,7 +15,6 @@ BUILD_DEPENDS+=		bison>=1.34:../../devel/bison
 USE_BUILDLINK2=		# defined
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		# defined
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		# defined
 CONFIGURE_ARGS+=	--enable-fd-solver
diff --git a/math/fftw/Makefile b/math/fftw/Makefile
index 2468ee59cb8..3c87a0eeb27 100644
--- a/math/fftw/Makefile
+++ b/math/fftw/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2004/01/24 13:58:23 grant Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:44 jlam Exp $
 
 .if (${MACHINE_ARCH} == "powerpc")
 DISTNAME=		fftw-3.0.1-fma
@@ -15,7 +15,6 @@ HOMEPAGE=		http://www.fftw.org/
 COMMENT=		Collection of fast C routines to compute DFTs
 
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/fftw.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--enable-shared
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index c34d5ed30cd..7535395e529 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.78 2004/01/24 13:58:23 grant Exp $
+# $NetBSD: Makefile,v 1.79 2004/02/14 17:21:44 jlam Exp $
 #
 
 DISTNAME=		gnumeric-1.0.13
@@ -19,15 +19,13 @@ USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
 USE_PERL5=		YES
+USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-python
 CONFIGURE_ARGS+=	--without-psiconv
 LIBS+=      		-lunicode
 
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 .include "../../devel/bonobo/buildlink2.mk"
 .include "../../devel/gal/buildlink2.mk"
 .include "../../devel/gettext-lib/buildlink2.mk"
diff --git a/math/gnumeric0/Makefile b/math/gnumeric0/Makefile
index 68adae47b57..51c3534d6ff 100644
--- a/math/gnumeric0/Makefile
+++ b/math/gnumeric0/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2004/01/24 13:58:23 grant Exp $
+# $NetBSD: Makefile,v 1.21 2004/02/14 17:21:44 jlam Exp $
 #
 
 DISTNAME=		gnumeric-0.75
@@ -17,15 +17,13 @@ USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
 USE_PERL5=		YES
+USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--without-guile		# needs CVS-only guile-1.5
 CONFIGURE_ARGS+=	--without-python
 LIBS+=      		-lunicode
 
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 pre-configure:
 	for i in ${WRKSRC}/plugins/*/Makefile.in ; do			\
 		${SED} <$$i >$$i.fixed					\
diff --git a/math/gsl/Makefile b/math/gsl/Makefile
index ce02ef27c95..23fae498d25 100644
--- a/math/gsl/Makefile
+++ b/math/gsl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2003/09/14 21:13:49 dmcmahill Exp $
+# $NetBSD: Makefile,v 1.17 2004/02/14 17:21:44 jlam Exp $
 
 DISTNAME=		gsl-1.4
 PKGREVISION=		2
@@ -11,7 +11,6 @@ COMMENT=		The GNU Scientific Library
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 INFO_FILES=		gsl-ref.info
 
 TEST_TARGET=		check
diff --git a/math/guppi/Makefile b/math/guppi/Makefile
index 698f89938d2..20829cf6b78 100644
--- a/math/guppi/Makefile
+++ b/math/guppi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.36 2004/02/14 17:21:44 jlam Exp $
 
 DISTNAME=	Guppi-0.40.3
 PKGNAME=	${DISTNAME:S/G/g/}
@@ -30,9 +30,7 @@ USE_PKGLOCALEDIR=	YES
 USE_X11BASE=		YES
 USE_GNU_TOOLS+=		make
 GNU_CONFIGURE=		YES
-
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PLIST_SUBST+=		LOCALBASE=${LOCALBASE}
 
 post-install:
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index 8ed7b517899..e9bfc9deef6 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.47 2004/02/01 01:43:29 jlam Exp $
+# $NetBSD: Makefile,v 1.48 2004/02/14 17:21:44 jlam Exp $
 #
 
 DISTNAME=	${SCIBASE}.src
@@ -26,9 +26,7 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 USE_BUILDLINK2=		yes
 USE_FORTRAN=		yes
 USE_X11BASE=		yes
-
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-xaw3d