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.

30 files changed, 61 insertions, 74 deletions

diff --git a/mail/YoSucker/Makefile b/mail/YoSucker/Makefile
index 00349d97753..7ec0afe44b3 100644
--- a/mail/YoSucker/Makefile
+++ b/mail/YoSucker/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:12 jlam Exp $
 #
 
 DISTNAME=		YoSucker-pr37
@@ -16,7 +16,7 @@ DEPENDS+=		p5-Digest-MD5-[0-9]*:../../security/p5-Digest-MD5
 DEPENDS+=		p5-IO-Socket-SSL-[0-9]*:../../security/p5-IO-Socket-SSL
 DEPENDS+=		p5-MIME-Base64-[0-9]*:../../converters/p5-MIME-Base64
 
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 REPLACE_PERL=		bin/EncProxyPasswd bin/EncPasswd bin/YoSucker
 
 NO_BUILD=		# defined
diff --git a/mail/anomy-sanitizer/Makefile b/mail/anomy-sanitizer/Makefile
index c8493c4e9ad..dec82068206 100644
--- a/mail/anomy-sanitizer/Makefile
+++ b/mail/anomy-sanitizer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.17 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.18 2005/07/16 01:19:12 jlam Exp $
 #
 
 DISTNAME=	anomy-sanitizer-1.69
@@ -18,7 +18,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 
 WRKSRC=		${WRKDIR}/anomy
 NO_CONFIGURE=	# defined
-USE_PERL5=	# defined
+USE_TOOLS+=	perl:run
 
 ANOMYLIB=	${PREFIX}/lib/anomy-sanitizer
 ANOMYDOC=	${PREFIX}/share/doc/anomy-sanitizer
diff --git a/mail/balsa2/Makefile b/mail/balsa2/Makefile
index f8810abcd0b..5baf5a5940a 100644
--- a/mail/balsa2/Makefile
+++ b/mail/balsa2/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/06/26 18:45:43 jmmv Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:12 jlam Exp $
 
 DISTNAME=	balsa-2.2.6
 PKGREVISION=	2
@@ -14,12 +14,11 @@ COMMENT=	GNOME2 EMail client
 BUILD_USES_MSGFMT=	yes
 
 USE_DIRS+=		gnome2-1.5
-USE_PERL5=		build
 USE_PKGINSTALL=		yes
 USE_LIBTOOL=		yes
 USE_PKGLOCALEDIR=	yes
 GNU_CONFIGURE=		yes
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl
 
 CONFIGURE_ARGS=		--with-gpgme=${BUILDLINK_PREFIX.gpgme}/bin/gpgme-config
 CONFIGURE_ARGS+=	--disable-more-warnings
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index 7a5b1cfe07b..04f36d7a034 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.40 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.41 2005/07/16 01:19:12 jlam Exp $
 
 DISTNAME=	courier-imap-4.0.2
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -12,11 +12,9 @@ HOMEPAGE=	http://www.courier-mta.org/imap/
 
 DEPENDS+=	courier-maildir>=0.48.2:../../mail/courier-maildir
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		env gmake perl
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_PERL5=		build
-USE_TOOLS+=		env
 
 .include "../../mail/courier-maildir/Makefile.common"
 
diff --git a/mail/courier-maildir/Makefile b/mail/courier-maildir/Makefile
index af06995adb0..a9f62114d38 100644
--- a/mail/courier-maildir/Makefile
+++ b/mail/courier-maildir/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/05/22 20:08:11 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:12 jlam Exp $
 
 DISTNAME=	courier-0.49.0
 PKGNAME=	${DISTNAME:S/-/-maildir-/}
@@ -13,9 +13,8 @@ HOMEPAGE=	http://www.courier-mta.org/
 
 CONFLICTS=	courier-maildirmake-[0-9]*
 
-USE_TOOLS+=		gmake
+USE_TOOLS+=		gmake perl:run
 USE_LANGUAGES=		c c++
-USE_PERL5=		yes
 PERL5_REQD+=		5.8.0
 
 .include "Makefile.common"
diff --git a/mail/distribute/Makefile b/mail/distribute/Makefile
index e024fb9ff1a..95ee687d724 100644
--- a/mail/distribute/Makefile
+++ b/mail/distribute/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.16 2005/03/24 21:12:55 wiz Exp $
+# $NetBSD: Makefile,v 1.17 2005/07/16 01:19:12 jlam Exp $
 
 DISTNAME=	distribute-2.1-pl19
 PKGNAME=	distribute-2.1.26
@@ -15,7 +15,7 @@ HOMEPAGE=	http://www.foretune.co.jp/people/shigeya/distribute/
 COMMENT=	Mail dispatcher for mailing list.  Fits nicely with majordomo
 
 WRKSRC=		${WRKDIR}/distribute-pl19
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 
 MAN1=		distribute.1
 DIST_SUBDIR=	distribute
diff --git a/mail/dspam/Makefile b/mail/dspam/Makefile
index 2b1682f2364..6462e6193bb 100644
--- a/mail/dspam/Makefile
+++ b/mail/dspam/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/06/15 16:26:36 xtraeme Exp $
+# $NetBSD: Makefile,v 1.35 2005/07/16 01:19:12 jlam Exp $
 
 DISTNAME=	dspam-3.4.8
 CATEGORIES=	mail
@@ -11,7 +11,7 @@ COMMENT=	Extremely scalable, statistical-hybrid anti-spam filter
 GNU_CONFIGURE=		yes
 USE_LIBTOOL=		yes
 
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 REPLACE_PERL=		tools/dspam_genaliases.in			\
 			tools/dspam_corpus.in				\
 			cgi/*.cgi cgi/configure.pl.in
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index 25bdfd36187..87dc6addb2e 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.58 2005/07/12 04:07:41 grant Exp $
+# $NetBSD: Makefile,v 1.59 2005/07/16 01:19:12 jlam Exp $
 
 DISTNAME=	exim-4.51
 CATEGORIES=	mail net
@@ -13,7 +13,7 @@ COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 
 CONFLICTS+=	exim-exiscan-[0-9]*
 
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 USE_PKGINSTALL=	yes
 
 MAKE_ENV+=	SSLBASE=${SSLBASE:Q}
diff --git a/mail/exim3/Makefile b/mail/exim3/Makefile
index 655e16e54e4..6b3c5b6d05d 100644
--- a/mail/exim3/Makefile
+++ b/mail/exim3/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/07/12 04:07:41 grant Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:12 jlam Exp $
 
 DISTNAME=	exim-3.36
 PKGREVISION=	4
@@ -13,7 +13,6 @@ COMMENT=	The Exim mail transfer agent, a replacement for sendmail
 
 CONFLICTS+=	exim-exiscan-[0-9]*
 
-USE_PERL5=	YES
 USE_PKGINSTALL=	YES
 
 BUILD_DEFS+=		EXIM_USER EXIM_GROUP
@@ -35,7 +34,7 @@ PKG_GROUPS=		${EXIM_GROUP}
 
 .include "../../mk/bsd.prefs.mk"
 
-USE_TOOLS+=		gzip gzcat
+USE_TOOLS+=		gzip gzcat perl:run
 FILES_SUBST+=		GZIP_CMD="${GZIP_CMD:C/^/_asdf_/1:M_asdf_*:S/^_asdf_//}"
 FILES_SUBST+=		GZCAT="${GZCAT}"
 
diff --git a/mail/fix-mime-charset/Makefile b/mail/fix-mime-charset/Makefile
index 95a1eaf7a78..1503e03be0d 100644
--- a/mail/fix-mime-charset/Makefile
+++ b/mail/fix-mime-charset/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/04/11 21:46:19 tv Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:12 jlam Exp $
 #
 
 DISTNAME=		fix-mime-charset-0.5.3
@@ -10,7 +10,7 @@ HOMEPAGE=		http://fix-mime-chr.sourceforge.net/
 COMMENT=		Correct MIME charset type in mail headers
 
 USE_PKGLOCALEDIR=	yes
-USE_PERL5=		build
+USE_TOOLS+=		perl
 GNU_CONFIGURE=		yes
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/fromto/Makefile b/mail/fromto/Makefile
index 9b067f3ba2d..c15437e479f 100644
--- a/mail/fromto/Makefile
+++ b/mail/fromto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.9 2005/07/16 01:19:12 jlam Exp $
 #
 
 DISTNAME=	fromto-1.5
@@ -12,7 +12,7 @@ COMMENT=	Sendmail logfile viewer
 RESTRICTED=	"Redistribution allowed for non-commercial purposes only"
 
 WRKSRC=		${WRKDIR}
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 
 INSTALLATION_DIRS=	bin
 
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index da858857cd9..2e88d368883 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2005/03/24 21:12:56 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2005/07/16 01:19:12 jlam Exp $
 
 DISTNAME=		mailagent-3.0.73
 CATEGORIES=		mail
@@ -7,7 +7,7 @@ MASTER_SITES=		${MASTER_SITE_PERL_CPAN:S/by-module/by-authors\/id\/RAM/g}
 MAINTAINER=		itojun@itojun.org
 COMMENT=		Sophisticated automatic mail-processing tool
 
-USE_PERL5=		# defined
+USE_TOOLS+=		perl:run
 
 NO_PACKAGE=		"Correct FQDN needs to be hardcoded"
 INTERACTIVE_STAGE=	configure
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index 9ace88c5770..86863743b6b 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.4 2005/07/16 01:19:13 jlam Exp $
 #
 
 DISTNAME=	mailgraph-1.10
@@ -10,14 +10,11 @@ MAINTAINER=	kim@tac.nyc.ny.us
 HOMEPAGE=	http://people.ee.ethz.ch/~dws/software/mailgraph/
 COMMENT=	RRDtool frontend for mail statistics
 
-USE_PKGINSTALL=	yes
-USE_PERL5=	yes
-
 DEPENDS+=	rrdtool-1*:../../databases/rrdtool
 DEPENDS+=	p5-File-Tail-[0-9]*:../../misc/p5-File-Tail
 
-USE_LANGUAGES=	yes
-USE_PERL5=	# defined
+USE_PKGINSTALL=	yes
+USE_TOOLS+=	perl:run
 
 .include "../../mk/bsd.prefs.mk"
 
@@ -62,5 +59,4 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/$i ${PREFIX}/${DOCDIR}/$i
 .endfor
 
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 097eb9e7627..91ac824bdf7 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2005/07/16 01:19:12 jlam Exp $
 #
 
 DISTNAME=		MailScanner-4.30.3-2
@@ -23,7 +23,7 @@ DEPENDS+=		p5-MIME-tools>=0:../../mail/p5-MIME-tools
 DEPENDS+=		tnef>=1.0:../../mail/tnef
 
 NO_BUILD=		YES
-USE_PERL5=		YES
+USE_TOOLS=		perl:run
 REPLACE_PERL=		bin/MailScanner
 
 DOCSDIR=		${LOCALBASE}/share/doc/MailScanner
diff --git a/mail/mailserv/Makefile b/mail/mailserv/Makefile
index 4b0b2e7bd3c..27a3f4960a9 100644
--- a/mail/mailserv/Makefile
+++ b/mail/mailserv/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2005/06/16 06:58:02 jlam Exp $
+# $NetBSD: Makefile,v 1.11 2005/07/16 01:19:12 jlam Exp $
 #
 
 DISTNAME=	mailserv
@@ -13,7 +13,7 @@ COMMENT=	WWW interface to several types of mailing list servers
 WRKSRC=		${WRKDIR}
 DIST_SUBDIR=	${PKGNAME_NOREV}
 
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 USE_PKGINSTALL=	YES
 NO_BUILD=	YES
 
diff --git a/mail/majordomo/Makefile b/mail/majordomo/Makefile
index 950cbd31959..e668be311a5 100644
--- a/mail/majordomo/Makefile
+++ b/mail/majordomo/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.18 2004/12/03 15:15:02 wiz Exp $
+# $NetBSD: Makefile,v 1.19 2005/07/16 01:19:13 jlam Exp $
 
 DISTNAME=		majordomo-1.94.5
 CATEGORIES=		mail
@@ -21,7 +21,7 @@ ADDUSER=		${LOCALBASE}/sbin/useradd
 ADDGROUP=		${LOCALBASE}/sbin/groupadd
 .endif
 
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 
 NO_BIN_ON_FTP=		requires compiled-in hardcoded uid/gid
 NO_BIN_ON_CDROM=	${NO_BIN_ON_FTP}
diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile
index 23e43206fce..4c88bf641ee 100644
--- a/mail/mb2md/Makefile
+++ b/mail/mb2md/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/06/16 06:58:03 jlam Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:12 jlam Exp $
 #
 
 DISTNAME=		mb2md-3.20.pl
@@ -15,7 +15,7 @@ DEPENDS+=		p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 
 WRKSRC=			${WRKDIR}
 
-USE_PERL5=		run
+USE_TOOLS+=		perl:run
 REPLACE_PERL=		${DISTNAME}
 
 NO_BUILD=		# defined
diff --git a/mail/mdfrm/Makefile b/mail/mdfrm/Makefile
index 14df5596dad..c8d476c2f43 100644
--- a/mail/mdfrm/Makefile
+++ b/mail/mdfrm/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:58:03 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:13 jlam Exp $
 #
 
 DISTNAME=	mdfrm.pl
@@ -15,7 +15,7 @@ DEPENDS+=       p5-TimeDate-[0-9]*:../../time/p5-TimeDate
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
 WRKSRC=		${WRKDIR}
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 NO_BUILD=	yes
 
 INSTALLATION_DIRS=	bin
diff --git a/mail/mhonarc/Makefile b/mail/mhonarc/Makefile
index ef47e83935d..3bea2340d2c 100644
--- a/mail/mhonarc/Makefile
+++ b/mail/mhonarc/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2005/05/27 11:41:03 adrianp Exp $
+# $NetBSD: Makefile,v 1.21 2005/07/16 01:19:13 jlam Exp $
 #
 
 DISTNAME=	MHonArc-2.6.11
@@ -11,8 +11,7 @@ MAINTAINER=	jwise@NetBSD.org
 HOMEPAGE=	http://www.mhonarc.org/
 COMMENT=	Mailbox to HTML converter, suitable for list archives
 
-USE_PERL5=	YES
-
+USE_TOOLS+=	perl:run
 NO_BUILD=	YES
 
 pre-install:
diff --git a/mail/mimedefang/Makefile b/mail/mimedefang/Makefile
index 42a0ca5e4b5..c467f1a36ce 100644
--- a/mail/mimedefang/Makefile
+++ b/mail/mimedefang/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.25 2005/06/20 10:20:45 markd Exp $
+# $NetBSD: Makefile,v 1.26 2005/07/16 01:19:13 jlam Exp $
 
 DISTNAME=		mimedefang-2.52
 PKGREVISION=		1
@@ -18,7 +18,7 @@ DEPENDS+=		p5-MIME-Base64>=2.11:../../converters/p5-MIME-Base64
 DEPENDS+=		p5-MIME-tools>=5.411.1:../../mail/p5-MIME-tools
 DEPENDS+=		spamassassin>=2.31:../../mail/spamassassin
 
-USE_PERL5=		YES
+USE_TOOLS+=		perl:run
 GNU_CONFIGURE=		YES
 PKG_SYSCONFSUBDIR?=	mimedefang
 
diff --git a/mail/mutt-devel/Makefile b/mail/mutt-devel/Makefile
index 6795c075e25..718ee7014f2 100644
--- a/mail/mutt-devel/Makefile
+++ b/mail/mutt-devel/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2005/05/29 05:09:55 minskim Exp $
+# $NetBSD: Makefile,v 1.32 2005/07/16 01:19:13 jlam Exp $
 
 DISTNAME=		mutt-1.5.6i
 PKGNAME=		${DISTNAME:C/i$//}
@@ -21,7 +21,7 @@ PKG_INSTALLATION_TYPES=	overwrite pkgviews
 WRKSRC=			${WRKDIR}/${DISTNAME:C/i$$//}
 BUILD_USES_MSGFMT=	yes
 USE_PKGLOCALEDIR=	yes
-USE_PERL5=		yes
+USE_TOOLS+=		perl:run
 REPLACE_PERL=		smime_keys */*.pl
 
 GNU_CONFIGURE=		yes
diff --git a/mail/poppy/Makefile b/mail/poppy/Makefile
index 59b08f3b0dc..6c9b07419bf 100644
--- a/mail/poppy/Makefile
+++ b/mail/poppy/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2005/06/16 06:58:03 jlam Exp $
+# $NetBSD: Makefile,v 1.7 2005/07/16 01:19:13 jlam Exp $
 #
 
 DISTNAME=	poppy-3.1
@@ -10,7 +10,7 @@ HOMEPAGE=	http://www.cnpbagwell.com/projects.html
 COMMENT=	Client to perform simple tasks with a POP3/IMAP server
 
 NO_BUILD=	YES
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	poppy
 
 INSTALLATION_DIRS=	bin man/man1
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index dd9104615a4..970f523b9a1 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2005/06/16 06:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.8 2005/07/16 01:19:13 jlam Exp $
 #
 
 DISTNAME=	postgrey-1.21
@@ -17,7 +17,7 @@ DEPENDS+=	p5-Net-Server-[0-9]*:../../net/p5-Net-Server
 
 NO_CONFIGURE=	yes
 USE_PKGINSTALL=	yes
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 
 .include "../../mk/bsd.prefs.mk"
 
diff --git a/mail/prayer/Makefile b/mail/prayer/Makefile
index d9939f21d77..d2de6a26658 100644
--- a/mail/prayer/Makefile
+++ b/mail/prayer/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.21 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.22 2005/07/16 01:19:13 jlam Exp $
 #
 
 DISTNAME=	prayer-1.0.12
@@ -10,8 +10,7 @@ HOMEPAGE=	http://www-uxsup.csx.cam.ac.uk/~dpc22/prayer/
 COMMENT=	Small, fast, web mail interface
 
 USE_PKGINSTALL=	yes
-USE_TOOLS+=	gmake
-USE_PERL5=	build
+USE_TOOLS+=	gmake perl
 PRAYER_USER=	prayer
 PRAYER_GROUP=	prayer
 PKG_GROUPS=	${PRAYER_GROUP}
@@ -47,7 +46,6 @@ post-patch:
 
 .include "../../databases/db4/buildlink3.mk"
 .include "../../devel/zlib/buildlink3.mk"
-.include "../../lang/perl5/buildlink3.mk"
 .include "../../mail/imap-uw/buildlink3.mk"
 .include "../../security/openssl/buildlink3.mk"
 
diff --git a/mail/qgreylist/Makefile b/mail/qgreylist/Makefile
index 0cb5493ed7e..37b8c252123 100644
--- a/mail/qgreylist/Makefile
+++ b/mail/qgreylist/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/04/11 21:46:23 tv Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:13 jlam Exp $
 #
 
 DISTNAME=		qgreylist-0.2
@@ -14,7 +14,7 @@ DEPENDS+=		${DEPENDS_QMAIL}
 
 WRKSRC=			${WRKDIR}/qgreylist
 
-USE_PERL5=		run
+USE_TOOLS+=		perl:run
 USE_PKGINSTALL=		yes
 OWN_DIRS_PERMS=		${PKG_SYSCONFDIR}/greylist qmaild wheel 0755
 NO_BUILD=		# defined
diff --git a/mail/qmHandle/Makefile b/mail/qmHandle/Makefile
index 4e5c92e6605..1d46217a9b6 100644
--- a/mail/qmHandle/Makefile
+++ b/mail/qmHandle/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2005/06/16 06:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.14 2005/07/16 01:19:13 jlam Exp $
 #
 
 DISTNAME=	qmhandle-1.2.0
@@ -12,7 +12,7 @@ HOMEPAGE=	http://qmhandle.sourceforge.net/
 COMMENT=	Tool to view and manage the qmail message queue
 
 WRKSRC=		${WRKDIR}
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	qmHandle
 NO_BUILD=	YES
 
diff --git a/mail/qmail-lint/Makefile b/mail/qmail-lint/Makefile
index acd9802ef30..2fae28da80a 100644
--- a/mail/qmail-lint/Makefile
+++ b/mail/qmail-lint/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2005/06/16 06:58:08 jlam Exp $
+# $NetBSD: Makefile,v 1.10 2005/07/16 01:19:13 jlam Exp $
 #
 
 DISTNAME=	qmail-lint-0.55
@@ -14,7 +14,7 @@ COMMENT=	Examine the qmail configuration for common errors
 EXTRACT_CMD=	${CP} ${DOWNLOADED_DISTFILE} ${WRKSRC}
 
 WRKSRC=		${WRKDIR}
-USE_PERL5=	yes
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	${DISTNAME}
 NO_BUILD=	yes
 
diff --git a/mail/sendmail/options.mk b/mail/sendmail/options.mk
index c330a4f0c93..ab83ca44633 100644
--- a/mail/sendmail/options.mk
+++ b/mail/sendmail/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.7 2005/07/02 01:12:52 tv Exp $
+# $NetBSD: options.mk,v 1.8 2005/07/16 01:19:13 jlam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.sendmail
 PKG_SUPPORTED_OPTIONS=	inet6 db2 db4 ldap sasl starttls tcpwrappers \
@@ -48,7 +48,7 @@ PKG_SUGGESTED_OPTIONS=	tcpwrappers
 ### Enable Sendmail SOCKETMAP support
 ###
 .if !empty(PKG_OPTIONS:Msocketmap)
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 REPLACE_PERL=	contrib/socketmapClient.pl contrib/socketmapServer.pl
 .endif
 
diff --git a/mail/sqwebmail/Makefile b/mail/sqwebmail/Makefile
index 24bdfdd6ed4..9757d36a95a 100644
--- a/mail/sqwebmail/Makefile
+++ b/mail/sqwebmail/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.34 2005/05/22 20:08:12 jlam Exp $
+# $NetBSD: Makefile,v 1.35 2005/07/16 01:19:13 jlam Exp $
 
 DISTNAME=	sqwebmail-5.0.1
 PKGBASE=	${DISTNAME:C/-[^-]*$//}
@@ -13,10 +13,9 @@ HOMEPAGE=	http://www.courier-mta.org/sqwebmail/
 DEPENDS+=	courier-maildir>=0.48.2:../../mail/courier-maildir
 DEPENDS+=	maildrop>=1.8.0:../../mail/maildrop
 
-USE_TOOLS+=		env gmake
+USE_TOOLS+=		env gmake perl:run
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_PERL5=		yes
 
 .include "../../mail/courier-maildir/Makefile.common"
 .include "../../security/courier-authlib/Makefile.common"
diff --git a/mail/turba/Makefile b/mail/turba/Makefile
index 22eea64c332..6d0f025f114 100644
--- a/mail/turba/Makefile
+++ b/mail/turba/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2005/05/09 16:15:06 minskim Exp $
+# $NetBSD: Makefile,v 1.3 2005/07/16 01:19:13 jlam Exp $
 
 DISTNAME=	turba-h3-${TURBAVER}
 PKGNAME=	turba-${TURBAVER}
@@ -19,7 +19,7 @@ HORDEDIR=	${PREFIX}/share/horde
 TURBADIR=	${HORDEDIR}/turba
 TURBAVER=	2.0.2
 PAXDIRS=	lib locale po scripts templates themes
-USE_PERL5=	YES
+USE_TOOLS+=	perl:run
 
 MESSAGE_SUBST+=	TURBADIR=${TURBADIR}
 MESSAGE_SUBST+=	PKG_SYSCONFDIR=${PKG_SYSCONFDIR}