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.

24 files changed, 44 insertions, 61 deletions

diff --git a/www/SpeedyCGI/Makefile b/www/SpeedyCGI/Makefile
index f696723a10a..666a5b108ad 100644
--- a/www/SpeedyCGI/Makefile
+++ b/www/SpeedyCGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/07/13 18:01:45 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:24 jlam Exp $
 
 DISTNAME=	CGI-SpeedyCGI-2.22
 PKGNAME=	SpeedyCGI-2.22
@@ -9,8 +9,6 @@ MAINTAINER=	adrianp@stindustries.net
 HOMEPAGE=	http://daemoninc.com/speedycgi/
 COMMENT=	Speed up perl scripts by running them persistently
 
-USE_PERL5=	YES
-
 PERL5_PACKLIST= auto/CGI/SpeedyCGI/.packlist
 
 .include "../../lang/perl5/module.mk"
diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 75c97a4d735..16668964890 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2005/06/17 03:50:39 jlam Exp $
+# $NetBSD: Makefile,v 1.50 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	adzap-20050504
@@ -13,7 +13,7 @@ COMMENT=	Filter out animated ad banners from web pages
 
 WRKSRC=		${WRKDIR}/adzap
 NO_BUILD=	# defined
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 
 INSTALLATION_DIRS=	libexec
 
diff --git a/www/album/Makefile b/www/album/Makefile
index 1ef533e2c14..abe57b66b45 100644
--- a/www/album/Makefile
+++ b/www/album/Makefile
@@ -20,7 +20,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 
 MY_SCRIPT=	album
 
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	${MY_SCRIPT}
 
 NO_CONFIGURE=	YES
diff --git a/www/ap-jserv/Makefile b/www/ap-jserv/Makefile
index 14e4a3c5be2..b6c6911a66d 100644
--- a/www/ap-jserv/Makefile
+++ b/www/ap-jserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:44 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:25 jlam Exp $
 
 DISTNAME=	ApacheJServ-1.1.2
 PKGNAME=	ap-jserv-1.1.2
@@ -12,9 +12,8 @@ COMMENT=	Older Java Servlet engine for Apache Server
 DEPENDS+=	{apache-1.3.9*,apache-1.3.[1-9][0-9]*,apache6-1.3.9*,apache6-1.3.[1-9][0-9]*}:../../www/apache
 # yes, this needs _exactly_ version 2.0
 DEPENDS+=	jsdk-2.0:../../www/jsdk20
-USE_PERL5=	build	# for "apxs"
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_LIBTOOL=		yes
 LTCONFIG_OVERRIDE=	${WRKSRC}/src/scripts/build/unix/ltconfig
 GNU_CONFIGURE=		yes
diff --git a/www/apache/buildlink3.mk b/www/apache/buildlink3.mk
index 2c0b88b8b23..9c320a7328f 100644
--- a/www/apache/buildlink3.mk
+++ b/www/apache/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.9 2004/12/19 04:02:43 grant Exp $
+# $NetBSD: buildlink3.mk,v 1.10 2005/07/16 01:19:25 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ BUILDLINK_DEPMETHOD.apache+=	full
 BUILDLINK_DEPMETHOD.apache?=	build
 .endif
 
-USE_PERL5?=	build	# for "apxs"
+USE_TOOLS+=	perl	# for "apxs"
 APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
 
 .if defined(GNU_CONFIGURE)
diff --git a/www/apache2/buildlink3.mk b/www/apache2/buildlink3.mk
index 86313e811f4..afa994f6ee0 100644
--- a/www/apache2/buildlink3.mk
+++ b/www/apache2/buildlink3.mk
@@ -1,4 +1,4 @@
-# $NetBSD: buildlink3.mk,v 1.11 2004/12/18 08:42:12 adrianp Exp $
+# $NetBSD: buildlink3.mk,v 1.12 2005/07/16 01:19:25 jlam Exp $
 
 BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
 APACHE_BUILDLINK3_MK:=	${APACHE_BUILDLINK3_MK}+
@@ -20,7 +20,7 @@ BUILDLINK_DEPMETHOD.apache+=	full
 .  endif
 .endif	# APACHE_BUILDLINK3_MK
 
-USE_PERL5?=	build			# for "apxs"
+USE_TOOLS+=	perl			# for "apxs"
 CONFIGURE_ENV+=	APR_LIBTOOL=${LIBTOOL}	# make apxs use the libtool we specify
 MAKE_ENV+=	APR_LIBTOOL=${LIBTOOL}
 APXS?=		${BUILDLINK_PREFIX.apache}/sbin/apxs
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index ce15ebd827f..f97904cc63f 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/04/11 21:47:51 tv Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:25 jlam Exp $
 #
 
 DISTNAME=	awstats-6.3
@@ -13,13 +13,11 @@ COMMENT=	Free real-time logfile analyzer to get advanced web statistics
 
 DIST_SUBDIR=	${PKGNAME}
 NO_BUILD=	YES
-USE_PERL5=	run
 
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	tools/*.pl		\
 		wwwroot/cgi-bin/*.pl
 
-.include "../../lang/perl5/buildlink3.mk"
-
 do-install:
 	${INSTALL_DATA_DIR} ${PREFIX}/awstats
 	${INSTALL_SCRIPT_DIR} ${PREFIX}/awstats/bin
diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile
index bcc966e3fd4..3aee40b07f8 100644
--- a/www/calamaris/Makefile
+++ b/www/calamaris/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:40 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:25 jlam Exp $
 #
 
 DISTNAME=	calamaris-2.58
@@ -9,7 +9,7 @@ MAINTAINER=	rh@NetBSD.org
 HOMEPAGE=	http://cord.de/tools/squid/calamaris/
 COMMENT=	Squid logfile analyzer
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	calamaris
 NO_BUILD=	YES
 
diff --git a/www/cvsweb/Makefile b/www/cvsweb/Makefile
index 4307f75cbd2..8503ff9ba62 100644
--- a/www/cvsweb/Makefile
+++ b/www/cvsweb/Makefile
@@ -1,5 +1,5 @@
 #
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:47:52 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:25 jlam Exp $
 #
 
 DISTNAME=		cvsweb-3.0.5
@@ -20,7 +20,7 @@ DEPENDS+=		rcs-[0-9]*:../../devel/rcs
 .endif
 
 NO_BUILD=		YES
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 USE_PKGINSTALL=		YES
 
 PERL5_REQD+=		5.6
diff --git a/www/htmlfix/Makefile b/www/htmlfix/Makefile
index abb39ccb2f4..5553cbf629c 100644
--- a/www/htmlfix/Makefile
+++ b/www/htmlfix/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:40 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:25 jlam Exp $
 #
 
 DISTNAME=		htmlfix-1.03
@@ -10,7 +10,7 @@ COMMENT=		Fix latin1 to html entities and/or line endings
 
 DEPENDS+=	p5-HTML-FixEntities-[0-9]*:../../www/p5-HTML-FixEntities
 
-USE_PERL5=		YES
+USE_TOOLS+=		perl:run
 INSTALLATION_DIRS=	bin man/man1
 
 do-install:
diff --git a/www/htmllint/Makefile b/www/htmllint/Makefile
index afb259f89b4..a51f5c252ce 100644
--- a/www/htmllint/Makefile
+++ b/www/htmllint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/17 04:49:49 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:25 jlam Exp $
 #
 
 DISTNAME=	htmllint
@@ -17,7 +17,7 @@ WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 REPLACE_PERL=	htmllint.cgi htmllint parsedtd.pl tagslist.cgi
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 NO_BUILD=	# defined
 
 CGIDIR=		${PREFIX}/libexec/cgi-bin
diff --git a/www/kannel/Makefile b/www/kannel/Makefile
index 33df7601d23..a2e17a36587 100644
--- a/www/kannel/Makefile
+++ b/www/kannel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/05/22 20:08:45 jlam Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/16 01:19:25 jlam Exp $
 #
 
 DISTNAME=	gateway-${KANNEL_VER}
@@ -14,8 +14,7 @@ COMMENT=	Open source WAP and SMS gateway
 KANNEL_VER=	1.4.0
 
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		gmake
-USE_PERL5=		YES
+USE_TOOLS+=		gmake perl:run
 PTHREAD_OPTS+=		require
 
 CONFIGURE_ARGS+=	--disable-docs
diff --git a/www/kdewebdev3/Makefile b/www/kdewebdev3/Makefile
index 706250b9287..528bf19e1a8 100644
--- a/www/kdewebdev3/Makefile
+++ b/www/kdewebdev3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/05/31 14:30:37 markd Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:25 jlam Exp $
 
 DISTNAME=	kdewebdev-${_KDE_VERSION}
 CATEGORIES=	www
@@ -6,8 +6,7 @@ COMMENT= 	HTML editor and tools suitable for experienced web developers
 
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
-USE_PERL5=		build
-
+USE_TOOLS+=		perl
 REPLACE_PERL=		quanta/scripts/TemplateMagic.pl \
 			quanta/scripts/dwt.pl
 
diff --git a/www/make_album/Makefile b/www/make_album/Makefile
index d2b472f59e4..ee6b4c38bf2 100644
--- a/www/make_album/Makefile
+++ b/www/make_album/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:41 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:25 jlam Exp $
 #
 
 DISTNAME=	make_album_1_6
@@ -15,7 +15,7 @@ DEPENDS+=	ImageMagick-[0-9]*:../../graphics/ImageMagick
 
 MY_SCRIPTS=	index_albums ingest make_album newimagedir populate_master
 
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	${MY_SCRIPTS}
 
 NO_CONFIGURE=	# defined
diff --git a/www/mknmz-wwwoffle/Makefile b/www/mknmz-wwwoffle/Makefile
index 0f145077647..f9621c8ce32 100644
--- a/www/mknmz-wwwoffle/Makefile
+++ b/www/mknmz-wwwoffle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2003/07/22 04:14:24 martti Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:25 jlam Exp $
 #
 
 DISTNAME=	mknmz-wwwoffle-0.7.0
@@ -12,7 +12,7 @@ COMMENT=	Full text indexing and searching system for wwwoffle's cache directory
 DEPENDS+=	namazu>=2.0.5:../../textproc/namazu2
 DEPENDS+=	wwwoffle>=2.6:../../www/wwwoffle
 
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 GNU_CONFIGURE=	# defined
 CONFIG_ARGS+=	--prefix=${PREFIX}/share/namazu
 
diff --git a/www/mozilla/Makefile.common b/www/mozilla/Makefile.common
index 076d4c092c3..0ff8a184ac2 100644
--- a/www/mozilla/Makefile.common
+++ b/www/mozilla/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.58 2005/06/03 14:41:19 wiz Exp $
+# $NetBSD: Makefile.common,v 1.59 2005/07/16 01:19:25 jlam Exp $
 
 MOZ_DIST_VER?=	${MOZ_VER}
 DISTNAME?=	mozilla-${MOZ_DIST_VER}-source
@@ -15,8 +15,7 @@ BUILD_DEPENDS+=	zip>=2.3:../../archivers/zip
 
 WRKSRC=		${WRKDIR}/mozilla
 USE_LANGUAGES=	c c++
-USE_PERL5=	build
-USE_TOOLS+=	autoconf213 gmake
+USE_TOOLS+=	autoconf213 gmake perl
 GNU_CONFIGURE=	yes
 
 CONFIG_GUESS_OVERRIDE=	build/autoconf/config.guess
diff --git a/www/p5-Apache-Gallery/Makefile b/www/p5-Apache-Gallery/Makefile
index 85a983cacbf..8b9509b74ef 100644
--- a/www/p5-Apache-Gallery/Makefile
+++ b/www/p5-Apache-Gallery/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/07/13 18:01:45 jlam Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:25 jlam Exp $
 #
 
 DISTNAME=	Apache-Gallery-0.9.1
@@ -21,7 +21,6 @@ DEPENDS+=	p5-Text-Template-[0-9]*:../../textproc/p5-Text-Template
 DEPENDS+=	p5-libapreq{,2}-[0-9]*:../../www/${LIBAPREQ}
 
 USE_PKGINSTALL=		YES
-USE_PERL5=		run
 PERL5_PACKLIST=		auto/Apache/Gallery/.packlist
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/www/p5-CGI/Makefile b/www/p5-CGI/Makefile
index 2dc02d9f2eb..1c35c7ce037 100644
--- a/www/p5-CGI/Makefile
+++ b/www/p5-CGI/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/07/13 18:01:46 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/07/16 01:19:25 jlam Exp $
 #
 
 VERS=			3.10
@@ -12,10 +12,6 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://stein.cshl.org/WWW/software/CGI/
 COMMENT=		Perl5 module for writing forms-based CGI programs
 
-# Some perl packages install their own versions of this module.
-# Can't simply define USE_PERL5.
-BUILDLINK_DEPENDS.perl=	{perl-5.0*,perl-5.6.0nb2,perl-base>=5.6.0,perl{,-thread}>=5.6.1nb2}
-
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_LANGUAGES=		# empty
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 7f8bbdbac3c..7f61f8c02f5 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/13 18:01:46 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:26 jlam Exp $
 
 DISTNAME=		HTML-Mason-1.28
 PKGNAME=		p5-${DISTNAME}
@@ -18,10 +18,6 @@ DEPENDS+=		p5-Class-Container>=0.10:../../devel/p5-Class-Container
 
 PERL5_PACKLIST=		auto/HTML/Mason/.packlist
 
-# In case apache.mk is included below which will result in USE_PERL5
-# being set to 'build' explicitly set it to 'run' here.
-USE_PERL5=		run
-
 PKG_OPTIONS_VAR=	PKG_OPTIONS.p5-HTML-Mason
 PKG_SUPPORTED_OPTIONS=	modperl
 PKG_SUGGESTED_OPTIONS=	modperl
diff --git a/www/privoxy/Makefile b/www/privoxy/Makefile
index ccfa833b624..cc3092fabb9 100644
--- a/www/privoxy/Makefile
+++ b/www/privoxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:26 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME_NOREV}-stable-src
@@ -33,7 +33,7 @@ WRKSRC=			${WRKDIR}/${PKGNAME_NOREV}-stable
 USE_TOOLS+=		autoconf213 gmake
 MAKEFILE=		GNUmakefile
 
-USE_PERL5=		build
+USE_TOOLS+=		perl
 
 PTHREAD_AUTO_VARS=	yes
 PTHREAD_OPTS+=		require
diff --git a/www/swish-e/Makefile b/www/swish-e/Makefile
index 13f11714db6..355bfc77ba7 100644
--- a/www/swish-e/Makefile
+++ b/www/swish-e/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/04/11 21:48:02 tv Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:26 jlam Exp $
 
 DISTNAME=	swish-e-2.4.1
 PKGREVISION=	4
@@ -11,13 +11,13 @@ COMMENT= 	Simple web indexing for humans - enhanced
 
 GNU_CONFIGURE=	yes
 USE_LIBTOOL=	yes
-USE_PERL5=	yes
 
 CONFIGURE_ARGS+=	--with-libxml2=${BUILDLINK_PREFIX.libxml2}
 CONFIGURE_ARGS+=	--with-pcre=${BUILDLINK_PREFIX.pcre}
 CONFIGURE_ARGS+=	--with-zlib=${BUILDLINK_PREFIX.zlib}
 
-REPLACE_PERL=		prog-bin/*.pl conf/*.pl filter-bin/*.pl html/*.pl
+USE_TOOLS+=	perl:run
+REPLACE_PERL=	prog-bin/*.pl conf/*.pl filter-bin/*.pl html/*.pl
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/www/w3m/Makefile.common b/www/w3m/Makefile.common
index 8f31b7cd0d0..855ac65b1fb 100644
--- a/www/w3m/Makefile.common
+++ b/www/w3m/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.38 2005/06/03 19:22:20 wiz Exp $
+# $NetBSD: Makefile.common,v 1.39 2005/07/16 01:19:26 jlam Exp $
 #
 
 DISTNAME=	w3m-${W3M_VERS}
@@ -16,7 +16,7 @@ USE_TOOLS+=	gmake	# Needed for some combinations of options...
 W3M_VERS=	0.5.1
 
 # For w3mman, xface2xpm, cgi scripts.
-USE_PERL5=	run
+USE_TOOLS+=	perl:run
 
 DOCDIR=		share/doc/w3m
 
diff --git a/www/webnew/Makefile b/www/webnew/Makefile
index 663a877627f..3d6a702b19d 100644
--- a/www/webnew/Makefile
+++ b/www/webnew/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/17 03:50:43 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:26 jlam Exp $
 #
 
 DISTNAME=		webnew-1.3
@@ -9,7 +9,7 @@ MAINTAINER=		kim@tac.nyc.ny.us
 HOMEPAGE=		http://www.tac.nyc.ny.us/kim/webnew/
 COMMENT=		Retrieve modification times of web documents
 
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 
 NO_CONFIGURE=		yes
 BUILD_TARGET=		all DEST=${PREFIX} PERL=${PERL5}
diff --git a/www/whisker/Makefile b/www/whisker/Makefile
index cc34810f52e..47d7ca77c04 100644
--- a/www/whisker/Makefile
+++ b/www/whisker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:43 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:26 jlam Exp $
 
 DISTNAME=	whisker-2.1
 PKGREVISION=	1
@@ -11,7 +11,7 @@ COMMENT=	URL scanner used to search for known vulnerable CGIs on websites
 
 DEPENDS+=	p5-Net-SSLeay>=1.20:../../security/p5-Net-SSLeay
 
-USE_PERL5=      YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	whisker.pl
 
 INSTALLATION_DIRS=	bin