- convert to the new perl5 framework

- convert USE_GMAKE to Uses

Approved by:	portmgr (bapt@, blanket)

19 files changed, 30 insertions, 34 deletions

diff --git a/finance/kmymoney-kde4/Makefile b/finance/kmymoney-kde4/Makefile
index 001eb7c..74c19b3 100644
--- a/finance/kmymoney-kde4/Makefile
+++ b/finance/kmymoney-kde4/Makefile
@@ -71,7 +71,8 @@ PLIST_SUB+=	OFX="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MQUOTES}
-USE_PERL5_RUN=	yes
+USES+=		perl5
+USE_PERL5=	run
 RUN_DEPENDS+=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-Finance-Quote>=0:${PORTSDIR}/finance/p5-Finance-Quote \
 		p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser \
diff --git a/finance/p5-Finance-Bitcoin/Makefile b/finance/p5-Finance-Bitcoin/Makefile
index 63e64fc..e8639af 100644
--- a/finance/p5-Finance-Bitcoin/Makefile
+++ b/finance/p5-Finance-Bitcoin/Makefile
@@ -22,7 +22,8 @@ BUILD_DEPENDS=	p5-JSON-RPC>=0.96:${PORTSDIR}/devel/p5-JSON-RPC \
 		p5-Object-AUTHORITY>=0:${PORTSDIR}/devel/p5-Object-Authority
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Finance::Bitcoin::API.3 \
 	Finance::Bitcoin::Address.3 \
diff --git a/ftp/smbftpd/Makefile b/ftp/smbftpd/Makefile
index 6abc425..dcf8184 100644
--- a/ftp/smbftpd/Makefile
+++ b/ftp/smbftpd/Makefile
@@ -24,7 +24,7 @@ HAS_CONFIGURE=	yes
 MAKE_ENV=	OSTYPE=FreeBSD
 CONFIGURE_ARGS=	"--prefix=${PREFIX}"
 
-USE_PERL5=	yes
+USES=		perl5
 USE_RC_SUBR=	${PORTNAME}
 
 .include <bsd.port.pre.mk>
diff --git a/ftp/wget/Makefile b/ftp/wget/Makefile
index 51ddf1c..b9af990 100644
--- a/ftp/wget/Makefile
+++ b/ftp/wget/Makefile
@@ -11,10 +11,9 @@ MASTER_SITE_SUBDIR=	wget
 MAINTAINER=	vd@FreeBSD.org
 COMMENT=	Retrieve files from the Net via HTTP(S) and FTP
 
-USES=		charsetfix
+USES=		charsetfix gmake perl5
 USE_XZ=		yes
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 
 OPTIONS_RADIO=	SSL
diff --git a/misc/amanda-perl-wrapper/Makefile b/misc/amanda-perl-wrapper/Makefile
index e554fe6..15f571e 100644
--- a/misc/amanda-perl-wrapper/Makefile
+++ b/misc/amanda-perl-wrapper/Makefile
@@ -14,7 +14,8 @@ DISTFILES=	# empty
 MAINTAINER=	kuriyama@FreeBSD.org
 COMMENT=	Perl wrapper to use with Amanda (with libthr.so.* linked)
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 SUB_FILES=	perl-amanda.c
 SUB_LIST=	PREFIX=${LOCALBASE}
 PLIST_FILES=	bin/perl-amanda
diff --git a/misc/amanda25-server/Makefile b/misc/amanda25-server/Makefile
index db833ab..787638d 100644
--- a/misc/amanda25-server/Makefile
+++ b/misc/amanda25-server/Makefile
@@ -17,7 +17,7 @@ SLAVEDIRS=	misc/amanda25-client
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 USE_AUTOTOOLS=	autoconf
-USE_GMAKE=	yes
+USES=		gmake
 USE_OPENSSL=	yes
 PATCH_STRIP=
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
@@ -26,7 +26,6 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--disable-libtool --prefix=${PREFIX} \
 		--with-user=${AMANDA_USER} --with-group=${AMANDA_GROUP}
 USE_LDCONFIG=	yes
-WANT_PERL=	yes
 
 SAMBA_PORT?=	net/samba36
 
@@ -119,7 +118,7 @@ post-patch:
 		${WRKSRC}/server-src/amcrypt-ossl.sh.in \
 		${WRKSRC}/server-src/amcrypt-ossl-asym.sh.in
 
-USE_PERL5=	yes
+USES+=		perl5
 
 BUILD_DEPENDS+=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda25-client
 RUN_DEPENDS+=	${LOCALBASE}/sbin/amrecover:${PORTSDIR}/misc/amanda25-client
diff --git a/misc/amanda26-server/Makefile b/misc/amanda26-server/Makefile
index 3d2ab27..ac093d6 100644
--- a/misc/amanda26-server/Makefile
+++ b/misc/amanda26-server/Makefile
@@ -16,10 +16,9 @@ WRKSRC=		${WRKDIR}/amanda-${PORTVERSION}
 SLAVEDIRS=	misc/amanda26-client
 
 NO_LATEST_LINK=	yes
-USES=		pkgconfig
+USES=		gmake perl5 pkgconfig
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-USE_GMAKE=	yes
 USE_OPENSSL=	yes
 PATCH_STRIP=
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
@@ -33,7 +32,6 @@ CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--with-ssh-security
 
 USE_LDCONFIG=	yes
-USE_PERL5=	yes
 
 OPTIONS_DEFINE=	GNUTAR
 GNUTAR_DESC=	use GNU tar
diff --git a/misc/amanda32-server/Makefile b/misc/amanda32-server/Makefile
index c031576..fe27fdf 100644
--- a/misc/amanda32-server/Makefile
+++ b/misc/amanda32-server/Makefile
@@ -20,12 +20,10 @@ SLAVEDIRS=	misc/amanda32-client
 
 NO_LATEST_LINK=	yes
 GNU_CONFIGURE=	yes
-USES=		pkgconfig
+USES=		gmake perl5 pkgconfig
 USE_GNOME=	glib20
-USE_GMAKE=	yes
 USE_OPENSSL=	yes
 USE_LDCONFIG=	yes
-USE_PERL5=	yes
 CONFIGURE_ARGS=	--libexecdir=${PREFIX}/libexec/amanda \
 		--without-amlibexecdir \
 		--with-amandahosts --with-fqdn \
diff --git a/misc/hello/Makefile b/misc/hello/Makefile
index 4be4dae..6a69331 100644
--- a/misc/hello/Makefile
+++ b/misc/hello/Makefile
@@ -10,9 +10,9 @@ MASTER_SITE_SUBDIR=	hello
 MAINTAINER=	dhn@FreeBSD.org
 COMMENT=	A utility for saying hello to the world and reading email
 
-USE_PERL5_BUILD=	YES
+USES=		charsetfix perl5
+USE_PERL5=	build
 GNU_CONFIGURE=	YES
-USES=		charsetfix
 
 MAN1=		hello.1
 INFO=		hello
diff --git a/misc/mc/Makefile b/misc/mc/Makefile
index eadaef0..413440c 100644
--- a/misc/mc/Makefile
+++ b/misc/mc/Makefile
@@ -16,10 +16,8 @@ LIB_DEPENDS=	ssh2:${PORTSDIR}/security/libssh2
 
 CONFLICTS=	mc-light-4*
 
-USES=		pkgconfig
-USE_GMAKE=	yes
+USES=		gmake perl5 pkgconfig
 USE_GNOME=	glib20
-USE_PERL5=	yes
 USE_XZ=		yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ZIP=${UNZIP_CMD} UNZIP=${UNZIP_CMD}
diff --git a/misc/ossp-uuid/Makefile b/misc/ossp-uuid/Makefile
index 2ba1931..bdfcf21 100644
--- a/misc/ossp-uuid/Makefile
+++ b/misc/ossp-uuid/Makefile
@@ -27,7 +27,7 @@ MAN1=	uuid-config.1 uuid.1
 MAN3=	uuid.3 uuid++.3
 
 .if defined(WITH_PERL)
-USE_PERL5=	yes
+USES+=		perl5
 CONFIGURE_ENV+=	PERL=${PERL5}
 CONFIGURE_ARGS+=	--with-perl
 PLIST_SUB+=	WITH_PERL=''
diff --git a/news/fidogate/Makefile b/news/fidogate/Makefile
index 00cd598..1088019 100644
--- a/news/fidogate/Makefile
+++ b/news/fidogate/Makefile
@@ -15,8 +15,7 @@ RUN_DEPENDS=	${LOCALBASE}/libexec/ifmail/ifcico:${PORTSDIR}/news/ifmail
 
 MAKE_JOBS_UNSAFE=	yes
 
-USE_GMAKE=	yes
-USE_PERL5=	yes
+USES=		gmake perl5
 
 DOCLIST=	fidogate.texi fidogate.txt gatebau94.txt kludge-rfc.doc \
 		msgid.doc qmail.txt texinfo.tex dirs.html index.html \
diff --git a/news/inn/Makefile b/news/inn/Makefile
index fde8384..992345c 100644
--- a/news/inn/Makefile
+++ b/news/inn/Makefile
@@ -28,8 +28,7 @@ SUB_FILES=	pkg-install
 
 LATEST_LINK=	${PORTNAME}${PKGNAMESUFFIX}
 
-USE_GMAKE=	yes
-USE_PERL5=	yes
+USES=		gmake perl5
 
 CONFLICTS?=	inn-stable-[0-9]* inn-current-[0-9]*
 
diff --git a/news/mail2nntp/Makefile b/news/mail2nntp/Makefile
index cccce38..f14b2c5 100644
--- a/news/mail2nntp/Makefile
+++ b/news/mail2nntp/Makefile
@@ -13,7 +13,8 @@ LICENSE=	GPLv2
 
 RUN_DEPENDS=	p5-NNTPClient>=0:${PORTSDIR}/news/p5-NNTPClient
 
-USE_PERL5_RUN=	yes
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 PORTDOCS=	*
diff --git a/news/newsstar/Makefile b/news/newsstar/Makefile
index 899477f..dee607c 100644
--- a/news/newsstar/Makefile
+++ b/news/newsstar/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	gdbm:${PORTSDIR}/databases/gdbm
 BUILD_DEPENDS=	xmlto:${PORTSDIR}/textproc/xmlto \
 		${LOCALBASE}/share/xml/docbook/4.5/docbookx.dtd:${PORTSDIR}/textproc/docbook-xml
 
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-USES=		iconv
+USES=		iconv perl5
 
 OPTIONS_DEFINE=		SSL
 OPTIONS_DEFAULT=	SSL
diff --git a/www/blogsum/Makefile b/www/blogsum/Makefile
index 91219ca..78a5908 100644
--- a/www/blogsum/Makefile
+++ b/www/blogsum/Makefile
@@ -22,9 +22,9 @@ RUN_DEPENDS=	p5-DBI>=0:${PORTSDIR}/databases/p5-DBI \
 		p5-HTTP-Lite>=0:${PORTSDIR}/www/p5-HTTP-Lite \
 		${APACHE_PKGNAMEPREFIX}mod_perl2>=0:${PORTSDIR}/www/mod_perl2
 
+USES=		perl5
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
-
+USE_PERL5=	run
 USE_APACHE_RUN=	22+
 
 .include <bsd.port.pre.mk>
diff --git a/www/p5-HTML-DOM/Makefile b/www/p5-HTML-DOM/Makefile
index f52f0bc..57c6cb5 100644
--- a/www/p5-HTML-DOM/Makefile
+++ b/www/p5-HTML-DOM/Makefile
@@ -20,7 +20,8 @@ BUILD_DEPENDS=	p5-CSS-DOM>=0:${PORTSDIR}/www/p5-CSS-DOM \
 		p5-constant-lexical>0:${PORTSDIR}/devel/p5-constant-lexical
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 .include <bsd.port.pre.mk>
 .include "${MASTERDIR}/Makefile.man"
diff --git a/x11-toolkits/p5-Alien-wxWidgets/Makefile b/x11-toolkits/p5-Alien-wxWidgets/Makefile
index 0b20982..d023c99 100644
--- a/x11-toolkits/p5-Alien-wxWidgets/Makefile
+++ b/x11-toolkits/p5-Alien-wxWidgets/Makefile
@@ -15,9 +15,10 @@ OPTIONS_DEFAULT=	UNICODE
 UNICODE_DESC=	Build with Unicode support
 
 USE_GCC=	any
+USES=		perl5
+USE_PERL5=	modbuild
 USE_WX=		2.6+
 WX_COMPS=	wx contrib
-PERL_MODBUILD=	yes
 
 .include <bsd.port.pre.mk>
 
diff --git a/x11-toolkits/p5-Wx/Makefile b/x11-toolkits/p5-Wx/Makefile
index 4540288..fb38e41 100644
--- a/x11-toolkits/p5-Wx/Makefile
+++ b/x11-toolkits/p5-Wx/Makefile
@@ -22,9 +22,10 @@ OPTIONS_DEFINE=	UNICODE
 OPTIONS_DEFAULT=	UNICODE
 UNICODE_DESC=	Build with Unicode support
 
+USES=		perl5
+USE_PERL5=	configure
 USE_WX=		2.6+
 WX_COMPS=	wx contrib
-PERL_CONFIGURE=	yes
 CC=		${CXX}
 CFLAGS+=	-pthread -Wno-write-strings
 MAKE_JOBS_UNSAFE=	yes