19 files changed, 24 insertions, 45 deletions

diff --git a/devel/bonobo/Makefile b/devel/bonobo/Makefile
index 39fa7da271b1..92ee2eba8af9 100644
--- a/devel/bonobo/Makefile
+++ b/devel/bonobo/Makefile
@@ -17,10 +17,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	The component and compound document system for GNOME
 
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix oaf gnomehier gnomeprint
-USES=		gettext
+USES=		gettext gmake perl5
 GNOME_HTML_DIR=	${PREFIX}/share/doc/bonobo
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
diff --git a/devel/coccinelle/Makefile b/devel/coccinelle/Makefile
index 9a8cb94a893b..1fb6814fe569 100644
--- a/devel/coccinelle/Makefile
+++ b/devel/coccinelle/Makefile
@@ -10,10 +10,9 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	avg@icyb.net.ua
 COMMENT=	Coccinelle is a program matching and transformation engine
 
-USES=		shebangfix
+USES=		shebangfix gmake perl5
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 USE_PYTHON=	2.5+
 USE_OCAML=	3.0+
 SHEBANG_FILES=	configure
diff --git a/devel/creduce/Makefile b/devel/creduce/Makefile
index 3ee024cf1465..fe09cc32c1cf 100644
--- a/devel/creduce/Makefile
+++ b/devel/creduce/Makefile
@@ -26,8 +26,7 @@ GH_TAGNAME=	a2422d5
 GH_COMMIT=	a2422d5
 
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
 
-USES=	gmake
+USES=	gmake perl5
 
 .include <bsd.port.mk>
diff --git a/devel/glibmm/Makefile b/devel/glibmm/Makefile
index 6af23116a286..f23d50dc99f7 100644
--- a/devel/glibmm/Makefile
+++ b/devel/glibmm/Makefile
@@ -21,9 +21,8 @@ PLIST_SUB=	VERSION="2.4" API_VERSION="2.4"
 
 BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig perl5
 USE_GNOME=	glib20 ltverhack libsigc++20
-USE_PERL5=	yes
 USE_AUTOTOOLS=	libtool
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--enable-static --disable-documentation
diff --git a/devel/hypersrc/Makefile b/devel/hypersrc/Makefile
index 6719acc21f14..723fc0b486e2 100644
--- a/devel/hypersrc/Makefile
+++ b/devel/hypersrc/Makefile
@@ -16,12 +16,10 @@ RUN_DEPENDS=	exctags:${PORTSDIR}/devel/ctags
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
-USE_PERL5=	yes
 USE_GNOME=	gnomelibs
-USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
 MAKE_ARGS=	CC="${CC}" C_OPTIMIZE="${CFLAGS}"
-USES=		shebangfix
+USES=		shebangfix gmake perl5
 SHEBANG_FILES=	Hypersrc.pl
 
 MAN1=		hypersrc.1
diff --git a/devel/libbonobo/Makefile b/devel/libbonobo/Makefile
index e2e8847e7953..038c9e9024f3 100644
--- a/devel/libbonobo/Makefile
+++ b/devel/libbonobo/Makefile
@@ -18,11 +18,9 @@ USE_BZIP2=	yes
 
 LIB_DEPENDS=	popt:${PORTSDIR}/devel/popt
 
-USES=		bison gettext pathfix pkgconfig
-USE_GMAKE=	yes
+USES=		bison gettext pathfix pkgconfig gmake perl5
 USE_LDCONFIG=	yes
 GNU_CONFIGURE=	yes
-USE_PERL5=	yes
 USE_GNOME=	intlhack libxml2 orbit2 referencehack
 CONFIGURE_ARGS=	--with-html-dir=${PREFIX}/share/doc \
 		--disable-gtk-doc
diff --git a/devel/libgtop/Makefile b/devel/libgtop/Makefile
index a713115027e0..f9319a64c7de 100644
--- a/devel/libgtop/Makefile
+++ b/devel/libgtop/Makefile
@@ -12,9 +12,9 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	GNOME 2 top library
 
 USE_XZ=		yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 USE_XORG=	xau
-USES=		gettext gmake pathfix pkgconfig
+USES=		gettext gmake pathfix pkgconfig perl5
 USE_GNOME=	gnomeprefix glib20 ltverhack intlhack
 USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	libtool
diff --git a/devel/oaf/Makefile b/devel/oaf/Makefile
index b0068731a687..f729dd39db91 100644
--- a/devel/oaf/Makefile
+++ b/devel/oaf/Makefile
@@ -21,10 +21,8 @@ LIB_DEPENDS=	popt.0:${PORTSDIR}/devel/popt
 
 USE_AUTOTOOLS=	libtool
 USE_BZIP2=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomehack gnomeprefix gtk12 orbit libxml
-USES=		gettext
-USE_PERL5=	yes
+USES=		gettext gmake perl5
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS= --enable-static --enable-shared \
diff --git a/devel/p5-Locale-gettext/Makefile b/devel/p5-Locale-gettext/Makefile
index 8ed5e6be2526..279af967faa0 100644
--- a/devel/p5-Locale-gettext/Makefile
+++ b/devel/p5-Locale-gettext/Makefile
@@ -16,9 +16,9 @@ DISTNAME=	${PORTNAME:C/.*-//}-${PORTVERSION}
 MAINTAINER=	demon@FreeBSD.org
 COMMENT=	Message handling functions
 
-PERL_CONFIGURE=	yes
 CONFIGURE_ENV+=	LOCALBASE=${LOCALBASE}
-USES=		gettext
+USES=		gettext perl5
+USE_PERL5=	configure
 
 MAN3=		Locale::gettext.3
 
diff --git a/devel/p5-perlqt/Makefile b/devel/p5-perlqt/Makefile
index 2f71d4b63787..459096ca3332 100644
--- a/devel/p5-perlqt/Makefile
+++ b/devel/p5-perlqt/Makefile
@@ -15,11 +15,10 @@ LIB_DEPENDS=	qscintilla2:${PORTSDIR}/devel/qscintilla2 \
 		qwt.5:${PORTSDIR}/x11-toolkits/qwt5
 
 USE_XZ=		yes
-USE_PERL5=	yes
 USE_KDE4=	kdehier kdeprefix smokeqt qimageblitz
 USE_QT4=	corelib dbus gui network xml \
 		qmake_build moc_build uic_build rcc_build
-USES=		cmake:outsource
+USES=		cmake:outsource perl5
 
 
 # Respect PREFIX
diff --git a/net/ct/Makefile b/net/ct/Makefile
index ca81826b5e91..dab54ffe238e 100644
--- a/net/ct/Makefile
+++ b/net/ct/Makefile
@@ -15,9 +15,8 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 
 RUN_DEPENDS=	${LOCALBASE}/v6eval/bin/pktbuf:${PORTSDIR}/net/v6eval
 
-USE_PERL5=      yes
 NO_BUILD=	yes
-USES=	shebangfix
+USES=	shebangfix perl5
 SHEBANG_FILES=	\
 	dd/BEGIN.seq \
 	dd/DDDHCPv6.seq \
diff --git a/net/samba4wins/Makefile b/net/samba4wins/Makefile
index cab0e50fd753..2c0390ebb2b0 100644
--- a/net/samba4wins/Makefile
+++ b/net/samba4wins/Makefile
@@ -14,8 +14,7 @@ COMMENT=		Full featured replicating WINS server for UNIX
 CONFLICTS=		ja-samba-2.* ja-samba-4.* samba-2.* samba-4.* sharity-light-1.*
 
 MAKE_JOBS_UNSAFE=	yes
-USES=			iconv
-USE_PERL5=		yes
+USES=			iconv perl5
 GNU_CONFIGURE=		yes
 USE_AUTOTOOLS=		autoconf autoheader
 
diff --git a/net/v6eval/Makefile b/net/v6eval/Makefile
index e1d5aef59208..2365cbda8a9b 100644
--- a/net/v6eval/Makefile
+++ b/net/v6eval/Makefile
@@ -17,9 +17,8 @@ LICENSE_FILE=	${WRKSRC}/COPYRIGHT
 RUN_DEPENDS=	p5-Expect>=0:${PORTSDIR}/lang/p5-Expect \
 		p5-YAML>=0:${PORTSDIR}/textproc/p5-YAML
 
-USE_PERL5=	yes
 USE_OPENSSL=	yes
-USES=	shebangfix
+USES=	shebangfix perl5
 SHEBANG_FILES=	\
 	bin/autorun/autorun.pl \
 	bin/indexgen/indexgen.pl \
diff --git a/net/whois/Makefile b/net/whois/Makefile
index 1308dad91b9d..cdab3b1076e8 100644
--- a/net/whois/Makefile
+++ b/net/whois/Makefile
@@ -17,9 +17,8 @@ COMMENT=	Marco d'Itri whois client
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-USE_GMAKE=		yes
-USES=			iconv
-USE_PERL5_BUILD=	yes
+USES=		iconv gmake perl5
+USE_PERL5=	build
 
 WRKSRC=	${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
diff --git a/ports-mgmt/portcheckout/Makefile b/ports-mgmt/portcheckout/Makefile
index 425f5bfe7b0e..da8b4df44af6 100644
--- a/ports-mgmt/portcheckout/Makefile
+++ b/ports-mgmt/portcheckout/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	http://wolfram.schneider.org/src/
 MAINTAINER=	wosch@FreeBSD.org
 COMMENT=	Checkout and build ports and all depending ports
 
-USE_PERL5=	yes
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	portcheckout.pl
 MAN1=		portcheckout.1
 MANCOMPRESSED=	maybe
diff --git a/sysutils/colorize/Makefile b/sysutils/colorize/Makefile
index 1796ff2aaa9d..d031d447732e 100644
--- a/sysutils/colorize/Makefile
+++ b/sysutils/colorize/Makefile
@@ -16,9 +16,8 @@ RUN_DEPENDS=	p5-Term-ANSIColor>=0:${PORTSDIR}/devel/p5-Term-ANSIColor
 WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 
 NO_BUILD=	yes
-USE_PERL5=	yes
 SUB_FILES=	pkg-message
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	colorize
 
 MAN1=		colorize.1
diff --git a/sysutils/cromwell/Makefile b/sysutils/cromwell/Makefile
index ce1bb47b2079..220246651943 100644
--- a/sysutils/cromwell/Makefile
+++ b/sysutils/cromwell/Makefile
@@ -21,8 +21,6 @@ PATCH_DIST_STRIP=	-p1
 MAINTAINER=	rink@FreeBSD.org
 COMMENT=	Linux (and FreeBSD :-) BIOS images for the Microsoft Xbox
 
-USE_PERL5_BUILD=	yes
-
 SUB_FILES=	pkg-message
 
 PLIST_DIRS=		%%DATADIR%%
@@ -36,7 +34,8 @@ ONLY_FOR_ARCHS=		i386
 
 WRKSRC=			${WRKDIR}/cromwell
 USE_BZIP2=		yes
-USES=			gmake
+USE_PERL5=		build
+USES=			gmake perl5
 MAKE_JOBS_UNSAFE=	yes
 
 post-patch:
diff --git a/sysutils/fsbackup/Makefile b/sysutils/fsbackup/Makefile
index 75a6678ca141..a0fde4a90479 100644
--- a/sysutils/fsbackup/Makefile
+++ b/sysutils/fsbackup/Makefile
@@ -13,8 +13,7 @@ COMMENT=	File system backup and synchronization utility
 
 RUN_DEPENDS=	p5-Net>=0:${PORTSDIR}/net/p5-Net
 
-USES=		shebangfix
-USE_PERL5=	yes
+USES=		shebangfix perl5
 SHEBANG_FILES=	contrib/*.pl \
 		*.pl
 
diff --git a/sysutils/rsnapshot/Makefile b/sysutils/rsnapshot/Makefile
index e9b78a822051..7481264b1c14 100644
--- a/sysutils/rsnapshot/Makefile
+++ b/sysutils/rsnapshot/Makefile
@@ -14,8 +14,7 @@ BUILD_DEPENDS=	rsync:${PORTSDIR}/net/rsync
 RUN_DEPENDS=	rsync:${PORTSDIR}/net/rsync \
 		p5-Lchown>=0:${PORTSDIR}/sysutils/p5-Lchown
 
-USES=		shebangfix
-USE_PERL5=	yes
+USES=		shebangfix perl5
 GNU_CONFIGURE=	yes
 SHEBANG_FILES=	rsnapshot-program.pl