16 files changed, 26 insertions, 23 deletions

diff --git a/sysutils/boxbackup-devel/Makefile b/sysutils/boxbackup-devel/Makefile
index 1001b5df87c4..e340110a96d3 100644
--- a/sysutils/boxbackup-devel/Makefile
+++ b/sysutils/boxbackup-devel/Makefile
@@ -21,9 +21,9 @@ SVNVERSION=	0.11_trunk_2979
 
 NO_LATEST_LINK=	yes
 
+USES=		perl5
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
 USE_AUTOTOOLS=	autoconf aclocal autoheader
 ACLOCAL_ARGS+=	-I ${WRKSRC}/infrastructure/m4
 
diff --git a/sysutils/busybox/Makefile b/sysutils/busybox/Makefile
index 8236f06c091c..83da38b53d95 100644
--- a/sysutils/busybox/Makefile
+++ b/sysutils/busybox/Makefile
@@ -20,8 +20,8 @@ BUILD_DEPENDS=	gsed:${PORTSDIR}/textproc/gsed
 CONFLICTS_INSTALL=	busybox-unstable-*
 
 MAKE_ARGS+=	SKIP_STRIP=y CC="${CC}" HOSTCC="${CC}" CXX="${CXX}" HOSTCXX="${CXX}"
+USES=		gmake
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 # avoid clang, breaks in findutils/find.c l. 752+,
 # uses a GCC extension/invalid C code:
 USE_GCC?=	4.2+
@@ -31,7 +31,8 @@ PLIST_FILES=	bin/busybox
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MDOCS}
-USE_PERL5_BUILD=	yes
+USES+=		perl5
+USE_PERL5=	build
 PORTDOCS=		*
 .endif
 
diff --git a/sysutils/cvsweb-converters/Makefile b/sysutils/cvsweb-converters/Makefile
index aee07ab6e2b8..91e3c61edb8b 100644
--- a/sysutils/cvsweb-converters/Makefile
+++ b/sysutils/cvsweb-converters/Makefile
@@ -20,9 +20,9 @@ RUN_DEPENDS=	p5-URI>=0:${PORTSDIR}/net/p5-URI \
 		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
+USES=		perl5
 NO_BUILD=	yes
 USE_BZIP2=	yes
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 
 PLIST_FILES=	bin/commitlog2cvsweb bin/cvsrdiff2cvsweb \
diff --git a/sysutils/gcombust/Makefile b/sysutils/gcombust/Makefile
index bbc24735e13a..fd21d275db09 100644
--- a/sysutils/gcombust/Makefile
+++ b/sysutils/gcombust/Makefile
@@ -16,8 +16,8 @@ LICENSE=	GPLv2
 RUN_DEPENDS=	cdlabelgen:${PORTSDIR}/print/cdlabelgen \
 		cdrecord:${PORTSDIR}/sysutils/cdrtools
 
-USES=		gettext
-USE_PERL5_BUILD=yes
+USES=		gettext perl5
+USE_PERL5=	build
 USE_GNOME=	gtk12 gnomehier
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=--without-included-gettext --datadir=${PREFIX}/share
diff --git a/sysutils/hploscripts/Makefile b/sysutils/hploscripts/Makefile
index 0ff738b6483e..95ef3ad5b23d 100644
--- a/sysutils/hploscripts/Makefile
+++ b/sysutils/hploscripts/Makefile
@@ -13,10 +13,8 @@ COMMENT=	HP Lights-Out management perl scripts
 BUILD_DEPENDS=	p5-IO-Socket-SSL>=1.19:${PORTSDIR}/security/p5-IO-Socket-SSL
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USES=		shebangfix
-USE_PERL5=	yes
+USES=		shebangfix perl5
 NO_BUILD=	yes
-
 SHEBANG_FILES=	locfg.pl
 
 PORTDOCS=	iLO_perl_xml.pdf linux-LOsamplescripts.txt
diff --git a/sysutils/jailadmin/Makefile b/sysutils/jailadmin/Makefile
index 489cb6860b41..c65d4660e174 100644
--- a/sysutils/jailadmin/Makefile
+++ b/sysutils/jailadmin/Makefile
@@ -15,7 +15,7 @@ DISTNAME=	jailadmin-${PORTVERSION}
 MAINTAINER=	kirk@strauser.com
 COMMENT=	A system for managing a set of named jails
 
-USE_PERL5=	yes
+USES=		perl5
 
 PORTDOCS=	INSTALL README
 
diff --git a/sysutils/ldap-account-manager/Makefile b/sysutils/ldap-account-manager/Makefile
index 8bc4dae2627c..a9e4743edaa4 100644
--- a/sysutils/ldap-account-manager/Makefile
+++ b/sysutils/ldap-account-manager/Makefile
@@ -14,8 +14,7 @@ RUN_DEPENDS=	p5-Quota>=0:${PORTSDIR}/sysutils/p5-Quota \
 		p5-perl-ldap>=0:${PORTSDIR}/net/p5-perl-ldap
 
 NO_BUILD=	yes
-USES=		gettext
-USE_PERL5=	yes
+USES=		gettext perl5
 USE_PHP=	gettext hash iconv ldap mcrypt pcre session simplexml spl xml json zip
 WANT_PHP_WEB=	yes
 DEFAULT_PHP_VER=	5
diff --git a/sysutils/magicrescue/Makefile b/sysutils/magicrescue/Makefile
index edac1c5b2deb..0c4b9d894cf7 100644
--- a/sysutils/magicrescue/Makefile
+++ b/sysutils/magicrescue/Makefile
@@ -12,9 +12,10 @@ COMMENT=	File recovery tool which recovers deleted files from a block device
 
 LICENSE=	GPLv2
 
+USES=		perl5
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 
 MAN1=		dupemap.1 magicrescue.1 magicsort.1
 
diff --git a/sysutils/openipmi/Makefile b/sysutils/openipmi/Makefile
index a1f39fa4ce39..fb8712af973e 100644
--- a/sysutils/openipmi/Makefile
+++ b/sysutils/openipmi/Makefile
@@ -78,7 +78,7 @@ PLIST_SUB+=		TKINTER="@comment "
 
 .if ${PORT_OPTIONS:MPERL}
 WITH_SWIG=		yes
-USE_PERL5=		yes
+USES+=			perl5
 CONFIGURE_ARGS+=	--with-perl
 PLIST_SUB+=		PERL=""
 .else
diff --git a/sysutils/p5-Ubic/Makefile b/sysutils/p5-Ubic/Makefile
index d1db64676bdd..848872701535 100644
--- a/sysutils/p5-Ubic/Makefile
+++ b/sysutils/p5-Ubic/Makefile
@@ -29,7 +29,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 TEST_DEPENDS=	p5-Test-Class>=0:${PORTSDIR}/devel/p5-Test-Class \
 		p5-Test-Fatal>=0:${PORTSDIR}/devel/p5-Test-Fatal
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 REINPLACE_ARGS=	-i ''
 
 MAN1=		ubic.1 \
diff --git a/sysutils/parallel/Makefile b/sysutils/parallel/Makefile
index 885c309dc805..339c09e0ee63 100644
--- a/sysutils/parallel/Makefile
+++ b/sysutils/parallel/Makefile
@@ -16,9 +16,10 @@ OPTIONS_DEFINE=	DOCS
 CONFLICTS=	moreutils-parallel-[0-9]*
 
 CONFIGURE_ARGS=	--docdir="${DOCSDIR}"
+
+USES=		perl5
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_PERL5=	yes
 
 MAN1=		parallel.1 parallel_tutorial.1 sem.1 sql.1 niceload.1
 PLIST_FILES=	bin/parallel bin/sem bin/sql bin/niceload
diff --git a/sysutils/savelogs/Makefile b/sysutils/savelogs/Makefile
index fa33d815c5a0..b48e4151a44f 100644
--- a/sysutils/savelogs/Makefile
+++ b/sysutils/savelogs/Makefile
@@ -10,7 +10,8 @@ MASTER_SITE_SUBDIR=	CPAN:SCOTTW
 MAINTAINER=	danilogondolfo@gmail.com
 COMMENT=	Save log files in a nice way
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=		rotation.1 savelogs.1
 
diff --git a/sysutils/symon/Makefile b/sysutils/symon/Makefile
index 9c5ed8030e01..63036c25ff54 100644
--- a/sysutils/symon/Makefile
+++ b/sysutils/symon/Makefile
@@ -14,8 +14,8 @@ COMMENT=	Performance and information monitoring tool
 
 SUB_FILES=	pkg-message
 
-USE_PERL5_BUILD=	yes
-
+USES=		perl5
+USE_PERL5=	build
 MAKE_JOBS_UNSAFE=	yes
 
 # Synonym for WITHOUT_SYMUX
diff --git a/sysutils/torque/Makefile b/sysutils/torque/Makefile
index 100dcb004c2b..8d70593d844d 100644
--- a/sysutils/torque/Makefile
+++ b/sysutils/torque/Makefile
@@ -11,14 +11,13 @@ MASTER_SITES=	http://www.adaptivecomputing.com/index.php?wpfb_dl=77/ \
 MAINTAINER=	jwbacon@tds.net
 COMMENT=	Open source distributed computing resource manager based on PBS
 
+USES=		gmake perl5
 USE_AUTOTOOLS=	libtool
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-syslog \
 		--disable-spool
-USE_GMAKE=	yes
 USE_RC_SUBR=	pbs_server pbs_sched pbs_mom
 SUB_FILES=	pkg-message torque-config
-USE_PERL5=	yes
 USE_LDCONFIG=	yes
 
 CONFLICTS_INSTALL=	qstat-[0-9]* zh-qterm-[0-9]*
diff --git a/sysutils/userneu-devel/Makefile b/sysutils/userneu-devel/Makefile
index 6c4aaed57ceb..42a464e951da 100644
--- a/sysutils/userneu-devel/Makefile
+++ b/sysutils/userneu-devel/Makefile
@@ -22,7 +22,8 @@ RUN_DEPENDS=	\
     p5-Crypt-PasswdMD5>=0:${PORTSDIR}/security/p5-Crypt-PasswdMD5 \
     p5-Crypt-RandPasswd>=0:${PORTSDIR}/security/p5-Crypt-RandPasswd
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 CONFLICTS=	userneu-1.*
diff --git a/sysutils/webjob/Makefile b/sysutils/webjob/Makefile
index 763f153bfd25..16da243505ba 100644
--- a/sysutils/webjob/Makefile
+++ b/sysutils/webjob/Makefile
@@ -10,8 +10,9 @@ EXTRACT_SUFX=		.tgz
 MAINTAINER=		klm@uidzero.org
 COMMENT=		Download and execute a program over HTTP/HTTPS
 
+USES=			perl5
 GNU_CONFIGURE=		yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=		build
 MAN1=			webjob.1 xshar.1
 
 OPTIONS_DEFINE=	PAD_TOOLS DSV_TOOLS SSL