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, 12 insertions, 17 deletions

diff --git a/databases/gnome-mime-data/Makefile b/databases/gnome-mime-data/Makefile
index 848637b4abd..e3ec0aeafbb 100644
--- a/databases/gnome-mime-data/Makefile
+++ b/databases/gnome-mime-data/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/04/11 21:45:11 tv Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:08 jlam Exp $
 #
 
 DISTNAME=		gnome-mime-data-2.4.2
@@ -19,7 +19,7 @@ CONFLICTS=		gnome-vfs<=1.0.3
 USE_DIRS+=		gnome2-1.5
 USE_PKGINSTALL=		YES
 USE_PKGLOCALEDIR=	YES
-USE_PERL5=		build
+USE_TOOLS+=		perl
 GNU_CONFIGURE=		YES
 
 PKGCONFIG_OVERRIDE=	gnome-mime-data-2.0.pc.in
@@ -31,7 +31,6 @@ CONF_FILES=		${EGDIR}/gnome-vfs-mime-magic \
 				${PKG_SYSCONFDIR}/gnome-vfs-mime-magic
 
 .include "../../devel/gettext-lib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../textproc/intltool/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/lbdb/Makefile b/databases/lbdb/Makefile
index d9081d95f6f..aad67cfe06b 100644
--- a/databases/lbdb/Makefile
+++ b/databases/lbdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/22 20:07:45 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:08 jlam Exp $
 
 DISTNAME=		${PKGNAME:S/-/_/}
 PKGNAME=		lbdb-0.29
@@ -12,8 +12,7 @@ COMMENT=		The little brother's database
 DEPENDS+=		p5-perl-ldap>=0.20:../../databases/p5-perl-ldap
 
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
-USE_PERL5=		yes
+USE_TOOLS+=		gmake perl:run
 USE_PKGINSTALL=		yes
 
 CONFIGURE_ARGS+=	--libdir=${PREFIX}/libexec/lbdb/
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 05d50670976..364546b78a4 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.28 2005/06/01 18:02:42 jlam Exp $
+# $NetBSD: Makefile,v 1.29 2005/07/16 01:19:08 jlam Exp $
 #
 
 DISTNAME=		mergeant-0.52
@@ -10,9 +10,8 @@ MAINTAINER=		tech-pkg@NetBSD.org
 HOMEPAGE=		http://www.gnome-db.org/
 COMMENT=		GNOME2 GNOME-DB database front-end
 
-USE_PERL5=              build
 USE_DIRS+=		gnome2-1.5
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 USE_PKGLOCALEDIR=	YES
 GNU_CONFIGURE=		YES
 CONFIGURE_ARGS+=	--disable-gtk-doc
diff --git a/databases/mysql-client/Makefile.common b/databases/mysql-client/Makefile.common
index d901aae04ff..f122415f762 100644
--- a/databases/mysql-client/Makefile.common
+++ b/databases/mysql-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.45 2005/07/05 08:49:44 grant Exp $
+# $NetBSD: Makefile.common,v 1.46 2005/07/16 01:19:08 jlam Exp $
 
 DISTNAME=		mysql-4.0.24
 CATEGORIES=		databases
@@ -79,8 +79,7 @@ CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
 .endif
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-USE_PERL5=		yes
+USE_TOOLS+=		gmake perl:run
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
 SUBST_CLASSES+=		mk scripts
diff --git a/databases/mysql4-client/Makefile.common b/databases/mysql4-client/Makefile.common
index 41c9afe92a3..125aecc94cd 100644
--- a/databases/mysql4-client/Makefile.common
+++ b/databases/mysql4-client/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.40 2005/05/23 14:00:20 xtraeme Exp $
+# $NetBSD: Makefile.common,v 1.41 2005/07/16 01:19:08 jlam Exp $
 
 DISTNAME=		mysql-4.1.12
 CATEGORIES=		databases
@@ -88,8 +88,7 @@ CONFIGURE_ENV+=	ac_cv_func_pthread_attr_setschedparam=no
 .endif
 
 USE_LANGUAGES=		c c++
-USE_TOOLS+=		gmake
-USE_PERL5=		yes
+USE_TOOLS+=		gmake perl:run
 LDFLAGS+=		${COMPILER_RPATH_FLAG}${PREFIX}/lib/mysql
 
 SUBST_CLASSES+=		mk scripts
diff --git a/databases/rdb/Makefile b/databases/rdb/Makefile
index c9a90273fa8..e6a7292e3af 100644
--- a/databases/rdb/Makefile
+++ b/databases/rdb/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2004/04/17 19:25:28 snj Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:08 jlam Exp $
 
 DISTNAME=	RDB-2.6d
 PKGNAME=	rdb-2.6.4
@@ -12,7 +12,7 @@ COMMENT=	Relational database system that uses standard filters via pipes
 WRKSRC=		${WRKDIR}/rdb
 NO_BUILD=	yes
 NO_CONFIGURE=	yes
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 
 REPLACE_PERL=	column compute dataent etbl headchg jointbl lst2tbl mergetbl
 REPLACE_PERL+=	mktbl ptbl rdb rdbt repair reporttbl row search sorttbl