19 files changed, 32 insertions, 19 deletions

diff --git a/mail/maildirsync/Makefile b/mail/maildirsync/Makefile
index ce4503b00ed1..dbe71f73f875 100644
--- a/mail/maildirsync/Makefile
+++ b/mail/maildirsync/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	GOOGLE_CODE
 MAINTAINER=	5u623l20@gmail.com
 COMMENT=	Online synchronizer for Maildir-format mailboxes
 
-USE_PERL5=	yes
+USES=		perl5
 
 MAN1=		maildirsync.1
 
diff --git a/mail/mailgraph/Makefile b/mail/mailgraph/Makefile
index 931e3e8a67e0..104ebe063a1a 100644
--- a/mail/mailgraph/Makefile
+++ b/mail/mailgraph/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	rrdtool>=0:${PORTSDIR}/databases/rrdtool	\
 		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
 
 NO_BUILD=	yes
-USE_PERL5=	yes
+USES=		perl5
 
 CGIDIR?=	${PREFIX}/www/cgi-bin
 DATADIR?=	/var/db/mailgraph
diff --git a/mail/p5-Mail-Cache/Makefile b/mail/p5-Mail-Cache/Makefile
index a6e2c78be449..cc5c19cf2225 100644
--- a/mail/p5-Mail-Cache/Makefile
+++ b/mail/p5-Mail-Cache/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Caches mail information
 BUILD_DEPENDS=	p5-File-BaseDir>=0:${PORTSDIR}/devel/p5-File-BaseDir \
 		p5-Email-Simple>=0:${PORTSDIR}/mail/p5-Email-Simple
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Mail::Cache.3
 
diff --git a/mail/p5-Mail-Ezmlm/Makefile b/mail/p5-Mail-Ezmlm/Makefile
index 82118106c96f..31c817303818 100644
--- a/mail/p5-Mail-Ezmlm/Makefile
+++ b/mail/p5-Mail-Ezmlm/Makefile
@@ -22,7 +22,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 EZMLM_DIR?=	${LOCALBASE}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .if defined(PACKAGE_BUILDING)
 CONFIGURE_ENV=	BSD_BATCH_INSTALL=yes
diff --git a/mail/p5-Mail-IMAPTalk-MailCache/Makefile b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
index e92a8b49d0c6..6dbfce929572 100644
--- a/mail/p5-Mail-IMAPTalk-MailCache/Makefile
+++ b/mail/p5-Mail-IMAPTalk-MailCache/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Caches mail information for Mail::IMAPTalk using Mail::Cache
 BUILD_DEPENDS=	p5-Mail-Cache>=0:${PORTSDIR}/mail/p5-Mail-Cache \
 		p5-Mail-IMAPTalk>=0:${PORTSDIR}/mail/p5-Mail-IMAPTalk
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Mail::IMAPTalk::MailCache.3
 
diff --git a/mail/p5-Mail-Spool/Makefile b/mail/p5-Mail-Spool/Makefile
index ba9ad1564725..6688026fa412 100644
--- a/mail/p5-Mail-Spool/Makefile
+++ b/mail/p5-Mail-Spool/Makefile
@@ -19,7 +19,8 @@ BUILD_DEPENDS=	p5-File-NFSLock>=0:${PORTSDIR}/devel/p5-File-NFSLock \
 		p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Mail::Spool.3 Mail::Spool::Handle.3 Mail::Spool::Node.3
 
diff --git a/mail/p5-Mail-Verp/Makefile b/mail/p5-Mail-Verp/Makefile
index c28d8347c0a5..46512c8d2bbb 100644
--- a/mail/p5-Mail-Verp/Makefile
+++ b/mail/p5-Mail-Verp/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vivek@khera.org
 COMMENT=	Encodes and decodes Variable Envelope Return Paths (VERP) addresses
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Mail::Verp.3
 
diff --git a/mail/p5-Net-SMTP-TLS/Makefile b/mail/p5-Net-SMTP-TLS/Makefile
index 9c30f5ed1712..fa8e888dbd94 100644
--- a/mail/p5-Net-SMTP-TLS/Makefile
+++ b/mail/p5-Net-SMTP-TLS/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-Digest-HMAC>=0:${PORTSDIR}/security/p5-Digest-HMAC \
 		p5-IO-Socket-SSL>=0:${PORTSDIR}/security/p5-IO-Socket-SSL \
 		p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Net::SMTP::TLS.3
 
diff --git a/mail/pronto/Makefile b/mail/pronto/Makefile
index f7b5e2caf775..23fd77303602 100644
--- a/mail/pronto/Makefile
+++ b/mail/pronto/Makefile
@@ -31,7 +31,7 @@ BUILD_DEPENDS+=	p5-Mysql>=0:${PORTSDIR}/databases/p5-Mysql
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
+USES=		perl5
 
 post-patch:
 	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
diff --git a/mail/squirrelmail-user_special_mailboxes-plugin/Makefile b/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
index d6b0e8e31ff1..5fb9f1de29d9 100644
--- a/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
+++ b/mail/squirrelmail-user_special_mailboxes-plugin/Makefile
@@ -11,7 +11,8 @@ MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Lets define folders to be displayed at the top of the folders list
 
 USE_SM_COMPAT=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 SQUIRREL_PLUGIN_NAME=	${PORTNAME:S/-/_/}
 
diff --git a/net-mgmt/mrtg-ping-probe/Makefile b/net-mgmt/mrtg-ping-probe/Makefile
index 40d76fe31285..2562381300aa 100644
--- a/net-mgmt/mrtg-ping-probe/Makefile
+++ b/net-mgmt/mrtg-ping-probe/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/mrtg:${PORTSDIR}/net-mgmt/mrtg
 
 FETCH_BEFORE_ARGS=	-p      # MASTER_SITE needs PASSIVE FTP.
 
-USE_PERL5=	YES
+USES=		perl5
 
 MAN1=		${PORTNAME}.1
 
diff --git a/net-mgmt/nagios-silfreed-plugins/Makefile b/net-mgmt/nagios-silfreed-plugins/Makefile
index 605287c6bcf3..e441ad44de7e 100644
--- a/net-mgmt/nagios-silfreed-plugins/Makefile
+++ b/net-mgmt/nagios-silfreed-plugins/Makefile
@@ -33,7 +33,7 @@ RUN_DEPENDS+=	\
 	${LOCALBASE}/bin/expect:${PORTSDIR}/lang/expect
 .endif
 
-USE_PERL5=	yes
+USES=		perl5
 NO_WRKSUBDIR=	yes
 
 NAGIOS_PLUGIN_DIR=	${PREFIX}/libexec/nagios
diff --git a/net-mgmt/nagios-snmp-plugins-extras/Makefile b/net-mgmt/nagios-snmp-plugins-extras/Makefile
index 88ec664c044c..d493b6e128b5 100644
--- a/net-mgmt/nagios-snmp-plugins-extras/Makefile
+++ b/net-mgmt/nagios-snmp-plugins-extras/Makefile
@@ -15,7 +15,8 @@ MAINTAINER=	alexey@renatasystems.org
 COMMENT=	A set of Nagios plugins written in Perl to check devices with SNMP
 
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 RUN_DEPENDS+=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
 		${LOCALBASE}/libexec/nagios/utils.pm:${PORTSDIR}/net-mgmt/nagios-plugins
diff --git a/net-mgmt/nagios-spamd-plugin/Makefile b/net-mgmt/nagios-spamd-plugin/Makefile
index 5e75e83cba5b..64d570cb95aa 100644
--- a/net-mgmt/nagios-spamd-plugin/Makefile
+++ b/net-mgmt/nagios-spamd-plugin/Makefile
@@ -17,7 +17,7 @@ COMMENT=	Nagios plugin for checking SpamAssassins spamd
 
 RUN_DEPENDS+=	${LOCALBASE}/${NAGIOS_PLUGIN_DIR}/utils.pm:${PORTSDIR}/net-mgmt/nagios-plugins
 
-USE_PERL5=	yes
+USES=		perl5
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_FILES=	${NAGIOS_PLUGIN_DIR}/check_spamd.pl
diff --git a/net-mgmt/p5-Nagios-Object/Makefile b/net-mgmt/p5-Nagios-Object/Makefile
index 11815395211c..6c8248f44d9e 100644
--- a/net-mgmt/p5-Nagios-Object/Makefile
+++ b/net-mgmt/p5-Nagios-Object/Makefile
@@ -23,7 +23,8 @@ BUILD_DEPENDS=	p5-Test-Exception>=0.31:${PORTSDIR}/devel/p5-Test-Exception \
 		p5-Test-NoWarnings>=1.01:${PORTSDIR}/devel/p5-Test-NoWarnings
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN1=		parse.pl.1 \
 		config_status_demo.pl.1 \
diff --git a/net-mgmt/p5-Net-NSCA-Client/Makefile b/net-mgmt/p5-Net-NSCA-Client/Makefile
index 8e532348fb6f..68beec7357b3 100644
--- a/net-mgmt/p5-Net-NSCA-Client/Makefile
+++ b/net-mgmt/p5-Net-NSCA-Client/Makefile
@@ -40,7 +40,8 @@ TEST_DEPENDS=	p5-Test-Class>=0.37:${PORTSDIR}/devel/p5-Test-Class \
 		p5-Test-Requires>=0.06:${PORTSDIR}/devel/p5-Test-Requires \
 		p5-Test-TCP>=1.17:${PORTSDIR}/devel/p5-Test-TCP
 		
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Net::NSCA::Client.3 \
 		Net::NSCA::Client::DataPacket.3 \
diff --git a/net-mgmt/p5-NetApp/Makefile b/net-mgmt/p5-NetApp/Makefile
index 7e5d1f1675fa..5f985b63a10b 100644
--- a/net-mgmt/p5-NetApp/Makefile
+++ b/net-mgmt/p5-NetApp/Makefile
@@ -26,7 +26,8 @@ RUN_DEPENDS=	p5-IPC-Cmd>=0:${PORTSDIR}/devel/p5-IPC-Cmd \
 		p5-Clone>=0:${PORTSDIR}/devel/p5-Clone
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		NetApp::Aggregate.3 \
 		NetApp::Aggregate::Plex.3 \
diff --git a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
index ea0063aa1abb..b85abaf10ba5 100644
--- a/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
+++ b/net-mgmt/p5-SNMP-MIB-Compiler/Makefile
@@ -16,7 +16,8 @@ COMMENT=	A Perl MIB compiler supporting both SMIv1 and SMIv2
 
 BUILD_DEPENDS=	p5-Data-Compare>=0:${PORTSDIR}/devel/p5-Data-Compare
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		SNMP::MIB::Compiler.3 \
 		Bundle::SNMP::MIB::Compiler.3
diff --git a/net-mgmt/p5-Xymon-Server/Makefile b/net-mgmt/p5-Xymon-Server/Makefile
index f4ef3a5d6708..1fb7634b404c 100644
--- a/net-mgmt/p5-Xymon-Server/Makefile
+++ b/net-mgmt/p5-Xymon-Server/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	gslin@gslin.org
 COMMENT=	Xymon Server Interface
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Xymon::Server.3