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.

8 files changed, 15 insertions, 24 deletions

diff --git a/lang/drscheme/Makefile b/lang/drscheme/Makefile
index 576ecddd2c7..613d268ad90 100644
--- a/lang/drscheme/Makefile
+++ b/lang/drscheme/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/17 04:49:47 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:11 jlam Exp $
 #
 
 DISTNAME=		plt-${DRSCHEME_VERSION}-src-unix
@@ -23,8 +23,7 @@ COMMENT=		R4RS-compliant and nearly R5RS-compliant scheme tailored for teaching
 CONFLICTS+=		mzscheme-[0-9]*:../../lang/mzscheme
 
 WRKSRC=                 ${WRKDIR}/plt/src
-USE_TOOLS+=		gmake
-USE_PERL5=		yes
+USE_TOOLS+=		gmake perl:run
 GNU_CONFIGURE=		yes
 
 DRSCHEME_VERSION=	209
diff --git a/lang/erlang/Makefile b/lang/erlang/Makefile
index b919169f085..bf98887cf05 100644
--- a/lang/erlang/Makefile
+++ b/lang/erlang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/07/12 09:40:46 wiz Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:11 jlam Exp $
 
 DISTNAME=		otp_src_R9C-0
 PKGNAME=		erlang-9.2
@@ -12,9 +12,8 @@ COMMENT=		Concurrent functional programming language
 
 DIST_SUBDIR=		erlang
 
-USE_PERL5=		yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl:run
 USE_JAVA=		yes
 USE_JAVA2=		yes
 
diff --git a/lang/fort77/Makefile b/lang/fort77/Makefile
index cac2d47984d..e2250c9231c 100644
--- a/lang/fort77/Makefile
+++ b/lang/fort77/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2004/12/03 15:15:00 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:11 jlam Exp $
 #
 
 DISTNAME=		fort77-1.14a
@@ -23,8 +23,7 @@ PKG_SKIP_REASON=	"${PKGNAME} is part of your ${OPSYS} distribution"
 .endif
 
 BUILD_TARGET=		test
-
-USE_PERL5=		YES
+USE_TOOLS+=		perl:run
 
 post-patch:
 	for f in `${FIND} ${WRKDIR} -type f -print | ${XARGS} ${GREP} -l '/usr'`; \
diff --git a/lang/ghc/Makefile b/lang/ghc/Makefile
index 217c07f9c2c..0554b50dcac 100644
--- a/lang/ghc/Makefile
+++ b/lang/ghc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2005/05/22 20:08:09 jlam Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/16 01:19:11 jlam Exp $
 
 DISTNAME=	ghc-6.4
 CATEGORIES=	lang
@@ -19,8 +19,7 @@ GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--with-ghc=${WRKDIR}/bootstrap/bin/ghc
 CONFIGURE_ENV+=		PerlCmd=${PERL5}
 USE_GNU_READLINE=	yes	# uses the UNDO_ constants
-USE_PERL5=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl:run
 
 pre-configure:
 	${MV} ${WRKDIR}/ghc-6.2.1/mk/bootstrap.mk \
diff --git a/lang/mono/Makefile b/lang/mono/Makefile
index 5d45110c6b8..380111c996a 100644
--- a/lang/mono/Makefile
+++ b/lang/mono/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.36 2005/05/22 20:08:10 jlam Exp $
+# $NetBSD: Makefile,v 1.37 2005/07/16 01:19:11 jlam Exp $
 
 DISTNAME=	mono-1.1.6
 CATEGORIES=	lang
@@ -22,7 +22,7 @@ NOT_FOR_PLATFORM+=	NetBSD-2.9*-* NetBSD-3.*-*
 # LP64 problems
 NOT_FOR_PLATFORM+=	*-*-alpha *-*-sparc64
 
-USE_TOOLS+=		bison gmake
+USE_TOOLS+=		bison gmake perl
 USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 
@@ -42,7 +42,6 @@ PKGCONFIG_OVERRIDE+=	mono.pc.in
 PKGCONFIG_OVERRIDE+=	scripts/mono-nunit.pc.in
 #PKG_SYSCONFSUBDIR=	mono
 
-USE_PERL5=	build
 REPLACE_PERL=	mcs/errors/do-tests.pl
 REPLACE_PERL+=	mcs/mbas/Test/test-mbas.pl
 REPLACE_PERL+=	mcs/tools/scan-tests.pl
diff --git a/lang/moscow_ml/Makefile b/lang/moscow_ml/Makefile
index e7d45b71008..d228a05d1f3 100644
--- a/lang/moscow_ml/Makefile
+++ b/lang/moscow_ml/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/12/03 15:15:01 wiz Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/16 01:19:11 jlam Exp $
 
 DISTNAME=       mos20src
 PKGNAME=        moscow_ml-2.00
@@ -12,7 +12,7 @@ HOMEPAGE=	http://www.dina.kvl.dk/~sestoft/mosml.html
 COMMENT=	Moscow ML, a version of Standard ML
 
 WRKSRC=		${WRKDIR}/mosml/src
-USE_PERL5=	build
+USE_TOOLS+=	perl
 
 BUILD_TARGET=	clean world
 
diff --git a/lang/parrot/Makefile b/lang/parrot/Makefile
index f9bc5e78352..362940dac2b 100644
--- a/lang/parrot/Makefile
+++ b/lang/parrot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:00 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:11 jlam Exp $
 #
 
 DISTNAME=       parrot-0.0.1
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.python.org/parrot.html
 COMMENT=	Bytecode language possibly to be used by Perl/Python
 
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 
 BUILD_TARGET=	test_prog
 
diff --git a/lang/perl5/buildlink3.mk b/lang/perl5/buildlink3.mk
index 286af9a3e27..2ad9613a90f 100644
--- a/lang/perl5/buildlink3.mk
+++ b/lang/perl5/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.25 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: buildlink3.mk,v 1.26 2005/07/16 01:19:11 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 PERL5_BUILDLINK3_MK:=	${PERL5_BUILDLINK3_MK}+
@@ -19,10 +19,6 @@ BUILDLINK_DEPENDS.perl+=	{perl>=${PERL5_REQD},perl-thread>=${PERL5_REQD}}
 BUILDLINK_RECOMMENDED.perl+=	perl>=5.8.5nb6
 BUILDLINK_PKGSRCDIR.perl?=	../../lang/perl5
 
-.if defined(USE_PERL5) && !empty(USE_PERL5:Mbuild)
-BUILDLINK_DEPMETHOD.perl?=	build
-.endif
-
 PERL5_OPTIONS?=		# empty
 .if !empty(PERL5_OPTIONS:Mthreads)
 USE_PKGINSTALL=		yes