- convert to the new perl5 framework

- convert USE_GMAKE to Uses

Approved by:	portmgr (bapt@, blanket)

19 files changed, 32 insertions, 40 deletions

diff --git a/benchmarks/polygraph/Makefile b/benchmarks/polygraph/Makefile
index f36dd15..b9eb96f 100644
--- a/benchmarks/polygraph/Makefile
+++ b/benchmarks/polygraph/Makefile
@@ -48,7 +48,8 @@ CONFIGURE_ARGS+=	--without-ssl
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5_RUN=	yes
+USES+=		perl5
+USE_PERL5=	run
 .endif
 
 .if ${PORT_OPTIONS:MZLIB}
diff --git a/multimedia/ffmpeg-devel/Makefile b/multimedia/ffmpeg-devel/Makefile
index 84d5ee4..0f136b1 100644
--- a/multimedia/ffmpeg-devel/Makefile
+++ b/multimedia/ffmpeg-devel/Makefile
@@ -30,10 +30,9 @@ FETCH_URL=	"http://git.videolan.org/?p=ffmpeg.git;a=snapshot;h=${GIT_SNAPSHOT};s
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
-USES=		pkgconfig
-USE_GMAKE=	yes
+USES=		gmake perl5 pkgconfig
 WANT_SDL=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
 		FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM LAME \
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index ed56e10..b058ca9 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -24,11 +24,10 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
-USES=		pkgconfig
+USES=		gmake perl5 pkgconfig
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 WANT_SDL=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB CELT DEBUG DIRAC FAAC \
 		FFSERVER FREETYPE FREI0R GSM LAME OPENCV OPENJPEG \
diff --git a/multimedia/ffmpeg1/Makefile b/multimedia/ffmpeg1/Makefile
index ac2d6cb..f482aeb 100644
--- a/multimedia/ffmpeg1/Makefile
+++ b/multimedia/ffmpeg1/Makefile
@@ -23,11 +23,10 @@ LATEST_LINK=	ffmpeg${PKGNAMESUFFIX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
-USES=		pkgconfig
+USES=		gmake pkgconfig perl5
+USE_PERL5=	build
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 WANT_SDL=	yes
-USE_PERL5_BUILD=	yes
 
 OPTIONS_DEFINE=	AACPLUS ALSA AMR_NB AMR_WB ASS CDIO CELT DEBUG FAAC \
 		FDK_AAC FFSERVER FONTCONFIG FREETYPE FREI0R GNUTLS GSM ICONV \
diff --git a/multimedia/libvpx/Makefile b/multimedia/libvpx/Makefile
index 0092866..0bb8619 100644
--- a/multimedia/libvpx/Makefile
+++ b/multimedia/libvpx/Makefile
@@ -13,11 +13,11 @@ COMMENT=	VP8 Codec SDK
 BUILD_DEPENDS=	bash:${PORTSDIR}/shells/bash \
 		yasm:${PORTSDIR}/devel/yasm
 
+USES=		gmake perl5
 USE_BZIP2=	yes
 PROJECTHOST=	webm
 HAS_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PERL5_BUILD=	yes
+USE_PERL5=	build
 USE_LDCONFIG=	yes
 
 LICENSE=	BSD
diff --git a/multimedia/mythtv/Makefile b/multimedia/mythtv/Makefile
index 9cbe510..93cf980 100644
--- a/multimedia/mythtv/Makefile
+++ b/multimedia/mythtv/Makefile
@@ -23,15 +23,13 @@ RUN_DEPENDS=	tv_check:${PORTSDIR}/textproc/p5-xmltv \
 CONFLICTS=	mythtv-frontend-[0-9]*
 
 ONLY_FOR_ARCHS=	i386 amd64
-USES=		pkgconfig
+USES=		gmake pkgconfig perl5
 USE_BZIP2=	yes
 USE_QT4=	gui sql network script linguist_build l10n sql-mysql_run \
 		moc_build qmake_build rcc_build uic_build imageformats
 QT_NONSTANDARD=	yes
 USE_MYSQL=	51
-USE_GMAKE=	yes
 HAS_CONFIGURE=	yes
-USE_PERL5=	yes
 USE_LDCONFIG=	${PREFIX}/lib/mythtv/filters
 REINPLACE_ARGS=	-i ""
 USE_RC_SUBR=	mythbackend
diff --git a/multimedia/p5-Subtitles/Makefile b/multimedia/p5-Subtitles/Makefile
index 1b81858..91424b4 100644
--- a/multimedia/p5-Subtitles/Makefile
+++ b/multimedia/p5-Subtitles/Makefile
@@ -14,7 +14,8 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	osa@FreeBSD.org
 COMMENT=	A Perl5 backend for fix subtitles timing
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN1=	subs.1
 MAN3=	Subtitles.3
diff --git a/multimedia/xawtv/Makefile b/multimedia/xawtv/Makefile
index c6e80a3..674e34e 100644
--- a/multimedia/xawtv/Makefile
+++ b/multimedia/xawtv/Makefile
@@ -19,10 +19,9 @@ OPTIONS_DEFINE_i386=	MMX
 OPTIONS_DEFAULT=	AALIB
 ZVBI_DESC=	Enable libzvbi support
 
-USES=		gmake iconv motif
+USES=		gmake iconv motif perl5
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
 USE_XORG=	x11 xaw
 CONFIGURE_ENV=	LIBS="-L${PREFIX}/lib -L${LOCALBASE}/lib"
 CFLAGS+=	-I${WRKSRC}/common
diff --git a/multimedia/zoneminder/Makefile b/multimedia/zoneminder/Makefile
index 2bb372a..f7f8019 100644
--- a/multimedia/zoneminder/Makefile
+++ b/multimedia/zoneminder/Makefile
@@ -30,9 +30,9 @@ BUILD_DEPENDS=	${LOCALBASE}/bin/php-config:${PORTSDIR}/lang/php5-extensions \
 		p5-MIME-Tools>=0:${PORTSDIR}/mail/p5-MIME-Tools \
 		${LOCALBASE}/include/linux/videodev.h:${PORTSDIR}/multimedia/v4l_compat
 
+USES=		perl5
 GNU_CONFIGURE=	yes
 USE_PHP=	json mysql session
-USE_PERL5=	yes
 USE_MYSQL=	yes
 USE_RC_SUBR=	zoneminder
 
diff --git a/net/freeradius2/Makefile b/net/freeradius2/Makefile
index c4edfbc..6b0ecfc 100644
--- a/net/freeradius2/Makefile
+++ b/net/freeradius2/Makefile
@@ -33,8 +33,9 @@ CONFLICTS=	gnu-radius-[0-9].* openradius-[0-9].* radiusd-cistron-[0-9].* \
 		freeradius-mysql-[0-9].* freeradius-[013-9].*
 
 USE_RC_SUBR=	radiusd
+
+USES=		gmake
 USE_AUTOTOOLS=	libltdl libtool autoconf
-USE_GMAKE=	yes
 USE_BZIP2=	yes
 USE_OPENSSL=	yes
 MAKE_ARGS+=	LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
@@ -176,7 +177,7 @@ EXPM=		yes
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=	yes
+USES+=		perl5
 CONFIGURE_ARGS+=--with-rlm_perl
 PLIST_SUB+=	RLMPERL=""
 .else
diff --git a/net/isc-dhcp42-server/Makefile b/net/isc-dhcp42-server/Makefile
index 21075ec..3f09947 100644
--- a/net/isc-dhcp42-server/Makefile
+++ b/net/isc-dhcp42-server/Makefile
@@ -16,7 +16,7 @@ COMMENT?=	The ISC Dynamic Host Configuration Protocol server
 
 LICENSE=	ISCL
 
-USE_GMAKE=	yes
+USES=		gmake
 
 PATCHLEVEL=	P1
 PORTREVISION_SERVER=	0
@@ -138,7 +138,7 @@ PLIST_SUB+=	IPV6="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MBIND_SYMBOLS}
-USE_PERL5=	yes
+USES+=		perl5
 .else
 EXTRA_PATCHES+=	${PATCHDIR}/extra-patch-bind__Makefile
 .endif
diff --git a/net/openpgm/Makefile b/net/openpgm/Makefile
index 5442205..759e0e3 100644
--- a/net/openpgm/Makefile
+++ b/net/openpgm/Makefile
@@ -15,9 +15,8 @@ LICENSE=	LGPL3
 
 GNU_CONFIGURE=	yes
 USE_BZIP2=	yes
-USES=	pathfix
+USES=		pathfix perl5
 USE_LDCONFIG=	yes
-USE_PERL5=	yes
 USE_PYTHON=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/openpgm/pgm
 
diff --git a/net/p5-Net-Google-SafeBrowsing2/Makefile b/net/p5-Net-Google-SafeBrowsing2/Makefile
index 2887e47..3ad9557 100644
--- a/net/p5-Net-Google-SafeBrowsing2/Makefile
+++ b/net/p5-Net-Google-SafeBrowsing2/Makefile
@@ -31,7 +31,8 @@ Postgres_DESC=	uses Postgres as the storage backend
 
 OPTIONS_DEFAULT=SQLite
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 MAN3=	Net::Google::SafeBrowsing2::Storage.3 \
 	Net::Google::SafeBrowsing2::Lookup.3 \
diff --git a/net/sendemail/Makefile b/net/sendemail/Makefile
index c4c2209..9fc53fe 100644
--- a/net/sendemail/Makefile
+++ b/net/sendemail/Makefile
@@ -16,8 +16,9 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}
 MAINTAINER=	itetcu@FreeBSD.org
 COMMENT=	Lightweight, completely command line based, SMTP email agent
 
+USES=		perl5
+USE_PERL5=	run
 NO_BUILD=	yes
-USE_PERL5_RUN=	yes
 
 PLIST_FILES=	bin/sendEmail
 PORTDOCS=	CHANGELOG README TODO
diff --git a/net/silc-client/Makefile b/net/silc-client/Makefile
index c560d99..0321e0a 100644
--- a/net/silc-client/Makefile
+++ b/net/silc-client/Makefile
@@ -23,12 +23,10 @@ CONFLICTS=	silc-toolkit-1.1.* silc-irssi-plugin-1.1.*
 USE_BZIP2=	yes
 GNU_CONFIGURE=	yes
 USE_GNOME=	glib20
-USES=		pkgconfig
-USE_GMAKE=	yes
+USES=		pkgconfig gmake
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--docdir=${DOCSDIR} \
 		--without-libtoolfix
-WANT_PERL=	yes
 
 OPTIONS_DEFINE=	PTHREADS IPV6 ICONV PERL
 OPTIONS_DEFINE_i386=	ASM
@@ -94,7 +92,7 @@ CONFIGURE_ARGS+=	--without-iconv
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=		yes
+USES+=			perl5
 PERL_ARCHNAME!=		perl -V:archname 2>/dev/null || ${ECHO_CMD}
 PLIST_SUB+=		WITH_PERL="" PERL_ARCHNAME="${PERL_ARCHNAME:S/archname='//:S/';//}"
 CONFIGURE_ARGS+=	--with-perl-lib=${PREFIX}/lib/${PORTNAME}/perl
diff --git a/net/smbldap-tools/Makefile b/net/smbldap-tools/Makefile
index c2d504c..79ada36 100644
--- a/net/smbldap-tools/Makefile
+++ b/net/smbldap-tools/Makefile
@@ -20,9 +20,8 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:C/a//}
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_PERL5=	yes
+USES=		gmake perl5
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 ALL_TARGET=	build
 
 PORTDOCS=	*
diff --git a/net/ssltunnel-client/Makefile b/net/ssltunnel-client/Makefile
index fe2043c..e0fb37c 100644
--- a/net/ssltunnel-client/Makefile
+++ b/net/ssltunnel-client/Makefile
@@ -25,7 +25,6 @@ MAN1=		pppclient.1
 MAN5=		ssltunnelrc.5
 
 WANT_GNOME=	yes
-WANT_PERL=	yes
 
 .if defined(PACKAGE_BUILDING)
 WITHOUT_GNOME=	yes
@@ -35,7 +34,7 @@ WITHOUT_GNOME=	yes
 
 .if ${HAVE_GNOME:Mgtk12}!=""
 USE_GNOME=	gtk12
-USE_PERL5=	yes
+USES+=		perl5
 RUN_DEPENDS=	p5-Gtk>=0:${PORTSDIR}/x11-toolkits/p5-Gtk
 MAN1+=		gpppclient.1
 BUILD_PERLGTK=	yes
diff --git a/net/vnc/Makefile b/net/vnc/Makefile
index 6bd4db5..3332de5 100644
--- a/net/vnc/Makefile
+++ b/net/vnc/Makefile
@@ -21,7 +21,6 @@ LICENSE=	GPLv2
 
 GNU_CONFIGURE=	yes
 USE_XORG=	x11 xext xpm xext xtst sm ice inputproto
-WANT_PERL=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
 PLIST=		${WRKDIR}/pkg-plist
@@ -57,7 +56,7 @@ RUN_DEPENDS+=	xauth:${PORTSDIR}/x11/xauth \
 		${PREFIX}/lib/X11/fonts/misc/6x13-ISO8859-1.pcf.gz:${PORTSDIR}/x11-fonts/xorg-fonts-miscbitmaps \
 		${LOCALBASE}/lib/X11/fonts/misc/fonts.alias:${PORTSDIR}/x11-fonts/font-alias
 
-USE_PERL5=	yes
+USES=		perl5
 
 EXTRA_PATCHES+=	${WRKSRC}/xc.patch \
 		${PATCHDIR}/vnc.def-patch \
diff --git a/net/wireshark/Makefile b/net/wireshark/Makefile
index 80c93c7..f31d145 100644
--- a/net/wireshark/Makefile
+++ b/net/wireshark/Makefile
@@ -19,11 +19,10 @@ COMMENT?=	Powerful network analyzer/capture tool
 
 DATADIR_NAME=	wireshark
 
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 USE_PYTHON_BUILD=yes
-USES=		iconv gettext pkgconfig
+USES=		iconv gettext pkgconfig gmake perl5
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 WANT_GNOME=	yes
 USE_OPENSSL=	yes
 CONFIGURE_ENV=	LIBS="${WIRESHARK_LIBS}"