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, 16 deletions

diff --git a/chat/bitchbot/Makefile b/chat/bitchbot/Makefile
index a79b08e6ada..47bc2c52f12 100644
--- a/chat/bitchbot/Makefile
+++ b/chat/bitchbot/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:07 jlam Exp $
 
 DISTNAME=	bitchbot-1.0.2
 CATEGORIES=	chat
@@ -10,7 +10,7 @@ COMMENT=	Bitchbot is a perl-based IRC bot
 
 PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 USE_PKGINSTALL=	YES
 
 REPLACE_PERL=	bitch.pl genstats.pl
diff --git a/chat/centericq/Makefile b/chat/centericq/Makefile
index f4905eb9cde..c8f7867227c 100644
--- a/chat/centericq/Makefile
+++ b/chat/centericq/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.50 2005/05/22 20:07:42 jlam Exp $
+# $NetBSD: Makefile,v 1.51 2005/07/16 01:19:07 jlam Exp $
 #
 
 DISTNAME=	centericq-4.20.0
@@ -12,7 +12,7 @@ HOMEPAGE=	http://konst.org.ua/eng/software/centericq/info.html
 COMMENT=	Instant Messenger interface supporting many protocols
 
 USE_PKGLOCALEDIR=	yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl:run
 USE_LANGUAGES=		c c++
 
 GNU_CONFIGURE=		yes
@@ -20,7 +20,6 @@ CONFIGURE_ARGS+=	--with-ssl --with-openssl=${SSLBASE}
 CONFIGURE_ARGS+=      	--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
 LIBS=			${LDFLAGS}
 
-USE_PERL5=		run
 REPLACE_PERL=		misc/cicqconv
 
 INCOMPAT_CURSES+=	NetBSD-1.[45]*-* NetBSD-1.6-* NetBSD-1.6.[1-9]-*
@@ -45,7 +44,6 @@ GCC_REQD+=    3.0			# see PR 29185
 .include "../../converters/libiconv/buildlink3.mk"
 .include "../../devel/gettext-lib/buildlink3.mk"
 .include "../../devel/ncurses/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../security/gpgme/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 .include "../../www/curl/buildlink3.mk"
diff --git a/chat/cgiirc/Makefile b/chat/cgiirc/Makefile
index 84076ff6d7c..bf394e5e75d 100644
--- a/chat/cgiirc/Makefile
+++ b/chat/cgiirc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/05/20 22:12:28 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:07 jlam Exp $
 
 DISTNAME=	cgiirc-0.5.6
 CATEGORIES=	chat
@@ -8,7 +8,7 @@ MAINTAINER=	adrianp@NetBSD.org
 HOMEPAGE=	http://cgiirc.sourceforge.net/
 COMMENT=	Access IRC from a web browser
 
-USE_PERL5=	run
+USE_TOOLS+=	perl:run
 NO_BUILD=	YES
 USE_PKGINSTALL=	YES
 
diff --git a/chat/dircproxy-devel/Makefile b/chat/dircproxy-devel/Makefile
index 7f7ac65a043..16084c4e29a 100644
--- a/chat/dircproxy-devel/Makefile
+++ b/chat/dircproxy-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:07 jlam Exp $
 
 DISTNAME=	dircproxy-1.1.0
 CATEGORIES=	chat
@@ -9,7 +9,7 @@ HOMEPAGE=	http://dircproxy.securiweb.net/
 COMMENT=	Detachable internet relay chat proxy server
 
 GNU_CONFIGURE=		YES
-USE_PERL5=		YES
+USE_TOOLS+=		perl:run
 USE_PKGINSTALL=		YES
 
 CONFLICTS=		dircproxy-1.0.[0-9]*
diff --git a/chat/dircproxy/Makefile b/chat/dircproxy/Makefile
index 0b739a37a13..33a892aaf96 100644
--- a/chat/dircproxy/Makefile
+++ b/chat/dircproxy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/04/11 21:45:03 tv Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:07 jlam Exp $
 
 DISTNAME=	dircproxy-1.0.5
 PKGREVISION=	2
@@ -10,7 +10,7 @@ HOMEPAGE=	http://dircproxy.securiweb.net/
 COMMENT=	Detachable internet relay chat proxy server
 
 GNU_CONFIGURE=		YES
-USE_PERL5=		YES
+USE_TOOLS+=		perl:run
 USE_PKGINSTALL=		YES
 
 CONFLICTS=		dircproxy-1.1.[0-9]*
diff --git a/chat/ircservices/Makefile b/chat/ircservices/Makefile
index bffcc9544ee..48531f7427a 100644
--- a/chat/ircservices/Makefile
+++ b/chat/ircservices/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/06/21 16:18:52 jlam Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:07 jlam Exp $
 #
 
 DISTNAME=	ircservices-5.0.49
@@ -14,8 +14,7 @@ COMMENT=	Services for IRC networks
 
 HAS_CONFIGURE=	YES
 USE_PKGINSTALL=	YES
-USE_TOOLS+=	gmake grep gsed
-USE_PERL5=	build
+USE_TOOLS+=	gmake grep gsed perl
 RCD_SCRIPTS=	ircservices
 
 CONFIGURE_ARGS=	-prefix ${PREFIX}
@@ -79,5 +78,4 @@ post-install:
 	${INSTALL_DATA} ${WRKSRC}/data/example-modules.conf \
 		${PREFIX}/share/examples/ircservices/modules.conf
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"