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.

13 files changed, 26 insertions, 35 deletions

diff --git a/misc/bbweather/Makefile b/misc/bbweather/Makefile
index 8c5ace9428a..7022222cd47 100644
--- a/misc/bbweather/Makefile
+++ b/misc/bbweather/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=	bbweather-0.6.2
@@ -14,8 +14,7 @@ DEPENDS+=	wget>=1.7:../../net/wget
 
 GNU_CONFIGURE=		YES
 REPLACE_PERL=		GrabWeather
-USE_PERL5=		run
-USE_TOOLS+=		gunzip
+USE_TOOLS+=		gunzip perl:run
 
 .include "../../mk/x11.buildlink3.mk"
 
diff --git a/misc/colorize/Makefile b/misc/colorize/Makefile
index 9135aa32c7a..7585608b339 100644
--- a/misc/colorize/Makefile
+++ b/misc/colorize/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/07/15 18:27:52 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=	colorize_0.3.0
@@ -13,9 +13,8 @@ COMMENT=	Log colorize perl script
 
 WRKSRC=		${WRKDIR}/${PKGNAME_NOREV}
 NO_BUILD=	yes
-USE_PERL5=	yes
 
-USE_TOOLS+=		gunzip
+USE_TOOLS+=		gunzip perl:run
 INSTALLATION_DIRS=	bin man/man1
 
 post-patch:
diff --git a/misc/cowsay/Makefile b/misc/cowsay/Makefile
index 38a6d230a3b..4c0c7e84254 100644
--- a/misc/cowsay/Makefile
+++ b/misc/cowsay/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/04/24 22:46:11 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:14 jlam Exp $
 
 DISTNAME=		cowsay-3.03
 PKGREVISION=		1
@@ -9,7 +9,7 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.nog.net/~tony/warez/cowsay.shtml
 COMMENT=		Configurable talking cow
 
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 
 SUBST_CLASSES+=		pap
 SUBST_STAGE.pap=	pre-install # after patch to avoid sneaking into patches
diff --git a/misc/dpkg/Makefile b/misc/dpkg/Makefile
index 293aaa4a53b..eae033b786d 100644
--- a/misc/dpkg/Makefile
+++ b/misc/dpkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=	${PKGNAME:S,-,_,}
@@ -16,9 +16,8 @@ WRKSRC=		${WRKDIR}/${PKGNAME}
 
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_NCURSES=		# tigetstr()
-USE_PERL5=		build
 USE_PKGINSTALL=		yes
 
 REPLACE_PERL=		${WRKSRC}/scripts/*.pl
@@ -35,5 +34,4 @@ CONFIGURE_ARGS+=	--sysconfdir=${PREFIX}/share/dpkg
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/misc/gnome2-utils/Makefile b/misc/gnome2-utils/Makefile
index 341e8a60748..a017574abbf 100644
--- a/misc/gnome2-utils/Makefile
+++ b/misc/gnome2-utils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/01 18:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=		gnome-utils-2.10.1
@@ -12,8 +12,7 @@ COMMENT=		Set of useful GNOME2 utilities and applications
 
 BUILD_USES_MSGFMT=	yes
 
-USE_PERL5=		build
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_DIRS+=		gnome2-1.5
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
diff --git a/misc/kanjipad/Makefile b/misc/kanjipad/Makefile
index 887eb97e962..73cc21b83c7 100644
--- a/misc/kanjipad/Makefile
+++ b/misc/kanjipad/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:15 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=		kanjipad-2.0.0
@@ -10,8 +10,7 @@ MAINTAINER=		wiz@NetBSD.org
 HOMEPAGE=		http://fishsoup.net/software/kanjipad/
 COMMENT=		Japanese handwriting recognition
 
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 
 .include "../../devel/pkgconfig/buildlink3.mk"
 .include "../../x11/gtk2/buildlink3.mk"
diff --git a/misc/libcdio/Makefile b/misc/libcdio/Makefile
index 9f5c632091a..6033b18293c 100644
--- a/misc/libcdio/Makefile
+++ b/misc/libcdio/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/31 17:05:36 drochner Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=	libcdio-0.74
@@ -19,7 +19,7 @@ PKGCONFIG_OVERRIDE+=	libcdio_paranoia.pc.in
 PKGCONFIG_OVERRIDE+=	libiso9660.pc.in
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--without-versioned-libs
-USE_PERL5=		build
+USE_TOOLS+=		perl:run
 
 INFO_FILES=		libcdio.info
 
diff --git a/misc/loco/Makefile b/misc/loco/Makefile
index 91dd59aae3f..4c7ae996e52 100644
--- a/misc/loco/Makefile
+++ b/misc/loco/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2004/12/03 15:15:04 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=	loco-0.32
@@ -9,7 +9,7 @@ MAINTAINER=	zuntum@NetBSD.org
 HOMEPAGE=	http://zjuul.net/~jules/loco/
 COMMENT=	Colorize file or standard input and print on the standard output
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	loco
 
 BUILD_TARGET=	# defined
diff --git a/misc/nxtvepg/Makefile b/misc/nxtvepg/Makefile
index c3ac7753537..0415a3b32b7 100644
--- a/misc/nxtvepg/Makefile
+++ b/misc/nxtvepg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.46 2005/06/01 18:03:05 jlam Exp $
+# $NetBSD: Makefile,v 1.47 2005/07/16 01:19:14 jlam Exp $
 
 DISTNAME=	nxtvepg-2.7.5
 CATEGORIES=	misc
@@ -12,8 +12,7 @@ ONLY_FOR_PLATFORM=      NetBSD-1.4[Y-Z]-* NetBSD-1.4Z[A-Z]-* \
 			NetBSD-1.5_ALPHA-* NetBSD-1.[5-9]*-* \
 			NetBSD-[2-9]*-*
 
-USE_PERL5=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake perl:run
 
 PTHREAD_AUTO_VARS=	yes
 .include "../../mk/pthread.buildlink3.mk"
diff --git a/misc/openoffice/Makefile b/misc/openoffice/Makefile
index a3e6d8bf303..18a99890c31 100644
--- a/misc/openoffice/Makefile
+++ b/misc/openoffice/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.66 2005/06/17 03:50:22 jlam Exp $
+# $NetBSD: Makefile,v 1.67 2005/07/16 01:19:14 jlam Exp $
 
 DISTNAME=		openoffice-1.1.4
 PKGREVISION=		2
@@ -27,8 +27,7 @@ USE_LANGUAGES+=		c c++
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=		gmake
-USE_PERL5=		build
+USE_TOOLS+=		gmake perl
 PTHREAD_OPTS+=		require
 PTHREAD_AUTO_VARS=	yes
 
diff --git a/misc/pdmenu/Makefile b/misc/pdmenu/Makefile
index 23587640675..d8770052e16 100644
--- a/misc/pdmenu/Makefile
+++ b/misc/pdmenu/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:17 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=	pdmenu_1.2.65
@@ -13,8 +13,7 @@ COMMENT=	Simple console menu program
 
 WRKSRC=		${WRKDIR}/pdmenu
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake
-USE_PERL5=	YES
+USE_TOOLS+=	gmake perl:run
 
 REPLACE_PERL=	examples/showdir.pl
 
diff --git a/misc/reed/Makefile b/misc/reed/Makefile
index ff92b009a0e..bdf8e2f5781 100644
--- a/misc/reed/Makefile
+++ b/misc/reed/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:22 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:15 jlam Exp $
 
 DISTNAME=	reed-5.4
 PKGREVISION=	2
@@ -12,7 +12,7 @@ COMMENT=	Auto-scrolling file viewer
 CONFIGURE_SCRIPT=	./configures
 CONFIGURE_ARGS+=	-p ${PREFIX}
 HAS_CONFIGURE=		YES
-USE_PERL5=		YES
+USE_TOOLS+=		perl:run
 REPLACE_PERL=		breed fix_bookmarks.pl wrap
 
 # wgetnstr()
diff --git a/misc/tds/Makefile b/misc/tds/Makefile
index 80606c50075..6315fad4da9 100644
--- a/misc/tds/Makefile
+++ b/misc/tds/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/07/08 20:27:05 kristerw Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:15 jlam Exp $
 #
 
 DISTNAME=	tds-1.4.2
@@ -10,7 +10,7 @@ MAINTAINER=	kei@NetBSD.org
 HOMEPAGE=	http://tds.dive-in.to/
 COMMENT=	Web diary system
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 GNU_CONFIGURE=	YES
 CONFIGURE_ENV+=	PERL5="${PERL5}"