19 files changed, 25 insertions, 28 deletions

diff --git a/mail/bsmtp/Makefile b/mail/bsmtp/Makefile
index fa6b47cc46eb..db54bc589bbb 100644
--- a/mail/bsmtp/Makefile
+++ b/mail/bsmtp/Makefile
@@ -12,8 +12,7 @@ COMMENT=	Batch SMTP support for sendmail, incoming and outgoing
 
 CONFLICTS=	smail-3.*
 
-USES=		shebangfix
-USE_PERL5=	yes
+USES=		shebangfix perl5
 WRKSRC=		${WRKDIR}/${PORTNAME}
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--redo
diff --git a/mail/courier/Makefile b/mail/courier/Makefile
index ccac5c177cf5..d56d59ff21e1 100644
--- a/mail/courier/Makefile
+++ b/mail/courier/Makefile
@@ -62,10 +62,8 @@ AUTOMAKE_ARGS=	--add-missing
 USE_BZIP2=	yes
 USE_GCC=	any
 USE_FAM=	yes
-USES=		gettext pkgconfig
-USE_GMAKE=	yes
+USES=		gettext pkgconfig gmake perl5
 USE_OPENSSL=	yes
-USE_PERL5=	yes
 USE_SUBMAKE=	yes
 
 USE_RC_SUBR=	courier
diff --git a/mail/cyrus-imapd22/Makefile b/mail/cyrus-imapd22/Makefile
index 175cb7d35238..341d669aa7a8 100644
--- a/mail/cyrus-imapd22/Makefile
+++ b/mail/cyrus-imapd22/Makefile
@@ -20,8 +20,8 @@ LATEST_LINK=	${PORTNAME}22
 PERLMAN=	${SITE_PERL_REL:S/site_perl\///}
 
 USE_RC_SUBR=	imapd
+USES=		perl5
 USE_OPENSSL=	yes
-USE_PERL5=	yes
 USE_BDB=	yes
 INVALID_BDB_VER=2 45+
 GNU_CONFIGURE=	yes
diff --git a/mail/extmail/Makefile b/mail/extmail/Makefile
index 9973f1743704..2962a80c0c4c 100644
--- a/mail/extmail/Makefile
+++ b/mail/extmail/Makefile
@@ -13,7 +13,7 @@ COMMENT=	A high performance webmail system
 
 RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog
 
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=	MYSQL LDAP
diff --git a/mail/extman/Makefile b/mail/extman/Makefile
index 42658bb75aa5..c040e6f483ff 100644
--- a/mail/extman/Makefile
+++ b/mail/extman/Makefile
@@ -13,7 +13,7 @@ COMMENT=	Web interface to manage Virtual Accounts
 
 RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 OPTIONS_DEFINE=		MYSQL LDAP
diff --git a/mail/lbdb/Makefile b/mail/lbdb/Makefile
index 1cae65f6a444..ba5f6bc5e5b9 100644
--- a/mail/lbdb/Makefile
+++ b/mail/lbdb/Makefile
@@ -22,8 +22,7 @@ WRKSRC=		${WRKDIR}/lbdb-${PORTVERSION}
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--prefix=${PREFIX} --sysconfdir=${PREFIX}/etc \
 			--libdir=${PREFIX}/libexec --enable-lbdb-dotlock
-USE_GMAKE=	yes
-USE_PERL5=	yes
+USES=		gmake perl5
 
 .include <bsd.port.options.mk>
 
diff --git a/mail/mailscanner/Makefile b/mail/mailscanner/Makefile
index 551158dee933..7d83c919da78 100644
--- a/mail/mailscanner/Makefile
+++ b/mail/mailscanner/Makefile
@@ -40,7 +40,7 @@ CONFLICTS=	MailScanner-devel-[0-9]*
 
 PATCHLEVEL=	2
 
-USE_PERL5=	yes
+USES=		perl5
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-install-${PORTVERSION}
 SUB_FILES=	MailScanner.8 pkg-message pkg-install pkg-deinstall
diff --git a/mail/p5-FuzzyOcr-devel/Makefile b/mail/p5-FuzzyOcr-devel/Makefile
index 047e00616fe6..4ba6f4e0860e 100644
--- a/mail/p5-FuzzyOcr-devel/Makefile
+++ b/mail/p5-FuzzyOcr-devel/Makefile
@@ -27,7 +27,7 @@ RUN_DEPENDS=	giftopnm:${PORTSDIR}/graphics/netpbm			\
 		p5-MLDBM-Sync>=0:${PORTSDIR}/databases/p5-MLDBM-Sync \
 		p5-String-Approx>=0:${PORTSDIR}/devel/p5-String-Approx
 
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/mail/postfix-current/Makefile b/mail/postfix-current/Makefile
index 654c0e19fb08..d2b5422a2c08 100644
--- a/mail/postfix-current/Makefile
+++ b/mail/postfix-current/Makefile
@@ -27,8 +27,9 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.* postfix-base-2.* \
 
 USERS=		postfix
 GROUPS=		mail maildrop postfix
+USES=		perl5
+USE_PERL5=	build
 USE_SUBMAKE=	yes
-USE_PERL5_BUILD=yes
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_DEFINE=	PCRE SASL2 TLS BDB MYSQL PGSQL SQLITE OPENLDAP LDAP_SASL \
diff --git a/mail/postfix-policyd-weight/Makefile b/mail/postfix-policyd-weight/Makefile
index 225faf7c7df9..78214c2d8968 100644
--- a/mail/postfix-policyd-weight/Makefile
+++ b/mail/postfix-policyd-weight/Makefile
@@ -22,7 +22,7 @@ USERS=		polw
 GROUPS=		polw
 
 USE_RC_SUBR+=	policyd-weight
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 MAN8+=	policyd-weight.8
diff --git a/mail/postfix-postfwd/Makefile b/mail/postfix-postfwd/Makefile
index 101f13d6ff32..d5749564d7a9 100644
--- a/mail/postfix-postfwd/Makefile
+++ b/mail/postfix-postfwd/Makefile
@@ -28,7 +28,8 @@ PLIST_FILES=	bin/${PORTNAME} etc/${PORTNAME}.conf.sample
 SUB_FILES=	pkg-message
 
 USE_RC_SUBR=	${PORTNAME}
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 MAN8=		${PORTNAME}.8 ${PORTNAME}2.8
diff --git a/mail/postfix27/Makefile b/mail/postfix27/Makefile
index 6a4dbd1f4120..41faf6b71887 100644
--- a/mail/postfix27/Makefile
+++ b/mail/postfix27/Makefile
@@ -30,8 +30,9 @@ CONFLICTS=	courier-0.* postfix-1.* postfix-2.[0-689].* postfix-base-2.[0-689].*
 USERS=		postfix
 GROUPS=		mail maildrop postfix
 NO_LATEST_LINK=	yes
+USES=		perl5
+USE_PERL5=	build
 USE_SUBMAKE=	yes
-USE_PERL5_BUILD=yes
 SCRIPTS_ENV+=	POSTFIX_DEFAULT_MTA="${POSTFIX_DEFAULT_MTA}"
 
 OPTIONS_DEFINE=	PCRE SASL2 TLS BDB MYSQL PGSQL OPENLDAP CDB NIS VDA TEST SPF INST_BASE
diff --git a/mail/postgrey/Makefile b/mail/postgrey/Makefile
index 05971c23b3f1..bb744c8f8504 100644
--- a/mail/postgrey/Makefile
+++ b/mail/postgrey/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	p5-Net-Server>=0:${PORTSDIR}/net/p5-Net-Server \
 		p5-BerkeleyDB>=0:${PORTSDIR}/databases/p5-BerkeleyDB \
 		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 USE_RC_SUBR=	${PORTNAME}
 NO_BUILD=	yes
 POD2MAN?=	pod2man
@@ -36,7 +36,7 @@ USERS=		${PGY_USERNAME}
 GROUPS=		${PGY_GROUPNAME}
 MAN1=		${PORTNAME}.1 policy-test.1 postgreyreport.1
 
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	${WRKSRC}/postgrey
 
 .include <bsd.port.options.mk>
diff --git a/mail/sieve-connect/Makefile b/mail/sieve-connect/Makefile
index 42e1e1bee08b..2ab90165b460 100644
--- a/mail/sieve-connect/Makefile
+++ b/mail/sieve-connect/Makefile
@@ -23,8 +23,8 @@ RUN_DEPENDS=	p5-Authen-SASL>=0:${PORTSDIR}/security/p5-Authen-SASL \
 		p5-ReadLine-Gnu>=0:${PORTSDIR}/devel/p5-ReadLine-Gnu \
 		p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
 
+USES=		perl5
 USE_BZIP2=	yes
-USE_PERL5=	yes
 PLIST_FILES=	bin/sieve-connect
 
 MAN1=		sieve-connect.1
diff --git a/mail/spamstats/Makefile b/mail/spamstats/Makefile
index fa4bfab53b54..298c1a233e46 100644
--- a/mail/spamstats/Makefile
+++ b/mail/spamstats/Makefile
@@ -15,11 +15,10 @@ COMMENT=	A tool to generate statistics for spamd of Mail::SpamAssassin
 RUN_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-Compress-Bzip2>=2.08:${PORTSDIR}/archivers/p5-Compress-Bzip2
 
-USE_PERL5=	yes
 NO_BUILD=	yes
 PORTDOCS=	QUICK README copyright
 PLIST_FILES=	bin/spamstats.pl
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	${PORTNAME}${PORTVERSION}.pl
 
 post-patch:
diff --git a/mail/sympa/Makefile b/mail/sympa/Makefile
index d90b2d9bde30..5c78f3444b6f 100644
--- a/mail/sympa/Makefile
+++ b/mail/sympa/Makefile
@@ -42,8 +42,8 @@ PORTSCOUT=	limit:^[0-9]+(\.[0-9]+)*$$
 
 USERS=		sympa
 GROUPS=		sympa
+USES=		perl5
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
 ICONSDIR?=	www/icons
 CONFIGURE_ARGS+=--bindir=${PREFIX}/libexec/${PORTNAME}	\
 		--libexecdir=${PREFIX}/libexec/${PORTNAME} \
diff --git a/mail/vmailmgr/Makefile b/mail/vmailmgr/Makefile
index a48e3821504c..74cda3f3ca3e 100644
--- a/mail/vmailmgr/Makefile
+++ b/mail/vmailmgr/Makefile
@@ -20,10 +20,10 @@ MAN7=	vmailmgr.7
 MAN8=	vmailmgrd.8
 
 # get python paths (PYTHON_SITELIBDIR) in case we install the python API
-USE_GMAKE=			yes
+USES=			gmake perl5
 USE_AUTOTOOLS=		autoconf autoheader automake aclocal
-USE_PYTHON=			yes
-USE_PERL5_BUILD=	yes
+USE_PYTHON=		yes
+USE_PERL5=		build
 AUTOMAKE_ARGS+=		--add-missing -Wno-portability
 
 OPTIONS_DEFINE=		PYTHONLIBS
diff --git a/net-mgmt/circe/Makefile b/net-mgmt/circe/Makefile
index 70ab48ab7db9..a5a5a905c7a7 100644
--- a/net-mgmt/circe/Makefile
+++ b/net-mgmt/circe/Makefile
@@ -24,7 +24,7 @@ RUN_DEPENDS=	p5-Net-IP-Match-XS>=0:${PORTSDIR}/net-mgmt/p5-Net-IP-Match-XS \
 		p5-Crypt-CBC>=0:${PORTSDIR}/security/p5-Crypt-CBC \
 		p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
 
-USE_PERL5=	yes
+USES=		perl5
 
 DIST_SUBDIR=	${PORTNAME}
 WRKSRC=		${WRKDIR}
diff --git a/net-mgmt/netdot/Makefile b/net-mgmt/netdot/Makefile
index ccc0e997633e..a286fc25a2d3 100644
--- a/net-mgmt/netdot/Makefile
+++ b/net-mgmt/netdot/Makefile
@@ -44,9 +44,8 @@ RUN_DEPENDS=	p5-libapreq2>=0:${PORTSDIR}/www/p5-libapreq2 \
 		rrdtool:${PORTSDIR}/databases/rrdtool \
 		netdisco-mibs>=0:${PORTSDIR}/net-mgmt/netdisco-mibs
 
+USES=		gmake perl5
 NO_BUILD=	yes
-USE_PERL5=	yes
-USE_GMAKE=	yes
 USE_MYSQL=	yes
 
 SUB_FILES=	pkg-message pkg-install