19 files changed, 34 insertions, 19 deletions

diff --git a/sysutils/fanout/Makefile b/sysutils/fanout/Makefile
index f984b9a8e575..a2d899c7a6ad 100644
--- a/sysutils/fanout/Makefile
+++ b/sysutils/fanout/Makefile
@@ -11,7 +11,8 @@ MASTER_SITES=	http://www.stearns.org/fanout/ \
 MAINTAINER=	jmohacsi@bsd.hu
 COMMENT=	Tool to run commands on multiple machines
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 PLIST_FILES=	bin/fanout bin/fanterm bin/fanmux
 .if !defined(NOPORTDOCS)
diff --git a/sysutils/fcron/Makefile b/sysutils/fcron/Makefile
index eee0d3eeed4f..e5176f352537 100644
--- a/sysutils/fcron/Makefile
+++ b/sysutils/fcron/Makefile
@@ -21,7 +21,8 @@ COMMENT=	A periodic command scheduler
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USES=		perl5
+USE_PERL5=	build
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --localstatedir=/var \
 		--with-cflags="${CFLAGS}" \
 		--with-rootname=root --with-rootgroup=wheel \
diff --git a/sysutils/gather/Makefile b/sysutils/gather/Makefile
index 3fe877efd75f..41656a33beb3 100644
--- a/sysutils/gather/Makefile
+++ b/sysutils/gather/Makefile
@@ -17,7 +17,7 @@ LICENSE=	BSD
 
 PROJECTHOST=	gatherit
 
-USE_PERL5=	yes
+USES=		perl5
 
 CONFLICTS_INSTALL=	harvest-[0-9]*
 
diff --git a/sysutils/geteltorito/Makefile b/sysutils/geteltorito/Makefile
index 84ec7b55d381..e4c6a54c1d9e 100644
--- a/sysutils/geteltorito/Makefile
+++ b/sysutils/geteltorito/Makefile
@@ -16,7 +16,8 @@ MAINTAINER=	valerio.daelli@gmail.com
 COMMENT=	El Torito image extractor
 
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/sysutils/jps/Makefile b/sysutils/jps/Makefile
index ef2778fe57d5..e15c7d1bd605 100644
--- a/sysutils/jps/Makefile
+++ b/sysutils/jps/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 MAN1=		jps.1
 MANCOMPRESSED=	yes
-USE_PERL5=	yes
+USES=		perl5
 PLIST_FILES=	bin/jps
 
 .include <bsd.port.mk>
diff --git a/sysutils/lmon/Makefile b/sysutils/lmon/Makefile
index 73fe10b78af2..e98ad6a9282d 100644
--- a/sysutils/lmon/Makefile
+++ b/sysutils/lmon/Makefile
@@ -19,7 +19,7 @@ RUN_DEPENDS=	p5-Config-IniFiles>=0:${PORTSDIR}/devel/p5-Config-IniFiles \
 		p5-File-Tail>=0:${PORTSDIR}/devel/p5-File-Tail
 
 NO_BUILD=	yes
-USE_PERL5=	yes
+USES=		perl5
 
 do-install:
 	${INSTALL} -d -m 0755 ${PREFIX}/${PORTNAME}
diff --git a/sysutils/monkeytail/Makefile b/sysutils/monkeytail/Makefile
index 5305b3e18564..718e0ee350ee 100644
--- a/sysutils/monkeytail/Makefile
+++ b/sysutils/monkeytail/Makefile
@@ -14,7 +14,8 @@ COMMENT=	A multi-file tail on both local and remote hosts
 RUN_DEPENDS=	p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General \
 		p5-Getopt-Declare>=0:${PORTSDIR}/devel/p5-Getopt-Declare
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 NO_BUILD=	yes
 
diff --git a/sysutils/p5-BSD-Jail-Object/Makefile b/sysutils/p5-BSD-Jail-Object/Makefile
index e9b012719dd2..cc27dd8d11bc 100644
--- a/sysutils/p5-BSD-Jail-Object/Makefile
+++ b/sysutils/p5-BSD-Jail-Object/Makefile
@@ -15,7 +15,8 @@ BUILD_DEPENDS=	p5-Inline>=0:${PORTSDIR}/devel/p5-Inline
 
 MAKE_JOBS_UNSAFE=	yes
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		BSD::Jail::Object.3
 
diff --git a/sysutils/p5-File-Log/Makefile b/sysutils/p5-File-Log/Makefile
index bfd0ea6d9a97..d11c92803b0a 100644
--- a/sysutils/p5-File-Log/Makefile
+++ b/sysutils/p5-File-Log/Makefile
@@ -13,7 +13,8 @@ PKGNAMEPREFIX=		p5-
 MAINTAINER=		tj@FreeBSD.org
 COMMENT=		A simple Object Orientated Logger
 
-PERL_CONFIGURE=		yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=			File::Log.3
 
diff --git a/sysutils/p5-File-Signature/Makefile b/sysutils/p5-File-Signature/Makefile
index 335477cdb7b5..4937293b056f 100644
--- a/sysutils/p5-File-Signature/Makefile
+++ b/sysutils/p5-File-Signature/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	culot@FreeBSD.org
 COMMENT=	Detect changes to a file's content or attributes
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		File::Signature.3
 
diff --git a/sysutils/p5-File-Stat-ModeString/Makefile b/sysutils/p5-File-Stat-ModeString/Makefile
index b316438ea2cf..c14cb6c11022 100644
--- a/sysutils/p5-File-Stat-ModeString/Makefile
+++ b/sysutils/p5-File-Stat-ModeString/Makefile
@@ -20,7 +20,8 @@ LICENSE=	GPLv2
 BUILD_DEPENDS=	p5-File-Stat-Bits>0:${PORTSDIR}/sysutils/p5-File-Stat-Bits
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		File::Stat::ModeString.3
 
diff --git a/sysutils/p5-File-Tee/Makefile b/sysutils/p5-File-Tee/Makefile
index 41785917c383..2c5443a034db 100644
--- a/sysutils/p5-File-Tee/Makefile
+++ b/sysutils/p5-File-Tee/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kostjnspb@yandex.ru
 COMMENT=	Replicate data sent to a Perl stream
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	File::Tee.3
 
diff --git a/sysutils/p5-Filesys-Statvfs/Makefile b/sysutils/p5-Filesys-Statvfs/Makefile
index d2924d7b365c..76b29953644b 100644
--- a/sysutils/p5-Filesys-Statvfs/Makefile
+++ b/sysutils/p5-Filesys-Statvfs/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	pirzyk@FreeBSD.org
 COMMENT=	Perl extension for statvfs() and fstatvfs()
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Filesys::Statvfs.3
 
diff --git a/sysutils/p5-Fuse-Simple/Makefile b/sysutils/p5-Fuse-Simple/Makefile
index 33d93cbc139d..a2da0be80f83 100644
--- a/sysutils/p5-Fuse-Simple/Makefile
+++ b/sysutils/p5-Fuse-Simple/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Simple way to write filesystems in Perl using FUSE
 
 RUN_DEPENDS=	p5-Fuse>=0:${PORTSDIR}/sysutils/p5-Fuse
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Fuse::Simple.3
 
diff --git a/sysutils/p5-Sys-Filesystem/Makefile b/sysutils/p5-Sys-Filesystem/Makefile
index c82155ad5960..0b04f4b9e1c1 100644
--- a/sysutils/p5-Sys-Filesystem/Makefile
+++ b/sysutils/p5-Sys-Filesystem/Makefile
@@ -18,7 +18,8 @@ COMMENT=	Perl module to Retrieve list of filesystems and their properties
 RUN_DEPENDS=	p5-Params-Util>=1.0:${PORTSDIR}/devel/p5-Params-Util
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN3=		Sys::Filesystem::Mswin32.3 \
 		Sys::Filesystem.3 \
diff --git a/sysutils/p5-Sys-Hostname-Long/Makefile b/sysutils/p5-Sys-Hostname-Long/Makefile
index eeadeb16c5fd..0c5a9e405b23 100644
--- a/sysutils/p5-Sys-Hostname-Long/Makefile
+++ b/sysutils/p5-Sys-Hostname-Long/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	tdb@FreeBSD.org
 COMMENT=	Try every conceivable way to get full hostname
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Sys::Hostname::Long.3
 
diff --git a/sysutils/p5-Unix-Processors/Makefile b/sysutils/p5-Unix-Processors/Makefile
index 85cbd6329eb1..43f563621dbb 100644
--- a/sysutils/p5-Unix-Processors/Makefile
+++ b/sysutils/p5-Unix-Processors/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	jadawin@FreeBSD.org
 COMMENT=	Interface to processor (CPU) information
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Unix::Processors.3 Unix::Processors::Info.3
 
diff --git a/sysutils/vlogger/Makefile b/sysutils/vlogger/Makefile
index 7724b26fca76..6e2543ee5534 100644
--- a/sysutils/vlogger/Makefile
+++ b/sysutils/vlogger/Makefile
@@ -17,7 +17,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
 
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 MAN1=		${PORTNAME}.1
diff --git a/sysutils/zetaback/Makefile b/sysutils/zetaback/Makefile
index 6163ebcb8d7c..54f0f91ee37b 100644
--- a/sysutils/zetaback/Makefile
+++ b/sysutils/zetaback/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES=	https://labs.omniti.com/zetaback/tags/1.0/
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Zetaback ZFS backup and recovery management system
 
-USE_PERL5_RUN=	YES
+USES=		perl5
+USE_PERL5=	run
 GNU_CONFIGURE=	yes
 USE_AUTOTOOLS=	autoconf