- convert to the new perl5 framework

- convert USE_GMAKE to Uses

Approved by:	portmgr (bapt@, blanket)

18 files changed, 33 insertions, 29 deletions

diff --git a/net/beacon/Makefile b/net/beacon/Makefile
index 5be22ba75288..69c86da67053 100644
--- a/net/beacon/Makefile
+++ b/net/beacon/Makefile
@@ -15,7 +15,8 @@ RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
 
 WWW_DIR?=	${PREFIX}/www/
 PLIST_SUB+=	VERSION=${PORTVERSION}
-USE_PERL5=	yes
+
+USES=		perl5
 USE_AUTOTOOLS=	autoconf
 
 OPTIONS_DEFINE=		IPV6
diff --git a/net/freedbd/Makefile b/net/freedbd/Makefile
index ac1cca896268..e6e246b48b83 100644
--- a/net/freedbd/Makefile
+++ b/net/freedbd/Makefile
@@ -9,9 +9,10 @@ MASTER_SITES=	http://rink.nu/downloads/projects/
 MAINTAINER=	rink@FreeBSD.org
 COMMENT=	A lightweight daemon for answering FreeDB queries
 
+USES=		perl5
+USE_PERL5=	run
 GNU_CONFIGURE=	yes
 WANT_GNOME=	yes
-USE_PERL5_RUN=	yes
 
 PLIST_FILES=	bin/freedbd bin/freedbd-txt2xml %%EXAMPLESDIR%%/sample_db.txt
 PLIST_DIRS=	%%EXAMPLESDIR%%
diff --git a/net/gateway6/Makefile b/net/gateway6/Makefile
index 78032124f14a..27fde6d05f43 100644
--- a/net/gateway6/Makefile
+++ b/net/gateway6/Makefile
@@ -34,8 +34,8 @@ GW6C_DATA=	\
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USES=		gmake perl5
+USE_PERL5=	build
 MAKE_JOBS_UNSAFE=yes
 MAKE_ARGS=	target=freebsd installdir=${PREFIX}
 
diff --git a/net/httpry/Makefile b/net/httpry/Makefile
index 07888586817e..612ddae5f6e1 100644
--- a/net/httpry/Makefile
+++ b/net/httpry/Makefile
@@ -19,7 +19,8 @@ EXTRASCRIPTS_DESC=	Install additional scripts
 
 .if ${PORT_OPTIONS:MEXTRASCRIPTS}
 PLIST_SUB=	EXTRASCRIPTS=""
-USE_PERL5_RUN=	yes
+USES+=		perl5
+USE_PERL5=	run
 RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI
 .else
 PLIST_SUB=	EXTRASCRIPTS="@comment "
diff --git a/net/isc-dhcp41-server/Makefile b/net/isc-dhcp41-server/Makefile
index a84a5b1761a6..21a4ae9fa828 100644
--- a/net/isc-dhcp41-server/Makefile
+++ b/net/isc-dhcp41-server/Makefile
@@ -110,7 +110,8 @@ PLIST_SUB+=		SCHEMA_DIR="${SCHEMA_DIR:S,^${PREFIX}/,,}" LDAP=""
 PORTDOCS+=		README.ldap LICENSE.ldap
 LDAP_SCRIPT=		${WRKDIR}/${LDAPPATCHDIST}/dhcpd-conf-to-ldap
 LDAP_SCHEMA=		${WRKDIR}/${LDAPPATCHDIST}/dhcp.schema
-USE_PERL5_RUN=		yes
+USES+=			perl5
+USE_PERL5=		run
 USE_OPENLDAP=		yes
 USE_AUTOTOOLS=		aclocal libtoolize autoconf autoheader automake
 LIBTOOLIZE_ARG=		--copy --force
diff --git a/net/mosh/Makefile b/net/mosh/Makefile
index 041e5140ea09..36e28794d04a 100644
--- a/net/mosh/Makefile
+++ b/net/mosh/Makefile
@@ -14,13 +14,13 @@ LICENSE=	GPLv3
 
 LIB_DEPENDS=	protobuf:${PORTSDIR}/devel/protobuf
 
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-utempter
 CONFIGURE_ENV+=	OPENSSL_CFLAGS="-I${OPENSSLINC}" OPENSSL_LIBS="-L${OPENSSLLIB} -lssl -lcrypto"
 INSTALL_TARGET=	install-strip
 USE_OPENSSL=	yes
-USES=		pkgconfig
+USES=		pkgconfig perl5
 
 LATEST_LINK=	mosh-term
 
diff --git a/net/openldap24-server/Makefile b/net/openldap24-server/Makefile
index 1c26f9dacc89..95f6392feb25 100644
--- a/net/openldap24-server/Makefile
+++ b/net/openldap24-server/Makefile
@@ -408,7 +408,7 @@ PLIST_SUB+=		BACK_SOCK="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=		yes
+USES+=			perl5
 CONFIGURE_ARGS+=	--enable-perl=${BACKEND_ENABLE}
 CONFIGURE_ENV+=		PERLBIN="${PERL}"
 PLIST_SUB+=		BACK_PERL=${BACKEND_PLIST}
diff --git a/net/packter-agent/Makefile b/net/packter-agent/Makefile
index a5780b6f55e8..beeba52cf054 100644
--- a/net/packter-agent/Makefile
+++ b/net/packter-agent/Makefile
@@ -32,7 +32,8 @@ CONFIGURE_ARGS+=	--disable-ipv6
 .endif
 
 .if ${PORT_OPTIONS:MPACKTERTC}
-USE_PERL5_RUN=	yes
+USES+=		perl5
+USE_PERL5=	run
 RUN_DEPENDS+=	p5-XML-Pastor>=0:${PORTSDIR}/devel/p5-XML-Pastor
 PLIST_SUB+=	PACKTERTC=""
 .else
diff --git a/net/pbnc/Makefile b/net/pbnc/Makefile
index 65fd7032de71..b1a4898ebbd0 100644
--- a/net/pbnc/Makefile
+++ b/net/pbnc/Makefile
@@ -14,8 +14,9 @@ LICENSE=	BSD
 
 RUN_DEPENDS=	p5-Net-Netmask>=0:${PORTSDIR}/net-mgmt/p5-Net-Netmask
 
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
 PLIST_FILES=	etc/pbnc.cfg bin/pbnc.pl
 PORTDOCS= 	pbnc.readme
 
diff --git a/net/prosearch/Makefile b/net/prosearch/Makefile
index 0baaf981d5e6..6b9495bde74b 100644
--- a/net/prosearch/Makefile
+++ b/net/prosearch/Makefile
@@ -9,8 +9,9 @@ MASTER_SITES=	http://pro.setun.net/search/download/ SF/pro-search/pro-search/${P
 MAINTAINER=	proler@gmail.com
 COMMENT=	Powerful file search
 
+USES=		perl5
+USE_PERL5=	run
 USE_BZIP2=	yes
-WANT_PERL=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	SEARCHDIR=${SEARCHDIR}
 NO_BUILD=	yes
@@ -19,8 +20,6 @@ PLIST_SUB+=	SEARCHDIR=${SEARCHDIR}
 
 SAMBA_PORT?=	net/samba36
 
-USE_PERL5_RUN=	YES
-
 #todo
 # user and group for crawler, nginx
 OPTIONS_DEFINE=	CRAWLER SAMBA RSYNC APACHE MOD_PERL2 MOD_FASTCGI \
diff --git a/net/quagga-re/Makefile b/net/quagga-re/Makefile
index 4d4e6611efcf..805efca068ae 100644
--- a/net/quagga-re/Makefile
+++ b/net/quagga-re/Makefile
@@ -19,10 +19,10 @@ LICENSE_FILE=	${WRKSRC}/COPYING
 
 CONFLICTS=	openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-[0-9]*
 
+USES=			gmake perl5
 USE_AUTOTOOLS=		libtool autoheader
-USE_GMAKE=		yes
 USE_LDCONFIG=		yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=		build
 BUILD_DEPENDS+=		gawk:${PORTSDIR}/lang/gawk
 LIB_DEPENDS+=		gcrypt:${PORTSDIR}/security/libgcrypt
 CONFIGURE_ARGS+=	--with-libgcrypt
diff --git a/net/quagga/Makefile b/net/quagga/Makefile
index 126519ff5956..725b8646437f 100644
--- a/net/quagga/Makefile
+++ b/net/quagga/Makefile
@@ -16,12 +16,12 @@ LICENSE=	GPLv2
 
 CONFLICTS=	openbgpd-[0-9]* openospfd-[0-9]* zebra-0* quagga-re-[0-9]*
 
-USES=		gmake
+USES=		gmake perl5
 USE_AUTOTOOLS=	libtool autoheader aclocal
 ACLOCAL_ARGS=	-I${LOCALBASE}/share/aclocal
 BUILD_DEPENDS+=	gawk:${PORTSDIR}/lang/gawk
 USE_LDCONFIG=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 FETCH_ARGS=	-Fpr
 
 MAN1=		vtysh.1
diff --git a/net/samba4/Makefile b/net/samba4/Makefile
index a83277ccdcc9..e2d2739b19cd 100644
--- a/net/samba4/Makefile
+++ b/net/samba4/Makefile
@@ -67,11 +67,11 @@ CONFIGURE_ENV+=		PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
 			PTHREAD_LDFLAGS="${PTHREAD_LIBS}"
 
 USE_PYTHON_BUILD=	-2.7
-USE_PERL5_BUILD=	yes
+USE_PERL5=		build
 
 USE_GCC=		4.2+
 USE_PYTHON=		yes
-USES=			pkgconfig gettext iconv
+USES=			pkgconfig gettext iconv perl5
 USE_LDCONFIG=		${SAMBA4_LIBDIR}
 
 PKGCONFIGDIR?=		${PREFIX}/libdata/pkgconfig
diff --git a/net/sslh/Makefile b/net/sslh/Makefile
index 4d97e4a9e906..e340e949d6fc 100644
--- a/net/sslh/Makefile
+++ b/net/sslh/Makefile
@@ -20,8 +20,8 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}b.tar.gz
 
 LIB_DEPENDS=	config:${PORTSDIR}/devel/libconfig
 
-USE_GMAKE=	yes
-USE_PERL5_BUILD=	yes
+USES=		gmake perl5
+USE_PERL5=	build
 
 OPTIONS_DEFINE=	MANPAGES EXAMPLES
 OPTIONS_DEFAULT=	MANPAGES EXAMPLES
diff --git a/net/tac_plus4/Makefile b/net/tac_plus4/Makefile
index c0c4bdf3c7ae..5b4d4d7c5f0c 100644
--- a/net/tac_plus4/Makefile
+++ b/net/tac_plus4/Makefile
@@ -10,9 +10,9 @@ DISTNAME=	tacacs+-F4.0.4.26
 MAINTAINER=	marcus@FreeBSD.org
 COMMENT=	The Cisco remote authentication/authorization/accounting server
 
-USE_PERL5_BUILD=yes
 GNU_CONFIGURE=	yes
-USES=		bison
+USES=		bison perl5
+USE_PERL5=	build
 USE_RC_SUBR=	tac_plus
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--with-groupid=$$(/usr/bin/id -g tacacs 2>/dev/null || echo '559') \
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index c228c54a26a1..85cef8ca3220 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -22,11 +22,10 @@ RUN_DEPENDS=	showrgb:${PORTSDIR}/x11/rgb \
 MAKE_JOBS_UNSAFE=	yes
 CONFLICTS=	tridiavnc-[0-9]* vnc-[0-9]*
 WRKSRC=		${WRKDIR}/vnc_unixsrc
-USES=		imake shebangfix
+USES=		imake shebangfix perl5
 SHEBANG_FILES=	vncserver
 CFLAGS+=	-Wno-return-type
 USE_BZIP2=	yes
-USE_PERL5=	yes
 USE_XORG=	xaw
 ALL_TARGET=	World
 NO_INSTALL_MANPAGES=	yes
diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index 86d05a030d80..9b0c8a5d4934 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -15,9 +15,8 @@ COMMENT=	Display X and Win32 desktops on remote X/Win32/Java displays
 
 LICENSE=	GPLv2
 
-USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/unix/vnc_unixsrc
-USES=		imake shebangfix
+USES=		imake shebangfix perl5
 SHEBANG_FILES=	vncserver
 USE_XORG=	ice sm x11 xaw xext xmu xt xpm
 ALL_TARGET=	World
diff --git a/net/vmware-vsphere-cli/Makefile b/net/vmware-vsphere-cli/Makefile
index feca24bf6a0b..bf1cb3ad2949 100644
--- a/net/vmware-vsphere-cli/Makefile
+++ b/net/vmware-vsphere-cli/Makefile
@@ -23,7 +23,8 @@ RUN_DEPENDS=		p5-Class-MethodMaker>=0:${PORTSDIR}/devel/p5-Class-MethodMaker \
 			p5-Archive-Zip>=0:${PORTSDIR}/archivers/p5-Archive-Zip \
 			p5-SOAP-Lite>=0:${PORTSDIR}/net/p5-SOAP-Lite
 
-PERL_CONFIGURE=		yes
+USES=			perl5
+USE_PERL5=		configure
 RESTRICTED=		Downloading requires acceptance of license agreement
 NO_CDROM=		Distribution requires acceptance of license agreement
 NO_PACKAGE=		Distribution requires acceptance of license agreement