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.

17 files changed, 23 insertions, 46 deletions

diff --git a/security/beecrypt/Makefile b/security/beecrypt/Makefile
index 35924760f53..8b90939dfae 100644
--- a/security/beecrypt/Makefile
+++ b/security/beecrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/08/03 20:58:17 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:50 jlam Exp $
 #
 
 DISTNAME=	beecrypt-3.0.0
@@ -13,8 +13,6 @@ GNU_CONFIGURE=		YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CONFIGURE_ARGS+=	--without-javaglue
 
 .include "../../mk/pthread.buildlink2.mk"
diff --git a/security/cyrus-sasl2/Makefile.common b/security/cyrus-sasl2/Makefile.common
index f94ff3ff0b8..143f63b8086 100644
--- a/security/cyrus-sasl2/Makefile.common
+++ b/security/cyrus-sasl2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2004/02/14 14:43:51 jlam Exp $
+# $NetBSD: Makefile.common,v 1.18 2004/02/14 17:21:50 jlam Exp $
 #
 # This file is currently included by:
 #
@@ -37,7 +37,6 @@ USE_PKGINSTALL=		YES
 GNU_CONFIGURE=		YES
 
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 MAKE_ENV+=		SHLIBTOOL=${SHLIBTOOL:Q}
 
 # CYRUS_USER		username of the Cyrus administrator
diff --git a/security/gnutls/Makefile b/security/gnutls/Makefile
index c71195984c3..6c343233ad3 100644
--- a/security/gnutls/Makefile
+++ b/security/gnutls/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2004/02/10 00:20:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2004/02/14 17:21:50 jlam Exp $
 
 DISTNAME=	gnutls-1.0.4
 CATEGORIES=	security devel
@@ -12,8 +12,6 @@ USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
-
 DOCDIR=		${PREFIX}/share/doc/gnutls
 EGDIR=		${PREFIX}/share/examples/gnutls
 
diff --git a/security/gpgme/Makefile b/security/gpgme/Makefile
index 75da3d36aa7..7ddb617abbf 100644
--- a/security/gpgme/Makefile
+++ b/security/gpgme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2004/02/11 02:30:49 xtraeme Exp $
+# $NetBSD: Makefile,v 1.16 2004/02/14 17:21:50 jlam Exp $
 #
 
 DISTNAME=	gpgme-0.4.3
@@ -13,6 +13,7 @@ COMMENT=	GnuPG Made Easy
 DEPENDS+=	gnupg>=1.2.2:../../security/gnupg
 
 USE_BUILDLINK3=		YES
+USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
 
@@ -24,9 +25,6 @@ TEST_TARGET=		check
 CONFIGURE_ARGS+=	--without-pth --without-pth-test
 .endif
 
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 INFO_FILES=		gpgme.info
 
 .include "../../security/libgpg-error/buildlink3.mk"
diff --git a/security/gpgme03/Makefile b/security/gpgme03/Makefile
index 9d1f7fe9a22..20281005e6a 100644
--- a/security/gpgme03/Makefile
+++ b/security/gpgme03/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2003/12/14 17:57:36 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=	gpgme-0.3.15
@@ -13,6 +13,7 @@ COMMENT=	GnuPG Made Easy (0.3 branch)
 DEPENDS+=	gnupg>=1.2.0:../../security/gnupg
 
 USE_BUILDLINK2=		YES
+USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 PTHREAD_OPTS+=		require
 
@@ -22,9 +23,6 @@ PTHREAD_OPTS+=		require
 CONFIGURE_ARGS+=	--without-pth --without-pth-test
 .endif
 
-USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 INFO_FILES=		gpgme.info
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/gsasl/Makefile b/security/gsasl/Makefile
index 7d7affc1ea2..3a5a1ce597b 100644
--- a/security/gsasl/Makefile
+++ b/security/gsasl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/10 00:17:51 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:52 jlam Exp $
 
 DISTNAME=		gsasl-0.0.8
 PKGREVISION=		1
@@ -21,7 +21,6 @@ INFO_FILES=		gsasl.info
 CONFIGURE_ARGS+=	--disable-gtk-doc
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc/html
 
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/libgsasl.pc.in
 
 .include "../../devel/gettext-lib/buildlink3.mk"
diff --git a/security/gss/Makefile b/security/gss/Makefile
index 332d932952f..b310754f92d 100644
--- a/security/gss/Makefile
+++ b/security/gss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/10 00:14:41 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=		gss-0.0.6
@@ -15,7 +15,6 @@ GNU_CONFIGURE=		yes
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
 
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=    ${WRKSRC}/gss.pc.in
 
 INFO_FILES=		gss.info
diff --git a/security/heimdal/Makefile b/security/heimdal/Makefile
index f6245dd289c..6c734adc612 100644
--- a/security/heimdal/Makefile
+++ b/security/heimdal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/01/15 12:48:00 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:52 jlam Exp $
 
 DISTNAME=		heimdal-0.6
 CATEGORIES=		security
@@ -16,7 +16,6 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_BUILDLINK3=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 HEIMDAL_STATEDIR?=	/var/heimdal
 
diff --git a/security/kth-krb4/Makefile b/security/kth-krb4/Makefile
index 2bc3b33065c..10ea608284b 100644
--- a/security/kth-krb4/Makefile
+++ b/security/kth-krb4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/02/09 17:36:37 wennmach Exp $
+# $NetBSD: Makefile,v 1.31 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=		krb4-1.2.1
@@ -23,6 +23,7 @@ CRYPTO=			yes
 
 USE_BUILDLINK2=		yes
 USE_X11=		yes
+USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--includedir=${PREFIX}/include/kerberosIV
 
@@ -44,9 +45,6 @@ PLIST_SUBST+=		KRB4_PREFIX=
 .endif
 CONFIGURE_ARGS+=	--program-transform="${KTH_KRB4_TRANSFORM}"
 
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 INFO_FILES=		kth-krb.info
 
 EXAMPLEDIR=		${PREFIX}/share/examples/kth-krb4
diff --git a/security/libgcrypt/Makefile b/security/libgcrypt/Makefile
index e614f0081c7..646bac5ed8b 100644
--- a/security/libgcrypt/Makefile
+++ b/security/libgcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/02/10 00:13:24 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=	libgcrypt-1.1.90
@@ -29,7 +29,9 @@ INFO_FILES=		gcrypt.info
 .if empty(MACHINE_PLATFORM:MNetBSD-*-i386) && \
     empty(MACHINE_PLATFORM:MNetBSD-*-alpha)
 CONFIGURE_ARGS+=	--disable-asm
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool
+LIBTOOL_OVERRIDE+=	libtool
+.else
+LIBTOOL_OVERRIDE=	# empty
 .endif
 
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/security/libgpg-error/Makefile b/security/libgpg-error/Makefile
index 79b44dcef47..107cdcc1dc2 100644
--- a/security/libgpg-error/Makefile
+++ b/security/libgpg-error/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/02/09 20:28:16 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=	libgpg-error-0.6
@@ -15,8 +15,5 @@ USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 .include "../../devel/gettext-lib/buildlink3.mk"
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/libmcrypt/Makefile b/security/libmcrypt/Makefile
index cbb66b8a7fd..e54a1cc4a4d 100644
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2003/08/29 00:56:25 dan Exp $
+# $NetBSD: Makefile,v 1.14 2004/02/14 17:21:52 jlam Exp $
 
 DISTNAME=	libmcrypt-2.5.7
 CATEGORIES=	security devel
@@ -12,7 +12,6 @@ COMMENT=	Crypto algorithms library
 
 USE_BUILDLINK2=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		yes
 
 post-install:
diff --git a/security/libtasn1/Makefile b/security/libtasn1/Makefile
index d8a3b8720b9..3a5cb10eeba 100644
--- a/security/libtasn1/Makefile
+++ b/security/libtasn1/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/14 00:54:45 grant Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:52 jlam Exp $
 
 DISTNAME=	libtasn1-0.2.6
 CATEGORIES=	security devel
@@ -12,6 +12,4 @@ USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
-
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/mcrypt/Makefile b/security/mcrypt/Makefile
index b675aba0a3b..1010e4b8deb 100644
--- a/security/mcrypt/Makefile
+++ b/security/mcrypt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2003/07/21 17:20:11 martti Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:52 jlam Exp $
 
 DISTNAME=	mcrypt-2.6.4
 PKGREVISION=	1
@@ -14,7 +14,6 @@ USE_BUILDLINK2=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../devel/gettext-lib/buildlink2.mk"
 .include "../../security/libmcrypt/buildlink2.mk"
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 60542c346c8..303cf0ee17e 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2003/07/21 17:20:11 martti Exp $
+# $NetBSD: Makefile,v 1.10 2004/02/14 17:21:52 jlam Exp $
 
 DISTNAME=	mhash-0.8.17
 CATEGORIES=	security devel
@@ -10,8 +10,6 @@ COMMENT=	Hash algorithms library
 
 USE_BUILDLINK2=		YES
 GNU_CONFIGURE=		YES
-
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/nessus-libraries/Makefile b/security/nessus-libraries/Makefile
index e4a20d102dd..b33288ddb6f 100644
--- a/security/nessus-libraries/Makefile
+++ b/security/nessus-libraries/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2004/01/20 12:25:34 agc Exp $
+# $NetBSD: Makefile,v 1.13 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=	nessus-libraries-${VERS}
@@ -10,7 +10,6 @@ COMMENT=	Libs required by the Nessus Network security scanner
 WRKSRC=		${WRKDIR}/nessus-libraries
 USE_BUILDLINK2=	yes
 USE_LIBTOOL=	yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 BUILD_DEPENDS+=	bison-[0-9]*:../../devel/bison
 
diff --git a/security/opencdk/Makefile b/security/opencdk/Makefile
index 1504cfed675..86e28cf31bc 100644
--- a/security/opencdk/Makefile
+++ b/security/opencdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/02/10 00:20:29 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2004/02/14 17:21:52 jlam Exp $
 #
 
 DISTNAME=	opencdk-0.5.3
@@ -14,7 +14,6 @@ USE_BUILDLINK3=	YES
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
 
-LIBTOOL_OVERRIDE=       ${WRKSRC}/libtool
 REPLACE_PERL=		doc/gdoc
 
 DOCDIR=		${PREFIX}/share/doc/opencdk