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.

7 files changed, 16 insertions, 15 deletions

diff --git a/chat/gaim-encryption/Makefile b/chat/gaim-encryption/Makefile
index 4e9490b6148..d8c57de47de 100644
--- a/chat/gaim-encryption/Makefile
+++ b/chat/gaim-encryption/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2006/06/20 21:43:31 joerg Exp $
+# $NetBSD: Makefile,v 1.14 2006/07/07 15:49:31 jlam Exp $
 
 DISTNAME=	gaim-encryption-2.38
 PKGREVISION=	3
@@ -14,7 +14,7 @@ USE_LIBTOOL=		YES
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 CONFIGURE_ARGS+=	--with-nspr-includes=${BUILDLINK_PREFIX.nspr}/include/nspr
 CONFIGURE_ARGS+=	--with-nspr-libs=${BUILDLINK_PREFIX.nspr}/lib
diff --git a/chat/gaim/Makefile b/chat/gaim/Makefile
index d1afe84a841..0a6eca7a973 100644
--- a/chat/gaim/Makefile
+++ b/chat/gaim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.107 2006/04/17 13:46:18 wiz Exp $
+# $NetBSD: Makefile,v 1.108 2006/07/07 15:49:31 jlam Exp $
 
 DISTNAME=	gaim-1.5.0
 PKGREVISION=	6
@@ -18,7 +18,7 @@ USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 CONFIGURE_ARGS+=	--disable-binreloc
 CONFIGURE_ARGS+=	--disable-gevolution
diff --git a/chat/irssi-icb/Makefile b/chat/irssi-icb/Makefile
index 55389dc0b48..9ac2c86030d 100644
--- a/chat/irssi-icb/Makefile
+++ b/chat/irssi-icb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2006/03/07 22:18:53 adrianp Exp $
+# $NetBSD: Makefile,v 1.20 2006/07/07 15:49:31 jlam Exp $
 #
 
 DISTNAME=	irssi-icb-0.14
@@ -20,7 +20,7 @@ DEPENDS+=	irssi>=${IRSSI_VERSION}:../../chat/irssi
 GNU_CONFIGURE=	yes
 
 USE_LIBTOOL=	yes
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 CONFIGURE_ARGS+=	--with-irssi=${WRKDIR}/${IRSSI_DISTNAME}
 
diff --git a/chat/licq-gui-console/Makefile b/chat/licq-gui-console/Makefile
index ffe08db98d8..a09d240c399 100644
--- a/chat/licq-gui-console/Makefile
+++ b/chat/licq-gui-console/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2006/03/04 21:29:03 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2006/07/07 15:49:31 jlam Exp $
 #
 
 DISTNAME=	licq-1.2.6
@@ -17,7 +17,7 @@ DEPENDS+=	licq-core-[0-9]*:../../chat/licq-core
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 WRKSRC=			${WRKDIR:=/${DISTNAME}/plugins/console}
 
 INCOMPAT_CURSES=	NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
diff --git a/chat/licq-gui-qt/Makefile b/chat/licq-gui-qt/Makefile
index 6a2a31e9a2b..09e0503c9a3 100644
--- a/chat/licq-gui-qt/Makefile
+++ b/chat/licq-gui-qt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2006/05/25 14:29:41 wiz Exp $
+# $NetBSD: Makefile,v 1.27 2006/07/07 15:49:31 jlam Exp $
 #
 
 DISTNAME=	licq-1.2.6
@@ -23,8 +23,7 @@ NOT_FOR_PLATFORM= NetBSD-*-*
 GNU_CONFIGURE=		YES
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	# none
-SHLIBTOOL_OVERRIDE=	libtool */libtool */*/libtool
+SHLIBTOOL_OVERRIDE=	# empty
 WRKSRC=			${WRKDIR:=/${DISTNAME}/plugins/qt-gui}
 
 INCOMPAT_CURSES=	NetBSD-1.4*-* NetBSD-1.5*-* NetBSD-1.6[-_.]*-* NetBSD-1.6[A-Q]-*
diff --git a/chat/silc-client/Makefile b/chat/silc-client/Makefile
index 92b34b65562..b9e14fe07eb 100644
--- a/chat/silc-client/Makefile
+++ b/chat/silc-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.44 2006/02/05 23:08:26 joerg Exp $
+# $NetBSD: Makefile,v 1.45 2006/07/07 15:49:31 jlam Exp $
 #
 
 DISTNAME=		${SILC_CLIENT_DISTNAME}
@@ -20,7 +20,8 @@ COMMENT=                Client for the Secure Internet Live Conferencing (SILC)
 GNU_CONFIGURE=		YES
 USE_TOOLS+=		gmake
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	libtool */libtool */*/*/libtool
+OVERRIDE_DIRDEPTH=	3
+SHLIBTOOL_OVERRIDE=	# empty
 
 PKG_SYSCONFSUBDIR?=	${PKGBASE}
 
diff --git a/chat/silc-server/Makefile b/chat/silc-server/Makefile
index 335ff5515f0..a4135b1e480 100644
--- a/chat/silc-server/Makefile
+++ b/chat/silc-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2006/04/23 00:12:36 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2006/07/07 15:49:31 jlam Exp $
 #
 
 DISTNAME=		silc-server-1.0.2
@@ -16,7 +16,8 @@ COMMENT=                Server for the Secure Internet Live Conferencing (SILC)
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-SHLIBTOOL_OVERRIDE=	libtool */*/*/libtool
+OVERRIDE_DIRDEPTH=	3
+SHLIBTOOL_OVERRIDE=	# empty
 
 .include "../../mk/bsd.prefs.mk"