LIBTOOL_OVERRIDE generally doesn't need to be specified anymore... just

set OVERRIDE_DIRDEPTH to find any libtool scripts deeper in the WRKSRC
tree unless they're named something other than "libtool".

SHLIBTOOL_OVERRIDE generally doesn't need to be specified either -- just
define it to the empty list and shlibtool-override will look for libtool
scripts.

8 files changed, 13 insertions, 18 deletions

diff --git a/net/ethereal/Makefile b/net/ethereal/Makefile
index 13c0fce115f..36e5493c2d7 100644
--- a/net/ethereal/Makefile
+++ b/net/ethereal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.131 2006/06/03 16:04:23 tron Exp $
+# $NetBSD: Makefile,v 1.132 2006/07/07 15:49:33 jlam Exp $
 
 DISTNAME=		ethereal-0.99.0
 CATEGORIES=		net
@@ -25,7 +25,7 @@ USE_LANGUAGES+=		c++
 USE_TOOLS+=		perl pkg-config
 
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE+=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-gtk2
diff --git a/net/freeradius/Makefile b/net/freeradius/Makefile
index 2533fb63db5..f78b3ddf4dc 100644
--- a/net/freeradius/Makefile
+++ b/net/freeradius/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.48 2006/04/10 15:25:04 joerg Exp $
+# $NetBSD: Makefile,v 1.49 2006/07/07 15:49:33 jlam Exp $
 
 DISTNAME=	freeradius-1.1.1
 PKGREVISION=	3
@@ -23,7 +23,6 @@ USE_OLD_DES_API=	YES
 BUILDLINK_API_DEPENDS.openssl+=	openssl>=0.9.7
 
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE+=	libtool
 
 CONFIGURE_ARGS+=	--with-logdir=${VARBASE}/log
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE:Q}
diff --git a/net/gift-gnutella/Makefile b/net/gift-gnutella/Makefile
index 157fa4ff004..88ca4a3803c 100644
--- a/net/gift-gnutella/Makefile
+++ b/net/gift-gnutella/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2006/06/07 12:36:20 joerg Exp $
+# $NetBSD: Makefile,v 1.8 2006/07/07 15:49:33 jlam Exp $
 #
 
 DISTNAME=		gift-gnutella-0.0.9.2
@@ -16,7 +16,7 @@ USE_LIBTOOL=		yes
 USE_TOOLS+=		pkg-config
 GNU_CONFIGURE=		yes
 
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 CONFIGURE_ARGS+=	--with-libxml=${BUILDLINK_PREFIX.libxml2}
 
 .include "../../devel/zlib/buildlink3.mk"
diff --git a/net/gift-openft/Makefile b/net/gift-openft/Makefile
index de013e8e86f..b4a6f5addd4 100644
--- a/net/gift-openft/Makefile
+++ b/net/gift-openft/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2006/06/07 12:42:39 joerg Exp $
+# $NetBSD: Makefile,v 1.10 2006/07/07 15:49:33 jlam Exp $
 #
 
 DISTNAME=	gift-openft-0.2.1.3
@@ -15,7 +15,7 @@ USE_TOOLS+=	pkg-config
 GNU_CONFIGURE=	yes
 
 PTHREAD_AUTO_VARS=	yes
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 .include "../../devel/zlib/buildlink3.mk"
 .include "../../databases/db4/buildlink3.mk"
diff --git a/net/ja-samba/Makefile b/net/ja-samba/Makefile
index 5249df841fd..7552c96ebab 100644
--- a/net/ja-samba/Makefile
+++ b/net/ja-samba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2006/05/12 23:07:14 minskim Exp $
+# $NetBSD: Makefile,v 1.47 2006/07/07 15:49:33 jlam Exp $
 
 DISTNAME=		samba-${SAMBA_VERSION}-ja-${JA_VERSION}
 PKGNAME=		ja-samba-${SAMBA_VERSION}.${JA_PKG_VERSION}
@@ -108,7 +108,7 @@ EGDIR=		${PREFIX}/share/examples/samba
 USE_PKGLOCALEDIR=	YES
 USE_LANGUAGE=		c
 USE_LIBTOOL=		yes
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 CONF_FILES=		${EGDIR}/smb.conf.default ${SAMBA_ETCDIR}/smb.conf
 CONF_FILES_PERMS+=	${EGDIR}/adduser.sh ${SAMBA_ETCDIR}/adduser \
diff --git a/net/lftp/Makefile b/net/lftp/Makefile
index e8f1e67b804..6e56f592f38 100644
--- a/net/lftp/Makefile
+++ b/net/lftp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.70 2006/05/31 13:44:14 salo Exp $
+# $NetBSD: Makefile,v 1.71 2006/07/07 15:49:33 jlam Exp $
 
 DISTNAME=		lftp-3.4.7
 CATEGORIES=		net
@@ -19,7 +19,7 @@ USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
 USE_GNU_READLINE=	# uses GNU readline internal _rl_mark_modified_lines
 
-SHLIBTOOL_OVERRIDE+=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 .include "options.mk"
 
diff --git a/net/nmap/Makefile b/net/nmap/Makefile
index d774d29a716..9ecb344286f 100644
--- a/net/nmap/Makefile
+++ b/net/nmap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.54 2006/07/02 19:17:26 rillig Exp $
+# $NetBSD: Makefile,v 1.55 2006/07/07 15:49:33 jlam Exp $
 #
 
 DISTNAME=	nmap-4.11
@@ -17,8 +17,6 @@ USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
 USE_TOOLS+=		gmake
 
-LIBTOOL_OVERRIDE+=	libdnet-stripped/libtool
-
 CONFIGURE_ARGS+=	--with-libpcap=${BUILDLINK_PREFIX.libpcap}
 CONFIGURE_ARGS+=	--with-libpcre=${BUILDLINK_PREFIX.pcre}
 CONFIGURE_ARGS+=	--with-openssl=${BUILDLINK_PREFIX.openssl}
diff --git a/net/nocol/Makefile b/net/nocol/Makefile
index 87a7c8a9f03..0813c362870 100644
--- a/net/nocol/Makefile
+++ b/net/nocol/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2006/07/05 06:53:13 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2006/07/07 15:49:33 jlam Exp $
 #
 
 DISTNAME=		nocol-4.3.1
@@ -18,8 +18,6 @@ CONFIGURE_ARGS+=	< ${WRKSRC}/answers
 
 USE_TOOLS+=		perl:run mkdirhier yacc
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/cmu-snmp/snmp/libtool \
-			${WRKSRC}/cmu-snmp/snmpapps/libtool
 
 INSTALL_TARGET=		install root