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.

18 files changed, 38 insertions, 44 deletions

diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 4bd3efc52f3..01219acab26 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:18 jlam Exp $
 
 DISTNAME=	amavisd-new-${VERSION}${PATCHLEVEL}
 PKGNAME=	amavisd-new-${VERSION}${PATCHLEVEL:S/-//}
@@ -37,7 +37,7 @@ CONFLICTS+=	amavis-perl-[0-9]*
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 PERL5_REQD=		5.8.2
 REPLACE_PERL+=		amavisd amavisd-nanny
 
diff --git a/security/antonym/Makefile b/security/antonym/Makefile
index 68a6cd88c47..9e4c2324d5a 100644
--- a/security/antonym/Makefile
+++ b/security/antonym/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:18 jlam Exp $
 #
 
 DISTNAME=		antonym-1.9
@@ -13,9 +13,9 @@ DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=		pgp-2.*:../../security/pgp2
 
 WRKSRC=			${WRKDIR}/antonym
-USE_PERL5=		yes
-
+USE_TOOLS+=		perl:run
 REPLACE_PERL=		antonym
+
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 INSTALLATION_DIRS=	bin
 
diff --git a/security/apg/Makefile b/security/apg/Makefile
index f3f4f835bd2..65a9a8ff143 100644
--- a/security/apg/Makefile
+++ b/security/apg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/27 10:32:01 zuntum Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $
 #
 
 DISTNAME=	apg-2.2.3
@@ -11,7 +11,7 @@ COMMENT=	Tool set for random password generation
 
 MAKE_ENV+=	FLAGS="${CFLAGS}" INSTALL_PREFIX="${PREFIX}"
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	perl/apgcli.pl
 
 OPSYSVARS+=	CS_LIBS
diff --git a/security/courier-authlib/Makefile b/security/courier-authlib/Makefile
index 43b12cc45c0..240ca5d5650 100644
--- a/security/courier-authlib/Makefile
+++ b/security/courier-authlib/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/24 17:31:28 kristerw Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:19 jlam Exp $
 
 .include "Makefile.common"
 
@@ -17,11 +17,10 @@ CONFLICTS+=	courier-authldap-[0-9]*
 CONFLICTS+=	courier-authmysql-[0-9]*
 CONFLICTS+=	courier-authpgsql-[0-9]*
 
-USE_TOOLS+=		cat gmake
+USE_TOOLS+=		cat gmake perl:run
 USE_LIBTOOL=		yes
 PKG_SYSCONFSUBDIR=	authlib
 
-USE_PERL5=		run
 REPLACE_PERL=		sysconftool
 
 CONFIGURE_ARGS+=	--localstatedir=${VARBASE}
diff --git a/security/gpg2dot/Makefile b/security/gpg2dot/Makefile
index 7ea80da0dc4..a3e46120074 100644
--- a/security/gpg2dot/Makefile
+++ b/security/gpg2dot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:31 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:18 jlam Exp $
 #
 
 DISTNAME=	gpg2dot-1.4
@@ -11,7 +11,7 @@ HOMEPAGE=	ftp://ftp.NetBSD.org/pub/NetBSD/packages/pkgsrc/doc/pkgsrc.html
 COMMENT=	Converts your GnuPG keyring to a graph of associations
 
 USE_LANGUAGES=	# empty
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/security/hackbot/Makefile b/security/hackbot/Makefile
index 863bfae56fe..1d5313b623d 100644
--- a/security/hackbot/Makefile
+++ b/security/hackbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:32 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:19 jlam Exp $
 
 DISTNAME=		hackbot-2.15
 CATEGORIES=		security net
@@ -13,7 +13,7 @@ COMMENT=		Vulnerability scanner written in Perl
 
 WRKSRC=			${WRKDIR}/hackbot
 MANCOMPRESSED=		YES
-USE_PERL5=		YES
+USE_TOOLS+=		perl:run
 REPLACE_PERL=		hackbot.pl
 
 INSTALLATION_DIRS=	bin man/man1
diff --git a/security/mhash/Makefile b/security/mhash/Makefile
index 60f5e55af32..e1dd5a774b4 100644
--- a/security/mhash/Makefile
+++ b/security/mhash/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/05/22 20:08:30 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:19 jlam Exp $
 
 DISTNAME=	mhash-0.9.2
 CATEGORIES=	security devel
@@ -9,9 +9,8 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://mhash.sourceforge.net/
 COMMENT=	Hash algorithms library
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_LIBTOOL=		yes
-USE_PERL5=		build
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/security/msf/Makefile b/security/msf/Makefile
index 67fa5acb90f..86cd9b3f5ac 100644
--- a/security/msf/Makefile
+++ b/security/msf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/07/02 12:12:33 adrianp Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:19 jlam Exp $
 #
 
 DISTNAME=	framework-2.4
@@ -22,7 +22,7 @@ MSFDOC?=	${PREFIX}/share/doc/msf
 MESSAGE_SUBST+= MSFDIR=${MSFDIR}
 
 PERL5_REQD=	5.6.0
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 PERL_FILES=	msfcli msfconsole msfencode msflogdump msfpayload \
 		msfpescan msfweb msfupdate msfelfscan
 REPLACE_PERL+=	${PERL_FILES} tools/socketNinja.pl sdk/formatGen.pl \
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 94c4050b00f..9710956de47 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/07/02 11:30:01 adrianp Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:19 jlam Exp $
 
 DISTNAME=	nikto-1.35
 CATEGORIES=	security www
@@ -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
 DEPENDS+=	nmap>=2.00:../../net/nmap
 
-USE_PERL5=      YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	nikto.pl
 NO_BUILD=	YES
 USE_PKGINSTALL=	YES
diff --git a/security/openssh+gssapi/Makefile b/security/openssh+gssapi/Makefile
index fc9467f1c06..d948d1c9661 100644
--- a/security/openssh+gssapi/Makefile
+++ b/security/openssh+gssapi/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/01 20:08:01 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:19 jlam Exp $
 
 # NOTE:  This package is modeled on ../openssh, but does not share
 # files with it as that package may update faster than the gssapi
@@ -31,8 +31,6 @@ CONFLICTS+=		ssh-[0-9]* ssh6-[0-9]* ssh2-[0-9]*
 CONFLICTS+=		openssh-[0-9]*
 CONFLICTS+=		lsh>2.0
 
-USE_PERL5=		build
-
 CRYPTO=			yes
 KERBEROS=		yes
 
@@ -57,7 +55,7 @@ MANDIR=			man
 PLIST_SUBST+=		MANDIR=${MANDIR}
 
 USE_PKGINSTALL=		yes
-USE_TOOLS+=		autoconf
+USE_TOOLS+=		autoconf perl
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
 CONFIGURE_ARGS+=	--mandir=${PREFIX}/${MANDIR}
diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 3089422956f..82f8794988e 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.151 2005/05/25 23:17:11 reed Exp $
+# $NetBSD: Makefile,v 1.152 2005/07/16 01:19:19 jlam Exp $
 
 DISTNAME=		openssh-3.9p1
 PKGNAME=		openssh-3.9.1
@@ -24,7 +24,7 @@ CONFLICTS+=		ssh2-[0-9]* ssh2-nox11-[0-9]*
 CONFLICTS+=		openssh+gssapi-[0-9]*
 CONFLICTS+=		lsh>2.0
 
-USE_PERL5=		build
+USE_TOOLS+=		perl
 
 CRYPTO=			yes
 
diff --git a/security/openssl/Makefile b/security/openssl/Makefile
index db5a1188da6..c26187215ea 100644
--- a/security/openssl/Makefile
+++ b/security/openssl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.105 2005/06/11 22:16:15 jlam Exp $
+# $NetBSD: Makefile,v 1.106 2005/07/16 01:19:18 jlam Exp $
 
 OPENSSL_SNAPSHOT?=	# empty
 OPENSSL_STABLE?=	# empty
@@ -39,9 +39,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 .include "../../mk/bsd.prefs.mk"
 .include "../../mk/compiler.mk"
 
-USE_PERL5=		build	# perl is used throughout the build
 USE_PKGINSTALL=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 TEST_TARGET=		tests
 
 HAS_CONFIGURE=		yes
diff --git a/security/pgp5/Makefile b/security/pgp5/Makefile
index 2c62e296e8f..94f7d274269 100644
--- a/security/pgp5/Makefile
+++ b/security/pgp5/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.23 2004/01/20 12:25:34 agc Exp $
+# $NetBSD: Makefile,v 1.24 2005/07/16 01:19:19 jlam Exp $
 #
 
 DISTNAME=	pgp50i-unix-src
@@ -17,7 +17,7 @@ MAINTAINER=	mjl@NetBSD.org
 HOMEPAGE=       http://www.pgpi.com/
 COMMENT=	Public-key encryption and digital signature utilities (v5)
 
-USE_PERL5=	build
+USE_TOOLS+=	perl
 
 CONFLICTS=	pgraf-[0-9]*  	# Both have a `pgps' executable
 
diff --git a/security/sfs/Makefile b/security/sfs/Makefile
index 65cd25bc11d..e37f4c90e79 100644
--- a/security/sfs/Makefile
+++ b/security/sfs/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/04/11 21:47:19 tv Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:19 jlam Exp $
 #
 
 DISTNAME=		sfs-0.7.2
@@ -20,7 +20,7 @@ CONFIGURE_ARGS+=	--disable-uvfs
 
 USE_PKGINSTALL=		yes
 USE_LANGUAGES=		c c++
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 
 GCC_REQD+=		2.95.3
 
diff --git a/security/skey/Makefile b/security/skey/Makefile
index b63b1268cec..bd91aa9a112 100644
--- a/security/skey/Makefile
+++ b/security/skey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/30 04:06:39 minskim Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:19 jlam Exp $
 #
 
 DISTNAME=		skey-1.1.5
@@ -11,8 +11,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Port of OpenBSD s/key implementation
 
-USE_PERL5=		build
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
 USE_PKGINSTALL=		yes
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index 4998727f592..5c2880e56ed 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:32 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:19 jlam Exp $
 #
 
 DISTNAME=	SnortSnarf-050314.1
@@ -13,8 +13,8 @@ COMMENT=	Generate HTML report summaries from snort incident alerts
 DEPENDS+=	p5-Time>=101.062101:../../time/p5-Time
 
 NO_BUILD=	YES
-USE_PERL5=	run
 
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	snortsnarf.pl include/ann_xml.pl include/web_utils.pl	\
 		include/xml_help.pl
 
diff --git a/security/tinyca/Makefile b/security/tinyca/Makefile
index 07c2f3a3c7e..d534f1cf060 100644
--- a/security/tinyca/Makefile
+++ b/security/tinyca/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:19 jlam Exp $
 
 DISTNAME=	tinyca-0.6.8
 CATEGORIES=	security
@@ -15,10 +15,11 @@ DEPENDS+=	p5-gettext-[0-9]*:../../devel/p5-gettext
 DEPENDS+=	zip-[0-9]*:../../archivers/zip
 
 NO_BUILD=	YES
-USE_PERL5=	YES
 CADIR=		${PREFIX}/share/tinyca
 
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	tinyca
+
 BUILDLINK_DEPENDS.openssl+=	openssl>=0.9.7d
 
 SUBST_CLASSES+=		script
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index 2002582a532..885f24c287c 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/22 20:08:31 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:19 jlam Exp $
 
 DISTNAME=	zebedee-2.5.2
 CATEGORIES=	security
@@ -10,8 +10,7 @@ COMMENT=	Simple tunneling program for TCP or UDP with encryption
 
 DEPENDS+=	tcl-[0-9]*:../../lang/tcl
 
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 
 MAKE_ENV+=		PERL5=${PERL5}
 MAKE_FLAGS=		OS=${LOWER_OPSYS}