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.

14 files changed, 28 insertions, 35 deletions

diff --git a/textproc/btparse/Makefile b/textproc/btparse/Makefile
index eebe8fe66d0..636a6f89904 100644
--- a/textproc/btparse/Makefile
+++ b/textproc/btparse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/04/11 21:47:33 tv Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:23 jlam Exp $
 #
 
 DISTNAME=	btparse-0.33
@@ -11,7 +11,7 @@ COMMENT=	BibTeX parsing library
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PERL5=	build
+USE_TOOLS+=	perl
 GNU_CONFIGURE=	YES
 BUILD_TARGET=	lib
 TEST_TARGET=	test
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 159d47bfda3..22e05e96c8b 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 03:50:36 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:23 jlam Exp $
 #
 
 DISTNAME=		cdif-1.15
@@ -12,7 +12,7 @@ COMMENT=		Word context diff
 LICENSE=		no-commercial-use
 
 WRKSRC=			${WRKDIR}
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 
 NO_CONFIGURE=		# defined
 NO_BUILD=		# defined
diff --git a/textproc/eb/Makefile b/textproc/eb/Makefile
index 3fe55d484d1..520fe4aff80 100644
--- a/textproc/eb/Makefile
+++ b/textproc/eb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.32 2005/07/15 18:27:53 jlam Exp $
+# $NetBSD: Makefile,v 1.33 2005/07/16 01:19:23 jlam Exp $
 
 DISTNAME=	eb-4.1.3
 CATEGORIES=	textproc japanese
@@ -52,10 +52,9 @@ DIST_SUBDIR=	${PKGNAME_NOREV}
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 USE_PKGINSTALL=		YES
-USE_TOOLS+=		gmake gtar
+USE_TOOLS+=		gmake gtar perl
 USE_LIBTOOL=		YES
 GNU_CONFIGURE=		YES
-USE_PERL5=		build
 
 CONFIGURE_ARGS+=	--with-zlib
 CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
diff --git a/textproc/freepwing/Makefile b/textproc/freepwing/Makefile
index ab535501f68..22e8de45709 100644
--- a/textproc/freepwing/Makefile
+++ b/textproc/freepwing/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/07/08 21:35:03 kristerw Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:23 jlam Exp $
 
 DISTNAME=	freepwing-1.4.4
 PKGREVISION=	2
@@ -14,7 +14,6 @@ DEPENDS+=	p5-Jcode-[0-9]*:../../converters/p5-Jcode
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--with-pkgdocdir=${PREFIX}/share/doc/freepwing
 CONFIGURE_ENV+=	GNUMAKE="${GMAKE}"
-USE_TOOLS+=	gmake
-USE_PERL5=	yes
+USE_TOOLS+=	gmake perl:run
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 56c4eb535ff..d33ae3a6a2a 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/06/24 20:53:20 kristerw Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	groff-1.19.1
@@ -16,7 +16,7 @@ DEPENDS+=	psutils>=1.17:../../print/psutils
 USE_LANGUAGES=		c c++
 GNU_CONFIGURE=		YES
 CONFIGURE_ENV+=		PERLPATH="${PERL5}"
-USE_PERL5=		YES
+USE_TOOLS+=		perl:run
 
 INFO_FILES=	groff
 
diff --git a/textproc/ispell-german/Makefile b/textproc/ispell-german/Makefile
index 071afd46c0e..929e80a144a 100644
--- a/textproc/ispell-german/Makefile
+++ b/textproc/ispell-german/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:36 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	igerman98-20030222
@@ -14,8 +14,7 @@ COMMENT=	German dictionary for interactive spelling checker
 DEPENDS+=	ispell-base>=3.1.20nb1:../../textproc/ispell-base
 
 BUILD_TARGET=	german.hash
-USE_TOOLS+=	gmake
-USE_PERL5=	build
+USE_TOOLS+=	gmake perl
 REPLACE_PERL=	bin/dic2iso.pl bin/grepl bin/sq.pl bin/myspellfixprefix.pl \
 		bin/clear_affix.pl bin/unsq.pl bin/uniqflag.pl
 
diff --git a/textproc/latex2html/Makefile b/textproc/latex2html/Makefile
index d156f7d08e2..540ff6e090f 100644
--- a/textproc/latex2html/Makefile
+++ b/textproc/latex2html/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.15 2005/01/06 03:59:31 wiz Exp $
+# $NetBSD: Makefile,v 1.16 2005/07/16 01:19:24 jlam Exp $
 
 DISTNAME=	latex2html-2002-2-1
 PKGNAME=	latex2html-2002.2.1
@@ -13,7 +13,7 @@ COMMENT=	LaTeX to HTML converter
 DEPENDS+=       teTeX-bin>=1.0.6:../../print/teTeX-bin
 DEPENDS+=	netpbm>=9.7nb1:../../graphics/netpbm
 
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		# defined
 
 .include "../../mk/bsd.prefs.mk"
diff --git a/textproc/libpathan/Makefile b/textproc/libpathan/Makefile
index 93f9bd3bf06..c728f1aa3eb 100644
--- a/textproc/libpathan/Makefile
+++ b/textproc/libpathan/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:28:47 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:24 jlam Exp $
 
 DISTNAME=	libpathan-1.2-2-src
 PKGNAME=	${DISTNAME:S/-2-src/.2/}
@@ -14,9 +14,8 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=			${WRKDIR}/${DISTNAME:S/-2-src//}
 GNU_CONFIGURE=		YES
-USE_TOOLS+=		bison gmake
+USE_TOOLS+=		bison gmake perl
 USE_LIBTOOL=		YES
-USE_PERL5=		build
 USE_LANGUAGES=		c++
 
 CONFIGURE_ARGS+=	XERCESCROOT=${LOCALBASE}
diff --git a/textproc/libxslt/Makefile b/textproc/libxslt/Makefile
index 7f48fe020f0..a8901c81f66 100644
--- a/textproc/libxslt/Makefile
+++ b/textproc/libxslt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.57 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.58 2005/07/16 01:19:24 jlam Exp $
 
 DISTNAME=	libxslt-1.1.14
 PKGNAME=	${DISTNAME}
@@ -12,9 +12,8 @@ COMMENT=	XSLT parser library from the GNOME project
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_LIBTOOL=		yes
-USE_PERL5=		build
 PKGCONFIG_OVERRIDE=	libxslt.pc.in
 PKGCONFIG_OVERRIDE+=	libexslt.pc.in
 
diff --git a/textproc/openjade/Makefile b/textproc/openjade/Makefile
index f31efc42ba5..118dbfe03b9 100644
--- a/textproc/openjade/Makefile
+++ b/textproc/openjade/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/05/22 20:08:35 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	openjade-1.3.2
@@ -10,8 +10,7 @@ MAINTAINER=	kogule@mars.dti.ne.jp
 HOMEPAGE=	http://openjade.sourceforge.net/
 COMMENT=	SGML/XML parser toolkit and DSSSL engine, successor to "jade"
 
-USE_TOOLS+=	gmake
-USE_PERL5=	build
+USE_TOOLS+=	gmake perl
 USE_LANGUAGES=	c c++
 USE_LIBTOOL=	YES
 GNU_CONFIGURE=	YES
diff --git a/textproc/opensp/Makefile b/textproc/opensp/Makefile
index 463fef1eb72..fc9d41825f7 100644
--- a/textproc/opensp/Makefile
+++ b/textproc/opensp/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.26 2005/04/11 21:47:37 tv Exp $
+# $NetBSD: Makefile,v 1.27 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	OpenSP-1.5.1
@@ -14,7 +14,7 @@ COMMENT=	SGML parser, successor to "sp"
 CONFLICTS+=     sp-[0-9]*
 
 BUILD_USES_MSGFMT=	yes
-USE_PERL5=		build
+USE_TOOLS+=		perl
 USE_LIBTOOL=		yes
 PTHREAD_OPTS+=		require
 USE_PKGLOCALEDIR=	yes
diff --git a/textproc/postgresql-autodoc/Makefile b/textproc/postgresql-autodoc/Makefile
index 23c2412c4b8..8c5fff560ff 100644
--- a/textproc/postgresql-autodoc/Makefile
+++ b/textproc/postgresql-autodoc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/07/08 21:28:15 kristerw Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	postgresql_autodoc-1.24
@@ -14,8 +14,7 @@ DEPENDS=	p5-DBD-postgresql-[0-9]*:../../databases/p5-DBD-postgresql
 DEPENDS+=	p5-HTML-Template-[0-9]*:../../www/p5-HTML-Template
 
 WRKSRC=		${WRKDIR}/postgresql_autodoc
-USE_PERL5=	yes
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake perl:run
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/share/${PKGBASE}
 CONFIGURE_ENV+=	ac_cv_path_PERL=${PERL5}
diff --git a/textproc/rfcutil/Makefile b/textproc/rfcutil/Makefile
index 14fed443c95..d8553cf7e66 100644
--- a/textproc/rfcutil/Makefile
+++ b/textproc/rfcutil/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 03:50:37 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	rfc-3.2
@@ -18,7 +18,7 @@ WRKSRC=		${WRKDIR}
 EXTRACT_ONLY=	#
 
 NO_BUILD=	YES
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	rfc
 
 INSTALLATION_DIRS=	bin
diff --git a/textproc/troffcvt/Makefile b/textproc/troffcvt/Makefile
index f461bddddd5..71c62dd411b 100644
--- a/textproc/troffcvt/Makefile
+++ b/textproc/troffcvt/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2005/06/17 03:50:37 jlam Exp $
+# $NetBSD: Makefile,v 1.13 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=		troffcvt-1.04
@@ -10,7 +10,7 @@ MAINTAINER=		ben@NetBSD.org
 HOMEPAGE=		${MASTER_SITES}
 COMMENT=		Troff/groff to RTF/HTML/TEXT converter
 
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 
 INSTALL_TARGET=		install install.man
 INSTALLATION_DIRS=	bin man/man1