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.

20 files changed, 40 insertions, 55 deletions

diff --git a/devel/GConf2/Makefile.common b/devel/GConf2/Makefile.common
index cec2a9ea15c..261532bf9b3 100644
--- a/devel/GConf2/Makefile.common
+++ b/devel/GConf2/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.28 2005/05/22 20:07:47 jlam Exp $
+# $NetBSD: Makefile.common,v 1.29 2005/07/16 01:19:08 jlam Exp $
 #
 
 DISTNAME=		GConf-2.10.0
@@ -22,8 +22,7 @@ PATCHDIR=		${.CURDIR}/../GConf2/patches
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 
 PKGCONFIG_OVERRIDE=	gconf-2.0.pc.in
 
diff --git a/devel/adocman/Makefile b/devel/adocman/Makefile
index 9ec785a6dc2..bce0276a4bc 100644
--- a/devel/adocman/Makefile
+++ b/devel/adocman/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:57:44 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:08 jlam Exp $
 #
 
 DISTNAME=	adocman-0.10
@@ -13,7 +13,7 @@ COMMENT=	DocManager operation automation tool
 DEPENDS+=	p5-Term-ReadKey>=2.21:../../devel/p5-Term-ReadKey
 DEPENDS+=	p5-Crypt-SSLeay>=0.47:../../security/p5-SSLeay
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 NO_BUILD=	YES
 
 REPLACE_PERL=	adocman xml_export
@@ -33,5 +33,4 @@ do-install:
 .endfor
 .undef f
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/cvs2html/Makefile b/devel/cvs2html/Makefile
index f8a19e502ac..0fc857a5485 100644
--- a/devel/cvs2html/Makefile
+++ b/devel/cvs2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:57:45 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:08 jlam Exp $
 #
 
 DISTNAME=	cvs2html-1.82
@@ -10,7 +10,7 @@ HOMEPAGE=	http://cvs.sslug.dk/cvs2html/
 COMMENT=	Perl script to turn ``cvs log'' output into HTML
 
 NO_BUILD=	YES
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	cvs2html
 
 INSTALLATION_DIRS=	bin
diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index 25f0e63a015..00a12439d55 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:45 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:08 jlam Exp $
 #
 
 DISTNAME=	cvs2p4-2.3.3
@@ -17,7 +17,7 @@ DEPENDS+=	rcs-[0-9]*:../../devel/rcs
 .endif
 
 USE_PKGINSTALL=	yes
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 NO_BUILD=	yes
 
 DOCDIR=		share/doc/${PKGBASE}
diff --git a/devel/devhelp/Makefile b/devel/devhelp/Makefile
index 3b487d35b1e..e608a234493 100644
--- a/devel/devhelp/Makefile
+++ b/devel/devhelp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.24 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.25 2005/07/16 01:19:08 jlam Exp $
 
 DISTNAME=		devhelp-0.7
 PKGREVISION=		11
@@ -11,9 +11,8 @@ HOMEPAGE=		http://www.imendio.com/projects/devhelp/
 COMMENT=		Documentation viewer based on GNOME2
 
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_LIBTOOL=		yes
-USE_PERL5=		build
 USE_PKGLOCALEDIR=	yes
 
 GNU_CONFIGURE=		yes
diff --git a/devel/eel/Makefile b/devel/eel/Makefile
index 937565789b8..6dc89669768 100644
--- a/devel/eel/Makefile
+++ b/devel/eel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/01 18:02:43 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:08 jlam Exp $
 
 DISTNAME=	eel-1.0.2
 CATEGORIES=	devel gnome
@@ -11,9 +11,8 @@ COMMENT=	Eazel Extensions Library
 
 BUILD_USES_MSGFMT=	yes
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_LIBTOOL=		yes
-USE_PERL5=		build
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
 
diff --git a/devel/gettext-lib/builtin.mk b/devel/gettext-lib/builtin.mk
index 3617a83168f..75042ba7c37 100644
--- a/devel/gettext-lib/builtin.mk
+++ b/devel/gettext-lib/builtin.mk
@@ -1,4 +1,4 @@
-# $NetBSD: builtin.mk,v 1.25 2005/06/05 09:25:37 jlam Exp $
+# $NetBSD: builtin.mk,v 1.26 2005/07/16 01:19:08 jlam Exp $
 
 BUILTIN_PKG:=	gettext
 
@@ -210,7 +210,7 @@ CONFIGURE_ARGS+=	--without-libintl-prefix
 .  endif
 
 .  if defined(USE_MSGFMT_PLURALS) && !empty(USE_MSGFMT_PLURALS:M[Yy][Ee][Ss])
-USE_PERL5?=		build
+USE_TOOLS+=		perl
 CONFIGURE_ENV+=		MSGFMT=${BUILDLINK_DIR}/bin/msgfmt
 
 # XXX _USE_NEW_TOOLS=yes should make "msgfmt" and "msgfmt-plural" into
diff --git a/devel/glib2/Makefile b/devel/glib2/Makefile
index 54bb744c3a2..ed602469e80 100644
--- a/devel/glib2/Makefile
+++ b/devel/glib2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.74 2005/07/06 07:00:10 reed Exp $
+# $NetBSD: Makefile,v 1.75 2005/07/16 01:19:09 jlam Exp $
 
 DISTNAME=		glib-2.6.5
 PKGNAME=		${DISTNAME:S/glib/glib2/}
@@ -18,8 +18,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 BUILD_USES_MSGFMT=	yes
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
-USE_PERL5=		yes
+USE_TOOLS+=		gmake perl:run
 USE_LIBTOOL=		yes
 TEST_TARGET=		check
 
diff --git a/devel/kdesdk3/Makefile b/devel/kdesdk3/Makefile
index e2d61105053..dda082e1ef6 100644
--- a/devel/kdesdk3/Makefile
+++ b/devel/kdesdk3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.35 2005/06/19 13:10:33 markd Exp $
+# $NetBSD: Makefile,v 1.36 2005/07/16 01:19:09 jlam Exp $
 
 DISTNAME=	kdesdk-${_KDE_VERSION}
 PKGREVISION=	1
@@ -11,8 +11,7 @@ CONFLICTS+=	umbrello-[0-9]*
 .include "../../meta-pkgs/kde3/Makefile.kde3"
 
 USE_DIRS+=		xdg-1.1
-USE_TOOLS+=		lex
-USE_PERL5=		run
+USE_TOOLS+=		lex perl:run
 
 REPLACE_PERL=	cervisia/change_colors.pl \
 		cervisia/move_repositories.pl \
diff --git a/devel/kdevelop-base/Makefile b/devel/kdevelop-base/Makefile
index a68fe6c44e4..ea5044bf59c 100644
--- a/devel/kdevelop-base/Makefile
+++ b/devel/kdevelop-base/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.42 2005/05/31 15:14:04 markd Exp $
+# $NetBSD: Makefile,v 1.43 2005/07/16 01:19:09 jlam Exp $
 
 DISTNAME=	kdevelop-3.2.1
 PKGNAME=	kdevelop-base-3.2.1
@@ -22,7 +22,7 @@ DEPENDS+=		qt3-tools>=3.1.1:../../x11/qt3-tools
 
 CONFLICTS+=	kdevelop<=1.3
 
-USE_PERL5=	run
+USE_TOOLS+=	perl:run
 
 REPLACE_PERL= \
 	kdevprj2kdevelop \
diff --git a/devel/ldapsdk/Makefile b/devel/ldapsdk/Makefile
index b5e20788c26..059a251d96f 100644
--- a/devel/ldapsdk/Makefile
+++ b/devel/ldapsdk/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/05/22 20:07:52 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:09 jlam Exp $
 
 DISTNAME=	ldapsdk_12311998
 PKGNAME=	${DISTNAME:S/_/-/}
@@ -13,8 +13,7 @@ COMMENT=	LDAP C-SDK from the Mozilla project
 CONFLICTS+=	openldap-[0-9]*
 
 WRKSRC=		${WRKDIR}/mozilla
-USE_TOOLS+=	gmake
-USE_PERL5=	build
+USE_TOOLS+=	gmake perl
 
 PKG_SYSCONFSUBDIR=	ldapsdk
 EGDIR=			${PREFIX}/share/examples/ldapsdk
@@ -33,5 +32,4 @@ do-build:
 do-install:
 	cd ${.CURDIR} && ${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/pre-install
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/devel/libgnomeui/Makefile b/devel/libgnomeui/Makefile
index d2240b0792d..b6bf93798c1 100644
--- a/devel/libgnomeui/Makefile
+++ b/devel/libgnomeui/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.43 2005/06/01 18:02:44 jlam Exp $
+# $NetBSD: Makefile,v 1.44 2005/07/16 01:19:09 jlam Exp $
 #
 
 DISTNAME=	libgnomeui-2.10.0
@@ -17,8 +17,7 @@ CONFLICTS+=		gnome-libs<=1.4.2nb1
 GNU_CONFIGURE=		yes
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 USE_LIBTOOL=		yes
 
 CONFIGURE_ARGS+=	--disable-gtk-doc
diff --git a/devel/nasm/Makefile b/devel/nasm/Makefile
index 0c06184d7af..26b1e092dcd 100644
--- a/devel/nasm/Makefile
+++ b/devel/nasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:53 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:09 jlam Exp $
 
 DISTNAME=	nasm-0.98.39
 PKGREVISION=	1
@@ -12,10 +12,9 @@ COMMENT=	General-purpose x86 assembler
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 GCC_REQD+=		3.0
 USE_MAKEINFO=		yes
-USE_PERL5=		build
 GNU_CONFIGURE=		yes
 
 INFO_FILES=		nasm.info
diff --git a/devel/nss/Makefile b/devel/nss/Makefile
index 0d5ceffaf76..277f992a2da 100644
--- a/devel/nss/Makefile
+++ b/devel/nss/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:09 jlam Exp $
 
 DISTNAME=		nss-3.9.2
 PKGREVISION=		2
@@ -13,8 +13,7 @@ BUILD_DEPENDS+=		zip>=2.3:../../archivers/zip
 
 WRKSRC=			${WRKDIR}/${DISTNAME}/mozilla/security/nss
 
-USE_PERL5=		build
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 DIST=			${WRKSRC}/../../dist
 BUILD_TARGET=		nss_build_all
 MAKE_ENV=		BSD_LDOPTS="-L${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${BUILDLINK_PREFIX.nspr}/lib/nspr ${COMPILER_RPATH_FLAG}${LOCALBASE}/lib/nss"
diff --git a/devel/p4pr/Makefile b/devel/p4pr/Makefile
index e936a457802..061f932ddd5 100644
--- a/devel/p4pr/Makefile
+++ b/devel/p4pr/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2005/06/16 06:57:47 jlam Exp $
+# $NetBSD: Makefile,v 1.6 2005/07/16 01:19:09 jlam Exp $
 #
 
 DISTNAME=	p4pr
@@ -15,7 +15,7 @@ DEPENDS+=	p4-[0-9]*:../../devel/p4
 WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	# none
 NO_BUILD=	# defined
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	${DISTFILES}
 
 INSTALLATION_DIRS=	bin
diff --git a/devel/papaya/Makefile b/devel/papaya/Makefile
index d2ec38d3ac2..365226f23b7 100644
--- a/devel/papaya/Makefile
+++ b/devel/papaya/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/10 10:32:33 kristerw Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:09 jlam Exp $
 #
 
 DISTNAME=	papaya-0.1.7
@@ -15,12 +15,11 @@ BUILD_DEPENDS+=	texi2html>=1.76:../../textproc/texi2html
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PERL5=	run
 USE_LANGUAGES=	# empty
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	sh_command=${TOOLS_SH}
 CONFIGURE_ENV+=	tar_command=${TOOLS_TAR}
-USE_TOOLS+=	sh tar
+USE_TOOLS+=	sh perl:run tar
 INFO_FILES=	papaya.info
 
 CONFIGURE_ENV+=	perl_command=${PERL5:Q}
diff --git a/devel/patchutils/Makefile b/devel/patchutils/Makefile
index e19aa291cb4..caa4847cbbc 100644
--- a/devel/patchutils/Makefile
+++ b/devel/patchutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/04/11 21:45:36 tv Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:09 jlam Exp $
 #
 
 DISTNAME=		patchutils-0.2.30
@@ -14,7 +14,7 @@ COMMENT=		Some programs for manipulating patch files
 DEPENDS+=               patch-[0-9]*:../../devel/patch
 
 USE_PKGLOCALEDIR=	yes
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS=		--with-patch=${PREFIX}/bin/${GNU_PROGRAM_PREFIX}patch
 
diff --git a/devel/rpc2/Makefile b/devel/rpc2/Makefile
index cb268c42f43..c56d9a5b307 100644
--- a/devel/rpc2/Makefile
+++ b/devel/rpc2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.22 2005/05/22 20:07:54 jlam Exp $
+# $NetBSD: Makefile,v 1.23 2005/07/16 01:19:09 jlam Exp $
 #
 
 DISTNAME=	rpc2-1.26
@@ -10,11 +10,8 @@ MAINTAINER=	phil@cs.wwu.edu
 HOMEPAGE=	http://www.coda.cs.cmu.edu/
 COMMENT=	CMU (Coda) remote procedure call package
 
-USE_TOOLS+=		gmake
-
+USE_TOOLS+=		gmake perl
 GNU_CONFIGURE=		YES
-
-USE_PERL5=		build
 USE_LIBTOOL=		YES
 
 .include "../../devel/lwp/buildlink3.mk"
diff --git a/devel/tmake/Makefile b/devel/tmake/Makefile
index 0ce8ad46e16..f6d5374afab 100644
--- a/devel/tmake/Makefile
+++ b/devel/tmake/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:57:48 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:09 jlam Exp $
 #
 
 DISTNAME=	tmake-1.11
@@ -13,7 +13,7 @@ RESTRICTED=		No paid redistribution
 NO_BIN_ON_CDROM=	${RESTRICTED}
 NO_SRC_ON_CDROM=	${RESTRICTED}
 
-USE_PERL5=		YES
+USE_TOOLS+=	perl:run
 
 TMAKEPATH=	${PREFIX}/lib/tmake/netbsd-g++
 GLBASE=		${X11BASE}
diff --git a/devel/yasm/Makefile b/devel/yasm/Makefile
index 517c279c25f..3423c2bb6b7 100644
--- a/devel/yasm/Makefile
+++ b/devel/yasm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:45:39 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:09 jlam Exp $
 #
 
 DISTNAME=	yasm-0.2.2
@@ -14,7 +14,7 @@ BUILD_USES_MSGFMT=	YES
 
 GNU_CONFIGURE=		YES
 USE_LIBTOOL=		YES
-USE_PERL5=		build
+USE_TOOLS+=		perl
 
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"