aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authormat <mat@FreeBSD.org>2013-08-03 21:44:00 +0800
committermat <mat@FreeBSD.org>2013-08-03 21:44:00 +0800
commit75dd7415d6d89e4f6c03a98e4dd8589865c9cb43 (patch)
tree5fff787fcf509ed53762690c395516c337412423
parent3e657489e209d0aec5331fd70f19c96df0146a59 (diff)
downloadfreebsd-ports-gnome-75dd7415d6d89e4f6c03a98e4dd8589865c9cb43.tar.gz
freebsd-ports-gnome-75dd7415d6d89e4f6c03a98e4dd8589865c9cb43.tar.zst
freebsd-ports-gnome-75dd7415d6d89e4f6c03a98e4dd8589865c9cb43.zip
- Convert to new perl framework
- Remove MAKE_JOBS_SAFE=yes, it's the default.
-rw-r--r--audio/abcselect/Makefile4
-rw-r--r--audio/audiotag/Makefile4
-rw-r--r--audio/autozen/Makefile4
-rw-r--r--audio/mp3check/Makefile4
-rw-r--r--audio/mp3riot/Makefile1
-rw-r--r--benchmarks/dbs/Makefile3
-rw-r--r--biology/lagan/Makefile3
-rw-r--r--biology/wise/Makefile1
-rw-r--r--cad/chipvault/Makefile3
-rw-r--r--cad/dinotrace/Makefile5
-rw-r--r--cad/geda-utils/Makefile3
-rw-r--r--cad/geda/Makefile5
-rw-r--r--converters/nomyso/Makefile3
-rw-r--r--databases/gnatsweb4/Makefile3
-rw-r--r--databases/mrtg-mysql-load/Makefile3
-rw-r--r--databases/p5-qdbm/Makefile2
-rw-r--r--databases/postgis/Makefile4
-rw-r--r--deskutils/gtimer/Makefile3
-rw-r--r--deskutils/jlj/Makefile4
-rw-r--r--deskutils/mencal/Makefile3
-rw-r--r--devel/ace/Makefile5
-rw-r--r--devel/cc65/Makefile4
-rw-r--r--devel/cvsdadm/Makefile4
-rw-r--r--devel/gecode/Makefile4
-rw-r--r--devel/leaktracer/Makefile3
-rw-r--r--devel/naturaldocs/Makefile3
-rw-r--r--devel/paexec/Makefile3
-rw-r--r--devel/picasm/Makefile3
-rw-r--r--devel/ppl/Makefile4
-rw-r--r--editors/ne/Makefile4
-rw-r--r--emulators/xmame/Makefile2
-rw-r--r--games/3dc/Makefile3
-rw-r--r--games/acm/Makefile3
-rw-r--r--games/asc/Makefile4
-rw-r--r--games/falconseye/Makefile3
-rw-r--r--games/gtkpool/Makefile4
-rw-r--r--games/hlstats/Makefile3
-rw-r--r--games/latrine/Makefile5
-rw-r--r--games/mahjong/Makefile4
-rw-r--r--games/optimax/Makefile3
-rw-r--r--games/pengpong/Makefile3
-rw-r--r--games/ptools/Makefile3
-rw-r--r--games/stepmania-devel/Makefile5
-rw-r--r--games/zangband/Makefile3
-rw-r--r--graphics/dynamechs/Makefile3
-rw-r--r--graphics/giram/Makefile4
-rw-r--r--graphics/gtkgraph/Makefile4
-rw-r--r--graphics/icoutils/Makefile4
-rw-r--r--graphics/ida/Makefile5
-rw-r--r--graphics/openrm/Makefile4
-rw-r--r--graphics/pvmpov/Makefile3
-rw-r--r--graphics/sam2p/Makefile4
-rw-r--r--graphics/xmandel/Makefile4
-rw-r--r--irc/xchat1/Makefile3
-rw-r--r--japanese/im-ja/Makefile4
-rw-r--r--japanese/jcode.pl/Makefile3
-rw-r--r--lang/rubinius/Makefile3
-rw-r--r--lang/tcc/Makefile4
-rw-r--r--mail/kbiff/Makefile5
-rw-r--r--mail/kshowmail/Makefile5
-rw-r--r--mail/popfile/Makefile3
-rw-r--r--mail/sigit/Makefile3
-rw-r--r--mail/squirrelmail-multilogin-plugin/Makefile3
-rw-r--r--mail/squirrelmail-notes-plugin/Makefile3
-rw-r--r--mail/squirrelmail-notify-plugin/Makefile3
-rw-r--r--mail/squirrelmail-quota_usage-plugin/Makefile3
-rw-r--r--mail/squirrelmail-sasql-plugin/Makefile3
-rw-r--r--mail/squirrelmail-shared_calendars-plugin/Makefile3
-rw-r--r--mail/squirrelmail-wetteronline-plugin/Makefile3
-rw-r--r--mail/websieve/Makefile3
-rw-r--r--math/glgraph/Makefile3
-rw-r--r--math/lambda/Makefile3
-rw-r--r--math/plplot/Makefile5
-rw-r--r--math/xplot/Makefile3
-rw-r--r--multimedia/2mandvd/Makefile4
-rw-r--r--multimedia/gmtk/Makefile4
-rw-r--r--net-mgmt/check_multi/Makefile4
-rw-r--r--net-mgmt/netleak/Makefile3
-rw-r--r--net-mgmt/nrpe2/Makefile3
-rw-r--r--net/abills/Makefile3
-rw-r--r--net/click/Makefile3
-rw-r--r--net/freeswitch-core-devel/Makefile4
-rw-r--r--net/freeswitch-core/Makefile4
-rw-r--r--net/freewais-sf/Makefile3
-rw-r--r--net/hinfo/Makefile3
-rw-r--r--net/ldap2dns/Makefile3
-rw-r--r--net/ssvnc/Makefile4
-rw-r--r--net/wol/Makefile3
-rw-r--r--print/kover/Makefile5
-rw-r--r--print/latexmk/Makefile3
-rw-r--r--print/muttprint/Makefile2
-rw-r--r--science/bodr/Makefile3
-rw-r--r--security/amavis-stats/Makefile3
-rw-r--r--security/find-zlib/Makefile3
-rw-r--r--security/kripp/Makefile3
-rw-r--r--security/l0phtcrack/Makefile3
-rw-r--r--security/smtpscan/Makefile3
-rw-r--r--security/snortsnarf/Makefile3
-rw-r--r--security/zebedee/Makefile3
-rw-r--r--sysutils/bontmia/Makefile3
-rw-r--r--sysutils/clonehdd/Makefile3
-rw-r--r--sysutils/dim/Makefile4
-rw-r--r--sysutils/hyperic-sigar/Makefile3
-rw-r--r--sysutils/lavaps/Makefile3
-rw-r--r--sysutils/namefix/Makefile3
-rw-r--r--sysutils/powerman/Makefile4
-rw-r--r--sysutils/pslist/Makefile3
-rw-r--r--sysutils/syslinux/Makefile4
-rw-r--r--sysutils/titlefix/Makefile3
-rw-r--r--textproc/align/Makefile4
-rw-r--r--textproc/code2html/Makefile3
-rw-r--r--textproc/openvanilla-modules/Makefile3
-rw-r--r--textproc/re_graph/Makefile3
-rw-r--r--textproc/xslint/Makefile4
-rw-r--r--www/adzap/Makefile3
-rw-r--r--www/bookmarkbridge/Makefile4
-rw-r--r--www/chtml/Makefile3
-rw-r--r--www/quickie/Makefile3
-rw-r--r--www/script4rss/Makefile3
-rw-r--r--www/xapian-omega10/Makefile3
-rw-r--r--x11-fm/asfiles/Makefile3
-rw-r--r--x11-fm/gprename/Makefile4
-rw-r--r--x11-wm/golem/Makefile3
-rw-r--r--x11-wm/ratmen/Makefile3
124 files changed, 239 insertions, 181 deletions
diff --git a/audio/abcselect/Makefile b/audio/abcselect/Makefile
index 7ae484b2f7ce..c579309ca3e9 100644
--- a/audio/abcselect/Makefile
+++ b/audio/abcselect/Makefile
@@ -10,8 +10,8 @@ DISTNAME= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Extract parts, movements, etc from abc music files
-USES= shebangfix
-USE_PERL5_RUN= yes
+USES= shebangfix perl5
+USE_PERL5= run
NO_BUILD= yes
SHEBANG_FILES= abcselect
diff --git a/audio/audiotag/Makefile b/audio/audiotag/Makefile
index b3e91f9c2396..77ba914aa59a 100644
--- a/audio/audiotag/Makefile
+++ b/audio/audiotag/Makefile
@@ -16,9 +16,9 @@ OPTIONS_DEFAULT= VORBIS ID3 MP4 FLAC
NO_BUILD= yes
-USES= shebangfix
+USES= shebangfix perl5
USE_BZIP2= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
USE_GITHUB= yes
GH_ACCOUNT= Daenyth
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/audio/autozen/Makefile b/audio/autozen/Makefile
index 749115f18ea3..6c839441a429 100644
--- a/audio/autozen/Makefile
+++ b/audio/autozen/Makefile
@@ -15,9 +15,9 @@ LICENSE= GPLv2
OPTIONS_DEFINE= GTK2 DOCS
-USES= shebangfix
+USES= shebangfix perl5
SHEBANG_FILES= zentime
-USE_PERL5_RUN= yes
+USE_PERL5= run
DESKTOP_ENTRIES="AutoZen" \
"BrainWave Generator/Synchronizator" \
diff --git a/audio/mp3check/Makefile b/audio/mp3check/Makefile
index 2ba6d9dcf985..a23a0aa24412 100644
--- a/audio/mp3check/Makefile
+++ b/audio/mp3check/Makefile
@@ -13,8 +13,8 @@ COMMENT= Tool for checking and fixing MP3 archive inconsistencies
RUN_DEPENDS= ${LOCALBASE}/bin/id3tool:${PORTSDIR}/audio/id3tool \
${LOCALBASE}/bin/mp3_check:${PORTSDIR}/audio/mp3_check
-USES= shebangfix
-USE_PERL5_RUN= yes
+USES= shebangfix perl5
+USE_PERL5= run
NO_WRKSUBDIR= yes
EXTRACT_CMD= ${CP}
EXTRACT_BEFORE_ARGS=
diff --git a/audio/mp3riot/Makefile b/audio/mp3riot/Makefile
index e7cc2eba7344..caebaf9f9754 100644
--- a/audio/mp3riot/Makefile
+++ b/audio/mp3riot/Makefile
@@ -13,7 +13,6 @@ RUN_DEPENDS= p5-MP3-Info>=0:${PORTSDIR}/audio/p5-MP3-Info
USES= perl5
NO_BUILD= yes
-USE_PERL5= yes
NO_WRKSUBDIR= yes
PORTDOCS= example.unix groupfile CHANGELOG MANUAL mp3table.sql README repl.dat TODO utf.dat
diff --git a/benchmarks/dbs/Makefile b/benchmarks/dbs/Makefile
index 9937acff86b0..a06ec5a52f12 100644
--- a/benchmarks/dbs/Makefile
+++ b/benchmarks/dbs/Makefile
@@ -16,7 +16,8 @@ RUN_DEPENDS= gnuplot:${PORTSDIR}/math/gnuplot
BUILD_WRKSRC= ${WRKSRC}/obj/${OPSYS}
INSTALL_WRKSRC= ${WRKSRC}/obj/${OPSYS}
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
MAKEFILE= makefile
PLIST_FILES= bin/dbs_view bin/dbsc bin/dbsd
diff --git a/biology/lagan/Makefile b/biology/lagan/Makefile
index d9e44294e52c..8132c9422519 100644
--- a/biology/lagan/Makefile
+++ b/biology/lagan/Makefile
@@ -12,7 +12,8 @@ COMMENT= Efficient tools for large-scale multiple alignments of genomic DNA
LICENSE= GPLv2
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
MAKE_JOBS_UNSAFE=yes
SUB_FILES= pkg-message
diff --git a/biology/wise/Makefile b/biology/wise/Makefile
index e3780bd02c77..9eab34677e27 100644
--- a/biology/wise/Makefile
+++ b/biology/wise/Makefile
@@ -17,7 +17,6 @@ BUILD_WRKSRC= ${WRKSRC}/src
USES= pkgconfig
USE_GNOME= glib20
MAKEFILE= makefile
-MAKE_JOBS_SAFE= yes
SUB_FILES= pkg-message
diff --git a/cad/chipvault/Makefile b/cad/chipvault/Makefile
index 323ec27da264..71de94b7b4f9 100644
--- a/cad/chipvault/Makefile
+++ b/cad/chipvault/Makefile
@@ -22,7 +22,8 @@ EXTRACT_BEFORE_ARGS= # empty
EXTRACT_AFTER_ARGS= > ${DISTNAME}
NO_BUILD= yes
PLIST_FILES= bin/cv
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
do-install:
${INSTALL_SCRIPT} ${WRKSRC}/cv.pl ${PREFIX}/bin/cv
diff --git a/cad/dinotrace/Makefile b/cad/dinotrace/Makefile
index 67e99d4e3dfc..0ffb3b6b4ab1 100644
--- a/cad/dinotrace/Makefile
+++ b/cad/dinotrace/Makefile
@@ -16,10 +16,9 @@ OPTIONS_DEFAULT= EMACS
EMACS_DESC= Install Emacs supplimentary files
USE_XORG= x11 sm ice xmu xt
-USES= gmake motif
-USE_PERL5_BUILD= yes
+USES= gmake motif perl5
+USE_PERL5= build
GNU_CONFIGURE= yes
-MAKE_JOBS_SAFE= yes
INFO= dinotrace
PLIST_FILES= bin/dinotrace
diff --git a/cad/geda-utils/Makefile b/cad/geda-utils/Makefile
index dcce8cd6c0e8..c1c508a5c46e 100644
--- a/cad/geda-utils/Makefile
+++ b/cad/geda-utils/Makefile
@@ -24,10 +24,11 @@ LIB_DEPENDS= geda.33:${PORTSDIR}/cad/libgeda
DOCSDIR= ${PREFIX}/share/doc/geda
DATADIR= ${PREFIX}/share/geda
+USES= perl5
GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= gtk20
-USE_PERL5_RUN= yes
+USE_PERL5= run
USE_PYTHON_RUN= yes
CONFIGURE_ARGS= --with-docdir=${DOCSDIR}
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/cad/geda/Makefile b/cad/geda/Makefile
index 13be739e5732..5ce6100adb4f 100644
--- a/cad/geda/Makefile
+++ b/cad/geda/Makefile
@@ -20,16 +20,15 @@ RUN_DEPENDS= gawk:${PORTSDIR}/lang/gawk
OPTIONS_DEFINE= DOCS
-USES= pathfix gettext
+USES= pathfix gettext perl5
USE_GNOME= desktopfileutils gtk20
-USE_PERL5_RUN= yes
+USE_PERL5= run
USE_PYTHON= run
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
CONFIGURE_ARGS= --with-libstroke=${LOCALBASE}
USE_LDCONFIG= yes
INSTALLS_ICONS= yes
-MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/converters/nomyso/Makefile b/converters/nomyso/Makefile
index 51d4fc72144c..ff0fbb2e2cdd 100644
--- a/converters/nomyso/Makefile
+++ b/converters/nomyso/Makefile
@@ -14,8 +14,9 @@ DISTNAME= ${PORTNAME}${PORTVERSION:S/.//}
MAINTAINER= ports@FreeBSD.org
COMMENT= Convert MASM/TASM files to NASM compatible sources
+USES= yes
USE_ZIP= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/databases/gnatsweb4/Makefile b/databases/gnatsweb4/Makefile
index 97d5a7f4f39f..77ad606931de 100644
--- a/databases/gnatsweb4/Makefile
+++ b/databases/gnatsweb4/Makefile
@@ -14,7 +14,8 @@ RUN_DEPENDS= p5-MIME-Base64>=0:${PORTSDIR}/converters/p5-MIME-Base64
USE_APACHE_RUN= 22+
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
NO_BUILD= yes
CGI_DIR?= ${WWWDIR}/cgi-bin
diff --git a/databases/mrtg-mysql-load/Makefile b/databases/mrtg-mysql-load/Makefile
index 603985e5e8f9..549dfdd44e4a 100644
--- a/databases/mrtg-mysql-load/Makefile
+++ b/databases/mrtg-mysql-load/Makefile
@@ -13,9 +13,10 @@ COMMENT= A MySQL load analysis fetcher for MRTG
RUN_DEPENDS= mrtg:${PORTSDIR}/net-mgmt/mrtg
+USES= perl5
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
USE_MYSQL= yes
MAN1= ${PORTNAME}.1
diff --git a/databases/p5-qdbm/Makefile b/databases/p5-qdbm/Makefile
index e9dcc808d8f6..8f91098dfe32 100644
--- a/databases/p5-qdbm/Makefile
+++ b/databases/p5-qdbm/Makefile
@@ -10,7 +10,7 @@ PKGNAMEPREFIX= p5-
COMMENT= Perl API for QDBM
SLAVEPORT= perl
-USE_PERL5= yes
+USES= perl5
MASTERDIR= ${.CURDIR}/../../databases/qdbm
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/perl
diff --git a/databases/postgis/Makefile b/databases/postgis/Makefile
index ec7ea9cabeb6..b28343a2e08c 100644
--- a/databases/postgis/Makefile
+++ b/databases/postgis/Makefile
@@ -17,12 +17,12 @@ RUN_DEPENDS= postmaster:${PORTSDIR}/databases/postgresql${PGSQL_VER}-server
CONFLICTS= postgis-2.*
-USES= bison iconv gmake
+USES= bison iconv gmake perl5
USE_GNOME= libxml2
USE_PGSQL= yes
USE_LDCONFIG= yes
GNU_CONFIGURE= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
OPTIONS_DEFINE= LOADERGUI
LOADERGUI_DESC= Enable shp2pgsql-gui
diff --git a/deskutils/gtimer/Makefile b/deskutils/gtimer/Makefile
index de4416d1d78a..720295cdb6fb 100644
--- a/deskutils/gtimer/Makefile
+++ b/deskutils/gtimer/Makefile
@@ -16,8 +16,7 @@ RUN_DEPENDS= xdg-open:${PORTSDIR}/devel/xdg-utils
USE_XORG= xscrnsaver
USE_GNOME= gtk20
-USE_PERL5_BUILD=yes
-USES= gettext
+USES= gettext perl5
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/deskutils/jlj/Makefile b/deskutils/jlj/Makefile
index 01285a65242f..30b94f24397a 100644
--- a/deskutils/jlj/Makefile
+++ b/deskutils/jlj/Makefile
@@ -13,8 +13,8 @@ COMMENT= Jerry's command-line LiveJournal.com entry system
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= shebangfix
-USE_PERL5_RUN= yes
+USES= shebangfix perl5
+USE_PERL5= run
NO_BUILD= yes
SUB_FILES= pkg-message
diff --git a/deskutils/mencal/Makefile b/deskutils/mencal/Makefile
index 8d089e286d66..411dd7ff3f32 100644
--- a/deskutils/mencal/Makefile
+++ b/deskutils/mencal/Makefile
@@ -17,7 +17,8 @@ LICENSE= GPLv2
NO_BUILD= yes
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
PLIST_FILES= bin/mencal
diff --git a/devel/ace/Makefile b/devel/ace/Makefile
index dd4a7478e00a..b0fe22f3438b 100644
--- a/devel/ace/Makefile
+++ b/devel/ace/Makefile
@@ -21,14 +21,13 @@ CONFLICTS= ace+tao-5*
WRKSRC= ${WRKDIR}/ACE_wrappers
USE_BZIP2= yes
-USES= pkgconfig
-USE_PERL5_BUILD=yes
+USES= pkgconfig perl5
+USE_PERL5= build
USE_GMAKE= yes
MAKE_ENV= LD_LIBRARY_PATH="${WRKSRC}/lib" ACE_ROOT="${WRKSRC}" \
CROSS-COMPILE=1
MAKEFILE= GNUmakefile
USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/devel/cc65/Makefile b/devel/cc65/Makefile
index 71ee9162bba2..69d444adba44 100644
--- a/devel/cc65/Makefile
+++ b/devel/cc65/Makefile
@@ -15,9 +15,9 @@ COMMENT= Cross-compiler for 6502-based systems, includes 65816 assembler
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
-USES= shebangfix
+USES= shebangfix perl5
USE_BZIP2= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_GMAKE= yes
MAKEFILE= ${WRKSRC}/make/gcc.mak
MAKE_JOBS_UNSAFE=yes
diff --git a/devel/cvsdadm/Makefile b/devel/cvsdadm/Makefile
index d1b5386535a3..70ff2ea8a1be 100644
--- a/devel/cvsdadm/Makefile
+++ b/devel/cvsdadm/Makefile
@@ -14,9 +14,9 @@ COMMENT= Tool for CVSd pserver user administration
WRKSRC= ${WRKDIR}/${PORTNAME}
-USES= shebangfix
+USES= shebangfix perl5
NO_BUILD= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
POD2TEXT?= pod2text
PORTDOCS= cvsdadm.README
diff --git a/devel/gecode/Makefile b/devel/gecode/Makefile
index 9fed535b28d0..b6423e2d99cb 100644
--- a/devel/gecode/Makefile
+++ b/devel/gecode/Makefile
@@ -14,8 +14,8 @@ LICENSE= MIT
OPTIONS_DEFINE= GIST
GIST_DESC= Interactive Search Tool (requires Qt)
-USE_PERL5_BUILD=yes
-USES= bison
+USE_PERL5= build
+USES= bison perl5
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-static \
diff --git a/devel/leaktracer/Makefile b/devel/leaktracer/Makefile
index c30b301be879..86735954cb6c 100644
--- a/devel/leaktracer/Makefile
+++ b/devel/leaktracer/Makefile
@@ -15,9 +15,10 @@ DISTNAME= LeakTracer
MAINTAINER= ports@FreeBSD.org
COMMENT= Trace and analyze memory leaks in C++ programs
+USES= perl5
USE_LDCONFIG= yes
USE_GMAKE= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
PLIST_FILES= bin/LeakCheck bin/leak-analyze lib/LeakTracer.so
PORTDOCS= README README.html
diff --git a/devel/naturaldocs/Makefile b/devel/naturaldocs/Makefile
index 5d4629ce1bb2..ae7e7437d077 100644
--- a/devel/naturaldocs/Makefile
+++ b/devel/naturaldocs/Makefile
@@ -16,8 +16,9 @@ DISTNAME= NaturalDocs-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= An extensible, multi-language source code documentation generator
+USES= perl5
USE_ZIP= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
NO_WRKSUBDIR= yes
NO_BUILD= yes
diff --git a/devel/paexec/Makefile b/devel/paexec/Makefile
index f2b88f6134b7..53c70150cb8b 100644
--- a/devel/paexec/Makefile
+++ b/devel/paexec/Makefile
@@ -17,7 +17,8 @@ RUN_DEPENDS= runawk:${PORTSDIR}/lang/runawk
OPTIONS_DEFINE= DOCS EXAMPLES
-USE_PERL5_BUILD=yes
+USES= perl5
+USE_PERL5= build
MAKE_ENV= SUBPRJ_DFLT="${SUBPRJ_DFLT}"
CFLAGS+= -I${LOCALBASE}/include
diff --git a/devel/picasm/Makefile b/devel/picasm/Makefile
index c4caaa9ca2e7..cddc0f27e435 100644
--- a/devel/picasm/Makefile
+++ b/devel/picasm/Makefile
@@ -19,7 +19,8 @@ USE_BZIP2= yes
WRKSRC= ${WRKDIR}/${PORTNAME}${PORTVERSION:S/.//g}
-USE_PERL5_BUILD= yes
+USES= perl5
+USE_PERL5= build
MAKE_ARGS= CC="${CC}" CFLAGS="${CFLAGS}" PERL5="${PERL5}"
ALL_TARGET=
diff --git a/devel/ppl/Makefile b/devel/ppl/Makefile
index 1875a0f96768..22efe3d53094 100644
--- a/devel/ppl/Makefile
+++ b/devel/ppl/Makefile
@@ -20,8 +20,9 @@ EXPIRATION_DATE= 2013-09-21
PWL_DOC_PREFIX= share/doc/pwl
+USES= perl5
USE_GMAKE= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_AUTOTOOLS= libtool
LIBTOOLFILES= configure Watchdog/configure
USE_GCC= 4.2+
@@ -38,7 +39,6 @@ CONFIGURE_ARGS= --prefix=${PREFIX} \
--with-gmp-prefix="${LOCALBASE}" \
--enable-interfaces="${INTERFACES}"
USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
MAN1= ppl-config.1 ppl_lcdd.1 ppl_pips.1
MAN3= libppl.3 libppl_c.3
diff --git a/editors/ne/Makefile b/editors/ne/Makefile
index 30d3d11a81ce..8207969669ce 100644
--- a/editors/ne/Makefile
+++ b/editors/ne/Makefile
@@ -15,7 +15,8 @@ OPTIONS_DEFINE= DOCS
BUILD_WRKSRC= ${WRKSRC}/src
-USE_PERL5_BUILD=yes
+USES= perl5
+USE_PERL5= build
USE_GMAKE= yes
MAKEFILE= makefile
ALL_TARGET= ${PORTNAME}
@@ -23,7 +24,6 @@ MAKE_ARGS= CC="${CC}" \
CFLAGS="${CFLAGS}" \
LDFLAGS="-lgnuregex" \
NE_GLOBAL_DIR="${DATADIR}"
-MAKE_JOBS_SAFE= yes
MAN1= ${PORTNAME}.1
INFO= ${PORTNAME}
diff --git a/emulators/xmame/Makefile b/emulators/xmame/Makefile
index f5eb877fe52c..c01a30041a24 100644
--- a/emulators/xmame/Makefile
+++ b/emulators/xmame/Makefile
@@ -23,8 +23,8 @@ LIB_DEPENDS= expat.6:${PORTSDIR}/textproc/expat2
NO_CDROM= License does not permit selling
+USES= perl5
USE_BZIP2= yes
-USE_PERL5= yes
USE_GMAKE= yes
MAKE_ARGS+= ARCH=freebsd
WANT_SDL= yes
diff --git a/games/3dc/Makefile b/games/3dc/Makefile
index 095e16faf548..30f9f13f970a 100644
--- a/games/3dc/Makefile
+++ b/games/3dc/Makefile
@@ -16,7 +16,8 @@ LICENSE= GPLv2
LIB_DEPENDS= Xaw3d:${PORTSDIR}/x11-toolkits/Xaw3d
-USE_PERL5_BUILD=yes
+USES= perl5
+USE_PERL5= build
USE_XORG= x11 xaw xext xmu xpm xt
WRKSRC= ${WRKDIR}/3Dc/src
diff --git a/games/acm/Makefile b/games/acm/Makefile
index e00507eb4c8b..d434384977b1 100644
--- a/games/acm/Makefile
+++ b/games/acm/Makefile
@@ -16,9 +16,10 @@ COMMENT= A flight simulator for X11
LICENSE= GPLv2
+USES= perl5
USE_XORG= x11
GNU_CONFIGURE= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
MAN6= acm.6
diff --git a/games/asc/Makefile b/games/asc/Makefile
index a060fb43c5cd..93e48bf51f3b 100644
--- a/games/asc/Makefile
+++ b/games/asc/Makefile
@@ -27,16 +27,16 @@ RUN_DEPENDS:= ${BUILD_DEPENDS}
OPTIONS_DEFINE= MUSIC XVID
MUSIC_DESC= Install extra music files
+USES= perl5
USE_BZIP2= yes
USE_SDL= image mixer sound sdl
USE_WX= 2.4+
WX_CONF_ARGS= absolute
USE_LUA= 5.1
LUA_COMPS= lua
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_GMAKE= yes
GNU_CONFIGURE= yes
-MAKE_JOBS_SAFE= yes
MAN6= asc.6 asc_demount.6 asc_mapedit.6 asc_mount.6 \
asc_weaponguide.6
diff --git a/games/falconseye/Makefile b/games/falconseye/Makefile
index f188719000b5..497802f42467 100644
--- a/games/falconseye/Makefile
+++ b/games/falconseye/Makefile
@@ -13,11 +13,12 @@ COMMENT= NetHack derivative
RUN_DEPENDS= timidity:${PORTSDIR}/audio/timidity
+USES= perl5
NHDIR= "${PREFIX}/share/falconseyedir"
MAKE_ENV= NHDIR="${NHDIR}" NETHACKCONFIG="${NETHACKCONFIG}"
NETHACKCONFIG= ${FILESDIR}/x-config
USE_SDL= sdl
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_ZIP= yes
USE_XORG= x11 xpm xaw
CFLAGS+= -I${LOCALBASE}/include -L${LOCALBASE}/lib -I${LOCALBASE}/include/SDL11 \
diff --git a/games/gtkpool/Makefile b/games/gtkpool/Makefile
index 4e05e7214422..89723adc5fe0 100644
--- a/games/gtkpool/Makefile
+++ b/games/gtkpool/Makefile
@@ -15,13 +15,13 @@ MASTER_SITES= ftp://ftp.seul.org/pub/gtkpool/ \
MAINTAINER= ports@FreeBSD.org
COMMENT= A 2D pool game using the GTK+ toolkit
+USES= perl5
USE_GNOME= gtk20
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_GMAKE= yes
USE_AUTOTOOLS= aclocal automake autoheader autoconf
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
-MAKE_JOBS_SAFE= yes
post-patch:
.for file in application.cpp options.cpp
diff --git a/games/hlstats/Makefile b/games/hlstats/Makefile
index 7bf9cf15ac77..c8cb28bf44ff 100644
--- a/games/hlstats/Makefile
+++ b/games/hlstats/Makefile
@@ -18,10 +18,11 @@ LICENSE= CDDL
RUN_DEPENDS= p5-DBD-mysql>=0:${PORTSDIR}/databases/p5-DBD-mysql
+USES= perl5
NO_BUILD= yes
NO_WRKSUBDIR= yes
USE_PHP= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
HLSTATS?= www/${PORTNAME}
PLIST_SUB+= HLSTATS=${HLSTATS}
diff --git a/games/latrine/Makefile b/games/latrine/Makefile
index 75baa3886b94..0a70c94b1557 100644
--- a/games/latrine/Makefile
+++ b/games/latrine/Makefile
@@ -17,11 +17,10 @@ WRKSRC= ${WRKDIR}/${DISTNAME}/src
USE_CSTD= gnu89
USE_SQLITE= 3
-USE_PERL5_BUILD=yes
-USES= gettext ncurses
+USE_PERL5= build
+USES= gettext ncurses perl5
USE_GMAKE= yes
GNU_CONFIGURE= yes
-MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include -D_XOPEN_SOURCE_EXTENDED
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/games/mahjong/Makefile b/games/mahjong/Makefile
index 9fabb4fdc4f7..ed2aeaeb202b 100644
--- a/games/mahjong/Makefile
+++ b/games/mahjong/Makefile
@@ -19,12 +19,12 @@ COMMENT= A networked Mah Jong program, together with a computer player
LICENSE= GPLv2 # (or later)
+USES= perl5
USE_GNOME= gtk20
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_GMAKE= yes
MAKE_ENV= CCLINK="${CC}" CDEBUGFLAGS="${CFLAGS}" PERL="${PERL}" \
INCLUDES="-I."
-MAKE_JOBS_SAFE= yes
MAN1= xmj.1
MLINKS= xmj.1 mj-player.1 \
diff --git a/games/optimax/Makefile b/games/optimax/Makefile
index a2ceefc7e213..8a361d9a1db6 100644
--- a/games/optimax/Makefile
+++ b/games/optimax/Makefile
@@ -21,8 +21,9 @@ COMMENT= A Core War optimizer written in Perl
RUN_DEPENDS= p5-Tk>=0:${PORTSDIR}/x11-toolkits/p5-Tk
+USES= perl5
USE_ZIP= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
WRKSRC= ${WRKDIR}/publish_${PORTVERSION:S/.//}
BUILD_WRKSRC= ${WRKSRC}/optimars/optimars_0.1
ALL_TARGET= exmars
diff --git a/games/pengpong/Makefile b/games/pengpong/Makefile
index 5808c5bf042d..04795fab9772 100644
--- a/games/pengpong/Makefile
+++ b/games/pengpong/Makefile
@@ -10,9 +10,10 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}-linux
MAINTAINER= ports@FreeBSD.org
COMMENT= A cross-platform pong game written in SDL
+USES= perl5
USE_SDL= image sdl
NO_WRKSUBDIR= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
DATAFILES= 24P_Copperplate_Blue.png ball.tga logo.jpg \
paddle.tga red.png
diff --git a/games/ptools/Makefile b/games/ptools/Makefile
index 8c0ed05c5fe5..0810828e1eb7 100644
--- a/games/ptools/Makefile
+++ b/games/ptools/Makefile
@@ -19,8 +19,9 @@ EXTRACT_ONLY= ${DISTFILES:C/:[[:alpha:]]+$//:N*.pl:N*.c}
MAINTAINER= ports@FreeBSD.org
COMMENT= Accessory programs for pMARS (Core War simulator)
+USES= perl5
USE_ZIP= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
MAKEFILE= makefile.ptools
ALL_TARGET= mopt mts pname
NO_WRKSUBDIR= yes
diff --git a/games/stepmania-devel/Makefile b/games/stepmania-devel/Makefile
index c42eb9dae646..138ed2692adf 100644
--- a/games/stepmania-devel/Makefile
+++ b/games/stepmania-devel/Makefile
@@ -28,13 +28,12 @@ PROJECTHOST= sm-ssc
USE_BZIP2= yes
USE_XORG= x11 xau xdmcp xext xrandr xrender xtst
USE_GL= gl glu
-USES= pathfix iconv shebangfix
+USES= pathfix iconv shebangfix perl5
USE_GNOME= gtk20
-USE_PERL5_BUILD=yes
+USE_PERL5= build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --without-ffmpeg
INSTALLS_ICONS= yes
-MAKE_JOBS_SAFE= yes
SHEBANG_FILES= Utils/*.pl \
extern/zlib/zlib2ansi
diff --git a/games/zangband/Makefile b/games/zangband/Makefile
index 9192507e030e..623835cccd5c 100644
--- a/games/zangband/Makefile
+++ b/games/zangband/Makefile
@@ -11,9 +11,10 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Zangband (Zelazny Angband) with color, X11 support
+USES= perl5
USE_GMAKE= yes
USE_AUTOTOOLS= automake14 autoconf
-USE_PERL5_BUILD=yes
+USE_PERL5= build
CONFIGURE_ARGS= --datadir=${PREFIX}/lib --mandir=${PREFIX}/man \
--with-setgid=${SHAREGRP}
diff --git a/graphics/dynamechs/Makefile b/graphics/dynamechs/Makefile
index 544676c5ece3..51db9d174f3a 100644
--- a/graphics/dynamechs/Makefile
+++ b/graphics/dynamechs/Makefile
@@ -17,10 +17,11 @@ DISTNAME= ${PORTNAME}_${PORTVERSION:S/.p/pre/}
MAINTAINER= ports@FreeBSD.org
COMMENT= A Multibody Dynamic Simulation Library
+USES= perl5
USE_BZIP2= yes
USE_GL= glut
USE_GMAKE= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
CXXFLAGS+= ${PTHREAD_CFLAGS}
MAKE_ENV= OPENGLINCDIR="${LOCALBASE}/include" \
OPENGLLIBDIR="${LOCALBASE}/lib"
diff --git a/graphics/giram/Makefile b/graphics/giram/Makefile
index 5a4b07d1e6be..72e9052a01fc 100644
--- a/graphics/giram/Makefile
+++ b/graphics/giram/Makefile
@@ -18,8 +18,8 @@ LIB_DEPENDS= 3ds-1.3:${PORTSDIR}/graphics/lib3ds
BUILD_DEPENDS= povray:${PORTSDIR}/graphics/povray-meta
RUN_DEPENDS:= ${BUILD_DEPENDS}
-USES= gettext
-USE_PERL5_BUILD=yes
+USES= gettext perl5
+USE_PERL5= build
USE_GNOME= gtk20
USE_GMAKE= yes
USE_AUTOTOOLS= libtool
diff --git a/graphics/gtkgraph/Makefile b/graphics/gtkgraph/Makefile
index 48b046ac9892..f688e8ac1125 100644
--- a/graphics/gtkgraph/Makefile
+++ b/graphics/gtkgraph/Makefile
@@ -11,10 +11,10 @@ MASTER_SITE_SUBDIR= jedgar
MAINTAINER= ports@FreeBSD.org
COMMENT= Graphing calculator using GTK+
-USES= gettext
+USES= gettext perl5
USE_GMAKE= yes
USE_GNOME= imlib
-USE_PERL5_BUILD=yes
+USE_PERL5= build
GNU_CONFIGURE= yes
CONFIGURE_ENV= LIBS="-L${LOCALBASE}/lib"
CPPFLAGS+= -I${LOCALBASE}/include
diff --git a/graphics/icoutils/Makefile b/graphics/icoutils/Makefile
index bda2922c1e13..5cb13c60aa34 100644
--- a/graphics/icoutils/Makefile
+++ b/graphics/icoutils/Makefile
@@ -15,13 +15,13 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
OPTIONS_DEFINE= RESSCRIPTS
RESSCRIPTS_DESC= PERL resource scripts
+RESSCRIPTS_USES= perl5
USE_BZIP2= yes
USES= shebangfix
SHEBANG_FILES= extresso/*.in
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --disable-nls
-MAKE_JOBS_SAFE= yes
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
@@ -34,7 +34,7 @@ PLIST_FILES= bin/icotool \
.if ${PORT_OPTIONS:MRESSCRIPTS}
RUN_DEPENDS+= p5-libwww>=0:${PORTSDIR}/www/p5-libwww
-USE_PERL5_RUN= yes
+USE_PERL5= run
MAN1+= extresso.1 genresscript.1
PLIST_FILES+= bin/extresso \
bin/genresscript
diff --git a/graphics/ida/Makefile b/graphics/ida/Makefile
index 1c64e94c239e..cb017dcb9a2e 100644
--- a/graphics/ida/Makefile
+++ b/graphics/ida/Makefile
@@ -21,11 +21,10 @@ OPTIONS_DEFAULT= GIF PNG TIFF
PCD_DESC= Enable PhotoCD support
SANE_DESC= Enable SANE support
-USE_PERL5_BUILD=yes
-USES= iconv gmake motif
+USE_PERL5= build
+USES= iconv gmake motif perl5
MAKEFILE= GNUmakefile
MAKE_ARGS= JPEG_VER=80 verbose=yes
-MAKE_JOBS_SAFE= yes
LDFLAGS+= -liconv
diff --git a/graphics/openrm/Makefile b/graphics/openrm/Makefile
index c9dde4851d82..59eee4117573 100644
--- a/graphics/openrm/Makefile
+++ b/graphics/openrm/Makefile
@@ -18,11 +18,11 @@ OPTIONS_DEFINE= DOCS EXAMPLES
WRKSRC= ${WRKDIR}/rm${PORTVERSION:R:S/.//g}
-USES= shebangfix
+USES= shebangfix perl5
SHEBANG_FILES= doc/*.pl
USE_GL= glu
USE_XORG= xmu
-USE_PERL5_BUILD=yes
+USE_PERL5= build
ALL_TARGET= freebsd docs
MAKE_ARGS= AR="${AR}" \
CC="${CC}" \
diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile
index e1a4289ea6af..b2ebcb08e986 100644
--- a/graphics/pvmpov/Makefile
+++ b/graphics/pvmpov/Makefile
@@ -18,7 +18,8 @@ LIB_DEPENDS= png15:${PORTSDIR}/graphics/png
RUN_DEPENDS= povray31:${PORTSDIR}/graphics/povray31 \
pvmd:${PORTSDIR}/net/pvm
-USE_PERL5_BUILD=yes
+USES= perl5
+USE_PERL5= build
USE_XORG= x11
WRKSRC= ${WRKDIR}/pvmpov3_1g_2
diff --git a/graphics/sam2p/Makefile b/graphics/sam2p/Makefile
index 9cc14099b12c..2330842e055a 100644
--- a/graphics/sam2p/Makefile
+++ b/graphics/sam2p/Makefile
@@ -17,14 +17,14 @@ RUN_DEPENDS= zip:${PORTSDIR}/archivers/zip \
cjpeg:${PORTSDIR}/graphics/jpeg \
tif22pnm:${PORTSDIR}/graphics/tif22pnm
-USE_PERL5_BUILD= yes
+USES= perl5
+USE_PERL5= build
USE_GHOSTSCRIPT_RUN= yes
USE_GMAKE= yes
GNU_CONFIGURE= yes
CONFIGURE_ENV= ac_cv_path_pts_bash="${SH}"
MAKE_ARGS= CXXX="${CXX}" LDALL="${CXX}" CXXFLAGSB="${CXXFLAGS}"
ALL_TARGET= ${PORTNAME}
-MAKE_JOBS_SAFE= yes
PORTDOCS= README
PORTEXAMPLES= *
diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile
index cec3816df6cd..aad5c3448dd3 100644
--- a/graphics/xmandel/Makefile
+++ b/graphics/xmandel/Makefile
@@ -17,9 +17,9 @@ COMMENT= Window based interface to Mandelbrot sets and Julia sets
EXTRACT_CMD= ${SH}
EXTRACT_BEFORE_ARGS= # empty
EXTRACT_AFTER_ARGS= # empty
-USES= imake
+USES= imake perl5
USE_XORG= ice sm x11 xaw xext xmu xt
-USE_PERL5_BUILD=yes
+USE_PERL5= build
NO_WRKSUBDIR= yes
MAN1= xmandel.1
PLIST_FILES= bin/xmandel
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 3abd17dc0b0e..db1e2aa18fba 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -17,8 +17,7 @@ COMMENT= X11 IRC client using the GTK+ toolkit, and optionally, GNOME
USE_BZIP2= yes
USE_GMAKE= yes
-USES= iconv
-USE_PERL5= yes
+USES= iconv perl5
USE_GNOME= gtk12
WANT_GNOME= yes
GNU_CONFIGURE= yes
diff --git a/japanese/im-ja/Makefile b/japanese/im-ja/Makefile
index 77e0d22ddf25..abdd25215745 100644
--- a/japanese/im-ja/Makefile
+++ b/japanese/im-ja/Makefile
@@ -17,9 +17,9 @@ CANNA_DESC= Use Canna
WNN_DESC= Use FreeWnn
GNOMEPANEL_DESC= Build GNOME Panel Applet
-USES= pathfix
+USES= pathfix perl5
USE_GNOME= gconf2 gnomeprefix intlhack libglade2
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_GMAKE= yes
GNU_CONFIGURE= yes
diff --git a/japanese/jcode.pl/Makefile b/japanese/jcode.pl/Makefile
index 1f4f4aed7e74..fe706a08497d 100644
--- a/japanese/jcode.pl/Makefile
+++ b/japanese/jcode.pl/Makefile
@@ -16,7 +16,8 @@ EXTRACT_SUFX= # none
MAINTAINER= ports@FreeBSD.org
COMMENT= Perl library for Japanese character code conversion
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
NO_WRKSUBDIR= yes
NO_BUILD= yes
EXTRACT_CMD= ${CP}
diff --git a/lang/rubinius/Makefile b/lang/rubinius/Makefile
index 530c04bca0fe..4fda62bbe49a 100644
--- a/lang/rubinius/Makefile
+++ b/lang/rubinius/Makefile
@@ -30,10 +30,11 @@ CONFIGURE_ARGS= --without-execinfo \
--vendordir "${PREFIX}/lib/ruby/vendor_ruby/rubinius"
LLVMDIST= llvm-2.8.tgz
+USES= perl5
USE_RUBY= yes
RUBY_NO_RUN_DEPENDS= yes
USE_RAKE= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_GMAKE= yes
MAKE_JOBS_UNSAFE= yes
diff --git a/lang/tcc/Makefile b/lang/tcc/Makefile
index df8a34631d4b..16c2f1061942 100644
--- a/lang/tcc/Makefile
+++ b/lang/tcc/Makefile
@@ -18,13 +18,13 @@ ONLY_FOR_ARCHS= i386
CONFLICTS= TenDRA-*
+USES= perl5
USE_BZIP2= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix="${PREFIX}" --cc="${CC}"
MAKE_ARGS= CONFIG_NOLDL=1
-MAKE_JOBS_SAFE= yes
MAN1= tcc.1
diff --git a/mail/kbiff/Makefile b/mail/kbiff/Makefile
index 672bc2738896..e27ff526135a 100644
--- a/mail/kbiff/Makefile
+++ b/mail/kbiff/Makefile
@@ -20,9 +20,8 @@ USE_BZIP2= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs
USE_QT4= corelib dbus gui network svg xml \
qmake_build uic_build rcc_build
-USE_PERL5_BUILD=yes
-USES= cmake gettext
-MAKE_JOBS_SAFE= yes
+USE_PERL5= build
+USES= cmake gettext perl5
MAN1= kbiff.1
diff --git a/mail/kshowmail/Makefile b/mail/kshowmail/Makefile
index e4b5071e7432..afb642c11ed3 100644
--- a/mail/kshowmail/Makefile
+++ b/mail/kshowmail/Makefile
@@ -18,8 +18,7 @@ LICENSE= GPLv2
USE_KDE4= automoc4 kdehier kdeprefix kdelibs pimlibs
USE_QT4= corelib dbus gui network svg xml \
qmake_build uic_build rcc_build
-USE_PERL5_BUILD=yes
-USES= cmake gettext
-MAKE_JOBS_SAFE= yes
+USE_PERL5= build
+USES= cmake gettext perl5
.include <bsd.port.mk>
diff --git a/mail/popfile/Makefile b/mail/popfile/Makefile
index b92b4dbc05f8..ded3c0ca14d7 100644
--- a/mail/popfile/Makefile
+++ b/mail/popfile/Makefile
@@ -33,8 +33,9 @@ MECABU_DESC= \
NO_WRKSUBDIR= yes
NO_BUILD= yes
+USES= perl5
USE_ZIP= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
PLIST_SUB= VERSION="${PORTVERSION}"
diff --git a/mail/sigit/Makefile b/mail/sigit/Makefile
index 19eb7183dabc..bd52428926f9 100644
--- a/mail/sigit/Makefile
+++ b/mail/sigit/Makefile
@@ -18,7 +18,8 @@ BUILD_DEPENDS= ${LOCALBASE}/bin/boxes:${PORTSDIR}/misc/boxes
LICENSE= GPLv2
-USE_PERL5_BUILD= yes
+USES= perl5
+USE_PERL5= build
USE_GMAKE= yes
HAS_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${DATADIR} \
diff --git a/mail/squirrelmail-multilogin-plugin/Makefile b/mail/squirrelmail-multilogin-plugin/Makefile
index 860d8a90da05..a72a05e6570a 100644
--- a/mail/squirrelmail-multilogin-plugin/Makefile
+++ b/mail/squirrelmail-multilogin-plugin/Makefile
@@ -38,9 +38,10 @@ SUB_LIST+= "SQUIRRELDIR=squirrelmail"
SUB_FILES= pkg-message
+USES= perl5
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_PHP= yes
WANT_PHP_WEB= yes
diff --git a/mail/squirrelmail-notes-plugin/Makefile b/mail/squirrelmail-notes-plugin/Makefile
index 1c9879435516..3b18c1f7d380 100644
--- a/mail/squirrelmail-notes-plugin/Makefile
+++ b/mail/squirrelmail-notes-plugin/Makefile
@@ -37,9 +37,10 @@ SUB_LIST+= "SQUIRRELDIR=squirrelmail"
SUB_FILES= pkg-message
+USES= perl5
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_PHP= yes
WANT_PHP_WEB= yes
IGNORE_WITH_PHP= 5 # known incompatibilities with php-5.4, use 5.3 for now
diff --git a/mail/squirrelmail-notify-plugin/Makefile b/mail/squirrelmail-notify-plugin/Makefile
index a2d062cfe348..cf9110d24bd7 100644
--- a/mail/squirrelmail-notify-plugin/Makefile
+++ b/mail/squirrelmail-notify-plugin/Makefile
@@ -35,9 +35,10 @@ SUB_LIST+= "SQUIRRELDIR=squirrelmail"
. endif
.endif
+USES= perl5
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_PHP= yes
WANT_PHP_WEB= yes
diff --git a/mail/squirrelmail-quota_usage-plugin/Makefile b/mail/squirrelmail-quota_usage-plugin/Makefile
index e917467f3b31..71216bf3234c 100644
--- a/mail/squirrelmail-quota_usage-plugin/Makefile
+++ b/mail/squirrelmail-quota_usage-plugin/Makefile
@@ -37,9 +37,10 @@ SUB_LIST+= "SQUIRRELDIR=squirrelmail"
SUB_FILES= pkg-message
+USES= perl5
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_PHP= yes
WANT_PHP_WEB= yes
IGNORE_WITH_PHP= 5 # known incompatibilities with php-5.4, use 5.3 for now
diff --git a/mail/squirrelmail-sasql-plugin/Makefile b/mail/squirrelmail-sasql-plugin/Makefile
index 1aaa7f899d66..8fa0c1487d47 100644
--- a/mail/squirrelmail-sasql-plugin/Makefile
+++ b/mail/squirrelmail-sasql-plugin/Makefile
@@ -38,9 +38,10 @@ SUB_LIST+= "SQUIRRELDIR=squirrelmail"
SUB_FILES= pkg-message
+USES= perl5
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_PHP= yes
WANT_PHP_WEB= yes
diff --git a/mail/squirrelmail-shared_calendars-plugin/Makefile b/mail/squirrelmail-shared_calendars-plugin/Makefile
index 1847ae79702b..1b849baa4757 100644
--- a/mail/squirrelmail-shared_calendars-plugin/Makefile
+++ b/mail/squirrelmail-shared_calendars-plugin/Makefile
@@ -39,9 +39,10 @@ SUB_LIST+= "SQUIRRELDIR=squirrelmail"
SUB_FILES= pkg-message
+USES= perl5
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_PHP= yes
WANT_PHP_WEB= yes
diff --git a/mail/squirrelmail-wetteronline-plugin/Makefile b/mail/squirrelmail-wetteronline-plugin/Makefile
index 8c7b1cde8802..08a414c5d94a 100644
--- a/mail/squirrelmail-wetteronline-plugin/Makefile
+++ b/mail/squirrelmail-wetteronline-plugin/Makefile
@@ -35,9 +35,10 @@ SUB_LIST+= "SQUIRRELDIR=squirrelmail"
. endif
.endif
+USES= perl5
NO_BUILD= yes
NO_WRKSUBDIR= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_PHP= yes
WANT_PHP_WEB= yes
IGNORE_WITH_PHP=5 # known incompatibilities with php-5.4, use 5.3 for now
diff --git a/mail/websieve/Makefile b/mail/websieve/Makefile
index 9138039ea37c..7fc79bdb4872 100644
--- a/mail/websieve/Makefile
+++ b/mail/websieve/Makefile
@@ -16,7 +16,8 @@ COMMENT= Web based Cyrus IMAP user admin client
DISTVERSION= 063a
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
NO_BUILD= yes
diff --git a/math/glgraph/Makefile b/math/glgraph/Makefile
index 70bd2c15b963..29d3ee96ca0d 100644
--- a/math/glgraph/Makefile
+++ b/math/glgraph/Makefile
@@ -19,8 +19,9 @@ COMMENT= An OpenGL based function grapher
RUN_DEPENDS= p5-OpenGL>=0:${PORTSDIR}/graphics/p5-OpenGL \
import:${PORTSDIR}/graphics/ImageMagick
+USES= perl5
USE_BZIP2= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
diff --git a/math/lambda/Makefile b/math/lambda/Makefile
index ff96e9d09d05..be9f3ef88c0c 100644
--- a/math/lambda/Makefile
+++ b/math/lambda/Makefile
@@ -14,7 +14,8 @@ MASTER_SITES= http://www.freebsdbrasil.com.br/~jmelo/
MAINTAINER= ports@FreeBSD.org
COMMENT= A lambda calculus interpreter
-USE_PERL5_BUILD= yes
+USES= perl5
+USE_PERL5= build
GNU_CONFIGURE= yes
PLIST_FILES= bin/lambda \
diff --git a/math/plplot/Makefile b/math/plplot/Makefile
index bf756e00cff0..a9f65b176571 100644
--- a/math/plplot/Makefile
+++ b/math/plplot/Makefile
@@ -24,9 +24,9 @@ OPTIONS_DEFINE= FORTRAN GD LUA PYTHON QT4 TCLTK THREADS WXGTK X11
OPTIONS_DEFAULT= THREADS X11
USE_GNOME= pango
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_GHOSTSCRIPT=yes
-USES= cmake
+USES= cmake perl5
CMAKE_ARGS= -DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \
-DENABLE_pdl:BOOL=OFF -DENABLE_ada:BOOL=OFF \
-DENABLE_d:BOOL=OFF -DENABLE_ocaml:BOOL=OFF \
@@ -36,7 +36,6 @@ CMAKE_ARGS= -DENABLE_java:BOOL=OFF -DENABLE_octave:BOOL=OFF \
USE_GMAKE= yes
USE_AUTOTOOLS= libltdl
USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
MAN1= plm2gif.1 plpr.1 pltek.1 plrender.1
diff --git a/math/xplot/Makefile b/math/xplot/Makefile
index 271c36b723a1..ae6b0842b05f 100644
--- a/math/xplot/Makefile
+++ b/math/xplot/Makefile
@@ -14,8 +14,9 @@ MASTER_SITES= http://www.xplot.org/xplot/
MAINTAINER= ports@FreeBSD.org
COMMENT= X11 plotting package
+USES= perl5
USE_XORG= x11
-USE_PERL5_RUN= yes
+USE_PERL5= run
GNU_CONFIGURE= yes
MAN1= tcpdump2xplot.1 xplot.1
diff --git a/multimedia/2mandvd/Makefile b/multimedia/2mandvd/Makefile
index 8c8149d842a8..2f4ebbf66dfc 100644
--- a/multimedia/2mandvd/Makefile
+++ b/multimedia/2mandvd/Makefile
@@ -30,14 +30,14 @@ RUN_DEPENDS= sox:${PORTSDIR}/audio/sox \
WRKSRC= ${WRKDIR}/${PORTNAME}
+USES= perl5
USE_QT4= corelib gui opengl \
linguist_build moc_build qmake_build rcc_build uic_build
USE_GL= glu
USE_SDL= sdl
-USE_PERL5_RUN= yes
+USE_PERL5= run
USE_GMAKE= yes
MAKE_ENV= QTDIR="${QT_PREFIX}"
-MAKE_JOBS_SAFE= yes
DATADIR= ${PREFIX}/share/2ManDVD
diff --git a/multimedia/gmtk/Makefile b/multimedia/gmtk/Makefile
index 6eb33aa0d0ec..ef1c1f61099c 100644
--- a/multimedia/gmtk/Makefile
+++ b/multimedia/gmtk/Makefile
@@ -16,9 +16,9 @@ GNU_CONFIGURE= yes
USE_GMAKE= yes
USE_GNOME= glib20
USE_LDCONFIG= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_XORG= x11
-USES= pathfix pkgconfig
+USES= pathfix pkgconfig perl5
PORTDOCS= AUTHORS COPYING ChangeLog INSTALL NEWS README
diff --git a/net-mgmt/check_multi/Makefile b/net-mgmt/check_multi/Makefile
index b278bbaa1919..9678e91b8449 100644
--- a/net-mgmt/check_multi/Makefile
+++ b/net-mgmt/check_multi/Makefile
@@ -14,8 +14,8 @@ COMMENT= A multi purpose wrapper plugin for Nagios
LICENSE= GPLv2
-USES= shebangfix
-USE_PERL5_RUN= yes
+USES= shebangfix perl5
+USE_PERL5= run
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}
diff --git a/net-mgmt/netleak/Makefile b/net-mgmt/netleak/Makefile
index 4c5b1bbf091f..4c40268a2e70 100644
--- a/net-mgmt/netleak/Makefile
+++ b/net-mgmt/netleak/Makefile
@@ -25,7 +25,8 @@ RUN_DEPENDS= p5-Net-PcapUtils>=0:${PORTSDIR}/net/p5-Net-PcapUtils \
NO_BUILD= yes
WRKSRC= ${WRKDIR}/${PORTNAME}
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
MAN8= netleak.8 netleakd.8
PLIST_FILES= etc/netleak.conf etc/netleakd.conf sbin/netleak sbin/netleakd
diff --git a/net-mgmt/nrpe2/Makefile b/net-mgmt/nrpe2/Makefile
index b660a5abfebb..e73336fd3f5a 100644
--- a/net-mgmt/nrpe2/Makefile
+++ b/net-mgmt/nrpe2/Makefile
@@ -15,7 +15,8 @@ RUN_DEPENDS= ${LOCALBASE}/libexec/nagios/check_nagios:${PORTSDIR}/net-mgmt/nagio
LATEST_LINK= nrpe2
-USE_PERL5_BUILD= yes
+USES= perl5
+USE_PERL5= build
USE_RC_SUBR= nrpe2
CONFLICTS= nrpe-1.*
diff --git a/net/abills/Makefile b/net/abills/Makefile
index 063ee31ba60c..cfbb25f26bc8 100644
--- a/net/abills/Makefile
+++ b/net/abills/Makefile
@@ -22,7 +22,8 @@ RUN_DEPENDS= radiusd:${PORTSDIR}/net/freeradius2 \
WRKSRC= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
SUB_FILES= pkg-message
diff --git a/net/click/Makefile b/net/click/Makefile
index c1f3561b7f9c..09b9fd7a7e18 100644
--- a/net/click/Makefile
+++ b/net/click/Makefile
@@ -11,7 +11,8 @@ MASTER_SITES= http://www.read.cs.ucla.edu/click/
MAINTAINER= ports@FreeBSD.org
COMMENT= The Click Modular Router
-USE_PERL5_BUILD=yes
+USES= perl5
+USE_PERL5= build
GNU_CONFIGURE= yes
USE_GMAKE= yes
diff --git a/net/freeswitch-core-devel/Makefile b/net/freeswitch-core-devel/Makefile
index d58943901a7a..cf75ade99b1e 100644
--- a/net/freeswitch-core-devel/Makefile
+++ b/net/freeswitch-core-devel/Makefile
@@ -42,8 +42,8 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
USE_AUTOTOOLS= autoconf:env automake:env libtool:env
-USE_PERL5_BUILD=yes
-USES= bison:both pkgconfig
+USE_PERL5= build
+USES= bison:both pkgconfig perl5
USE_GCC= any
USE_GMAKE= yes
SUB_FILES= pkg-install
diff --git a/net/freeswitch-core/Makefile b/net/freeswitch-core/Makefile
index 40615520d30f..5e910da31b62 100644
--- a/net/freeswitch-core/Makefile
+++ b/net/freeswitch-core/Makefile
@@ -43,8 +43,8 @@ WRKSRC= ${WRKDIR}/${BASE_PORTNAME}-${PORTVERSION}
USE_AUTOTOOLS= autoconf:env automake:env libtool:env
-USE_PERL5_BUILD=yes
-USES= bison:both pkgconfig
+USE_PERL5= build
+USES= bison:both pkgconfig perl5
USE_GCC= any
USE_GMAKE= yes
SUB_FILES= pkg-install pkg-message
diff --git a/net/freewais-sf/Makefile b/net/freewais-sf/Makefile
index 2efa41e0b085..54f9e261fbc0 100644
--- a/net/freewais-sf/Makefile
+++ b/net/freewais-sf/Makefile
@@ -12,8 +12,9 @@ DISTNAME= freeWAIS-sf-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Enhanced Wide Area Information Server
+USES= perl5
HAS_CONFIGURE= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
CONFIGURE_SCRIPT= Configure
CONFIGURE_ENV= PREFIX="${PREFIX}"
CONFIGURE_ARGS= -sde -Dprefix="${PREFIX}" \
diff --git a/net/hinfo/Makefile b/net/hinfo/Makefile
index cde2f7f85dcd..abcb9ee79055 100644
--- a/net/hinfo/Makefile
+++ b/net/hinfo/Makefile
@@ -20,7 +20,8 @@ COMMENT= Utility primarily designed to find the owner of an IP block
RUN_DEPENDS= p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
wget:${PORTSDIR}/ftp/wget
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
DATADIR?= ${PREFIX}/lib/${PORTNAME}
diff --git a/net/ldap2dns/Makefile b/net/ldap2dns/Makefile
index 3480d09b31c4..072bb737d7b7 100644
--- a/net/ldap2dns/Makefile
+++ b/net/ldap2dns/Makefile
@@ -16,7 +16,8 @@ RUN_DEPENDS= p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS \
OPTIONS_DEFINE= DOCS
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
USE_GMAKE= yes
USE_OPENLDAP= yes
diff --git a/net/ssvnc/Makefile b/net/ssvnc/Makefile
index e3c2d406bf93..1fe6b5c56868 100644
--- a/net/ssvnc/Makefile
+++ b/net/ssvnc/Makefile
@@ -20,10 +20,10 @@ RUN_DEPENDS= stunnel:${PORTSDIR}/security/stunnel \
OPTIONS_DEFINE= ULTRAFTP DOCS
ULTRAFTP_DESC= UltraVNC File Transfer support (Java required)
-USES= imake:env gmake
+USES= imake:env gmake perl5
USE_XORG= xi xmu xt xaw ice xpm xext sm
USE_TK_WRAPPER= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
MAN1= ssvnc.1 ssvncviewer.1 ssvnc-gui.1
NO_INSTALL_MANPAGES= yes
diff --git a/net/wol/Makefile b/net/wol/Makefile
index a0b7981d9ee4..949c3017102b 100644
--- a/net/wol/Makefile
+++ b/net/wol/Makefile
@@ -10,8 +10,9 @@ MASTER_SITES= SF/ahh/OldFiles
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool to wake up Wake-On-LAN compliant computers
+USES= perl5
GNU_CONFIGURE= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/print/kover/Makefile b/print/kover/Makefile
index ea460c5042fb..068b8e5a3f45 100644
--- a/print/kover/Makefile
+++ b/print/kover/Makefile
@@ -18,9 +18,8 @@ USE_BZIP2= yes
USE_KDE4= automoc4 kdehier kdeprefix kdelibs sharedmime
USE_QT4= corelib dbus gui network svg xml \
qmake_build uic_build rcc_build
-USE_PERL5_BUILD=yes
-USES= cmake gettext
-MAKE_JOBS_SAFE= yes
+USE_PERL5= build
+USES= cmake gettext perl5
MAN1= kover.1
diff --git a/print/latexmk/Makefile b/print/latexmk/Makefile
index eeca6447e5fe..5e43eab3d7e3 100644
--- a/print/latexmk/Makefile
+++ b/print/latexmk/Makefile
@@ -16,8 +16,9 @@ OPTIONS_DEFINE= DOCS EXAMPLES
NO_WRKSUBDIR= yes
NO_BUILD= yes
+USES= perl5
USE_ZIP= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
USE_TEX= latex
MAN1= latexmk.1
diff --git a/print/muttprint/Makefile b/print/muttprint/Makefile
index 03d74a077d30..f8918f495baa 100644
--- a/print/muttprint/Makefile
+++ b/print/muttprint/Makefile
@@ -10,7 +10,7 @@ MASTER_SITES= SF/muttprint/muttprint/muttprint-${PORTVERSION}
MAINTAINER?= ports@FreeBSD.org
COMMENT?= Utility to print mail for most any mail client
-USE_PERL5= yes
+USES= perl5
.if !defined(PAPERSIZE)
PAPERSIZE= letter
diff --git a/science/bodr/Makefile b/science/bodr/Makefile
index 7e477bdc82c0..76803726ee25 100644
--- a/science/bodr/Makefile
+++ b/science/bodr/Makefile
@@ -14,9 +14,10 @@ COMMENT= Chemistry data like element and isotope properties, atomic radii, etc
BUILD_DEPENDS= xsltproc:${PORTSDIR}/textproc/libxslt
+USES= perl5
USE_BZIP2= yes
USE_GMAKE= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
GNU_CONFIGURE= yes
post-patch:
diff --git a/security/amavis-stats/Makefile b/security/amavis-stats/Makefile
index 2a96011f4751..b56184aba660 100644
--- a/security/amavis-stats/Makefile
+++ b/security/amavis-stats/Makefile
@@ -13,7 +13,8 @@ COMMENT= Simple AMaViS statistics generator based on rrdtool
RUN_DEPENDS= rrdtool>=0:${PORTSDIR}/databases/rrdtool
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
USE_PHP= pcre
MAN1= amavis-stats.1
diff --git a/security/find-zlib/Makefile b/security/find-zlib/Makefile
index 30b148fe0361..60fc7fc56a2d 100644
--- a/security/find-zlib/Makefile
+++ b/security/find-zlib/Makefile
@@ -16,7 +16,8 @@ LICENSE= GPLv2
NO_BUILD= none
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
PLIST_FILES= bin/find-zlib
diff --git a/security/kripp/Makefile b/security/kripp/Makefile
index b1e9242eed10..b81fbfad47f0 100644
--- a/security/kripp/Makefile
+++ b/security/kripp/Makefile
@@ -15,7 +15,8 @@ MASTER_SITE_SUBDIR= sniffers
MAINTAINER= ports@FreeBSD.org
COMMENT= Lightweight network password sniffer
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
NO_BUILD= yes
MAN1= kripp.1
diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index f1c89063a700..f3346a5103c8 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -12,11 +12,12 @@ DIST_SUBDIR= ${PORTNAME}
MAINTAINER= ports@FreeBSD.org
COMMENT= Cracks SAMBA or Windows NT passwords
+USES= perl5
DOCDIR= share/doc/${PORTNAME}
RESTRICTED= uses GNU getopt with BSDish-licensed code from OpenSSL
NO_WRKSUBDIR= yes
PLIST= ${WRKDIR}/pkg-plist
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_ZIP= yes
USE_DOS2UNIX= yes
diff --git a/security/smtpscan/Makefile b/security/smtpscan/Makefile
index b0a3af5c751a..fa4507646912 100644
--- a/security/smtpscan/Makefile
+++ b/security/smtpscan/Makefile
@@ -18,7 +18,8 @@ RUN_DEPENDS= p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
WRKSRC= ${WRKDIR}/${PORTNAME}
NO_BUILD= yes
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
MAN1= smtpscan.1
PLIST_FILES= bin/smtpscan \
diff --git a/security/snortsnarf/Makefile b/security/snortsnarf/Makefile
index 79cf90e407fe..596acd43fbfb 100644
--- a/security/snortsnarf/Makefile
+++ b/security/snortsnarf/Makefile
@@ -17,8 +17,9 @@ COMMENT= Generate HTML report summaries from snort incident alerts
RUN_DEPENDS= p5-Time-modules>=0:${PORTSDIR}/devel/p5-Time-modules
+USES= perl5
NO_BUILD= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
post-patch:
@${SED} -e 's|\./include|${PREFIX}/libdata/${PORTNAME}|' \
diff --git a/security/zebedee/Makefile b/security/zebedee/Makefile
index f0e45fdc0196..9429a6890388 100644
--- a/security/zebedee/Makefile
+++ b/security/zebedee/Makefile
@@ -13,8 +13,9 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}-src/${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Encrypted, secure compressed TCP tunnel
+USES= perl5
USE_OPENSSL= YES
-USE_PERL5_BUILD=YES
+USE_PERL5= build
MAKE_ENV+= PTHREAD_CFLAGS="${PTHREAD_CFLAGS}" \
PTHREAD_LIBS=${PTHREAD_LIBS}
diff --git a/sysutils/bontmia/Makefile b/sysutils/bontmia/Makefile
index aab0b1db378c..98128226c3c1 100644
--- a/sysutils/bontmia/Makefile
+++ b/sysutils/bontmia/Makefile
@@ -12,7 +12,8 @@ COMMENT= A small tool for incremental backups over network
RUN_DEPENDS= rsync:${PORTSDIR}/net/rsync
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
NO_BUILD= yes
diff --git a/sysutils/clonehdd/Makefile b/sysutils/clonehdd/Makefile
index 0bec2d2130e9..29464c794069 100644
--- a/sysutils/clonehdd/Makefile
+++ b/sysutils/clonehdd/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION}
MAINTAINER= ports@FreeBSD.org
COMMENT= Tool for clone HDD on FreeBSD
-USE_PERL5_RUN= YES
+USES= perl5
+USE_PERL5= run
PLIST_FILES= sbin/clonehdd
NO_BUILD= YES
MAN8= clonehdd.8
diff --git a/sysutils/dim/Makefile b/sysutils/dim/Makefile
index 5035d6b5b837..3d05e9f873c2 100644
--- a/sysutils/dim/Makefile
+++ b/sysutils/dim/Makefile
@@ -16,9 +16,9 @@ LICENSE= GPLv2 # (or later)
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USES= shebangfix
+USES= shebangfix perl5
SHEBANG_FILES= dim.pl
-USE_PERL5_RUN= yes
+USE_PERL5= run
PLIST_FILES= bin/dim
diff --git a/sysutils/hyperic-sigar/Makefile b/sysutils/hyperic-sigar/Makefile
index c64bd4fe16be..34291fe6ebaf 100644
--- a/sysutils/hyperic-sigar/Makefile
+++ b/sysutils/hyperic-sigar/Makefile
@@ -13,10 +13,11 @@ COMMENT= SIGAR - System Information Gatherer and Reporter
WRKSRC= ${WRKDIR}/${DISTNAME}/bindings/java/
+USES= perl5
USE_JAVA= yes
JAVA_VERSION= 1.6+
USE_ANT= yes
-USE_PERL5_BUILD=yes
+USE_PERL5= build
USE_LDCONFIG= yes
SHLIB_MAJOR= 0
diff --git a/sysutils/lavaps/Makefile b/sysutils/lavaps/Makefile
index 85b3e94654f7..c8614552c457 100644
--- a/sysutils/lavaps/Makefile
+++ b/sysutils/lavaps/Makefile
@@ -12,9 +12,10 @@ COMMENT= Lava lamp of currently running processes
LICENSE= GPLv2
+USES= perl5
GNU_CONFIGURE= yes
WANT_GNOME= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_XORG= x11 xext sm ice
MAN1= lavaps.1
diff --git a/sysutils/namefix/Makefile b/sysutils/namefix/Makefile
index 8e211f2989dc..8c0db9f02dc8 100644
--- a/sysutils/namefix/Makefile
+++ b/sysutils/namefix/Makefile
@@ -30,7 +30,8 @@ EXTRACT_AFTER_ARGS= -bd -y >/dev/null 2>&1
WRKSRC= ${WRKDIR}/${PORTNAME}.pl
NO_BUILD= yes
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
do-configure:
.for bin in ${PORTNAME} ${PORTNAME}-cli
diff --git a/sysutils/powerman/Makefile b/sysutils/powerman/Makefile
index 9ddcf67dd206..81c5053f989c 100644
--- a/sysutils/powerman/Makefile
+++ b/sysutils/powerman/Makefile
@@ -14,12 +14,12 @@ LICENSE= GPLv2 # (or later)
LIB_DEPENDS= curl:${PORTSDIR}/ftp/curl
-USE_PERL5_BUILD=yes
+USES= perl5
+USE_PERL5= build
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --with-httppower --localstatedir=${DESTDIR}/var \
--with-pkgconfig-dir=${PREFIX}/libdata/pkgconfig
USE_LDCONFIG= yes
-MAKE_JOBS_SAFE= yes
USE_RC_SUBR= powerman
diff --git a/sysutils/pslist/Makefile b/sysutils/pslist/Makefile
index 0479bd35d600..aeff7fdb232e 100644
--- a/sysutils/pslist/Makefile
+++ b/sysutils/pslist/Makefile
@@ -13,7 +13,8 @@ MASTER_SITES= http://devel.ringlet.net/sysutils/pslist/
MAINTAINER= ports@FreeBSD.org
COMMENT= A utility to view or send signals to processes with all their children
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
MAN1= pslist.1
MLINKS= pslist.1 rkill.1 pslist.1 rrenice.1
diff --git a/sysutils/syslinux/Makefile b/sysutils/syslinux/Makefile
index 58da5715845b..d2a825dcb1f1 100644
--- a/sysutils/syslinux/Makefile
+++ b/sysutils/syslinux/Makefile
@@ -14,12 +14,12 @@ LICENSE= GPLv2
BUILD_DEPENDS= nasm:${PORTSDIR}/devel/nasm
RUN_DEPENDS= mtools:${PORTSDIR}/emulators/mtools
+USES= perl5
USE_XZ= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_GMAKE= yes
MAKE_ARGS= CC="${CC}"
ALL_TARGET= bios
-MAKE_JOBS_SAFE= yes
MAN1= syslinux.1
diff --git a/sysutils/titlefix/Makefile b/sysutils/titlefix/Makefile
index e33dbcf31e7a..b0771104b928 100644
--- a/sysutils/titlefix/Makefile
+++ b/sysutils/titlefix/Makefile
@@ -15,7 +15,8 @@ COMMENT= Renames files in a proper English title format
RUN_DEPENDS= id3v2:${PORTSDIR}/audio/id3v2
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
NO_BUILD= yes
MAN1= titlefix.1 titlefixid3.1 titleid3.1
PLIST_FILES= bin/titlefix bin/titlefixid3 bin/titleid3
diff --git a/textproc/align/Makefile b/textproc/align/Makefile
index df8542ea031d..22414ad2c8a2 100644
--- a/textproc/align/Makefile
+++ b/textproc/align/Makefile
@@ -14,8 +14,8 @@ LICENSE= GPLv2 # (or later)
NO_BUILD= yes
-USES= shebangfix
-USE_PERL5_RUN= yes
+USES= shebangfix perl5
+USE_PERL5= run
SHEBANG_FILES= align width
diff --git a/textproc/code2html/Makefile b/textproc/code2html/Makefile
index 13d33fbb57ba..22e893bc74b4 100644
--- a/textproc/code2html/Makefile
+++ b/textproc/code2html/Makefile
@@ -16,7 +16,8 @@ MAINTAINER= ports@FreeBSD.org
COMMENT= Sourcecode to HTML converter
NO_BUILD= yes
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
MAN1= code2html.1
PLIST_FILES= bin/code2html
diff --git a/textproc/openvanilla-modules/Makefile b/textproc/openvanilla-modules/Makefile
index 9c41cd2037ff..e166d867762a 100644
--- a/textproc/openvanilla-modules/Makefile
+++ b/textproc/openvanilla-modules/Makefile
@@ -15,9 +15,10 @@ COMMENT= Input method modules for OpenVanilla
BUILD_DEPENDS= ${LOCALBASE}/include/OpenVanilla/OpenVanilla.h:${PORTSDIR}/textproc/openvanilla-framework
RUN_DEPENDS= ${LOCALBASE}/lib/scim-1.0/1.4.0/IMEngine/OVLoader-SCIM.so:${PORTSDIR}/textproc/scim-openvanilla
+USES= perl5
USE_AUTOTOOLS= libtool:env
USE_GMAKE= yes
-USE_PERL5_BUILD= yes
+USE_PERL5= build
OPTIONS_DEFINE= OVIMArray OVIMBig5 OVIMGeneric OVIMPOJ_Holo OVIMPhonetic OVIMRoman \
OVIMSpaceChewing OVIMTibetan OVIMUnicode
diff --git a/textproc/re_graph/Makefile b/textproc/re_graph/Makefile
index b86040b8120d..54717dba489f 100644
--- a/textproc/re_graph/Makefile
+++ b/textproc/re_graph/Makefile
@@ -15,9 +15,10 @@ COMMENT= Regular Expression Graphing Program
RUN_DEPENDS= p5-GD>=0:${PORTSDIR}/graphics/p5-GD \
p5-GD-Arrow>=0:${PORTSDIR}/graphics/p5-GD-Arrow
+USES= perl5
NO_WRKSUBDIR= yes
NO_BUILD= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
PLIST_FILES= bin/re_graph
diff --git a/textproc/xslint/Makefile b/textproc/xslint/Makefile
index bfa61b8dc04b..f7fdb55d1114 100644
--- a/textproc/xslint/Makefile
+++ b/textproc/xslint/Makefile
@@ -12,9 +12,9 @@ COMMENT= XSL(T) stylesheet checker
RUN_DEPENDS= p5-XML-DOM>=0:${PORTSDIR}/textproc/p5-XML-DOM
-USES= shebangfix
+USES= shebangfix perl5
USE_ZIP= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
WRKSRC= ${WRKDIR}/${PORTNAME}-0.05
NO_BUILD= yes
diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index f3e5cf277b7e..cd17c72670e1 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -12,8 +12,9 @@ MASTER_SITES= http://adzapper.sourceforge.net/
MAINTAINER= ports@FreeBSD.org
COMMENT= Filter out animated ad banners from web pages
+USES= perl5
NO_BUILD= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
SUB_FILES= adzap.conf pkg-message
PKGMESSAGE= ${WRKDIR}/pkg-message
diff --git a/www/bookmarkbridge/Makefile b/www/bookmarkbridge/Makefile
index a918d4ad6141..3faccaa6f4f9 100644
--- a/www/bookmarkbridge/Makefile
+++ b/www/bookmarkbridge/Makefile
@@ -12,12 +12,12 @@ COMMENT= Synchronize bookmarks between multiple browsers
LIB_DEPENDS= xml2:${PORTSDIR}/textproc/libxml2
-USE_PERL5_BUILD= yes
+USE_PERL5= build
USE_XORG= x11 ice xext
USE_QT4= corelib gui moc_build rcc_build uic_build qt3support
USE_GNOME= libxml2
USE_GMAKE= yes
-USES= pkgconfig
+USES= pkgconfig perl5
USE_AUTOTOOLS= aclocal automake autoconf
ACLOCAL_ARGS= -I ${LOCALBASE}/share/aclocal
AUTOMAKE_ARGS= --add-missing
diff --git a/www/chtml/Makefile b/www/chtml/Makefile
index 4fd770daf6a6..49bb3da84014 100644
--- a/www/chtml/Makefile
+++ b/www/chtml/Makefile
@@ -17,7 +17,8 @@ COMMENT= Chunked HTML templating engine
BUILD_DEPENDS= ${LOCALBASE}/bin/csiod:${PORTSDIR}/lang/siod
-USE_PERL5_RUN= yes
+USES= perl5
+USE_PERL5= run
MAKE_ENV= SITE_PERL=${SITE_PERL}
NO_WRKSUBDIR= yes
MAKEFILE= makefile
diff --git a/www/quickie/Makefile b/www/quickie/Makefile
index 348f527352dc..7660a6a81704 100644
--- a/www/quickie/Makefile
+++ b/www/quickie/Makefile
@@ -15,7 +15,8 @@ COMMENT= Small footprint, fast Wiki engine written in C++
GNU_CONFIGURE= yes
CONFIGURE_ARGS= --prefix=${PREFIX} --sysconfdir=${PREFIX}/etc \
--localstatedir=${DATADIR}
-USE_PERL5_BUILD= yes
+USES= perl5
+USE_PERL5= build
SUB_FILES= pkg-message
diff --git a/www/script4rss/Makefile b/www/script4rss/Makefile
index 67a457065026..3530f35359c0 100644
--- a/www/script4rss/Makefile
+++ b/www/script4rss/Makefile
@@ -14,8 +14,9 @@ MASTER_SITES= SF
MAINTAINER= ports@FreeBSD.org
COMMENT= Easily create scripts to convert HTML pages to RSS feeds
+USES= perl5
USE_BZIP2= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
NO_BUILD= yes
post-patch:
diff --git a/www/xapian-omega10/Makefile b/www/xapian-omega10/Makefile
index 4fa995ed43d4..28a760d2a606 100644
--- a/www/xapian-omega10/Makefile
+++ b/www/xapian-omega10/Makefile
@@ -14,9 +14,10 @@ LICENSE= GPLv2
LIB_DEPENDS= xapian:${PORTSDIR}/databases/xapian-core10
+USES= perl5
GNU_CONFIGURE= yes
USE_LDCONFIG= yes
-USE_PERL5_RUN= yes
+USE_PERL5= run
CPPFLAGS+= -I${LOCALBASE}/include
LDFLAGS+= -L${LOCALBASE}/lib
diff --git a/x11-fm/asfiles/Makefile b/x11-fm/asfiles/Makefile
index a6e493afa204..b0ec88eb746d 100644
--- a/x11-fm/asfiles/Makefile
+++ b/x11-fm/asfiles/Makefile
@@ -18,9 +18,10 @@ COMMENT= X11 file manager. Dockable in WindowMaker
LIB_DEPENDS= Dnd.1:${PORTSDIR}/x11/libdnd
+USES= perl5
GNU_CONFIGURE= yes
USE_XORG= xpm
-USE_PERL5_BUILD=yes
+USE_PERL5= build
MAN1= files.1
MAN3= regexp.3
diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index ea08d519d44d..44ee0f962261 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -19,8 +19,8 @@ RUN_DEPENDS= p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
WRKSRC= ${WRKDIR}/${PORTNAME}/trunk
USE_BZIP2= yes
-USE_PERL5_RUN= yes
-USES= gettext
+USE_PERL5= run
+USES= gettext perl5
NO_BUILD= yes
MAN1= gprename.1
diff --git a/x11-wm/golem/Makefile b/x11-wm/golem/Makefile
index b96bfd7af370..42bcc1c79aaa 100644
--- a/x11-wm/golem/Makefile
+++ b/x11-wm/golem/Makefile
@@ -18,7 +18,8 @@ LICENSE= BSD
OPTIONS_DEFINE= ESOUND XINERAMA
OPTIONS_DEFAULT= XINERAMA
-USE_PERL5_BUILD=yes
+USES= perl5
+USE_PERL5= build
USE_BZIP2= yes
USE_XORG= xpm
WANT_GNOME= yes
diff --git a/x11-wm/ratmen/Makefile b/x11-wm/ratmen/Makefile
index c2ce346d2c39..a48f07892a6e 100644
--- a/x11-wm/ratmen/Makefile
+++ b/x11-wm/ratmen/Makefile
@@ -14,8 +14,9 @@ MASTER_SITES= http://www.update.uu.se/~zrajm/programs/ratmen/
MAINTAINER= ports@FreeBSD.org
COMMENT= Simple program for displaying a menu in a window
+USES= perl5
USE_XORG= x11
-USE_PERL5_BUILD=yes
+USE_PERL5= build
MAN1= ratmen.1
PLIST_FILES= bin/ratmen