19 files changed, 25 insertions, 43 deletions

diff --git a/cad/gdt/Makefile b/cad/gdt/Makefile
index c513deefd1e4..ad02683d0f66 100644
--- a/cad/gdt/Makefile
+++ b/cad/gdt/Makefile
@@ -11,8 +11,8 @@ COMMENT=	GDS2/GDT format translator
 
 LICENSE=	GPLv2
 
-USE_PERL5_RUN=	yes
-USES=	shebangfix
+USES=	shebangfix perl5
+USE_PERL5=	run
 SHEBANG_FILES=	Examples/gdsinfo Examples/scalegds
 WRKSRC=		${WRKDIR}/${PORTNAME:U}-${PORTVERSION}
 PLIST_FILES=	bin/gdsinfo bin/gds2gdt bin/gdt2gds bin/scalegds
diff --git a/databases/mergeant/Makefile b/databases/mergeant/Makefile
index 4c85d2178ccb..48aadbcd23f8 100644
--- a/databases/mergeant/Makefile
+++ b/databases/mergeant/Makefile
@@ -13,9 +13,8 @@ MAINTAINER=	gnome@FreeBSD.org
 COMMENT=	Provide uniform access to data sources for the GNOME 2 environment
 
 USE_BZIP2=	yes
-USES=		pathfix gettext gmake pkgconfig
+USES=		pathfix gettext gmake pkgconfig perl5
 USE_GNOME=	gnomeprefix intlhack libgnomedb
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_OMF=	yes
 INSTALLS_ICONS=	yes
diff --git a/devel/cvsplot/Makefile b/devel/cvsplot/Makefile
index 1f1485f606c8..c4c20af4df81 100644
--- a/devel/cvsplot/Makefile
+++ b/devel/cvsplot/Makefile
@@ -14,10 +14,9 @@ RUN_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote \
 		gnuplot:${PORTSDIR}/math/gnuplot
 
-USE_PERL5=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/cvsplot
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	cvsplot.pl
 
 do-install:
diff --git a/dns/vizone/Makefile b/dns/vizone/Makefile
index 75d0953c0248..15dad66660c3 100644
--- a/dns/vizone/Makefile
+++ b/dns/vizone/Makefile
@@ -9,8 +9,8 @@ MASTER_SITES=	CRITICAL
 MAINTAINER=	ehaupt@FreeBSD.org
 COMMENT=	Updates the serial number in one or more zonefiles
 
-USES=		shebangfix
-USE_PERL5_RUN=	yes
+USES=		shebangfix perl5
+USE_PERL5=	run
 NO_BUILD=	yes
 
 SHEBANG_FILES=	updserial
diff --git a/editors/kate/Makefile b/editors/kate/Makefile
index 0dce487b3750..736bb2d3c72a 100644
--- a/editors/kate/Makefile
+++ b/editors/kate/Makefile
@@ -17,8 +17,8 @@ CONFLICTS=	kdebase-4.[0-6].* kdelibs-4.[0-6].* kdesdk-4.[0-6].*
 
 USE_XZ=		yes
 USE_KDE4=	kdelibs kdeprefix kdehier automoc4 kactivities
-USES=		cmake:outsource gettext
-USE_PERL5_BUILD=	yes
+USES=		cmake:outsource gettext perl5
+USE_PERL5=	build
 USE_QT4=	dbus gui script sql webkit xml \
 		moc_build qmake_build rcc_build uic_build
 USE_LDCONFIG=	yes
diff --git a/games/filters/Makefile b/games/filters/Makefile
index 95d099cf6cb1..62670cc3bae8 100644
--- a/games/filters/Makefile
+++ b/games/filters/Makefile
@@ -14,8 +14,7 @@ COMMENT=	Collection of filters, including B1FF, and the Swedish Chef
 CONFLICTS=	talkfilters-[0-9]* jive-[0-9]* chef-[0-9]* kenny-[0-9]* \
 		lolcat-[0-9]*
 
-USES=		shebangfix gmake
-USE_PERL5=	yes
+USES=		shebangfix gmake perl5
 USE_GCC=	any
 MAKE_JOBS_UNSAFE=	yes
 
diff --git a/games/golly/Makefile b/games/golly/Makefile
index 09cad3d70734..85fa6493e598 100644
--- a/games/golly/Makefile
+++ b/games/golly/Makefile
@@ -10,8 +10,7 @@ MASTER_SITES=	SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
 MAINTAINER=	makc@FreeBSD.org
 COMMENT=	Conway's Game of Life and other cellular automata
 
-USES=		cmake:outsource
-USE_PERL5=	yes
+USES=		cmake:outsource perl5
 USE_PYTHON=	2.7+
 USE_WX=		2.8+
 
diff --git a/games/textmaze/Makefile b/games/textmaze/Makefile
index 646a56ffe442..df04f3e493e7 100644
--- a/games/textmaze/Makefile
+++ b/games/textmaze/Makefile
@@ -13,8 +13,7 @@ COMMENT=	Generates mazes on a text terminal and lets you traverse them
 
 RUN_DEPENDS=	p5-Curses>=0:${PORTSDIR}/devel/p5-Curses
 
-USES=		shebangfix
-USE_PERL5=	yes
+USES=		shebangfix perl5
 NO_BUILD=	yes
 
 SHEBANG_FILES=	textmaze
diff --git a/hebrew/hspell/Makefile b/hebrew/hspell/Makefile
index ccae600e8fcc..3f0ba3d0adea 100644
--- a/hebrew/hspell/Makefile
+++ b/hebrew/hspell/Makefile
@@ -11,9 +11,8 @@ MASTER_SITE_SUBDIR=	makc
 MAINTAINER=	onatan@gmail.com
 COMMENT=	Hebrew spellchecker and morphology engine
 
-USES=		shebangfix
-USE_PERL5_BUILD=	yes
-USE_GMAKE=	yes
+USES=		shebangfix gmake perl5
+USE_PERL5=	build
 GNU_CONFIGURE=	yes
 CFLAGS+=	-fPIC
 SHEBANG_FILES=	pmerge
diff --git a/lang/ocs/Makefile b/lang/ocs/Makefile
index d599b3005a47..03de08855dac 100644
--- a/lang/ocs/Makefile
+++ b/lang/ocs/Makefile
@@ -24,10 +24,9 @@ PLIST=		${WRKDIR}/pkg-plist
 ALL_TARGET=	install
 
 USE_BZIP2=	yes
-USES=		gmake
+USES=		gmake perl5
 USE_TCL=	yes
 USE_TK=		yes
-USE_PERL5=	yes
 HAS_CONFIGURE=	yes
 USE_XORG=	xt
 MAKE_JOBS_UNSAFE=	yes
diff --git a/net-p2p/torrentsniff/Makefile b/net-p2p/torrentsniff/Makefile
index 82dfe59bd5cd..c2d8db4101e4 100644
--- a/net-p2p/torrentsniff/Makefile
+++ b/net-p2p/torrentsniff/Makefile
@@ -12,9 +12,8 @@ COMMENT=	Commandline tool for getting status of torrent
 RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 		p5-Digest-SHA1>=0:${PORTSDIR}/security/p5-Digest-SHA1
 
-USE_PERL5=	yes
 NO_BUILD=	yes
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	torrentsniff
 
 do-install:
diff --git a/textproc/colordiff/Makefile b/textproc/colordiff/Makefile
index 4dac6b2d861c..4313be9ae495 100644
--- a/textproc/colordiff/Makefile
+++ b/textproc/colordiff/Makefile
@@ -11,8 +11,7 @@ COMMENT=	Tool to colorize diff output
 
 LICENSE=	GPLv2
 
-USES=		shebangfix
-USE_PERL5=	yes
+USES=		shebangfix perl5
 NO_BUILD=	yes
 
 SHEBANG_FILES=	colordiff.pl
diff --git a/textproc/docbook2X/Makefile b/textproc/docbook2X/Makefile
index 590c27bec358..53a6d67ded9a 100644
--- a/textproc/docbook2X/Makefile
+++ b/textproc/docbook2X/Makefile
@@ -27,9 +27,7 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 CONFLICTS=	docbook-utils-*
 
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
-USES=		iconv
+USES=		iconv gmake perl5
 
 .if defined(NOPORTDOCS)
 EXTRA_PATCHES+=	${FILESDIR}/extra-patch-doc__Makefile.in
diff --git a/textproc/gnome-spell/Makefile b/textproc/gnome-spell/Makefile
index 50fe9a355e10..c6374755be6b 100644
--- a/textproc/gnome-spell/Makefile
+++ b/textproc/gnome-spell/Makefile
@@ -15,10 +15,8 @@ COMMENT=	A GNOME/Bonobo component for spell checking
 LIB_DEPENDS=	aspell.16:${PORTSDIR}/textproc/aspell
 
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gnomeprefix gnomehack intlhack libgnomeui
-USES=		gettext gmake pkgconfig
+USES=		gettext gmake pkgconfig perl5
 GNU_CONFIGURE=	yes
 CPPFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
diff --git a/textproc/gtk-doc/Makefile b/textproc/gtk-doc/Makefile
index 41a381d64af0..27bd589726cc 100644
--- a/textproc/gtk-doc/Makefile
+++ b/textproc/gtk-doc/Makefile
@@ -26,9 +26,8 @@ XMLCATMGR=		${LOCALBASE}/bin/xmlcatmgr
 CATALOG_PORTS_SGML=	${PREFIX}/share/sgml/catalog.ports
 
 USE_XZ=		yes
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-USES=		gmake pathfix pkgconfig shebangfix
+USES=		gmake pathfix pkgconfig shebangfix perl5
 USE_GNOME=	gnomeprefix libxslt gnomedocutils
 INSTALLS_OMF=	yes
 CONFIGURE_ARGS=	--with-xml-catalog=${LOCALBASE}/share/xml/catalog.ports
diff --git a/textproc/intltool/Makefile b/textproc/intltool/Makefile
index d386a4afc8a9..93fdc90acfbc 100644
--- a/textproc/intltool/Makefile
+++ b/textproc/intltool/Makefile
@@ -14,9 +14,7 @@ COMMENT=	Tools to internationalize various kinds of data files
 BUILD_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 RUN_DEPENDS=	p5-XML-Parser>=0:${PORTSDIR}/textproc/p5-XML-Parser
 
-USE_GMAKE=	yes
-USES=		iconv
-USE_PERL5=	yes
+USES=		iconv gmake perl5
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--libdir="${PREFIX}/libdata"
 
diff --git a/textproc/markdown/Makefile b/textproc/markdown/Makefile
index 170741971fe6..e89eedb1a8f6 100644
--- a/textproc/markdown/Makefile
+++ b/textproc/markdown/Makefile
@@ -12,9 +12,8 @@ MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	A text-to-HTML conversion tool for web writers
 
 USE_ZIP=	yes
-USE_PERL5=	yes
 NO_BUILD=	yes
-USES=		shebangfix
+USES=		shebangfix perl5
 SHEBANG_FILES=	Markdown.pl
 
 .if !defined(NOPORTDOCS)
diff --git a/textproc/p5-XML-TinyXML/Makefile b/textproc/p5-XML-TinyXML/Makefile
index 91796083e94a..75d29d040706 100644
--- a/textproc/p5-XML-TinyXML/Makefile
+++ b/textproc/p5-XML-TinyXML/Makefile
@@ -10,10 +10,10 @@ PKGNAMEPREFIX=	p5-
 MAINTAINER=	info@rickvanderzwet.nl
 COMMENT=	Little and efficient Perl module to manage xml data
 
-USES=		iconv
+USES=		iconv perl5
+USE_PERL5=	configure
 
 MAKE_ARGS+=	LIBS='-L${LOCALBASE}/lib' INC='-I. -I${LOCALBASE}/include'
-PERL_CONFIGURE=	yes
 
 MAN3=		XML::TinyXML.3 \
 		XML::TinyXML::Node.3 \
diff --git a/textproc/uim-el/Makefile b/textproc/uim-el/Makefile
index 1182ebb25add..2aeef24bcf37 100644
--- a/textproc/uim-el/Makefile
+++ b/textproc/uim-el/Makefile
@@ -19,10 +19,9 @@ CONFLICTS?=	uim-el-xemacs21-mule-[0-9]* \
 RUN_DEPENDS=	uim-el-agent:${PORTSDIR}/textproc/uim
 
 USE_BZIP2=	yes
-USE_PERL5_BUILD=yes
+USE_PERL5=	build
 USE_GNOME=	intltool
-USE_GMAKE=	yes
-USES=		iconv
+USES=		iconv gmake perl5
 USE_EMACS=	yes
 GNU_CONFIGURE=	yes