svn commit: r327302 - in head/net-mgmt: argus3 argus3-clients devmon glpi-plugins-tracker-agent nagios-check_email_delivery nagios-plugins nagios-portaudit nagios-snmp-plugins ndpmon ocsinventory-n...

Sat Sep 14 16:38:33 UTC 2013

Author: az
Date: Sat Sep 14 16:38:28 2013
New Revision: 327302
URL: http://svnweb.freebsd.org/changeset/ports/327302

Log:
  - convert to the new perl5 framework
  - convert USE_GMAKE to Uses
  
  Approved by:	portmgr (bapt@, blanket)

Modified:
  head/net-mgmt/argus3-clients/Makefile
  head/net-mgmt/argus3/Makefile
  head/net-mgmt/devmon/Makefile
  head/net-mgmt/glpi-plugins-tracker-agent/Makefile
  head/net-mgmt/nagios-check_email_delivery/Makefile   (contents, props changed)
  head/net-mgmt/nagios-plugins/Makefile
  head/net-mgmt/nagios-portaudit/Makefile   (contents, props changed)
  head/net-mgmt/nagios-snmp-plugins/Makefile   (contents, props changed)
  head/net-mgmt/ndpmon/Makefile
  head/net-mgmt/ocsinventory-ng/Makefile
  head/net-mgmt/p5-Cflow/Makefile   (contents, props changed)
  head/net-mgmt/p5-SNMP_Session/Makefile   (contents, props changed)
  head/net-mgmt/pandorafms_agent/Makefile   (contents, props changed)
  head/net-mgmt/pnp/Makefile
  head/net-mgmt/rackmonkey/Makefile   (contents, props changed)
  head/net-mgmt/rancid-devel/Makefile
  head/net-mgmt/sendip/Makefile   (contents, props changed)
  head/net-mgmt/snmptt/Makefile
  head/net-mgmt/weathermap/Makefile   (contents, props changed)

Modified: head/net-mgmt/argus3-clients/Makefile
==============================================================================

--- head/net-mgmt/argus3-clients/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/argus3-clients/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -17,14 +17,12 @@ CONFLICTS=	argus-clients-2* argus-client
 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

Modified: head/net-mgmt/argus3/Makefile
==============================================================================
--- head/net-mgmt/argus3/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/argus3/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -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

Modified: head/net-mgmt/devmon/Makefile
==============================================================================
--- head/net-mgmt/devmon/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/devmon/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -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
 

Modified: head/net-mgmt/glpi-plugins-tracker-agent/Makefile
==============================================================================
--- head/net-mgmt/glpi-plugins-tracker-agent/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/glpi-plugins-tracker-agent/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -23,7 +23,7 @@ RUN_DEPENDS=	p5-Net-SNMP>=0:${PORTSDIR}/
 		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

Modified: head/net-mgmt/nagios-check_email_delivery/Makefile
==============================================================================
--- head/net-mgmt/nagios-check_email_delivery/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/nagios-check_email_delivery/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -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 \

Modified: head/net-mgmt/nagios-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-plugins/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/nagios-plugins/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -11,11 +11,9 @@ MASTER_SITES=	SF/nagiosplug/nagiosplug/$
 MAINTAINER=	demon at 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

Modified: head/net-mgmt/nagios-portaudit/Makefile
==============================================================================
--- head/net-mgmt/nagios-portaudit/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/nagios-portaudit/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -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
 

Modified: head/net-mgmt/nagios-snmp-plugins/Makefile
==============================================================================
--- head/net-mgmt/nagios-snmp-plugins/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/nagios-snmp-plugins/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -16,10 +16,9 @@ COMMENT=	Additional SNMP plugins for Nag
 
 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
 

Modified: head/net-mgmt/ndpmon/Makefile
==============================================================================
--- head/net-mgmt/ndpmon/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/ndpmon/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -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

Modified: head/net-mgmt/ocsinventory-ng/Makefile
==============================================================================
--- head/net-mgmt/ocsinventory-ng/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/ocsinventory-ng/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -20,9 +20,9 @@ RUN_DEPENDS=	p5-XML-Simple>=0:${PORTSDIR
 		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

Modified: head/net-mgmt/p5-Cflow/Makefile
==============================================================================
--- head/net-mgmt/p5-Cflow/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/p5-Cflow/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -15,6 +15,9 @@ COMMENT=	Analyze raw flow files written 
 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

Modified: head/net-mgmt/p5-SNMP_Session/Makefile
==============================================================================
--- head/net-mgmt/p5-SNMP_Session/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/p5-SNMP_Session/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -12,7 +12,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	demon at 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}
 

Modified: head/net-mgmt/pandorafms_agent/Makefile
==============================================================================
--- head/net-mgmt/pandorafms_agent/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/pandorafms_agent/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -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

Modified: head/net-mgmt/pnp/Makefile
==============================================================================
--- head/net-mgmt/pnp/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/pnp/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -18,6 +18,7 @@ RUN_DEPENDS=	${LOCALBASE}/bin/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 p
 
 .include <bsd.port.options.mk>
 
-USE_PERL5=	yes
 USE_PHP=	gd iconv json pcre simplexml sockets xml zlib
 
 WANT_PHP_WEB=	yes

Modified: head/net-mgmt/rackmonkey/Makefile
==============================================================================
--- head/net-mgmt/rackmonkey/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/rackmonkey/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -27,11 +27,13 @@ SAMPLE_DESC= 	Install sample data (SQLit
 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

Modified: head/net-mgmt/rancid-devel/Makefile
==============================================================================
--- head/net-mgmt/rancid-devel/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/rancid-devel/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -15,9 +15,8 @@ BUILD_DEPENDS=	expect:${PORTSDIR}/lang/e
 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}/ \

Modified: head/net-mgmt/sendip/Makefile
==============================================================================
--- head/net-mgmt/sendip/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/sendip/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -14,8 +14,7 @@ MASTER_SITES=	http://www.earth.li/projec
 MAINTAINER=	joseph at 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

Modified: head/net-mgmt/snmptt/Makefile
==============================================================================
--- head/net-mgmt/snmptt/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/snmptt/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -16,7 +16,7 @@ RUN_DEPENDS=	net-snmp>=0:${PORTSDIR}/net
 
 WRKSRC=		${WRKDIR}/${PORTNAME}_${PORTVERSION}
 
-USE_PERL5=	yes
+USES=		perl5
 
 USE_RC_SUBR=	snmptt
 

Modified: head/net-mgmt/weathermap/Makefile
==============================================================================
--- head/net-mgmt/weathermap/Makefile	Sat Sep 14 16:34:27 2013	(r327301)
+++ head/net-mgmt/weathermap/Makefile	Sat Sep 14 16:38:28 2013	(r327302)
@@ -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
