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.

6 files changed, 13 insertions, 17 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index b1c561a0aac..229dd357e9e 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.71 2005/06/24 12:28:31 markd Exp $
+# $NetBSD: Makefile,v 1.72 2005/07/16 01:19:13 jlam Exp $
 
 DISTNAME=		R-2.1.1
 CATEGORIES=		math
@@ -15,8 +15,7 @@ NOT_FOR_PLATFORM=	NetBSD-1.[0-4]*-alpha NetBSD-1.5-alpha \
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 TEST_TARGET=		check
-USE_PERL5=		# defined
-USE_TOOLS+=		gmake xmkmf sed
+USE_TOOLS+=		gmake perl:run sed xmkmf
 USE_GNU_READLINE=	# uses callback interface
 USE_LANGUAGES=		c fortran
 USE_MAKEINFO=		# defined
diff --git a/math/ess/Makefile b/math/ess/Makefile
index 36663d48715..22586bbfade 100644
--- a/math/ess/Makefile
+++ b/math/ess/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/17 03:50:20 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:13 jlam Exp $
 
 DISTNAME=	ess-5.1.24
 CATEGORIES=	math
@@ -10,7 +10,8 @@ COMMENT=	Emacs Speaks Statistics
 
 MAKEFLAGS+=	EMACS=${EMACS_BIN}
 
-USE_MAKEINFO=		YES
+USE_MAKEINFO=	YES
+USE_TOOLS+=	perl
 
 .if defined(USE_XEMACS)
 LISPDIR=	${EMACS_LISPPREFIX}
@@ -24,7 +25,6 @@ INSTALLATION_DIRS=	${INFODIR}
 
 MAKE_ENV+=	LISPDIR=${EMACS_LISPPREFIX}/ess
 PLIST_SUBST+=	INFODIR=${INFODIR}
-USE_PERL5=	build
 
 do-install:
 	${INSTALL_DATA_DIR} ${EMACS_LISPPREFIX}/ess
diff --git a/math/gnumeric/Makefile b/math/gnumeric/Makefile
index 667480a85be..af6437e9360 100644
--- a/math/gnumeric/Makefile
+++ b/math/gnumeric/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.95 2005/06/01 18:03:03 jlam Exp $
+# $NetBSD: Makefile,v 1.96 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=		gnumeric-1.2.13
@@ -14,8 +14,7 @@ COMMENT=		Spreadsheet program from the GNOME project
 BUILD_USES_MSGFMT=	YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
-USE_PERL5=		YES
+USE_TOOLS+=		gmake perl:run
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/math/gnumeric14/Makefile b/math/gnumeric14/Makefile
index 06b2ff2824a..a71a57cf486 100644
--- a/math/gnumeric14/Makefile
+++ b/math/gnumeric14/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/01 18:03:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=		gnumeric-1.4.3
@@ -13,8 +13,7 @@ COMMENT=		Spreadsheet program from the GNOME project
 BUILD_USES_MSGFMT=	YES
 USE_DIRS+=		xdg-1.1
 USE_PKGLOCALEDIR=	YES
-USE_TOOLS+=		gmake
-USE_PERL5=		YES
+USE_TOOLS+=		gmake perl:run
 USE_LIBTOOL=		YES
 
 GNU_CONFIGURE=		YES
diff --git a/math/maxima/Makefile b/math/maxima/Makefile
index df21d969164..3d418f6cb99 100644
--- a/math/maxima/Makefile
+++ b/math/maxima/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/07 15:21:19 kristerw Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=		maxima-5.9.1
@@ -14,6 +14,6 @@ DEPENDS+=		tk-[0-9]*:../../x11/tk
 
 GNU_CONFIGURE=		yes
 CONFIGURE_ARGS+=	--enable-clisp
-USE_PERL5=		build
+USE_TOOLS+=		perl
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/math/yacas/Makefile b/math/yacas/Makefile
index c1eb703a21f..33be4dd52ed 100644
--- a/math/yacas/Makefile
+++ b/math/yacas/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2005/06/01 18:03:04 jlam Exp $
+# $NetBSD: Makefile,v 1.20 2005/07/16 01:19:14 jlam Exp $
 #
 
 DISTNAME=	yacas-1.0.57
@@ -11,9 +11,8 @@ COMMENT=	Yet Another Computer Algebra System
 
 USE_LANGUAGES=	c c++
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake
+USE_TOOLS+=	gmake perl
 USE_LIBTOOL=	YES
-USE_PERL5=	build
 
 TEST_TARGET=	test