From 4ff5f6ae062a1143c9d2a08f5e33e22d43752ad6 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 16 Jul 2005 01:19:06 +0000
Subject: Get rid of USE_PERL5.  The new way to express needing the Perl
 executable around at either build-time or at run-time is:

	USE_TOOLS+=	perl		# build-time
	USE_TOOLS+=	perl:run	# run-time

Also remove some places where perl5/buildlink3.mk was being included
by a package Makefile, but all that the package wanted was the Perl
executable.
---
 multimedia/acidrip/Makefile      | 4 +---
 multimedia/gnome2-media/Makefile | 5 ++---
 multimedia/gst-plugins/Makefile  | 4 ++--
 multimedia/gstreamer/Makefile    | 5 ++---
 multimedia/kmplayer/Makefile     | 5 ++---
 multimedia/xawtv/Makefile        | 5 ++---
 6 files changed, 11 insertions(+), 17 deletions(-)

(limited to 'multimedia')

diff --git a/multimedia/acidrip/Makefile b/multimedia/acidrip/Makefile
index 5bf452ec170..f92139baecd 100644
--- a/multimedia/acidrip/Makefile
+++ b/multimedia/acidrip/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/13 18:01:34 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:15 jlam Exp $
 #
 
 DISTNAME=	acidrip-0.14
@@ -15,8 +15,6 @@ DEPENDS+=	mencoder-[0-9]*:../../multimedia/mencoder
 DEPENDS+=	mplayer-[0-9]*:../../multimedia/mplayer
 DEPENDS+=	p5-gtk2>=1.040:../../x11/p5-gtk2
 
-USE_PERL5=	yes
-
 PERL5_REQD=     5.8
 PERL5_PACKLIST= auto/AcidRip/.packlist
 
diff --git a/multimedia/gnome2-media/Makefile b/multimedia/gnome2-media/Makefile
index 36e325f0052..bfb62981767 100644
--- a/multimedia/gnome2-media/Makefile
+++ b/multimedia/gnome2-media/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:15 jlam Exp $
 
 DISTNAME=		gnome-media-2.10.2
 CATEGORIES=		multimedia gnome
@@ -18,8 +18,7 @@ GNU_CONFIGURE=		yes
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 
 CONFIGURE_ARGS+=	--enable-gtk-doc=no
 CONFIGURE_ARGS+=	--with-html-dir=${PREFIX}/share/doc
diff --git a/multimedia/gst-plugins/Makefile b/multimedia/gst-plugins/Makefile
index 6fdb71c9a4e..f88445ca74b 100644
--- a/multimedia/gst-plugins/Makefile
+++ b/multimedia/gst-plugins/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/26 09:30:09 wiz Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:15 jlam Exp $
 #
 
 .include "Makefile.common"
@@ -6,7 +6,7 @@
 PKGREVISION=		1
 COMMENT+=		base plugins
 
-USE_PERL5=		run
+USE_TOOLS+=		perl:run
 
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-gconf.pc.in
 PKGCONFIG_OVERRIDE+=	pkgconfig/gstreamer-interfaces.pc.in
diff --git a/multimedia/gstreamer/Makefile b/multimedia/gstreamer/Makefile
index 8d88d1510d8..8472d009e6e 100644
--- a/multimedia/gstreamer/Makefile
+++ b/multimedia/gstreamer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/01 18:03:06 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:15 jlam Exp $
 #
 
 DISTNAME=		gstreamer-0.8.10
@@ -16,8 +16,7 @@ GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 
 CONFIGURE_ARGS+=	--disable-plugin-builddir
 CONFIGURE_ARGS+=	--localstatedir=${PREFIX}/libdata/gstreamer-0.8
diff --git a/multimedia/kmplayer/Makefile b/multimedia/kmplayer/Makefile
index 135d10d80ac..a03519f37ef 100644
--- a/multimedia/kmplayer/Makefile
+++ b/multimedia/kmplayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/05/22 20:08:18 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:15 jlam Exp $
 #
 
 DISTNAME=	kmplayer-0.8.4b
@@ -16,10 +16,9 @@ DEPENDS+=		mencoder>=1.0rc3:../../multimedia/mencoder
 DEPENDS+=		xine-arts>=1rc0a:../../audio/xine-arts
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_PERL5=		build
 
 CONFIGURE_ARGS+=	--without-gstreamer
 
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index e6e2cd9d429..62f3f1095cb 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/11 16:58:08 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:15 jlam Exp $
 #
 
 DISTNAME=	xawtv_3.90
@@ -13,8 +13,7 @@ COMMENT=	TV application for Brooktree 848 compatible cards
 
 WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 
 CONFIGURE_ARGS+=	--disable-aalib
 CONFIGURE_ARGS+=	--disable-motif
-- 
cgit v1.2.3