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.

6 files changed, 12 insertions, 18 deletions

diff --git a/games/crossfire-cli/Makefile b/games/crossfire-cli/Makefile
index e75d8ef296d..6c69a017f48 100644
--- a/games/crossfire-cli/Makefile
+++ b/games/crossfire-cli/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:10 jlam Exp $
 #
 
 DISTNAME=	crossfire-client-1.0.0
@@ -17,8 +17,7 @@ CF_SRC=		crossfire-client-1.0.0.tar.gz
 CF_SND=		client-0.95.2-au-sounds.tgz
 CF_RAW=		client-0.95.2-raw-sounds.tgz
 
-USE_PERL5=	yes
-USE_TOOLS+=	gmake gtar
+USE_TOOLS+=	gmake gtar perl:run
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-sound-dir=${PREFIX}/share/cfclient/sounds
 
diff --git a/games/crossfire-srv/Makefile b/games/crossfire-srv/Makefile
index a9a3e871aa3..63a2102ba18 100644
--- a/games/crossfire-srv/Makefile
+++ b/games/crossfire-srv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/07/15 18:27:50 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:10 jlam Exp $
 #
 
 DISTNAME=	crossfire-1.0.0
@@ -17,9 +17,8 @@ EXTRACT_ONLY=	${CF_SRC}
 CF_SRC=		crossfire-1.0.0.tar.bz2
 CF_MAPS=	crossfire-1.0.0-maps.tar.bz2
 
-USE_TOOLS+=	gmake gtar
+USE_TOOLS+=	gmake gtar perl:run
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
 CONFIGURE_ARGS+=	--with-includes=-I${LOCALBASE}/include
 
 MAKE_ENV+=	EXTRA_INCLUDES=-I${LOCALBASE}/include
diff --git a/games/frozen-bubble/Makefile b/games/frozen-bubble/Makefile
index bc07bfca6e1..b94c2edeb22 100644
--- a/games/frozen-bubble/Makefile
+++ b/games/frozen-bubble/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/13 18:01:30 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:10 jlam Exp $
 #
 
 DISTNAME=	frozen-bubble-1.0.0
@@ -13,8 +13,7 @@ COMMENT=	Pop the frozen bubbles
 
 DEPENDS+=	p5-SDL>=1.19.2:../../devel/p5-SDL
 
-USE_PERL5=	run
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake perl:run
 
 MAKE_ENV+=	PERL5="${PERL5}" CP="${CP}"
 
diff --git a/games/openmortal/Makefile b/games/openmortal/Makefile
index 23409850cd7..e9680db14ee 100644
--- a/games/openmortal/Makefile
+++ b/games/openmortal/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:02:51 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:10 jlam Exp $
 #
 
 DISTNAME=	openmortal-0.7
@@ -12,8 +12,7 @@ HOMEPAGE=	http://apocalypse.rulez.org/~upi/Mortal/
 COMMENT=	Parody of Mortal Kombat with real characters
 
 GNU_CONFIGURE=	yes
-USE_TOOLS+=	gmake
-USE_PERL5=	yes
+USE_TOOLS+=	gmake perl:run
 
 REPLACE_PERL=	data/script/*.pl
 
diff --git a/games/xracer/Makefile b/games/xracer/Makefile
index f9031660cbc..b916c00a249 100644
--- a/games/xracer/Makefile
+++ b/games/xracer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/07/13 18:01:30 jlam Exp $
+# $NetBSD: Makefile,v 1.36 2005/07/16 01:19:10 jlam Exp $
 #
 
 DISTNAME=		xracer-0.96.9
@@ -12,8 +12,7 @@ COMMENT=		XRacer is a clone of the popular Psygnosis game Wipeout
 
 BUILD_USES_MSGFMT=	# defined
 
-USE_TOOLS+=		automake14 gmake
-USE_PERL5=		# defined
+USE_TOOLS+=		automake14 gmake perl:run
 PERL5_PACKLIST=		auto/XRacer/.packlist
 
 USE_LIBTOOL=		# defined
diff --git a/games/zoom/Makefile b/games/zoom/Makefile
index 3139be0d66a..925f8de13f0 100644
--- a/games/zoom/Makefile
+++ b/games/zoom/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 04:49:46 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:10 jlam Exp $
 #
 
 DISTNAME=	zoom-1.0.1
@@ -18,8 +18,7 @@ COMMENT=		Plays Infocom-compatible games, with graphics support
 USE_PKGLOCALEDIR=	yes
 USE_LIBTOOL=		yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 
 .if ${MACHINE_ARCH} == "alpha"
 GCC_REQD+=		3.0