- convert to the new perl5 framework

- convert USE_GMAKE to Uses

Approved by:	portmgr (bapt@, blanket)

19 files changed, 34 insertions, 24 deletions

diff --git a/www/MT/Makefile b/www/MT/Makefile
index ab9ed14447f2..a3a079df7d84 100644
--- a/www/MT/Makefile
+++ b/www/MT/Makefile
@@ -45,7 +45,8 @@ SUB_LIST+=	DATADIR=${DATADIR}\
 		WWWOWN=${WWWOWN}\
 		WWWGRP=${WWWGRP}
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 MT_DOCS_URL?=	http://www.movabletype.org/documentation/
 MT_UPGRADE_URL?=http://www.movabletype.org/documentation/installation/upgrade-movable-type.html
diff --git a/www/apache22/Makefile b/www/apache22/Makefile
index 2f26cbaf32b0..55d0b1ede2c9 100644
--- a/www/apache22/Makefile
+++ b/www/apache22/Makefile
@@ -24,9 +24,8 @@ CONFLICTS_INSTALL=	caudium14-1.* \
 
 USE_APACHE=	common22
 USE_BZIP2=	yes
-USES=		iconv
+USES=		iconv perl5
 USE_AUTOTOOLS=	autoconf libtool
-USE_PERL5=	yes
 USE_RC_SUBR=	apache22 htcacheclean
 LIBTOOLFILES=	configure.in
 
diff --git a/www/awstats/Makefile b/www/awstats/Makefile
index 86815551d95e..76eea1e81e83 100644
--- a/www/awstats/Makefile
+++ b/www/awstats/Makefile
@@ -14,8 +14,9 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-Net-XWhois>=0:${PORTSDIR}/net/p5-Net-XWhois
 
+USES=		perl5
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 USE_DOS2UNIX=	tools/*.pl \
 		wwwroot/cgi-bin/awstats.model.conf \
 		wwwroot/cgi-bin/*.pl \
diff --git a/www/bins/Makefile b/www/bins/Makefile
index 1efef64fcfc1..bf9e7a974922 100644
--- a/www/bins/Makefile
+++ b/www/bins/Makefile
@@ -30,8 +30,9 @@ RUN_DEPENDS=	\
 	p5-XML-Handler-YAWriter>=0:${PORTSDIR}/textproc/p5-XML-Handler-YAWriter \
 	p5-libxml>=0:${PORTSDIR}/textproc/p5-libxml
 
+USES=		perl5
+USE_PERL5=	run
 USE_BZIP2=	yes
-USE_PERL5_RUN=	yes
 NO_BUILD=	yes
 
 # additional scripts
diff --git a/www/drraw/Makefile b/www/drraw/Makefile
index 033c4b3ce3b9..272f51c6d01e 100644
--- a/www/drraw/Makefile
+++ b/www/drraw/Makefile
@@ -16,7 +16,8 @@ RUN_DEPENDS+=	rrdtool>=0:${PORTSDIR}/databases/rrdtool
 OPTIONS_DEFINE=	ZOOM_PATCH
 ZOOM_PATCH_DESC=	Zoom support using jQuery via external patch
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 PORTDOCS=	CHANGES INSTALL LICENSE README.EVENTS
diff --git a/www/igal2/Makefile b/www/igal2/Makefile
index 92e90572a516..f5a7bcb92972 100644
--- a/www/igal2/Makefile
+++ b/www/igal2/Makefile
@@ -15,7 +15,7 @@ OPTIONS_DEFINE=	EXIF
 EXIF_DESC=	Support EXIF data (-e option)
 
 CONFLICTS=	igal-1.*
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 MAN1=		igal2.1
diff --git a/www/interchange/Makefile b/www/interchange/Makefile
index f9348c3d2c51..fa1a09602bea 100644
--- a/www/interchange/Makefile
+++ b/www/interchange/Makefile
@@ -17,8 +17,9 @@ RUN_DEPENDS=	p5-Safe-Hole>=0.10:${PORTSDIR}/security/p5-Safe-Hole \
 		p5-Digest-SHA1>=2.11:${PORTSDIR}/security/p5-Digest-SHA1
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
+USES=		perl5
+USE_PERL5=	configure
 USE_BZIP2=	yes
-PERL_CONFIGURE=	yes
 
 OPTIONS_DEFINE=	MYSQL PGSQL
 OPTIONS_DEFAULT=	MYSQL
diff --git a/www/newsbeuter/Makefile b/www/newsbeuter/Makefile
index 5da666bccaa4..c244f1305cb9 100644
--- a/www/newsbeuter/Makefile
+++ b/www/newsbeuter/Makefile
@@ -17,8 +17,8 @@ LIB_DEPENDS=	stfl.1:${PORTSDIR}/devel/stfl \
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		gettext ncurses gmake pkgconfig
-USE_PERL5_BUILD=yes
+USES=		gettext ncurses gmake pkgconfig perl5
+USE_PERL5=	build
 USE_SQLITE=	yes
 USE_GNOME=	libxml2
 
diff --git a/www/p5-CGI-FormBuilder/Makefile b/www/p5-CGI-FormBuilder/Makefile
index 72b423b4a87b..bbd4f3bbc5d0 100644
--- a/www/p5-CGI-FormBuilder/Makefile
+++ b/www/p5-CGI-FormBuilder/Makefile
@@ -15,7 +15,8 @@ COMMENT=	FormBuilder for CGI
 LICENSE=	ART10 GPLv1
 LICENSE_COMB=	dual
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 OPTIONS_DEFINE=	TT HTML_TEMPLATE TEXT_TEMPLATE CGI_FAST_TEMPLATE CGI_SSI CGI_SESSION
 OPTIONS_DEFAULT=	TT
diff --git a/www/p5-HTML-Mason/Makefile b/www/p5-HTML-Mason/Makefile
index 648d24e3600f..0fa8fd067b49 100644
--- a/www/p5-HTML-Mason/Makefile
+++ b/www/p5-HTML-Mason/Makefile
@@ -23,7 +23,8 @@ TEST_DEPENDS=	p5-CHI>=0.210:${PORTSDIR}/devel/p5-CHI \
 		p5-Test-Deep>=0:${PORTSDIR}/devel/p5-Test-Deep \
 		p5-Test-Memory-Cycle>=0:${PORTSDIR}/devel/p5-Test-Memory-Cycle
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=		HTML::Mason.3 \
 		HTML::Mason::Admin.3 \
diff --git a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
index d56d790d97df..8ab62ae239d6 100644
--- a/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
+++ b/www/p5-HTTP-MobileAgent-Plugin-Charset/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS=	\
 	p5-HTTP-MobileAgent>=0.26:${PORTSDIR}/www/p5-HTTP-MobileAgent
 BUILD_DEPENDS:=	${RUN_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	HTTP::MobileAgent::Plugin::Charset.3
 
diff --git a/www/p5-Pod-Site/Makefile b/www/p5-Pod-Site/Makefile
index f3eb70622a85..96b894d5ced4 100644
--- a/www/p5-Pod-Site/Makefile
+++ b/www/p5-Pod-Site/Makefile
@@ -24,7 +24,8 @@ OPTIONS_DEFINE=	PODT
 
 PODT_DESC=	Include Pod package tests
 
-PERL_MODBUILD=	yes
+USES=		perl5
+USE_PERL5=	modbuild
 
 MAN1=		podsite.1
 MAN3=		Pod::Site.3
diff --git a/www/p5-Task-Plack/Makefile b/www/p5-Task-Plack/Makefile
index f6ca4d2a32d2..843d625cfc4a 100644
--- a/www/p5-Task-Plack/Makefile
+++ b/www/p5-Task-Plack/Makefile
@@ -10,7 +10,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl module bundle for Plack
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Task::Plack.3
 
diff --git a/www/p5-WebService-NoPaste/Makefile b/www/p5-WebService-NoPaste/Makefile
index 29d684aad050..5869810d94e3 100644
--- a/www/p5-WebService-NoPaste/Makefile
+++ b/www/p5-WebService-NoPaste/Makefile
@@ -15,8 +15,8 @@ BUILD_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
 		p5-Spiffy>=0:${PORTSDIR}/devel/p5-Spiffy
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
-USES=		shebangfix
+USES=		shebangfix perl5
+USE_PERL5=	configure
 SHEBANG_FILES=	nopaste
 
 MAN3=		WebService::NoPaste.3
diff --git a/www/snownews/Makefile b/www/snownews/Makefile
index 73262f3e16cf..cd006b44e2b0 100644
--- a/www/snownews/Makefile
+++ b/www/snownews/Makefile
@@ -10,8 +10,8 @@ MASTER_SITES=	http://kiza.kcore.de/media/software/snownews/
 MAINTAINER=	clsung@FreeBSD.org
 COMMENT=	A text mode RSS newsreader
 
-USE_PERL5_BUILD=yes
-USES=		gmake iconv
+USES=		gmake iconv perl5
+USE_PERL5=	build
 USE_GNOME=	libxml2
 HAS_CONFIGURE=	yes
 
diff --git a/www/squid/Makefile b/www/squid/Makefile
index 59082bbd4e1f..a1e823758522 100644
--- a/www/squid/Makefile
+++ b/www/squid/Makefile
@@ -114,9 +114,9 @@ COMMENT=	HTTP Caching Proxy
 SQUID_STABLE_VER=	9
 
 CONFLICTS_INSTALL=	squid-2.[^7]* squid-3.* cacheboy-[0-9]* lusca-head-[0-9]*
+USES=		perl5
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_PERL5=	yes
 USE_RC_SUBR=	squid
 
 SQUID_UID?=	squid
diff --git a/www/squid32/Makefile b/www/squid32/Makefile
index a009b6babc14..910ca6d1ad56 100644
--- a/www/squid32/Makefile
+++ b/www/squid32/Makefile
@@ -79,9 +79,9 @@ LATEST_LINK=	squid32
 SQUID_STABLE_VER=	13
 
 CONFLICTS_INSTALL=	squid-2.[0-9].* squid-3.[!2].* cacheboy-[0-9]* lusca-head-[0-9]*
+USES=		perl5
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USE_PERL5=	yes
 USE_RC_SUBR=	squid
 
 USERS=		squid
diff --git a/www/validator/Makefile b/www/validator/Makefile
index 747c95ff16b3..ef6f23452386 100644
--- a/www/validator/Makefile
+++ b/www/validator/Makefile
@@ -25,8 +25,9 @@ RUN_DEPENDS=	onsgmls:${PORTSDIR}/textproc/opensp \
 		p5-URI>=0:${PORTSDIR}/net/p5-URI \
 		p5-XML-LibXML>=0:${PORTSDIR}/textproc/p5-XML-LibXML
 
+USES=		perl5
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 
 SUB_FILES=	pkg-message validator.conf.sample
 
diff --git a/www/xombrero/Makefile b/www/xombrero/Makefile
index de4d88f4d9a5..262fd0effbab 100644
--- a/www/xombrero/Makefile
+++ b/www/xombrero/Makefile
@@ -15,8 +15,8 @@ LICENSE=	ISCL
 LIB_DEPENDS=	gnutls:${PORTSDIR}/security/gnutls \
 		soup-2.4:${PORTSDIR}/devel/libsoup
 
-USES=		pkgconfig
-USE_PERL5_BUILD=yes
+USES=		pkgconfig perl5
+USE_PERL5=	build
 INSTALLS_ICONS=	yes
 
 MAN1=		xombrero.1