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.

6 files changed, 10 insertions, 12 deletions

diff --git a/audio/libopendaap/Makefile b/audio/libopendaap/Makefile
index 55510bd84b6..9d496cda6d0 100644
--- a/audio/libopendaap/Makefile
+++ b/audio/libopendaap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:28:56 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:30 jlam Exp $
 
 DISTNAME=	libopendaap-0.4.0
 CATEGORIES=	audio
@@ -11,7 +11,6 @@ COMMENT=	DAAP client library
 
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_TOOLS+=		pkg-config
 
 SUBST_CLASSES+=		pthread
diff --git a/audio/tunesbrowser/Makefile b/audio/tunesbrowser/Makefile
index 910974aa468..44b765de245 100644
--- a/audio/tunesbrowser/Makefile
+++ b/audio/tunesbrowser/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2006/04/17 13:46:16 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2006/07/07 15:49:30 jlam Exp $
 #
 
 DISTNAME=		tunesbrowser-0.3.0
@@ -13,7 +13,6 @@ COMMENT=		Front-end for DAAP client
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_TOOLS+=		pkg-config
 
 CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/tunesbrowser
diff --git a/audio/xmms-alarm/Makefile b/audio/xmms-alarm/Makefile
index 50a60ef8991..84230260b7c 100644
--- a/audio/xmms-alarm/Makefile
+++ b/audio/xmms-alarm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2006/03/04 21:28:59 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2006/07/07 15:49:30 jlam Exp $
 #
 
 DISTNAME=		xmms-alarm-0.3.6
@@ -12,7 +12,7 @@ COMMENT=		Plugin which allows XMMS to be used as an alarm clock
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 .include "../../audio/xmms/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/audio/xmms-arts/Makefile b/audio/xmms-arts/Makefile
index 88b94698676..c0fb4ec39df 100644
--- a/audio/xmms-arts/Makefile
+++ b/audio/xmms-arts/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2006/07/07 15:49:30 jlam Exp $
 #
 
 DISTNAME=	arts_output-0.7.1
@@ -13,7 +13,7 @@ COMMENT=	XMMS plugin to output sound through the aRts sound daemon
 
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 LIBS+=			${LIBOSSAUDIO}
 
diff --git a/audio/xmms-faad/Makefile b/audio/xmms-faad/Makefile
index 26fec0e985e..aad110d6270 100644
--- a/audio/xmms-faad/Makefile
+++ b/audio/xmms-faad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2006/06/13 17:59:51 drochner Exp $
+# $NetBSD: Makefile,v 1.9 2006/07/07 15:49:31 jlam Exp $
 
 DISTNAME=		faad2-2.0
 PKGNAME=		xmms-faad-2.0
@@ -18,7 +18,7 @@ WRKSRC=			${WRKDIR}/faad2
 USE_TOOLS+=		automake14 gmake pkg-config
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		YES
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 AUTOCONF_REQD=		2.50
 GNU_CONFIGURE=		YES
diff --git a/audio/xmms/Makefile.common b/audio/xmms/Makefile.common
index d4a4314746b..5cf50ccfcef 100644
--- a/audio/xmms/Makefile.common
+++ b/audio/xmms/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.23 2006/03/09 21:04:42 jlam Exp $
+# $NetBSD: Makefile.common,v 1.24 2006/07/07 15:49:31 jlam Exp $
 #
 
 DISTNAME=	xmms-1.2.10
@@ -21,7 +21,7 @@ FILESDIR=		${.CURDIR}/../../audio/xmms/files
 PATCHDIR=		${.CURDIR}/../../audio/xmms/patches
 
 CONFIGURE_ARGS+=	--without-gnome
-SHLIBTOOL_OVERRIDE=	libtool
+SHLIBTOOL_OVERRIDE=	# empty
 
 # Broken configure script assumes that iconv_open lives in libc; work around.
 CPPFLAGS+=		-DHAVE_ICONV_OPEN=1