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.

10 files changed, 20 insertions, 22 deletions

diff --git a/print/a2ps/Makefile b/print/a2ps/Makefile
index 3eb46ee23eb..fb6c3ec8a71 100644
--- a/print/a2ps/Makefile
+++ b/print/a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.56 2005/07/15 20:14:03 jlam Exp $
+# $NetBSD: Makefile,v 1.57 2005/07/16 01:19:18 jlam Exp $
 
 DISTNAME=		a2ps-4.13b
 PKGNAME=		a2ps-4.13.0.2
@@ -19,10 +19,9 @@ DEPENDS+=		psutils>=1.17:../../print/psutils
 WRKSRC=			${WRKDIR}/a2ps-4.13
 STRIP=			# empty
 
-USE_PERL5=		yes
 USE_LIBTOOL=		yes
 
-USE_TOOLS+=		file:run gmake mktemp:run
+USE_TOOLS+=		file:run gmake mktemp:run perl:run
 CONFIGURE_ENV+=		file_prog=${FILE_CMD:Q}
 
 USE_PKGINSTALL=		YES
diff --git a/print/cjk-lyx/Makefile b/print/cjk-lyx/Makefile
index de9bece9dd7..be3d261d379 100644
--- a/print/cjk-lyx/Makefile
+++ b/print/cjk-lyx/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/06/01 18:03:09 jlam Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 01:19:18 jlam Exp $
 
 DISTNAME=	lyx-${LYX_VERS}
 PKGNAME=	cjk-${DISTNAME}
@@ -25,7 +25,7 @@ DEPENDS+=	teTeX-bin>=1.0.7nb1:../../print/teTeX-bin
 
 USE_LANGUAGES=		c c++
 USE_PKGLOCALEDIR=	yes
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
diff --git a/print/cupsomatic/Makefile b/print/cupsomatic/Makefile
index da8b40b4d9e..b2210f08764 100644
--- a/print/cupsomatic/Makefile
+++ b/print/cupsomatic/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:18 jlam Exp $
 
 DISTNAME=	cupsomatic
 PKGNAME=	${DISTNAME}-2.2
@@ -31,7 +31,7 @@ DEPENDS+=	cups>=1.1.14nb1:../../print/cups
 DEPENDS+=	foomatic-gswrapper>=1.2:../../print/foomatic-gswrapper
 DEPENDS+=	mpage-[0-9]*:../../print/mpage
 
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
 
 FILTERDIR=	${PREFIX}/libexec/cups/filter
diff --git a/print/foomatic-filters/Makefile b/print/foomatic-filters/Makefile
index 50b86c61c2c..95d77c00623 100644
--- a/print/foomatic-filters/Makefile
+++ b/print/foomatic-filters/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/22 20:08:27 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:18 jlam Exp $
 
 DISTNAME=	foomatic-filters-3.0.2
 CATEGORIES=	print
@@ -25,8 +25,7 @@ CONFIGURE_ENV+= 	CUPS=${LOCALBASE}/share/cups
 CONFIGURE_ENV+= 	CUPS_FILTERS=${LOCALBASE}/lib/cups/filter
 CONFIGURE_ENV+= 	PRINTCAP=/etc/printcap
 
-USE_TOOLS+=	gmake
-USE_PERL5=	yes
+USE_TOOLS+=	gmake perl:run
 USE_PKGINSTALL=	yes
 PERL5_REQD=	5.6
 INSTALL_TARGET=	install-bin install-man
diff --git a/print/foomatic-gswrapper/Makefile b/print/foomatic-gswrapper/Makefile
index 727ce8b484f..6809999fae5 100644
--- a/print/foomatic-gswrapper/Makefile
+++ b/print/foomatic-gswrapper/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:18 jlam Exp $
 
 DISTNAME=	foomatic-gswrapper
 PKGNAME=	foomatic-gswrapper-1.2
@@ -22,7 +22,7 @@ WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
 EXTRACT_CMD=		${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}/${DISTNAME}
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 NO_BUILD=		# defined
 
 REPLACE_PERL=	${DISTNAME}
diff --git a/print/html2ps/Makefile b/print/html2ps/Makefile
index 724584343d4..f5f45f446a4 100644
--- a/print/html2ps/Makefile
+++ b/print/html2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/07/08 19:23:28 hubertf Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:18 jlam Exp $
 #
 
 DISTNAME=	html2ps-1.0b4
@@ -17,7 +17,7 @@ DEPENDS+=	p5-libwww-[0-9]*:../../www/p5-libwww
 DEPENDS+=	teTeX-bin>=1.0.6:../../print/teTeX3-bin
 DEPENDS+=	weblint-[0-9]*:../../www/weblint
 
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
diff --git a/print/if-psprint/Makefile b/print/if-psprint/Makefile
index 018a390bc14..a165e0a5e20 100644
--- a/print/if-psprint/Makefile
+++ b/print/if-psprint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:18 jlam Exp $
 #
 
 DISTNAME=	if-psprint-1.7
@@ -12,7 +12,7 @@ COMMENT=	Print text or postscript to arbitrary printer, can use smb
 
 DEPENDS+=	enscript>=1.6.3nb1:../../print/enscript
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 
 INSTALLATION_DIRS=	libexec man/man1
 
diff --git a/print/ja-a2ps/Makefile b/print/ja-a2ps/Makefile
index 82c3f33da57..4cd7399325f 100644
--- a/print/ja-a2ps/Makefile
+++ b/print/ja-a2ps/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:30 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $
 
 DISTNAME=	a2ps.pl-1.45
 PKGNAME=	ja-a2ps-1.45
@@ -11,7 +11,7 @@ MAINTAINER=	tech-pkg-ja@jp.NetBSD.org
 COMMENT=	Text file to postscript converter (with Japanese support)
 
 WRKSRC=		${WRKDIR}
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} .
 NO_BUILD=	yes
diff --git a/print/psutils/Makefile b/print/psutils/Makefile
index f0805854230..25113555ef8 100644
--- a/print/psutils/Makefile
+++ b/print/psutils/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.30 2005/04/11 21:47:09 tv Exp $
+# $NetBSD: Makefile,v 1.31 2005/07/16 01:19:18 jlam Exp $
 
 DISTNAME=	psutils-p17
 PKGNAME=	psutils-1.17
@@ -13,7 +13,7 @@ COMMENT=	Utilities for manipulating PostScript documents
 DEPENDS+=	papersize-[0-9]*:../../print/papersize
 
 WRKSRC=		${WRKDIR}/psutils
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 USE_PKGINSTALL=	yes
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/print/yup/Makefile b/print/yup/Makefile
index 449efd6d1f6..19b374a4b9b 100644
--- a/print/yup/Makefile
+++ b/print/yup/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/05/29 16:35:15 minskim Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:18 jlam Exp $
 #
 
 DISTNAME=		yup-r1-rel
@@ -12,7 +12,7 @@ COMMENT=		Print multiple PostScript/ASCII pages per sheet
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 
 WRKSRC=			${WRKDIR}/yup-r1
 NO_CONFIGURE=		# defined