- convert to the new perl5 framework

- convert USE_GMAKE to Uses

Approved by:	portmgr (bapt@, blanket)

19 files changed, 34 insertions, 32 deletions

diff --git a/sysutils/backuppc/Makefile b/sysutils/backuppc/Makefile
index f4795ce22e14..140323f9d277 100644
--- a/sysutils/backuppc/Makefile
+++ b/sysutils/backuppc/Makefile
@@ -13,11 +13,11 @@ COMMENT=	System for backing PCs and laptops to a server
 
 RUN_DEPENDS=	p5-File-Listing>=0:${PORTSDIR}/sysutils/p5-File-Listing
 
-NO_BUILD=	yes
-
-USE_PERL5=	yes
 USE_RC_SUBR=	backuppc
 
+USES=		perl5
+NO_BUILD=	yes
+
 USERS=		backuppc
 GROUPS=		backuppc
 
diff --git a/sysutils/boxbackup/Makefile b/sysutils/boxbackup/Makefile
index b47ef0535b39..d3d9426783b5 100644
--- a/sysutils/boxbackup/Makefile
+++ b/sysutils/boxbackup/Makefile
@@ -16,9 +16,9 @@ LICENSE=	BSD GPLv2
 LICENSE_COMB=	dual
 LICENSE_FILE=	${WRKSRC}/LICENSE-DUAL.txt
 
+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/condor/Makefile b/sysutils/condor/Makefile
index 9f0c8051ca9a..bba9d6d4f191 100644
--- a/sysutils/condor/Makefile
+++ b/sysutils/condor/Makefile
@@ -17,10 +17,8 @@ LIB_DEPENDS+=	krb5support:${PORTSDIR}/security/krb5 \
 
 RESTRICTED=	Requires manual distfile fetch
 WRKSRC=		${WRKDIR}/condor-${PORTVERSION}
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USES=		cmake
-USE_PERL5=	yes
+USES=		cmake gmake perl5
 USE_PGSQL=	server
 CXXFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-rpath=${LOCALBASE}/lib:/usr/lib:/lib
diff --git a/sysutils/coreutils/Makefile b/sysutils/coreutils/Makefile
index 55096b4a44d8..b6adcab12ad1 100644
--- a/sysutils/coreutils/Makefile
+++ b/sysutils/coreutils/Makefile
@@ -26,10 +26,10 @@ CONFIGURE_ARGS=	--program-prefix=g	\
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib" FORCE_UNSAFE_CONFIGURE=1
 CPPFLAGS+=	"-I${LOCALBASE}/include"
 
+USES=		gmake perl5
+USE_PERL5=	build	# build - required for tests and man page generation
 USE_XZ=		yes
-USE_GMAKE=	yes
 USE_LDCONFIG=	yes
-USE_PERL5_BUILD=	yes # Required for tests and man page generation
 #USE_BISON=	yes
 
 INFO=		coreutils
diff --git a/sysutils/flexbackup/Makefile b/sysutils/flexbackup/Makefile
index 205f6f66653b..24ce8bccf5f4 100644
--- a/sysutils/flexbackup/Makefile
+++ b/sysutils/flexbackup/Makefile
@@ -18,7 +18,7 @@ TAR_CMD=	${PREFIX}/bin/gtar
 
 MAKE_ARGS=	PERLPATH=${PERL} CONFFILE=${PREFIX}/etc/flexbackup.conf
 
-USE_PERL5=	yes
+USES=		perl5
 
 SUB_FILES+=	pkg-message
 
diff --git a/sysutils/heartbeat/Makefile b/sysutils/heartbeat/Makefile
index 225673bdb307..4f32a9981e4b 100644
--- a/sysutils/heartbeat/Makefile
+++ b/sysutils/heartbeat/Makefile
@@ -80,7 +80,8 @@ PLIST_SUB+=		MGMT="@comment "
 .if ${PORT_OPTIONS:MLDIRECTORD}
 RUN_DEPENDS+=		p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 			p5-Mail-Tools>=0:${PORTSDIR}/mail/p5-Mail-Tools
-USE_PERL5_RUN=		yes
+USES+=			perl5
+USE_PERL5=		run
 PLIST_SUB+=		LDIRECTORD=""
 MAN8+=			ldirectord.8
 .else
diff --git a/sysutils/jx/Makefile b/sysutils/jx/Makefile
index f08b5bfb1fb8..34dbadba1a29 100644
--- a/sysutils/jx/Makefile
+++ b/sysutils/jx/Makefile
@@ -9,8 +9,9 @@ MASTER_SITES=	http://legh.ru/wp-content/uploads/jx/
 MAINTAINER=	legh@legh.ru
 COMMENT=	Wrapper to jexec with more feature in interpreting jail id
 
+USES=		perl5
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/sysutils/libcdio/Makefile b/sysutils/libcdio/Makefile
index 3868ba673408..b76fd2503208 100644
--- a/sysutils/libcdio/Makefile
+++ b/sysutils/libcdio/Makefile
@@ -18,11 +18,10 @@ LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 GNU_CONFIGURE=	yes
-USES=		pathfix pkgconfig iconv ncurses
-USE_GMAKE=	yes
+USES=		pathfix pkgconfig iconv ncurses gmake perl5
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS+=${ICONV_CONFIGURE_ARG}
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib ${ICONV_LIB}
 MAN1=	cd-drive.1 cd-info.1 iso-read.1 iso-info.1 cd-read.1
diff --git a/sysutils/lire/Makefile b/sysutils/lire/Makefile
index c26977d9b4fe..0c793bd68642 100644
--- a/sysutils/lire/Makefile
+++ b/sysutils/lire/Makefile
@@ -33,9 +33,9 @@ CHARTS_DESC=	Have Charts output format
 HTML_DESC=	Have HTML or DocBook output format
 PDF_DESC=	Have PDF output format
 EXCEL95_DESC=	Have Excel95 Spreadsheet output format
+
+USES=		gmake perl5
 USE_GNOME=	libxml2 libxslt
-USE_PERL5=	yes
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	"--with-docbookdir=${LOCALBASE}/share/xml/docbook/4.2/docbookx.dtd"
 CONFIGURE_ENV=	POD2MAN=${LOCALBASE}/bin/pod2man
diff --git a/sysutils/monitorix/Makefile b/sysutils/monitorix/Makefile
index bc32df427345..9ddfd991b426 100644
--- a/sysutils/monitorix/Makefile
+++ b/sysutils/monitorix/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS=	p5-ParallelUA>=0:${PORTSDIR}/www/p5-ParallelUA \
 		p5-HTTP-Server-Simple>=0:${PORTSDIR}/www/p5-HTTP-Server-Simple \
 		p5-Config-General>=0:${PORTSDIR}/devel/p5-Config-General
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 MAN5=		monitorix.conf.5
 MAN8=		monitorix.8
 MANCOMPRESSED=	no
diff --git a/sysutils/munin-master/Makefile b/sysutils/munin-master/Makefile
index 727766c3be75..831128d792fe 100644
--- a/sysutils/munin-master/Makefile
+++ b/sysutils/munin-master/Makefile
@@ -41,8 +41,8 @@ RUN_DEPENDS=	munin-common>=0:${PORTSDIR}/sysutils/munin-common \
 		p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-FCGI>=0:${PORTSDIR}/www/p5-FCGI
 
-USE_PERL5=	yes
-USE_GMAKE=	yes
+USES=		gmake perl5
+
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 .include "${.CURDIR}/../munin-common/munin.mk"
diff --git a/sysutils/munin-node/Makefile b/sysutils/munin-node/Makefile
index d881dfceb8fe..14984403ae74 100644
--- a/sysutils/munin-node/Makefile
+++ b/sysutils/munin-node/Makefile
@@ -24,9 +24,7 @@ RUN_DEPENDS=	p5-Cache-Cache>=0:${PORTSDIR}/devel/p5-Cache-Cache \
 
 DISTINFO_FILE=	${MUNIN_DISTINFO}
 EXTRA_PATCHES+=	${MUNIN_PATCHES}
-USES=		shebangfix
-USE_PERL5=	yes
-USE_GMAKE=	yes
+USES=		gmake shebangfix perl5
 PKGMESSAGE=	${WRKDIR}/pkg-message
 REINPLACE_ARGS=	-i ""
 SHEBANG_FILES=	node/sbin/munin-node
diff --git a/sysutils/p5-MogileFS-Server/Makefile b/sysutils/p5-MogileFS-Server/Makefile
index 27d9ed836d19..7dca43b48283 100644
--- a/sysutils/p5-MogileFS-Server/Makefile
+++ b/sysutils/p5-MogileFS-Server/Makefile
@@ -25,7 +25,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 OPTIONS_DEFINE=	DOCS
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 REINPLACE_ARGS=	-i ''
 USE_RC_SUBR=	mogilefsd mogstored
 
diff --git a/sysutils/p5-Sys-Utmp/Makefile b/sysutils/p5-Sys-Utmp/Makefile
index a0ac69cb3a77..94cda1aa7ac4 100644
--- a/sysutils/p5-Sys-Utmp/Makefile
+++ b/sysutils/p5-Sys-Utmp/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	zaa@ulstu.ru
 COMMENT=	Perl5 module which provides Object(ish) Interface to UTMP files
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Sys::Utmp.3 Sys::Utmp::Utent.3
 
diff --git a/sysutils/pdsh/Makefile b/sysutils/pdsh/Makefile
index bb6a40ce5a32..61cde1743c85 100644
--- a/sysutils/pdsh/Makefile
+++ b/sysutils/pdsh/Makefile
@@ -11,9 +11,10 @@ COMMENT=	Parallel Distributed Shell
 
 LICENSE=	GPLv2
 
+USES=		perl5
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 
 OPTIONS_DEFINE=		SSH DSHGROUPS NETGROUP READLINE RSH
 OPTIONS_DEFAULT=	SSH DSHGROUPS
diff --git a/sysutils/rej/Makefile b/sysutils/rej/Makefile
index 0bc46821ba6f..bca758f43a42 100644
--- a/sysutils/rej/Makefile
+++ b/sysutils/rej/Makefile
@@ -9,8 +9,7 @@ MASTER_SITES=	CRITICAL
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Merges patch-rejects and runs a merge program to verify the changes
 
-USES=		shebangfix
-USE_PERL5=	yes
+USES=		shebangfix perl5
 NO_BUILD=	yes
 
 SHEBANG_FILES=	qp mp
diff --git a/sysutils/safe-rm/Makefile b/sysutils/safe-rm/Makefile
index 7d845ad5157d..866eafc89b76 100644
--- a/sysutils/safe-rm/Makefile
+++ b/sysutils/safe-rm/Makefile
@@ -11,8 +11,8 @@ COMMENT=	Wrapper around the rm command to prevent accidental deletions
 
 LICENSE=	GPLv3
 
-USE_PERL5_RUN=	yes
-
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 FETCH_ARGS=	-pRr
diff --git a/sysutils/sec/Makefile b/sysutils/sec/Makefile
index 024f0e157bce..1c1b438c14c9 100644
--- a/sysutils/sec/Makefile
+++ b/sysutils/sec/Makefile
@@ -10,9 +10,10 @@ COMMENT=	Simple event (logs) correlator
 
 LICENSE=	GPLv2
 
-USE_PERL5_RUN=	yes
 USE_RC_SUBR=	sec
 
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 MAN8=		sec.8
diff --git a/sysutils/userneu/Makefile b/sysutils/userneu/Makefile
index fd6c07f35506..0bd8e7f3e576 100644
--- a/sysutils/userneu/Makefile
+++ b/sysutils/userneu/Makefile
@@ -21,7 +21,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-devel-[0-9]*