- convert to the new perl5 framework

- convert USE_GMAKE to Uses

Approved by:	portmgr (bapt@, blanket)

19 files changed, 26 insertions, 27 deletions

diff --git a/net-mgmt/argus3-clients/Makefile b/net-mgmt/argus3-clients/Makefile
index a20916264bcd..49b9db47005b 100644
--- a/net-mgmt/argus3-clients/Makefile
+++ b/net-mgmt/argus3-clients/Makefile
@@ -17,14 +17,12 @@ CONFLICTS=	argus-clients-2* argus-clients-sasl-2*
 OPTIONS_DEFINE=	GEOIP MANPAGES MYSQL SASL
 OPTIONS_DEFAULT=MANPAGES MYSQL SASL
 
-USES=		bison ncurses
-
+USES=		bison ncurses perl5
 USE_CSTD=	gnu89
 
 .include <bsd.port.options.mk>
 
 GNU_CONFIGURE=	true
-USE_PERL5=	yes
 
 .if ${PORT_OPTIONS:MSASL}
 PKGNAMESUFFIX+=	-sasl
diff --git a/net-mgmt/argus3/Makefile b/net-mgmt/argus3/Makefile
index b5ca034ab80b..838a346ff938 100644
--- a/net-mgmt/argus3/Makefile
+++ b/net-mgmt/argus3/Makefile
@@ -21,9 +21,8 @@ USE_RC_SUBR=	argus
 
 .include <bsd.port.options.mk>
 
-USES=		bison
+USES=		bison perl5
 GNU_CONFIGURE=	true
-USE_PERL5=	yes
 
 .if ${PORT_OPTIONS:MSASL}
 PKGNAMESUFFIX+=	-sasl
diff --git a/net-mgmt/devmon/Makefile b/net-mgmt/devmon/Makefile
index 877b620ce0d4..83a3f474fc14 100644
--- a/net-mgmt/devmon/Makefile
+++ b/net-mgmt/devmon/Makefile
@@ -14,7 +14,7 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-SNMP_Session>0:${PORTSDIR}/net-mgmt/p5-SNMP_Session
 
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 USE_RC_SUBR=	devmon
 
diff --git a/net-mgmt/glpi-plugins-tracker-agent/Makefile b/net-mgmt/glpi-plugins-tracker-agent/Makefile
index c74d69410edd..3dd09e5b09f6 100644
--- a/net-mgmt/glpi-plugins-tracker-agent/Makefile
+++ b/net-mgmt/glpi-plugins-tracker-agent/Makefile
@@ -23,7 +23,7 @@ RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/net-mgmt/p5-Net-SNMP \
 		p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
 		p5-Parallel-ForkManager>=0:${PORTSDIR}/devel/p5-Parallel-ForkManager
 
-USE_PERL5=	yes
+USES=		perl5
 WRKSRC=		${WRKDIR}/agent_tracker
 NO_BUILD=	yes
 PKGMESSAGE=	${WRKDIR}/pkg-message
diff --git a/net-mgmt/nagios-check_email_delivery/Makefile b/net-mgmt/nagios-check_email_delivery/Makefile
index de6030e25b32..33bd70d559f6 100644
--- a/net-mgmt/nagios-check_email_delivery/Makefile
+++ b/net-mgmt/nagios-check_email_delivery/Makefile
@@ -20,8 +20,9 @@ LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 RUN_DEPENDS=	p5-Net-SMTP-TLS>=0:${PORTSDIR}/mail/p5-Net-SMTP-TLS \
 		p5-Mail-IMAPClient>=0:${PORTSDIR}/mail/p5-Mail-IMAPClient
 
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
 DOC_FILES=	check_email_delivery.html check_email_delivery.pod \
 		check_imap_receive.html check_imap_receive.pod \
 		check_smtp_send.html check_smtp_send.pod \
diff --git a/net-mgmt/nagios-plugins/Makefile b/net-mgmt/nagios-plugins/Makefile
index 85267890863d..3f08bf258ee8 100644
--- a/net-mgmt/nagios-plugins/Makefile
+++ b/net-mgmt/nagios-plugins/Makefile
@@ -11,11 +11,9 @@ MASTER_SITES=	SF/nagiosplug/nagiosplug/${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Plugins for Nagios
 
-USES=		charsetfix
+USES=		charsetfix gmake perl5
 CHARSETFIX_MAKEFILEIN=Makefile.am
 USE_SUBMAKE=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool aclocal autoconf automake
 ACLOCAL_ARGS=	-I m4 -I gl/m4
 AUTOMAKE_ARGS=	--add-missing
diff --git a/net-mgmt/nagios-portaudit/Makefile b/net-mgmt/nagios-portaudit/Makefile
index d3535d156db9..e62e6710e143 100644
--- a/net-mgmt/nagios-portaudit/Makefile
+++ b/net-mgmt/nagios-portaudit/Makefile
@@ -19,7 +19,7 @@ PORTAUDIT_DESC=		Enable portaudit check
 PORTUPGRADE_DESC=	Enable portupgrade check
 PORTUPGRADE_DEVEL_DESC=	Use portupgrade-devel
 
-USE_PERL5=	yes
+USES=		perl5
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
diff --git a/net-mgmt/nagios-snmp-plugins/Makefile b/net-mgmt/nagios-snmp-plugins/Makefile
index 4710a292dbf5..43d256dc044e 100644
--- a/net-mgmt/nagios-snmp-plugins/Makefile
+++ b/net-mgmt/nagios-snmp-plugins/Makefile
@@ -16,10 +16,9 @@ COMMENT=	Additional SNMP plugins for Nagios
 
 LIB_DEPENDS=	netsnmp.30:${PORTSDIR}/net-mgmt/net-snmp
 
+USES=			gmake perl5
 GNU_CONFIGURE=		yes
 USE_AUTOTOOLS=	automake14 autoheader autoconf
-USE_GMAKE=		yes
-USE_PERL5=		yes
 
 NAGIOS_PLUGIN_DIR=	${PREFIX}/libexec/nagios
 
diff --git a/net-mgmt/ndpmon/Makefile b/net-mgmt/ndpmon/Makefile
index 207fd2c93b0d..fe05545dbd7e 100644
--- a/net-mgmt/ndpmon/Makefile
+++ b/net-mgmt/ndpmon/Makefile
@@ -30,8 +30,9 @@ PLIST_SUB+=	PY=""
 PLIST_SUB+=	PY="@comment "
 .endif
 
+USES=		perl5
+USE_PERL5=	run
 USE_GNOME=	libxml2
-USE_PERL5_RUN=	yes
 USE_RC_SUBR=	ndpmonitor
 
 GNU_CONFIGURE=	yes
diff --git a/net-mgmt/ocsinventory-ng/Makefile b/net-mgmt/ocsinventory-ng/Makefile
index 456b04db9c6e..97d8a9d41025 100644
--- a/net-mgmt/ocsinventory-ng/Makefile
+++ b/net-mgmt/ocsinventory-ng/Makefile
@@ -20,9 +20,9 @@ RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR}/textproc/p5-XML-Simple \
 		p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite \
 		p5-XML-Entities>=0:${PORTSDIR}/textproc/p5-XML-Entities
 
+USES=		perl5
 USE_APACHE_RUN=	22+
 USE_MYSQL=	41+
-USE_PERL5=	yes
 WANT_PHP_WEB=	yes
 DEFAULT_PHP_VER=	5
 USE_PHP=	mysql pcre zlib session xml gd zip openssl mbstring
diff --git a/net-mgmt/p5-Cflow/Makefile b/net-mgmt/p5-Cflow/Makefile
index ea2954675e8e..ddfbe1f4e171 100644
--- a/net-mgmt/p5-Cflow/Makefile
+++ b/net-mgmt/p5-Cflow/Makefile
@@ -15,6 +15,9 @@ COMMENT=	Analyze raw flow files written by cflowd (Cisco NetFlow data)
 OPTIONS_DEFINE=	FLOW_TOOLS
 FLOW_TOOLS_DESC=	Enable flow-tools support
 
+USES=		perl5
+USE_PERL5=	configure
+
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MFLOW_TOOLS}
@@ -26,7 +29,6 @@ CONFIGURE_ARGS+=	\
 	"LDDLFLAGS= -shared -L${LOCALBASE}/lib -lft -lz" \
 	"INC= -I${LOCALBASE}/include" "LDLOADLIBS= -L${LOCALBASE}/lib -lft -lz"
 .endif
-PERL_CONFIGURE=	YES
 
 MAN1=		flowdumper.1
 MAN3=		Cflow.3
diff --git a/net-mgmt/p5-SNMP_Session/Makefile b/net-mgmt/p5-SNMP_Session/Makefile
index 4aa224eda8c3..55e43578eefa 100644
--- a/net-mgmt/p5-SNMP_Session/Makefile
+++ b/net-mgmt/p5-SNMP_Session/Makefile
@@ -12,7 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	A perl5 module providing rudimentary access to SNMPv1 and v2 agents
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 DOCSDIR=	${PREFIX}/share/doc/${PKGNAMEPREFIX}${PORTNAME}
 
diff --git a/net-mgmt/pandorafms_agent/Makefile b/net-mgmt/pandorafms_agent/Makefile
index 6d4f791d54d8..29889fbeb8bb 100644
--- a/net-mgmt/pandorafms_agent/Makefile
+++ b/net-mgmt/pandorafms_agent/Makefile
@@ -16,7 +16,7 @@ OPTIONS_DEFINE=	TENTACLE_SERVER
 OPTIONS_DEFAULT=	TENTACLE_SERVER
 TENTACLE_SERVER_DESC=	Install tentalce_server
 
-USE_PERL5=	yes
+USES=		perl5
 SUB_LIST+=	PERL="${PERL}"
 
 MAN1=		pandora_agent.1	tentacle_client.1
diff --git a/net-mgmt/pnp/Makefile b/net-mgmt/pnp/Makefile
index e035ea2581b8..d7d009993440 100644
--- a/net-mgmt/pnp/Makefile
+++ b/net-mgmt/pnp/Makefile
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/rrdtool:${PORTSDIR}/databases/rrdtool \
 		nagios:${PORTSDIR}/net-mgmt/nagios
 
 MAKE_JOBS_UNSAFE=	yes
+USES=		perl5
 
 OPTIONS_DEFINE=	PDF
 OPTIONS_DEFAULT=	PDF
@@ -25,7 +26,6 @@ PDF_DESC=	Use built-in fpdf library to produce PDF views
 
 .include <bsd.port.options.mk>
 
-USE_PERL5=	yes
 USE_PHP=	gd iconv json pcre simplexml sockets xml zlib
 
 WANT_PHP_WEB=	yes
diff --git a/net-mgmt/rackmonkey/Makefile b/net-mgmt/rackmonkey/Makefile
index 8d7bc9116290..5eec604a31f1 100644
--- a/net-mgmt/rackmonkey/Makefile
+++ b/net-mgmt/rackmonkey/Makefile
@@ -27,11 +27,13 @@ SAMPLE_DESC= 	Install sample data (SQLite Only)
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}-1
 NO_BUILD=	YES
 
-USE_PERL5_RUN=	YES
+USES=		perl5
+USE_PERL5=	run
 
 SUB_FILES=	pkg-message
 
 .include <bsd.port.options.mk>
+
 .if ${PORT_OPTIONS:MSQLITE}
 USE_SQLITE=	yes
 RUN_DEPENDS+=	p5-DBD-SQLite>=0:${PORTSDIR}/databases/p5-DBD-SQLite
diff --git a/net-mgmt/rancid-devel/Makefile b/net-mgmt/rancid-devel/Makefile
index 8fe69ef8adfd..95589be38039 100644
--- a/net-mgmt/rancid-devel/Makefile
+++ b/net-mgmt/rancid-devel/Makefile
@@ -15,9 +15,8 @@ BUILD_DEPENDS=	expect:${PORTSDIR}/lang/expect-devel
 RUN_DEPENDS=	expect:${PORTSDIR}/lang/expect-devel \
 		p5-LockFile-Simple>=0:${PORTSDIR}/devel/p5-LockFile-Simple
 
-USE_PERL5=	yes
+USES=		perl5 gmake
 SUB_FILES=	pkg-message
-USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	\
 		--localstatedir=${PREFIX}/var/${PORTNAME}/ \
diff --git a/net-mgmt/sendip/Makefile b/net-mgmt/sendip/Makefile
index e516e97337ce..b7284c98848a 100644
--- a/net-mgmt/sendip/Makefile
+++ b/net-mgmt/sendip/Makefile
@@ -14,8 +14,7 @@ MASTER_SITES=	http://www.earth.li/projectpurple/files/
 MAINTAINER=	joseph@randomnetworks.com
 COMMENT=	SendIP is a commandline tool to allow sending arbitrary IP packets
 
-USE_GMAKE=	yes
-USE_PERL5=	yes
+USES=		gmake perl5
 USE_LDCONFIG=	yes
 
 MAN1=		sendip.1
diff --git a/net-mgmt/snmptt/Makefile b/net-mgmt/snmptt/Makefile
index 7a5b450ec9df..7c489359c456 100644
--- a/net-mgmt/snmptt/Makefile
+++ b/net-mgmt/snmptt/Makefile
@@ -16,7 +16,7 @@ RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net-mgmt/net-snmp \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-USE_PERL5=	yes
+USES=		perl5
 
 USE_RC_SUBR=	snmptt
 
diff --git a/net-mgmt/weathermap/Makefile b/net-mgmt/weathermap/Makefile
index 1be966c4d669..500bbfbf1e64 100644
--- a/net-mgmt/weathermap/Makefile
+++ b/net-mgmt/weathermap/Makefile
@@ -14,8 +14,8 @@ LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
 		mrtg:${PORTSDIR}/net-mgmt/mrtg
 
+USES=		perl5
 NO_BUILD=	yes
-USE_PERL5=	yes
 
 OPTIONS_DEFINE=	WGET
 WGET_DESC=	WGET support