19 files changed, 30 insertions, 35 deletions

diff --git a/audio/gnormalize/Makefile b/audio/gnormalize/Makefile
index c6645088556e..10f1e11961d0 100644
--- a/audio/gnormalize/Makefile
+++ b/audio/gnormalize/Makefile
@@ -13,8 +13,8 @@ COMMENT=	An alternative for replaygain
 RUN_DEPENDS+=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 		wavegain:${PORTSDIR}/audio/wavegain
 
-USES=		shebangfix
-USE_PERL5_RUN=	yes
+USES=		perl5 shebangfix
+USE_PERL5=	run
 INSTALLS_ICONS=	yes
 
 SHEBANGFILES=	${PORTNAME}
diff --git a/audio/ripit/Makefile b/audio/ripit/Makefile
index 457292749f88..6c86fb6a1849 100644
--- a/audio/ripit/Makefile
+++ b/audio/ripit/Makefile
@@ -8,7 +8,7 @@ CATEGORIES=	audio
 MASTER_SITES=	http://www.suwald.com/ripit/
 
 MAINTAINER=	tobias.rehbein@web.de
-COMMENT=	A command line audio CD ripper
+COMMENT=	Command line audio CD ripper
 
 # See pkg-message about other dependencies.
 RUN_DEPENDS=	p5-CDDB_get>=0:${PORTSDIR}/audio/p5-CDDB_get \
@@ -18,12 +18,12 @@ RUN_DEPENDS=	p5-CDDB_get>=0:${PORTSDIR}/audio/p5-CDDB_get \
 	lame:${PORTSDIR}/audio/lame \
 	cdparanoia:${PORTSDIR}/audio/cdparanoia \
 
-USES=	shebangfix
+USES=		perl5 shebangfix
 NO_BUILD=	yes
 PLIST_FILES=	bin/ripit
 MAN1=		ripit.1
 PORTEXAMPLES=	config
-USE_PERL5_RUN=	yes
+USE_PERL5=	run
 USE_BZIP2=	yes
 SHEBANG_FILES=	ripit.pl
 perl_OLD_CMD=	/usr/bin/env perl
diff --git a/audio/squeezeboxserver/Makefile b/audio/squeezeboxserver/Makefile
index 7e50c1c970c7..e5574b7074ff 100644
--- a/audio/squeezeboxserver/Makefile
+++ b/audio/squeezeboxserver/Makefile
@@ -44,7 +44,7 @@ RUN_DEPENDS+=	p5-Package-DeprecationManager>=0.10:${PORTSDIR}/devel/p5-Package-D
 
 USERS=		${SLIMUSER}
 GROUPS=		${SLIMGROUP}
-USE_PERL5=	yes
+USES=		perl5
 
 .include <bsd.port.pre.mk>
 
diff --git a/graphics/bugle/Makefile b/graphics/bugle/Makefile
index 0e3af13da5f3..64480f62303c 100644
--- a/graphics/bugle/Makefile
+++ b/graphics/bugle/Makefile
@@ -15,7 +15,7 @@ AVCODEC_DESC=	LAVC codec support
 
 GNU_CONFIGURE=	yes
 USE_GL=		gl
-USE_PERL5=	yes
+USES=		perl5
 USE_AUTOTOOLS=	libltdl
 USE_LDCONFIG=	${PREFIX}/lib ${PREFIX}/lib/${PORTNAME}
 
diff --git a/graphics/cadubi/Makefile b/graphics/cadubi/Makefile
index e6d79259f23c..4420324e5ea2 100644
--- a/graphics/cadubi/Makefile
+++ b/graphics/cadubi/Makefile
@@ -14,7 +14,7 @@ LICENSE=	ART10
 
 RUN_DEPENDS=	p5-Term-ReadKey>=0:${PORTSDIR}/devel/p5-Term-ReadKey
 
-USE_PERL5=	yes
+USES=		perl5
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME}
diff --git a/graphics/cbview/Makefile b/graphics/cbview/Makefile
index 91804e75f9e3..b0e2021380b1 100644
--- a/graphics/cbview/Makefile
+++ b/graphics/cbview/Makefile
@@ -17,7 +17,7 @@ RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
 		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
 
 NO_BUILD=	yes
-USE_PERL5=	yes
+USES=		perl5
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/graphics/feh/Makefile b/graphics/feh/Makefile
index 9df9dc05b7e7..2ee635f58e3f 100644
--- a/graphics/feh/Makefile
+++ b/graphics/feh/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		giblib.1:${PORTSDIR}/graphics/giblib
 
 USE_XORG=	x11 xt xinerama
-USE_PERL5_RUN=	yes
-USE_GMAKE=	yes
+USES=		gmake perl5
+USE_PERL5=	run
 USE_BZIP2=	yes
 
 MAN1=		feh.1 feh-cam.1 gen-cam-menu.1
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 5922649ea721..32be11d612dd 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -24,7 +24,6 @@ GNU_CONFIGURE=	yes
 GNU_CONFIGURE_ENV=	PKG_CONFIG_LIBDIR=${LOCALBASE}/libdata/pkgconfig
 GNU_CONFIGURE_ARGS=
 USE_LDCONFIG=	yes
-WANT_PERL=	yes
 
 OPTIONS_DEFINE=	FONTCONFIG ICONV VPX XPM
 OPTIONS_DEFAULT=FONTCONFIG
@@ -76,7 +75,8 @@ GNU_CONFIGURE_ARGS+=	--with-xpm=no
 #       koi9x15.bdf koi12x24.bdf koi10x20.bdf"
 #
 .if defined(GD_FONTS)
-USE_PERL5_BUILD=	yes
+USES+=		perl5
+USE_PERL5=	build
 WRKFONTS=	${WRKSRC}/src
 .endif
 
diff --git a/graphics/graphviz/Makefile b/graphics/graphviz/Makefile
index bff208abf644..252edc8396f4 100644
--- a/graphics/graphviz/Makefile
+++ b/graphics/graphviz/Makefile
@@ -334,7 +334,7 @@ CONFIGURE_ENV+=		SWIG="/nonexistent"
 .if ${PORT_OPTIONS:MPERL}
 CONFIGURE_ARGS+=	--enable-perl
 PLIST_SUB+=		WITH_PERL=""
-USE_PERL5=	yes
+USES+=			perl5
 MAN3+=			gv.3perl
 .else
 CONFIGURE_ARGS+=	--disable-perl
diff --git a/graphics/gscan2pdf/Makefile b/graphics/gscan2pdf/Makefile
index d768a216b317..bd8a48c0c7de 100644
--- a/graphics/gscan2pdf/Makefile
+++ b/graphics/gscan2pdf/Makefile
@@ -62,9 +62,9 @@ RUN_DEPENDS=	p5-Archive-Tar>=0:${PORTSDIR}/archivers/p5-Archive-Tar \
 		p5-Gtk2-ImageView>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2-ImageView \
 		bash:${PORTSDIR}/shells/bash
 
-USE_GMAKE=	yes
+USES=		gmake perl5
 USE_GNOME=	gtk20 librsvg2
-PERL_CONFIGURE=	yes
+PERL5=		configure
 MAN1=		${PORTNAME}.1 scanadf-perl.1 scanimage-perl.1
 PORT_VERBS=	${PORTNAME} Gscan2pdf
 
diff --git a/graphics/import-pictures/Makefile b/graphics/import-pictures/Makefile
index ce243ff0fae8..b8b84ba1d30b 100644
--- a/graphics/import-pictures/Makefile
+++ b/graphics/import-pictures/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool \
 		p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
 
 USE_BZIP2=	yes
-USE_GMAKE=	yes
-USE_PERL5=	yes
+USES=		gmake perl5
 
 PLIST_FILES=	bin/${PORTNAME}
 
diff --git a/graphics/libwpg/Makefile b/graphics/libwpg/Makefile
index ce36eff6e16b..8ee20a9b13fc 100644
--- a/graphics/libwpg/Makefile
+++ b/graphics/libwpg/Makefile
@@ -14,10 +14,9 @@ LICENSE_COMB=	dual
 LIB_DEPENDS=	wpd-0.9:${PORTSDIR}/textproc/libwpd
 
 USE_AUTOTOOLS=	libtool
-USES=		pkgconfig
+USES=		pkgconfig perl5
 USE_GNOME=	gnomeprefix gnomehack ltverhack
 USE_BZIP2=	yes
-USE_PERL5=	yes
 USE_LDCONFIG=	yes
 CONFIGURE_ARGS=	--disable-werror
 
diff --git a/graphics/mapserver/Makefile b/graphics/mapserver/Makefile
index bd42f935a873..7b2522de87b6 100644
--- a/graphics/mapserver/Makefile
+++ b/graphics/mapserver/Makefile
@@ -149,10 +149,10 @@ PLIST_SUB+=		PHP="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-USE_PERL5=yes
-PLIST_SUB+=		PERL=""
+USES+=		perl5
+PLIST_SUB+=	PERL=""
 .else
-PLIST_SUB+=		PERL="@comment "
+PLIST_SUB+=	PERL="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MCURL}
diff --git a/graphics/opengtl/Makefile b/graphics/opengtl/Makefile
index 93c00ab606fe..b65d9e907b4a 100644
--- a/graphics/opengtl/Makefile
+++ b/graphics/opengtl/Makefile
@@ -15,9 +15,8 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png
 BUILD_DEPENDS=	${LOCALBASE}/lib/libLLVM-3.2.so:${PORTSDIR}/devel/llvm
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
-USE_PERL5=	yes
 USE_BZIP2=	yes
-USES=		cmake
+USES=		cmake perl5
 USE_LDCONFIG=	yes
 
 OPTIONS_DEFINE=	SHIVA
diff --git a/graphics/pgplot/Makefile b/graphics/pgplot/Makefile
index 8b15b96a7c2a..5ffd85250a95 100644
--- a/graphics/pgplot/Makefile
+++ b/graphics/pgplot/Makefile
@@ -40,7 +40,8 @@ DOCS=	cpg/cpgplot.doc pgplot-routines.tex pgplot.doc pgplot.html \
 	readme.pgdisp rgb.txt
 SUFFIXES+=	doc
 PORTDOCS=	${DOCS:C|.*/||}
-USE_PERL5_BUILD=	yes
+USES+=		perl5
+USE_PERL5=	build
 .endif
 
 .if ${PORT_OPTIONS:MEXAMPLES}
diff --git a/graphics/renrot/Makefile b/graphics/renrot/Makefile
index 745d80e05625..789f72fda7ef 100644
--- a/graphics/renrot/Makefile
+++ b/graphics/renrot/Makefile
@@ -14,7 +14,8 @@ LICENSE=	ART20
 BUILD_DEPENDS=	p5-Image-ExifTool>=0:${PORTSDIR}/graphics/p5-Image-ExifTool
 RUN_DEPENDS:=	${BUILD_DEPENDS} jpegtran:${PORTSDIR}/graphics/jpeg
 
-PERL_CONFIGURE=	yes
+USES=		perl5
+USE_PERL5=	configure
 
 OPTIONS_DEFINE=	IMAGEMAGICK DOCS
 IMAGEMAGICK_DESC=	Image::Magick Perl module support
diff --git a/graphics/sketch/Makefile b/graphics/sketch/Makefile
index f5420d469d06..8f573125b26b 100644
--- a/graphics/sketch/Makefile
+++ b/graphics/sketch/Makefile
@@ -14,8 +14,8 @@ LICENSE=	GPLv3
 
 MAKEFILE=	makefile
 ALL_TARGET=
-USE_GMAKE=	yes
-USE_PERL5_BUILD=yes
+USES=		gmake perl5
+USE_PERL5=	build
 USE_DOS2UNIX=	yes
 
 PLIST_FILES=	bin/sketch
diff --git a/x11-fm/thunar-vfs/Makefile b/x11-fm/thunar-vfs/Makefile
index 347daf8c2112..13e8d2b670cd 100644
--- a/x11-fm/thunar-vfs/Makefile
+++ b/x11-fm/thunar-vfs/Makefile
@@ -19,13 +19,11 @@ LIB_DEPENDS=	png15:${PORTSDIR}/graphics/png \
 
 USE_BZIP2=	yes
 USE_AUTOTOOLS=	libtool
-USE_PERL5=	yes
 GNU_CONFIGURE=	yes
-USE_GMAKE=	yes
 USE_GNOME=	glib20 gtk20 intltool intlhack
 USE_XFCE=	configenv libutil libexo
 USE_XORG=	x11
-USES=		pkgconfig pathfix
+USES=		gmake pathfix perl5 pkgconfig
 
 CONFIGURE_ARGS=	--disable-debug
 
diff --git a/x11-fm/thunar/Makefile b/x11-fm/thunar/Makefile
index 139d2b114925..5339c498a179 100644
--- a/x11-fm/thunar/Makefile
+++ b/x11-fm/thunar/Makefile
@@ -16,13 +16,11 @@ LIB_DEPENDS=	tumbler-1:${PORTSDIR}/deskutils/xfce4-tumbler
 GNU_CONFIGURE=	yes
 INSTALLS_ICONS=	yes
 USE_BZIP2=	yes
-USE_PERL5=	yes
-USE_GMAKE=	yes
 USE_GNOME=	gtk20 intltool intlhack gdkpixbuf2
 USE_LDCONFIG=	yes
 USE_XFCE=	configenv libexo libmenu libutil
 USE_XORG=	sm x11
-USES=		desktop-file-utils pathfix pkgconfig
+USES=		desktop-file-utils gmake pathfix perl5 pkgconfig
 
 OPTIONS_DEFINE=	DBUS DOCS GVFS NLS NOTIFY STARTUP
 OPTIONS_GROUP=	PLUGINS