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.

15 files changed, 19 insertions, 36 deletions

diff --git a/multimedia/avidemux/Makefile b/multimedia/avidemux/Makefile
index 44a7e90146f..327e7e61adf 100644
--- a/multimedia/avidemux/Makefile
+++ b/multimedia/avidemux/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 12:59:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=	avidemux-2.0.18
@@ -17,8 +17,6 @@ USE_BUILDLINK2=		YES
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		YES
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 CFLAGS+=		-DDEVOSSAUDIO=\"\\\"${DEVOSSAUDIO}\\\"\"
 LDFLAGS+=		${LIBOSSAUDIO}
 
diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile
index c2074ab6bcd..a1196963858 100644
--- a/multimedia/gst-plugins/Makefile
+++ b/multimedia/gst-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/02/09 18:47:38 jmmv Exp $
+# $NetBSD: Makefile,v 1.8 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=		gst-plugins-0.6.4
@@ -18,7 +18,6 @@ USE_PKGLOCALEDIR=	yes
 USE_GNU_TOOLS+=		make
 USE_X11=		yes
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/gst-libs/gst/gconf/gstreamer-gconf.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/pkgconfig/gstreamer-libs.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/pkgconfig/gstreamer-play.pc.in
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 701f9890335..72417a6f81d 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/02/11 08:16:09 xtraeme Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=		gstreamer-0.6.4
@@ -22,7 +22,6 @@ USE_PERL5=		build
 
 CONFIGURE_ARGS+=	--disable-plugin-builddir
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/libs/ext/cothreads/cothreads.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/pkgconfig/gstreamer-control.pc.in
 PKGCONFIG_OVERRIDE+=	${WRKSRC}/pkgconfig/gstreamer.pc.in
diff --git a/multimedia/gxine/Makefile b/multimedia/gxine/Makefile
index 335e358cc33..131a85f70ac 100644
--- a/multimedia/gxine/Makefile
+++ b/multimedia/gxine/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 13:18:06 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=		gxine-0.3.3
@@ -13,7 +13,6 @@ COMMENT=		Gtk-based media player
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 
 .include "../../devel/glib2/buildlink2.mk"
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index f6f193df34a..eb9f56eb047 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/08 13:11:27 markd Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=	kmplayer-0.8.2
@@ -22,7 +22,7 @@ USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
 USE_PERL5=		build
 
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE=	libtool
 
 SUBST_CLASSES+=		desktop
 SUBST_MESSAGE.desktop=	"Fixing application launcher."
diff --git a/multimedia/libdvdcss/Makefile b/multimedia/libdvdcss/Makefile
index fc8e2565877..11c68f9cab1 100644
--- a/multimedia/libdvdcss/Makefile
+++ b/multimedia/libdvdcss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/28 14:25:37 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $
 #
 # Unfortunately, some reading of the United States law (DMCA) means
 # that we are not able to provide pointers to the source or homepage
@@ -26,7 +26,6 @@ NO_BIN_ON_CDROM=	${RESTRICTED}
 
 USE_BUILDLINK2=	YES
 USE_LIBTOOL=	YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=	YES
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdplay/Makefile b/multimedia/libdvdplay/Makefile
index e5c1d53d059..9edb6bc5468 100644
--- a/multimedia/libdvdplay/Makefile
+++ b/multimedia/libdvdplay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/28 14:30:24 recht Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $
 
 DISTNAME=	libdvdplay-1.0.1
 PKGREVISION=	1
@@ -14,7 +14,5 @@ USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 USE_BUILDLINK2=	yes
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 .include "../../multimedia/libdvdread/buildlink2.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/libdvdread/Makefile b/multimedia/libdvdread/Makefile
index 3991ae0a1a3..ed3e49cf1f6 100644
--- a/multimedia/libdvdread/Makefile
+++ b/multimedia/libdvdread/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/11 08:59:40 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $
 
 DISTNAME=	libdvdread-0.9.4
 CATEGORIES=	multimedia
@@ -13,8 +13,6 @@ USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 USE_BUILDLINK3=	yes
 
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 MESSAGE_SUBST+=	PKGBASE=${PKGBASE}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/multimedia/mjpegtools/Makefile b/multimedia/mjpegtools/Makefile
index 097c6da9726..87821b0bba9 100644
--- a/multimedia/mjpegtools/Makefile
+++ b/multimedia/mjpegtools/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/02/13 23:50:17 snj Exp $
+# $NetBSD: Makefile,v 1.5 2004/02/14 17:21:45 jlam Exp $
 
 DISTNAME=	mjpegtools-1.6.1.93
 CATEGORIES=	multimedia
@@ -15,7 +15,7 @@ USE_BUILDLINK2=		yes
 USE_GNU_TOOLS+=		make
 
 USE_LIBTOOL=		yes
-SHLIBTOOL_OVERRIDE=	${WRKSRC}/libtool
+SHLIBTOOL_OVERRIDE=	libtool
 PKGCONFIG_OVERRIDE=	mjpegtools.pc.in
 
 GNU_CONFIGURE=		yes
diff --git a/multimedia/mplex/Makefile b/multimedia/mplex/Makefile
index 578f3b1e674..a003facf2db 100644
--- a/multimedia/mplex/Makefile
+++ b/multimedia/mplex/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/01/26 12:57:01 jmmv Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $
 
 DISTNAME=	mjpegtools-1.6.0
 PKGNAME=	mplex-1.6.0
@@ -15,7 +15,6 @@ USE_GNU_TOOLS+=	make
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 USE_GCC_SHLIB=	yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 do-build:
 	cd ${WRKSRC}/utils && ${GMAKE}
diff --git a/multimedia/nautilus-media/Makefile b/multimedia/nautilus-media/Makefile
index 3dc3dde6c20..f0a4e538bc0 100644
--- a/multimedia/nautilus-media/Makefile
+++ b/multimedia/nautilus-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/02/14 00:24:34 jmmv Exp $
+# $NetBSD: Makefile,v 1.4 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=	nautilus-media-0.3.3.1
@@ -14,7 +14,6 @@ BUILD_USES_MSGFMT=	yes
 DEPENDS+=		gnome2-dirs>=1.2:../../misc/gnome2-dirs
 
 GNU_CONFIGURE=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 USE_BUILDLINK2=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
diff --git a/multimedia/ogle/Makefile b/multimedia/ogle/Makefile
index e89d233483f..ba659bdad4f 100644
--- a/multimedia/ogle/Makefile
+++ b/multimedia/ogle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/03 05:27:03 reed Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $
 
 DISTNAME=	ogle-0.9.2
 PKGREVISION=	1
@@ -20,7 +20,6 @@ USE_BUILDLINK2=		yes
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
 USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ENV+=		CPPFLAGS="${CPPFLAGS}"
diff --git a/multimedia/ogle_gui/Makefile b/multimedia/ogle_gui/Makefile
index 93e61c36960..5647212fd1b 100644
--- a/multimedia/ogle_gui/Makefile
+++ b/multimedia/ogle_gui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/02/03 04:36:19 grant Exp $
+# $NetBSD: Makefile,v 1.3 2004/02/14 17:21:45 jlam Exp $
 
 DISTNAME=	ogle_gui-0.9.2
 PKGREVISION=	2
@@ -13,15 +13,13 @@ USE_BUILDLINK2=		yes
 USE_PKGLOCALEDIR=	yes
 USE_X11=		yes
 USE_GNU_TOOLS+=		make
+USE_LIBTOOL=		yes
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--bindir=${PREFIX}/lib/ogle
 
 GCC_REQD+=		2.95.3
 
-USE_LIBTOOL=		yes
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-
 LDFLAGS+=	${BUILDLINK_LDFLAGS.ogle}
 
 .include "../../devel/binutils/buildlink2.mk"
diff --git a/multimedia/xine-lib/Makefile.common b/multimedia/xine-lib/Makefile.common
index 34597c262cc..282f2655713 100644
--- a/multimedia/xine-lib/Makefile.common
+++ b/multimedia/xine-lib/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2004/01/26 13:03:38 jmmv Exp $
+# $NetBSD: Makefile.common,v 1.2 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=		xine-lib-1-rc0a
@@ -19,8 +19,7 @@ GNU_CONFIGURE=		YES
 USE_PKGLOCALEDIR=	YES
 USE_BUILDLINK2=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
-LIBTOOL_OVERRIDE+=	${WRKSRC}/libtool-nofpic
+LIBTOOL_OVERRIDE=	libtool libtool-nofpic
 PKGCONFIG_OVERRIDE=	${WRKSRC}/misc/libxine.pc.in
 USE_GNU_TOOLS+=		make
 
diff --git a/multimedia/xine-ui/Makefile b/multimedia/xine-ui/Makefile
index 8bf084ab08c..087fd7d2c83 100644
--- a/multimedia/xine-ui/Makefile
+++ b/multimedia/xine-ui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2004/01/26 13:04:46 jmmv Exp $
+# $NetBSD: Makefile,v 1.2 2004/02/14 17:21:45 jlam Exp $
 #
 
 DISTNAME=		xine-ui-0.9.22
@@ -17,7 +17,6 @@ USE_PKGLOCALEDIR=	YES
 USE_BUILDLINK2=		YES
 USE_X11=		YES
 USE_LIBTOOL=		YES
-LIBTOOL_OVERRIDE=	${WRKSRC}/libtool
 GNU_CONFIGURE=		YES
 
 .include "../../converters/libiconv/buildlink2.mk"