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.

19 files changed, 38 insertions, 44 deletions

diff --git a/sysutils/adjustkernel/Makefile b/sysutils/adjustkernel/Makefile
index 547e325bda9..3bf270bd4e5 100644
--- a/sysutils/adjustkernel/Makefile
+++ b/sysutils/adjustkernel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:20 jlam Exp $
 
 DISTNAME=	adjustkernel-1.7
 CATEGORIES=	sysutils
@@ -13,8 +13,7 @@ NO_CHECKSUM=    yes
 NO_BUILD=	yes
 NO_MTREE=	yes
 
-USE_PERL5=     YES
-
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	adjustkernel
 
 INSTALLATION_DIRS=	bin man/man1
diff --git a/sysutils/amanda-server/Makefile b/sysutils/amanda-server/Makefile
index eec25c600ba..4f87ea6d68d 100644
--- a/sysutils/amanda-server/Makefile
+++ b/sysutils/amanda-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.33 2005/05/22 20:08:31 jlam Exp $
+# $NetBSD: Makefile,v 1.34 2005/07/16 01:19:20 jlam Exp $
 
 PKGNAME=		amanda-server-${VERS}
 # PKGREVISION=		1
@@ -6,8 +6,7 @@ SVR4_PKGNAME=		amase
 
 COMMENT=		Server part of Amanda, a network backup system
 
-USE_PERL5=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl:run
 
 .include "../../mk/bsd.prefs.mk"
 .include "../../sysutils/amanda-common/Makefile.common"
diff --git a/sysutils/cdbkup/Makefile b/sysutils/cdbkup/Makefile
index f86599d7b81..69bf3bf3250 100644
--- a/sysutils/cdbkup/Makefile
+++ b/sysutils/cdbkup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/07/15 23:02:08 kristerw Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:20 jlam Exp $
 
 DISTNAME=		cdbkup-1.0
 PKGREVISION=		3
@@ -16,8 +16,7 @@ COMMENT=		CD-R(W) backup/restore system
 DEPENDS+=		cdrecord>=1.10:../../sysutils/cdrecord
 
 GNU_CONFIGURE=		YES
-USE_PERL5=		YES
-USE_TOOLS+=		cat date gtar
+USE_TOOLS+=		cat date gtar perl:run
 CONFIGURE_ENV+=		CAT="${TOOLS_CAT}"
 CONFIGURE_ENV+=		DATE="${TOOLS_DATE}"
 CONFIGURE_ENV+=		GNUTAR="${TOOLS_TAR}"
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 2afc8a0057b..69374ff7d65 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:23 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:20 jlam Exp $
 
 DISTNAME=	coreutils-5.2.1
 PKGREVISION=	1
@@ -15,7 +15,7 @@ BUILD_USES_MSGFMT=	YES
 CONFLICTS=	fileutils-* linuxls-* sh-utils-* textutils-*
 
 GNU_CONFIGURE=		YES
-USE_PERL5=		build
+USE_TOOLS+=		perl
 USE_PKGLOCALEDIR=	YES
 
 INFO_FILES=	coreutils.info
diff --git a/sysutils/cpogm/Makefile b/sysutils/cpogm/Makefile
index e8c267dc7c3..015a0ff2ddd 100644
--- a/sysutils/cpogm/Makefile
+++ b/sysutils/cpogm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2004/12/03 15:15:09 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:20 jlam Exp $
 #
 
 DISTNAME=		cpogm-1.0
@@ -8,7 +8,7 @@ MASTER_SITES=		ftp://ftp.gw.com/pub/people/kim/
 MAINTAINER=		kim@tac.nyc.ny.us
 COMMENT=		Copy owner, group and mode of a file
 
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 
 NO_CONFIGURE=		yes
 BUILD_TARGET=		all PREFIX=${PREFIX}
diff --git a/sysutils/dmassage/Makefile b/sysutils/dmassage/Makefile
index 3192a1b911d..8f325e411f2 100644
--- a/sysutils/dmassage/Makefile
+++ b/sysutils/dmassage/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2004/06/07 18:36:13 xtraeme Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:20 jlam Exp $
 #
 
 DISTNAME=	dmassage-0.6
@@ -14,7 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 ONLY_FOR_PLATFORM=	NetBSD-*-* OpenBSD-*-*
 
 NO_BUILD=	yes
-USE_PERL5=	run
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	dmassage
 
 INSTALLATION_DIRS=	bin share/doc/${PKGBASE}
@@ -23,5 +23,4 @@ do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/dmassage ${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/${PKGBASE}
 
-.include "../../lang/perl5/module.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/dmesg2gif/Makefile b/sysutils/dmesg2gif/Makefile
index ba434ac9cde..c1c80fb6fe9 100644
--- a/sysutils/dmesg2gif/Makefile
+++ b/sysutils/dmesg2gif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:33 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:20 jlam Exp $
 #
 
 DISTNAME=		dmesg2gif-1.3
@@ -16,7 +16,7 @@ EXTRACT_ONLY=		# empty
 NO_BUILD=		yes
 NO_CHECKSUM=		yes
 NO_CONFIGURE=		yes
-USE_PERL5=		run
+USE_TOOLS+=		perl:run
 INSTALLATION_DIRS=	bin man/man1
 
 do-install:
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 294e7745440..0f9d768cd18 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/01 18:03:22 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:20 jlam Exp $
 #
 
 DISTNAME=	lavaps-1.20
@@ -9,7 +9,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.isi.edu/~johnh/SOFTWARE/LAVAPS/
 COMMENT=	Lava lamp of currently running processes
 
-USE_PERL5=	build
+USE_TOOLS+=	perl
 
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-additional-includes='-I${LOCALBASE}/include' \
diff --git a/sysutils/libgtop2/Makefile b/sysutils/libgtop2/Makefile
index ca1c79365d2..7a80110652b 100644
--- a/sysutils/libgtop2/Makefile
+++ b/sysutils/libgtop2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/05/22 20:08:33 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:20 jlam Exp $
 
 DISTNAME=		libgtop-2.10.1
 PKGNAME=		${DISTNAME:S/-/2-/}
@@ -15,9 +15,8 @@ BUILD_USES_MSGFMT=	YES
 OSVERSION_SPECIFIC=	YES
 USE_MSGFMT_PLURALS=	YES
 
-USE_PERL5=		build
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_LIBTOOL=		YES
 PKGCONFIG_OVERRIDE=	libgtop-2.0.pc.in
 PKGCONFIG_OVERRIDE+=	support/gnome-support-2.0.pc.in
diff --git a/sysutils/mgm/Makefile b/sysutils/mgm/Makefile
index 25c410a545a..d6484c381f2 100644
--- a/sysutils/mgm/Makefile
+++ b/sysutils/mgm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:34 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:20 jlam Exp $
 
 DISTNAME=	mgm-1.1
 CATEGORIES=	sysutils
@@ -13,7 +13,7 @@ DEPENDS+=	p5-Tk-[0-9]*:../../x11/p5-Tk
 
 WRKSRC=		${WRKDIR}/${DISTNAME:C/-.*$//}
 NO_BUILD=	# defined
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 PERL_SCRIPTS=	mgm
 
 MGM_PERL_DIR=	${PREFIX}/lib/${DISTNAME:C/-.*$//}
diff --git a/sysutils/pflogsumm/Makefile b/sysutils/pflogsumm/Makefile
index 99e7a40c34b..b6285894c04 100644
--- a/sysutils/pflogsumm/Makefile
+++ b/sysutils/pflogsumm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:34 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:20 jlam Exp $
 #
 
 DISTNAME=		pflogsumm-1.1.0
@@ -14,7 +14,7 @@ DEPENDS+=		p5-Date-Calc-[0-9]*:../../devel/p5-Date-Calc
 .include "../../mk/bsd.prefs.mk"
 
 NO_CONFIGURE=		# defined
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 INSTALLATION_DIRS=	man/man1 sbin
 
 do-build:
diff --git a/sysutils/rconfig/Makefile b/sysutils/rconfig/Makefile
index d75a459e124..fc86b3af28e 100644
--- a/sysutils/rconfig/Makefile
+++ b/sysutils/rconfig/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2004/12/22 14:50:30 abs Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/16 01:19:20 jlam Exp $
 
 DISTNAME=	rconfig-0.42
 CATEGORIES=	sysutils
@@ -13,6 +13,6 @@ DEPENDS+=	fping-[0-9]*:../../net/fping
 DEPENDS+=	freerdist-[0-9]*:../../net/rdist6
 DEPENDS+=	shmux-[0-9]*:../../sysutils/shmux
 
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/sysutils/roller/Makefile b/sysutils/roller/Makefile
index c0a5f47f729..e5b495e5ce6 100644
--- a/sysutils/roller/Makefile
+++ b/sysutils/roller/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.27 2005/01/20 09:11:18 wiz Exp $
+# $NetBSD: Makefile,v 1.28 2005/07/16 01:19:20 jlam Exp $
 #
 
 DISTNAME=		roller-1.19
@@ -17,7 +17,7 @@ DEPENDS+=		pflogsumm-[0-9]*:../../sysutils/pflogsumm
 .include "../../mk/bsd.prefs.mk"
 
 NO_CONFIGURE=		# defined
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 
 MAKE_PARAMS+=		PREFIX=${PREFIX}
 MAKE_PARAMS+=		GAWK=${AWK}
diff --git a/sysutils/rox-archive/Makefile b/sysutils/rox-archive/Makefile
index 755a35f15d7..04fbf498bf5 100644
--- a/sysutils/rox-archive/Makefile
+++ b/sysutils/rox-archive/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:23 jlam Exp $
 #
 
 DISTNAME=	Archive-0.1.2
@@ -18,7 +18,7 @@ DEPENDS+=	rox-lib>=0.1.4nb1:../../sysutils/rox-lib
 WRKSRC=		${WRKDIR}/Archive
 DIST_SUBDIR=	rox
 
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile
index 776bbc60382..5e6e4266aba 100644
--- a/sysutils/rsnapshot/Makefile
+++ b/sysutils/rsnapshot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:23 jlam Exp $
 #
 
 DISTNAME=	rsnapshot-1.1.6
@@ -14,7 +14,7 @@ DEPENDS+=	rsync>=2.3.1:../../net/rsync
 DEPENDS+=	p5-Lchown>=0.07:../../sysutils/p5-Lchown
 
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 USE_PKGINSTALL=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/sysutils/safetynet/Makefile b/sysutils/safetynet/Makefile
index 99b1afb1a25..9baf7c7f5b0 100644
--- a/sysutils/safetynet/Makefile
+++ b/sysutils/safetynet/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:23 jlam Exp $
 #
 
 DISTNAME=	safetynet-1.15
@@ -11,7 +11,7 @@ COMMENT=	Safetynet is a perl script intended to monitor system services
 
 WRKSRC=		${WRKDIR}
 NO_BUILD=	YES
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 
 INSTALLATION_DIRS=	bin etc
 
diff --git a/sysutils/sarah/Makefile b/sysutils/sarah/Makefile
index aae6c9421fd..dd5d8118a75 100644
--- a/sysutils/sarah/Makefile
+++ b/sysutils/sarah/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/17 03:50:35 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:23 jlam Exp $
 
 DISTNAME=	sarah-0.7b
 CATEGORIES=	sysutils
@@ -14,7 +14,7 @@ NO_BIN_ON_FTP=	${RESTRICTED}
 NO_SRC_ON_CDROM=${RESTRICTED}
 NO_BIN_ON_CDROM=${RESTRICTED}
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	sarah
 NO_BUILD=	YES
 
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 40e5e3e8ec1..d9a9681cddf 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:30 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:23 jlam Exp $
 
 DISTNAME=	webmin-1.170-minimal
 PKGNAME=	${DISTNAME:S/-minimal$//}
@@ -16,7 +16,7 @@ WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 USE_LANGUAGES=	# empty
 NO_BUILD=	yes
 
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	*.cgi */*.cgi *.pl */*.pl
 
 WEBMIN_DIR=		${PREFIX}/${WEBMIN_SUBDIR}
diff --git a/sysutils/xps/Makefile b/sysutils/xps/Makefile
index f548f933f4d..7dce7a248a4 100644
--- a/sysutils/xps/Makefile
+++ b/sysutils/xps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/05/22 20:08:34 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:23 jlam Exp $
 
 DISTNAME=	xps-4.2
 CATEGORIES=	sysutils
@@ -8,8 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://motif-pstree.sourceforge.net/
 COMMENT=	Displays the Unix process list as a hierarchical tree
 
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		yes
 
 .include "../../mk/motif.buildlink3.mk"