Convert to new perl framework

Submitted by:	az

8 files changed, 23 insertions, 27 deletions

diff --git a/cad/p5-Verilog-Perl/Makefile b/cad/p5-Verilog-Perl/Makefile
index afa0b93e1d10..9783d6d5f51b 100644
--- a/cad/p5-Verilog-Perl/Makefile
+++ b/cad/p5-Verilog-Perl/Makefile
@@ -12,11 +12,8 @@ COMMENT=	Building point for Verilog support in the Perl language
 
 BUILD_DEPENDS=	flex>=2.5.35:${PORTSDIR}/textproc/flex
 
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USES=		bison
-
-PERL_CONFIGURE=	yes
+USES=		bison gmake perl5
+USE_PERL5=	configure
 
 MAN1=	vhier.1 vpassert.1 vppreproc.1 vrename.1
 
diff --git a/devel/abi-compliance-checker/Makefile b/devel/abi-compliance-checker/Makefile
index ddbfaca6981e..8beff0523874 100644
--- a/devel/abi-compliance-checker/Makefile
+++ b/devel/abi-compliance-checker/Makefile
@@ -15,11 +15,12 @@ COMMENT=	Checks binary compatibility of two versions of a C/C++ shared library
 LICENSE=	LGPL20 GPLv2
 LICENSE_COMB=	dual
 
+USES=		perl5
+
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
 BUILD_DEPENDS?=	exctags:${PORTSDIR}/devel/ctags
-USE_PERL5=	yes
 .else
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 .endif
 RUN_DEPENDS?=	exctags:${PORTSDIR}/devel/ctags
 USE_GCC=	any
diff --git a/devel/api-sanity-autotest/Makefile b/devel/api-sanity-autotest/Makefile
index f75d1ec91704..870115949301 100644
--- a/devel/api-sanity-autotest/Makefile
+++ b/devel/api-sanity-autotest/Makefile
@@ -17,11 +17,12 @@ LICENSE_COMB=	dual
 
 RUN_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:${PORTSDIR}/devel/abi-compliance-checker
 
+USES=		perl5
+
 .if defined(MAINTAINER_MODE) || defined(PACKAGE_BUILDING)
 BUILD_DEPENDS=	${LOCALBASE}/bin/abi-compliance-checker.pl:${PORTSDIR}/devel/abi-compliance-checker
-USE_PERL5=	yes
 .else
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 .endif
 USE_GCC=	any
 
diff --git a/irc/kvirc/Makefile b/irc/kvirc/Makefile
index e708e4f9003e..eb5d4603f383 100644
--- a/irc/kvirc/Makefile
+++ b/irc/kvirc/Makefile
@@ -23,10 +23,10 @@ CONFLICTS_INSTALL=	kvirc-qt4-4.*
 
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 USE_QT4=	moc_build qmake_build rcc_build uic_build \
 		dbus gui network sql xml
-USES=		cmake gettext
+USES=		cmake gettext perl5
 CMAKE_ARGS=	-DWANT_ESD=no -DWANT_DOXYGEN=no \
 		-DMANDIR=${MANPREFIX}
 INSTALLS_ICONS=	yes
@@ -97,7 +97,7 @@ PLIST_SUB+=	PYTHON="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5_RUN=	yes
+USE_PERL5+=	run
 PLIST_SUB+=	PERL=""
 .else
 CMAKE_ARGS+=	-DWANT_PERL=no
diff --git a/irc/znc/Makefile b/irc/znc/Makefile
index 067251a66052..d9c8baacf1ce 100644
--- a/irc/znc/Makefile
+++ b/irc/znc/Makefile
@@ -15,9 +15,7 @@ LICENSE=	GPLv2
 FETCH_ARGS=	-Fpr
 GNU_CONFIGURE=	yes
 USE_RC_SUBR=	znc
-USES=		pkgconfig iconv
-USE_GMAKE=	yes
-WANT_PERL=	yes
+USES=		pkgconfig iconv gmake
 
 NO_OPTIONS_SORT=	yes
 
@@ -50,8 +48,9 @@ PLIST_SUB+=		OPENSSL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
+USES+=			perl5
+USE_PERL5+=		run build
 CONFIGURE_ARGS+=	--enable-perl
-USE_PERL5=		yes
 PLIST_SUB+=		PERL=""
 BUILD_DEPENDS+=		swig>=2.0.4:${PORTSDIR}/devel/swig20
 .else
@@ -70,7 +69,8 @@ PLIST_SUB+=		TCL="@comment "
 
 .if ${PORT_OPTIONS:MPYTHON}
 USE_PYTHON=	3.1-3.2
-USE_PERL5_BUILD=	yes
+USES+=		perl5
+USE_PERL5+=	build
 PLIST_SUB+=	PYTHON=""
 CONFIGURE_ARGS+=	--enable-python=python-${PYTHON_VER}
 BUILD_DEPENDS+=		swig>=2.0.4:${PORTSDIR}/devel/swig20
diff --git a/net-mgmt/nagios/Makefile b/net-mgmt/nagios/Makefile
index acf818fdec86..a0fd923d3263 100644
--- a/net-mgmt/nagios/Makefile
+++ b/net-mgmt/nagios/Makefile
@@ -14,8 +14,8 @@ LICENSE=	GPLv2
 LIB_DEPENDS=	gd:${PORTSDIR}/graphics/gd
 RUN_DEPENDS=	${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagios-plugins
 
-USES=		iconv
-USE_PERL5_BUILD=yes
+USES=		iconv perl5
+USE_PERL5=	build
 USE_AUTOTOOLS=	autoconf libltdl
 USE_PHP=	yes
 USE_RC_SUBR=	nagios
@@ -86,7 +86,7 @@ UNHANDLED_HACK_DESC=	Display passive checks in unhandled queries
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MEMBEDDED_PERL}
-USE_PERL5=	yes
+USE_PERL5+=	run
 CONFIGURE_ARGS+=--enable-embedded-perl \
 		--with-perlcache
 PLIST_SUB+=	EMBEDDED_PERL=""
diff --git a/net-mgmt/netxms/Makefile b/net-mgmt/netxms/Makefile
index d7aeea3fcf43..e2e3ce66d92d 100644
--- a/net-mgmt/netxms/Makefile
+++ b/net-mgmt/netxms/Makefile
@@ -26,10 +26,8 @@ BROKEN=		Does not fetch
 
 NO_PACKAGE=	yes
 
-USE_PERL5=	yes
 USE_OPENSSL=	yes
-USES=		iconv
-USE_GMAKE=	yes
+USES=		iconv gmake perl5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-silent-rules
 USE_LDCONFIG=	yes
@@ -103,7 +101,6 @@ USE_RC_SUBR+=	nxhttpd
 CONFIGURE_ARGS+=	--with-nxhttpd
 PLIST_SUB+=	NXHTTPD=""
 LIB_DEPENDS+=	gd:${PORTSDIR}/graphics/gd
-USE_PERL5=	yes
 .else
 PLIST_SUB+=	NXHTTPD="@comment "
 .endif
diff --git a/textproc/p5-Plagger/Makefile b/textproc/p5-Plagger/Makefile
index f13e6a0d8aad..ebbc2923f42e 100644
--- a/textproc/p5-Plagger/Makefile
+++ b/textproc/p5-Plagger/Makefile
@@ -12,8 +12,6 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	sumikawa@FreeBSD.org
 COMMENT=	Pluggable RSS/Atom feed aggregator written in Perl
 
-USE_PERL5=	yes
-
 BUILD_DEPENDS=	p5-Class-Accessor>=0:${PORTSDIR}/devel/p5-Class-Accessor \
 		p5-DateTime>=0:${PORTSDIR}/devel/p5-DateTime \
 		p5-DateTime-TimeZone>=0:${PORTSDIR}/devel/p5-DateTime-TimeZone \
@@ -375,7 +373,9 @@ BUILD_DEPENDS+=	p5-Text-Original>=0:${PORTSDIR}/textproc/p5-Text-Original
 .endif
 
 RUN_DEPENDS:=	${BUILD_DEPENDS}
-PERL_CONFIGURE=	yes
+
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		Plagger.3 \
 		Plagger::Cookies.3 \