From 4ff5f6ae062a1143c9d2a08f5e33e22d43752ad6 Mon Sep 17 00:00:00 2001
From: jlam <jlam>
Date: Sat, 16 Jul 2005 01:19:06 +0000
Subject: 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.
---
 pkgtools/pkg_filecheck/Makefile | 4 ++--
 pkgtools/pkg_notify/Makefile    | 4 ++--
 pkgtools/pkgdep/Makefile        | 4 ++--
 pkgtools/pkgdepgraph/Makefile   | 4 ++--
 pkgtools/pkgse/Makefile         | 4 ++--
 pkgtools/port2pkg/Makefile      | 5 ++---
 pkgtools/revbump/Makefile       | 4 ++--
 7 files changed, 14 insertions(+), 15 deletions(-)

(limited to 'pkgtools')

diff --git a/pkgtools/pkg_filecheck/Makefile b/pkgtools/pkg_filecheck/Makefile
index bb807c9a0fb..0b81d8ea78b 100644
--- a/pkgtools/pkg_filecheck/Makefile
+++ b/pkgtools/pkg_filecheck/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:17 jlam Exp $
 #
 
 DISTNAME=		pkg_filecheck-0.1
@@ -11,7 +11,7 @@ MAINTAINER=		dillo@NetBSD.org
 COMMENT=		Check for files not owned by any package
 
 WRKSRC=		${WRKDIR}
-USE_PERL5=	run
+USE_TOOLS+=	perl:run
 USE_PKGINSTALL=	yes
 
 EXTRACT_ONLY=	# empty
diff --git a/pkgtools/pkg_notify/Makefile b/pkgtools/pkg_notify/Makefile
index ce9e97e2587..65978debeba 100644
--- a/pkgtools/pkg_notify/Makefile
+++ b/pkgtools/pkg_notify/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/04/11 21:47:05 tv Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:17 jlam Exp $
 #
 
 DISTNAME=	pkg_notify-0.4.2
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NO_BUILD=		yes
 NO_CONFIGURE=		yes
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 USE_PKGINSTALL=		yes
 WRKSRC=			${WRKDIR}/pkg_notify
 
diff --git a/pkgtools/pkgdep/Makefile b/pkgtools/pkgdep/Makefile
index b5bce3f9d3a..bc43a1118b8 100644
--- a/pkgtools/pkgdep/Makefile
+++ b/pkgtools/pkgdep/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:17 jlam Exp $
 #
 
 DISTNAME=	pkgdep-1.0
@@ -10,7 +10,7 @@ MAINTAINER=	sakamoto@NetBSD.org
 COMMENT=	Script for displaying dependence information on software packages
 
 WRKSRC=		${WRKDIR}
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/pkgtools/pkgdepgraph/Makefile b/pkgtools/pkgdepgraph/Makefile
index ca112f80b65..9879daebf9c 100644
--- a/pkgtools/pkgdepgraph/Makefile
+++ b/pkgtools/pkgdepgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/06/26 17:34:19 atatat Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:17 jlam Exp $
 #
 
 DISTNAME=	pkgdepgraph-2.8
@@ -14,7 +14,7 @@ COMMENT=	Visual representation of installed NetBSD packages
 # DEPENDS+=	graphviz-[0-9]*:../../graphics/graphviz
 
 WRKSRC=		${WRKDIR}
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
diff --git a/pkgtools/pkgse/Makefile b/pkgtools/pkgse/Makefile
index 282683c8ca5..c3b9a416107 100644
--- a/pkgtools/pkgse/Makefile
+++ b/pkgtools/pkgse/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2004/08/12 13:15:45 wiz Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:17 jlam Exp $
 #
 
 DISTNAME=	pkgse-0.2
@@ -16,7 +16,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 NO_CONFIGURE=	yes
 NO_BUILD=	yes
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 
 INSTALLATION_DIRS=	bin
 
diff --git a/pkgtools/port2pkg/Makefile b/pkgtools/port2pkg/Makefile
index cb4ca9d17d2..4b566386eb4 100644
--- a/pkgtools/port2pkg/Makefile
+++ b/pkgtools/port2pkg/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/17 03:50:29 jlam Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:18 jlam Exp $
 #
 
 DISTNAME=	port2pkg-1.11
@@ -13,12 +13,11 @@ COMMENT=	Convert from a FreeBSD port to a NetBSD package
 DEPENDS+=	pkglint-[0-9]*:../../pkgtools/pkglint
 
 WRKSRC=		${WRKDIR}
-USE_PERL5=	YES
 
 EXTRACT_ONLY=	# empty
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
-USE_TOOLS+=	gtar
+USE_TOOLS+=	gtar perl:run
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/pkgtools/revbump/Makefile b/pkgtools/revbump/Makefile
index 60e106e6785..1d76774db67 100644
--- a/pkgtools/revbump/Makefile
+++ b/pkgtools/revbump/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:47:06 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:18 jlam Exp $
 #
 
 DISTNAME=		revbump-1.0
@@ -15,7 +15,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=		${WRKDIR}
 NO_CHECKSUM=	yes
 NO_CONFIGURE=	yes
-USE_PERL5=	run
+USE_TOOLS+=	perl:run
 USE_LANGUAGES=	# empty
 
 INSTALLATION_DIRS=	bin man/man8
-- 
cgit v1.2.3