19 files changed, 29 insertions, 19 deletions

diff --git a/sysutils/debhelper/Makefile b/sysutils/debhelper/Makefile
index 2935c44ee943..617cf364fbbf 100644
--- a/sysutils/debhelper/Makefile
+++ b/sysutils/debhelper/Makefile
@@ -12,7 +12,7 @@ COMMENT=	Helper programs for debian/rules
 
 MAKE_ENV+=	SITE_PERL_REL=${SITE_PERL_REL}
 NO_BUILD=	yes
-USE_PERL5=	yes
+USES=		perl5
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/sysutils/epylog/Makefile b/sysutils/epylog/Makefile
index 8db62bdc5794..b462c59b10d1 100644
--- a/sysutils/epylog/Makefile
+++ b/sysutils/epylog/Makefile
@@ -24,7 +24,7 @@ MAN8=		epylog.8
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-lynx=${LOCALBASE}/bin/lynx
-USE_PERL5=	yes
+USES=		perl5
 USE_PYTHON=	yes
 
 LOCAL_CONF_FILES=	epylog.conf \
diff --git a/sysutils/evtviewer/Makefile b/sysutils/evtviewer/Makefile
index 8711f0550fe4..98993c1ffd09 100644
--- a/sysutils/evtviewer/Makefile
+++ b/sysutils/evtviewer/Makefile
@@ -18,7 +18,7 @@ COMMENT=	PERL-based Event viewer
 
 LICENSE=	GPLv2
 
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/evtViewer
diff --git a/sysutils/fpkg/Makefile b/sysutils/fpkg/Makefile
index c3a4f5ea56fc..336cb896807b 100644
--- a/sysutils/fpkg/Makefile
+++ b/sysutils/fpkg/Makefile
@@ -17,7 +17,7 @@ EXTRACT_ONLY=
 MAINTAINER=	y.shimazu@nifty.com
 COMMENT=	Package Tool Wrapper for FreeBSD
 
-USE_PERL5=	YES
+USES=		perl5
 NO_WRKSUBDIR=	YES
 NO_BUILD=	YES
 PLIST_FILES=	bin/fpkg
diff --git a/sysutils/gupsc/Makefile b/sysutils/gupsc/Makefile
index 858ab0c0d4fc..e102e2bc3184 100644
--- a/sysutils/gupsc/Makefile
+++ b/sysutils/gupsc/Makefile
@@ -13,7 +13,8 @@ COMMENT=	A free Gnome client for the Network UPS Tools
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	gnomelibs gnomehier
-USE_PERL5_BUILD=yes
+USES=		perl5
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
diff --git a/sysutils/jkill/Makefile b/sysutils/jkill/Makefile
index 91a85eea9288..3806058c42ad 100644
--- a/sysutils/jkill/Makefile
+++ b/sysutils/jkill/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=
 MAINTAINER=	pavel@ext.by
 COMMENT=	Shutdowns a running jail and all its processes
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 MAN1=		jkill.1
 MANCOMPRESSED=	yes
diff --git a/sysutils/p5-Dir-Purge/Makefile b/sysutils/p5-Dir-Purge/Makefile
index 396d13990a17..e9bf8733ff08 100644
--- a/sysutils/p5-Dir-Purge/Makefile
+++ b/sysutils/p5-Dir-Purge/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Purge directories to a given number of files
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Dir::Purge.3
 
diff --git a/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile b/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile
index dd2d3f57b909..131292d33ed7 100644
--- a/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile
+++ b/sysutils/p5-Plugtools-Plugins-HomeOU/Makefile
@@ -17,7 +17,8 @@ COMMENT=	Automatically handles the home OU for when adding/removing users
 
 RUN_DEPENDS=	p5-Plugtools>=0:${PORTSDIR}/sysutils/p5-Plugtools
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Plugtools::Plugins::HomeOU.3 \
 		Plugtools::Plugins::HomeOUremove.3
diff --git a/sysutils/p5-Probe-Perl/Makefile b/sysutils/p5-Probe-Perl/Makefile
index d8e08a06fd28..db8f6cad715a 100644
--- a/sysutils/p5-Probe-Perl/Makefile
+++ b/sysutils/p5-Probe-Perl/Makefile
@@ -11,7 +11,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	lippe@FreeBSD.org
 COMMENT=	Information about the currently running perl
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Probe::Perl.3
 
diff --git a/sysutils/p5-Samba-SIDhelper/Makefile b/sysutils/p5-Samba-SIDhelper/Makefile
index c894601136cc..f4a6dbd7ae50 100644
--- a/sysutils/p5-Samba-SIDhelper/Makefile
+++ b/sysutils/p5-Samba-SIDhelper/Makefile
@@ -12,7 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	vvelox@vvelox.net
 COMMENT=	Create SIDs based on G/UIDs
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Samba::SIDhelper.3
 
diff --git a/sysutils/p5-Sys-HostIP/Makefile b/sysutils/p5-Sys-HostIP/Makefile
index 109dc616edc7..6c3249f1a51a 100644
--- a/sysutils/p5-Sys-HostIP/Makefile
+++ b/sysutils/p5-Sys-HostIP/Makefile
@@ -15,7 +15,8 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}${PORTVERSION:E}
 MAINTAINER=	mopsfelder@gmail.com
 COMMENT=	A Perl module to get IP address related info
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Sys::HostIP.3
 
diff --git a/sysutils/p5-Sys-Load/Makefile b/sysutils/p5-Sys-Load/Makefile
index 41dc839cce5c..0f8c7751d8e5 100644
--- a/sysutils/p5-Sys-Load/Makefile
+++ b/sysutils/p5-Sys-Load/Makefile
@@ -15,7 +15,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kostjnspb@yandex.ru
 COMMENT=	Getting the current system load and uptime
 
-PERL_CONFIGURE=	YES
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Sys::Load.3
 
diff --git a/sysutils/p5-ZConf-Cron/Makefile b/sysutils/p5-ZConf-Cron/Makefile
index c7c75bedb12e..b9648c9b6b01 100644
--- a/sysutils/p5-ZConf-Cron/Makefile
+++ b/sysutils/p5-ZConf-Cron/Makefile
@@ -26,7 +26,8 @@ RUN_DEPENDS:=	p5-DateTime-Event-Cron>=0:${PORTSDIR}/devel/p5-DateTime-Event-Cron
 		p5-ZConf-GUI>=0:${PORTSDIR}/devel/p5-ZConf-GUI \
 		p5-ZConf>=0:${PORTSDIR}/net/p5-ZConf
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		ZConf::Cron.3 \
 		ZConf::Cron::GUI.3
diff --git a/sysutils/rsyncbackup/Makefile b/sysutils/rsyncbackup/Makefile
index 405933c92b09..2c6f0507b610 100644
--- a/sysutils/rsyncbackup/Makefile
+++ b/sysutils/rsyncbackup/Makefile
@@ -21,7 +21,7 @@ CONFIGSRC=	${WRKSRC}/config
 CONFIGFILES=	backupset.conf config.conf destinations.conf sources.conf
 
 USE_ZIP=	yes
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 SUB_FILES=	pkg-message
diff --git a/sysutils/stow/Makefile b/sysutils/stow/Makefile
index a233afb8ef0a..ea56accabf19 100644
--- a/sysutils/stow/Makefile
+++ b/sysutils/stow/Makefile
@@ -20,7 +20,7 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 TEST_DEPENDS=	p5-Test-Output>0:${PORTSDIR}/devel/p5-Test-Output
 
 USE_BZIP2=	yes
-USE_PERL5=	yes
+USES=		perl5
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ac_cv_path_PERL=${PERL}
diff --git a/sysutils/ucspi-ipc/Makefile b/sysutils/ucspi-ipc/Makefile
index 9de962bf327d..a44e32ba1fde 100644
--- a/sysutils/ucspi-ipc/Makefile
+++ b/sysutils/ucspi-ipc/Makefile
@@ -13,7 +13,7 @@ MASTER_SITES=	http://www.superscript.com/ucspi-ipc/
 MAINTAINER=	lx@redundancy.redundancy.org
 COMMENT=	UCSPI tools for building local-domain client-server applications
 
-USE_PERL5=	yes
+USES=		perl5
 
 DISABLE_SIZE=	yes
 
diff --git a/sysutils/webmin/Makefile b/sysutils/webmin/Makefile
index 9125559b3dbb..5fb745083293 100644
--- a/sysutils/webmin/Makefile
+++ b/sysutils/webmin/Makefile
@@ -18,7 +18,7 @@ RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay \
 		p5-IO-Tty>=0:${PORTSDIR}/devel/p5-IO-Tty \
 		p5-Authen-PAM>=0:${PORTSDIR}/security/p5-Authen-PAM
 
-USE_PERL5=	yes
+USES=		perl5
 USE_PYTHON=	yes
 USE_RC_SUBR=	webmin
 SUB_LIST=	PERL5=${PERL}
diff --git a/sysutils/whatpix/Makefile b/sysutils/whatpix/Makefile
index 9183954d523e..eddcde787529 100644
--- a/sysutils/whatpix/Makefile
+++ b/sysutils/whatpix/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
 NO_BUILD=	yes
 PLIST_FILES=	bin/whatpix
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/whatpix ${PREFIX}/bin
diff --git a/sysutils/zfs-stats/Makefile b/sysutils/zfs-stats/Makefile
index 42a7a129acef..5f12192e87e0 100644
--- a/sysutils/zfs-stats/Makefile
+++ b/sysutils/zfs-stats/Makefile
@@ -15,7 +15,7 @@ COMMENT=	Display human-readable ZFS statistics
 
 LICENSE=	BSD
 
-USE_PERL5=	yes
+USES=		perl5
 
 NO_BUILD=	yes