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.

5 files changed, 10 insertions, 16 deletions

diff --git a/wm/afterstep/Makefile b/wm/afterstep/Makefile
index a622e923558..b6bcf832420 100644
--- a/wm/afterstep/Makefile
+++ b/wm/afterstep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:24 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	AfterStep-2.00.01
@@ -14,8 +14,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 GNU_CONFIGURE=		YES
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
-USE_PERL5=		run
+USE_TOOLS+=		gmake perl:run
 
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../mk/x11.buildlink3.mk"
diff --git a/wm/enlightenment/Makefile b/wm/enlightenment/Makefile
index 3f3537cb83d..db5c7c3755c 100644
--- a/wm/enlightenment/Makefile
+++ b/wm/enlightenment/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.29 2005/06/01 18:03:24 jlam Exp $
+# $NetBSD: Makefile,v 1.30 2005/07/16 01:19:24 jlam Exp $
 
 DISTNAME=	enlightenment-0.16.7.2
 CATEGORIES=	x11 gnome wm
@@ -8,8 +8,7 @@ MAINTAINER=	tech-pkg@NetBSD.org
 HOMEPAGE=	http://www.enlightenment.org/
 COMMENT=	Highly themeable and configurable window manager
 
-USE_TOOLS+=		bison
-USE_PERL5=		YES
+USE_TOOLS+=		bison perl:run
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--enable-fsstd
diff --git a/wm/fvwm2-themes/Makefile b/wm/fvwm2-themes/Makefile
index 952cb1ae6b2..3a2b9665bdc 100644
--- a/wm/fvwm2-themes/Makefile
+++ b/wm/fvwm2-themes/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/06/01 18:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	fvwm-themes-${THEM_VER}
@@ -19,7 +19,7 @@ DEPENDS+=	{fvwm2,fvwm-devel}>=2.4.8:../../wm/fvwm2
 THEM_VER=	0.6.2
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 USE_X11BASE=	YES
 GNU_CONFIGURE=	YES
 
diff --git a/wm/pekwm/Makefile b/wm/pekwm/Makefile
index 4732a02fc00..09bf8bbd4c1 100644
--- a/wm/pekwm/Makefile
+++ b/wm/pekwm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2005/06/01 18:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.15 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	pekwm-0.1.3
@@ -12,8 +12,7 @@ HOMEPAGE=	http://pekwm.org/
 COMMENT=	Window manager based on aewm++
 
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake
-USE_PERL5=	run
+USE_TOOLS+=	gmake perl:run
 USE_PKGINSTALL=	YES
 USE_LANGUAGES+=	c++
 
@@ -38,6 +37,5 @@ CONF_FILES+=		${EGDIR}/${f} ${PKG_SYSCONFDIR}/${f}
 .endfor
 .undef f
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../graphics/xpm/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/wm/waimea/Makefile b/wm/waimea/Makefile
index 78b70cb4bfd..a3f1328deb3 100644
--- a/wm/waimea/Makefile
+++ b/wm/waimea/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/06/01 18:03:25 jlam Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:24 jlam Exp $
 #
 
 DISTNAME=	waimea-0.4.0
@@ -11,8 +11,7 @@ HOMEPAGE=	http://www.waimea.org/
 COMMENT=	Fast and highly customizable virtual window manager
 
 GNU_CONFIGURE=	YES
-USE_TOOLS+=	gmake
-USE_PERL5=	run
+USE_TOOLS+=	gmake perl:run
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -39,5 +38,4 @@ REPLACE_PERL = \
 .include "../../fonts/Xft2/buildlink3.mk"
 .include "../../graphics/freetype2/buildlink3.mk"
 .include "../../graphics/imlib2/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"