diff -ruN ./korean/baekmukfonts-bdf.orig/Makefile ./korean/baekmukfonts-bdf/Makefile
--- ./korean/baekmukfonts-bdf.orig/Makefile	Sat Jun 26 12:55:12 2004
+++ ./korean/baekmukfonts-bdf/Makefile	Sat Jun 26 13:49:06 2004
@@ -22,6 +22,7 @@
 COMMENT=	Free Hangul fonts for X11(baekmuk)
 
 USE_X_PREFIX=	yes
+USE_PERL5_BUILD=yes
 
 .include <bsd.port.pre.mk>
 
@@ -46,7 +47,6 @@
 FONTSDIR=	lib/X11/fonts/local
 MAKE_ENV=	FONTSDIR=${FONTSDIR}
 PLIST_SUB=	FONTSDIR=${FONTSDIR}
-USE_PERL5_BUILD=yes
 
 # manually install hinted fonts
 do-configure:
diff -ruN ./databases/mysql-editor.orig/Makefile ./databases/mysql-editor/Makefile
--- ./databases/mysql-editor.orig/Makefile	Sat Jun 26 12:01:26 2004
+++ ./databases/mysql-editor/Makefile	Sat Jun 26 12:02:08 2004
@@ -17,6 +17,8 @@
 
 RUN_DEPENDS=	${CGI_BIN}:${PORTSDIR}/${APACHE_PORT}
 
+USE_PERL5=	yes
+
 NO_BUILD=	True
 
 CGI_BIN=	${LOCALBASE}/www/cgi-bin
diff -ruN ./devel/p5-SDL.orig/Makefile ./devel/p5-SDL/Makefile
--- ./devel/p5-SDL.orig/Makefile	Sat Jun 26 12:33:14 2004
+++ ./devel/p5-SDL/Makefile	Sat Jun 26 13:49:18 2004
@@ -17,6 +17,7 @@
 LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
+USE_PERL5=	yes
 USE_SDL=	sdl
 
 .include <bsd.port.pre.mk>
@@ -50,7 +51,6 @@
 RUN_DEPENDS+=	${SITE_PERL}/Test/More.pm:${PORTSDIR}/devel/p5-Test-Simple
 .endif
 
-USE_PERL5=	yes
 INSTALLS_SHLIB=	yes
 
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
diff -ruN ./devel/p5-Config-Auto.orig/Makefile ./devel/p5-Config-Auto/Makefile
--- ./devel/p5-Config-Auto.orig/Makefile	Sat Jun 26 12:15:16 2004
+++ ./devel/p5-Config-Auto/Makefile	Sat Jun 26 13:40:52 2004
@@ -17,6 +17,8 @@
 BUILD_DEPENDS=	${SITE_PERL}/Config/IniFiles.pm:${PORTSDIR}/devel/p5-Config-IniFiles
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_PERL5=	yes
+
 OPTIONS=	XMLSIMPLE "Support for XML config files" off
 
 .include <bsd.port.pre.mk>
diff -ruN ./devel/p5-PCSC-Card.orig/Makefile ./devel/p5-PCSC-Card/Makefile
--- ./devel/p5-PCSC-Card.orig/Makefile	Sat Jun 26 12:26:05 2004
+++ ./devel/p5-PCSC-Card/Makefile	Sat Jun 26 13:40:59 2004
@@ -17,6 +17,8 @@
 
 LIB_DEPENDS=	pcsclite.0:${PORTSDIR}/devel/pcsc-lite
 
+USE_PERL5=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
diff -ruN ./devel/subversion-perl.orig/Makefile ./devel/subversion-perl/Makefile
--- ./devel/subversion-perl.orig/Makefile	Sat Jun 26 12:42:22 2004
+++ ./devel/subversion-perl/Makefile	Sat Jun 26 12:45:37 2004
@@ -14,6 +14,7 @@
 PKGDIR=		${.CURDIR}
 PLIST=		${MASTERDIR}/pkg-plist
 
+USE_PERL5=	yes
 WITH_PERL=	yes
 
 .include "${MASTERDIR}/Makefile"
diff -ruN ./editors/vim5.orig/Makefile ./editors/vim5/Makefile
--- ./editors/vim5.orig/Makefile	Sat Jun 26 12:19:03 2004
+++ ./editors/vim5/Makefile	Sat Jun 26 12:18:10 2004
@@ -24,8 +24,9 @@
 .if defined(PACKAGE_BUILDING) && !defined(LITE)
 BUILD_DEPENDS=	tclsh8.0:${PORTSDIR}/lang/tcl80
 LIB_DEPENDS=	tcl80.1:${PORTSDIR}/lang/tcl80
-USE_PERL5=	yes
 .endif
+
+USE_PERL5=	yes
 
 LATEST_LINK?=	vim5
 DIST_SUBDIR=	vim
diff -ruN ./graphics/gd.orig/Makefile ./graphics/gd/Makefile
--- ./graphics/gd.orig/Makefile	Sat Jun 26 14:06:56 2004
+++ ./graphics/gd/Makefile	Sat Jun 26 14:01:34 2004
@@ -26,6 +26,11 @@
 INSTALLS_SHLIB=	yes
 SCRIPTDIR=	${FILESDIR}
 
+.if defined(GD_FONTS)
+USE_PERL5_BUILD=	yes
+SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if defined(WITH_XPM)
@@ -44,11 +49,6 @@
 .if defined(WITH_LZW) || defined(HAVE_UNISYS_LICENSE) || \
     (defined(USA_RESIDENT) && ${USA_RESIDENT} == "YES")
 CPPFLAGS+=	-DLZW_LICENSED
-.endif
-
-.if defined(GD_FONTS)
-USE_PERL5_BUILD=	yes
-SCRIPTS_ENV+=	GD_FONTS="${GD_FONTS}"
 .endif
 
 pre-everything::
diff -ruN ./irc/xchat-gnome.orig/Makefile ./irc/xchat-gnome/Makefile
--- ./irc/xchat-gnome.orig/Makefile	Sat Jun 26 12:52:46 2004
+++ ./irc/xchat-gnome/Makefile	Sat Jun 26 13:52:26 2004
@@ -22,6 +22,7 @@
 USE_GMAKE=	yes
 USE_LIBTOOL_VER=13
 USE_GNOME=	gnomeprefix gnomehack lthack libgnomeui
+USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
@@ -66,8 +67,8 @@
 .if ${ARCH} == "amd64" || ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
 CONFIGURE_ARGS+=--disable-perl
 PLIST_SUB+=	PERL="@comment "
+.undef USE_PERL5
 .else
-USE_PERL5=	yes
 CONFIGURE_ARGS+=--enable-perl
 PLIST_SUB+=	PERL=""
 .endif
diff -ruN ./irc/xchat2.orig/Makefile ./irc/xchat2/Makefile
--- ./irc/xchat2.orig/Makefile	Sat Jun 26 12:53:26 2004
+++ ./irc/xchat2/Makefile	Sat Jun 26 13:52:48 2004
@@ -20,6 +20,7 @@
 USE_GNOME=	gnomeprefix gnomehack gtk20
 GNU_CONFIGURE=	yes
 USE_REINPLACE=	yes
+USE_PERL5=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_CFLAGS}" \
 		LIBS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--enable-nls \
@@ -61,8 +62,8 @@
 .if ${ARCH} == "amd64" || ${PERL_LEVEL} < 500600 || defined(WITHOUT_PERL)
 CONFIGURE_ARGS+=--disable-perl
 PLIST_SUB+=	PERL="@comment "
+.undef USE_PERL5
 .else
-USE_PERL5=	yes
 CONFIGURE_ARGS+=--enable-perl
 PLIST_SUB+=	PERL=""
 .endif
diff -ruN ./lang/pike76.orig/Makefile ./lang/pike76/Makefile
--- ./lang/pike76.orig/Makefile	Sat Jun 26 12:55:52 2004
+++ ./lang/pike76/Makefile	Sat Jun 26 13:53:16 2004
@@ -75,6 +75,7 @@
 		 --without-machine-code \
 		 --prefix=${PREFIX}
 
+USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_GETTEXT=	yes
 USE_BISON=	yes
@@ -95,9 +96,9 @@
 # Allow building Embeded perl when >= 5.6
 .if ${PERL_LEVEL} > 500600
 CONFIGURE_ARGS+=	--with-perl
-USE_PERL5=	YES
 .else
 CONFIGURE_ARGS+=	--without-perl
+.undef USE_PERL5
 .endif
 
 .if defined(WITHOUT_RELOCATABLE_DUMPED_MODULES)
diff -ruN ./mail/qmail-tls.orig/Makefile ./mail/qmail-tls/Makefile
--- ./mail/qmail-tls.orig/Makefile	Sat Jun 26 12:56:53 2004
+++ ./mail/qmail-tls/Makefile	Sat Jun 26 12:57:10 2004
@@ -18,6 +18,7 @@
 COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH TLS support
 
 USE_OPENSSL=	YES
+USE_PERL5=	YES
 
 # Patches from the main qmail port are not wanted
 MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
diff -ruN ./mail/qmail-smtp_auth+tls.orig/Makefile ./mail/qmail-smtp_auth+tls/Makefile
--- ./mail/qmail-smtp_auth+tls.orig/Makefile	Sat Jun 26 13:00:11 2004
+++ ./mail/qmail-smtp_auth+tls/Makefile	Sat Jun 26 13:00:27 2004
@@ -20,6 +20,7 @@
 ONLY_FOR_ARCHS=	i386
 
 USE_OPENSSL=	YES
+USE_PERL5=	YES
 
 # Patches from the main qmail port are not wanted
 MAIN_QMAIL_PORT_WITH_OUTGOINGIP_PATCH_BARRIER=	yes
diff -ruN ./mail/openwebmail.orig/Makefile ./mail/openwebmail/Makefile
--- ./mail/openwebmail.orig/Makefile	Sat Jun 26 13:04:13 2004
+++ ./mail/openwebmail/Makefile	Sat Jun 26 13:04:34 2004
@@ -18,6 +18,8 @@
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/Text/Iconv.pm:${PORTSDIR}/converters/p5-Text-Iconv \
 		${SITE_PERL}/${PERL_ARCH}/MIME/Base64.pm:${PORTSDIR}/converters/p5-MIME-Base64
 
+USE_PERL5=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500802
@@ -26,7 +28,6 @@
 		${SITE_PERL}/Net/SMTP.pm:${PORTSDIR}/net/p5-Net
 .endif
 
-USE_PERL5=	yes
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 OWCGIDIR?=	${PREFIX}/www/cgi-bin/openwebmail
diff -ruN ./mail/pronto.orig/Makefile ./mail/pronto/Makefile
--- ./mail/pronto.orig/Makefile	Sat Jun 26 13:04:46 2004
+++ ./mail/pronto/Makefile	Sat Jun 26 13:05:16 2004
@@ -35,6 +35,8 @@
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_PERL5=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
diff -ruN ./mail/qmail-ldap.orig/Makefile ./mail/qmail-ldap/Makefile
--- ./mail/qmail-ldap.orig/Makefile	Sat Jun 26 13:05:30 2004
+++ ./mail/qmail-ldap/Makefile	Sat Jun 26 13:06:10 2004
@@ -20,6 +20,7 @@
 MAINTAINER=	lioux@FreeBSD.org
 COMMENT=	A SECURE, reliable, and FAST MTA for UNIX systems WITH LDAP support
 
+USE_PERL5=	yes
 USE_OPENLDAP=	yes
 PKGNAMESUFFIX:=	${PKGNAMESUFFIX}2
 
diff -ruN ./mail/qmail-mysql.orig/Makefile ./mail/qmail-mysql/Makefile
--- ./mail/qmail-mysql.orig/Makefile	Sat Jun 26 13:06:25 2004
+++ ./mail/qmail-mysql/Makefile	Sat Jun 26 13:06:51 2004
@@ -19,6 +19,8 @@
 
 LIB_DEPENDS+=	mysqlclient.10:${PORTSDIR}/databases/mysql323-client
 
+USE_PERL5=	yes
+
 # patches from the master port that brake this one are now allowed
 MAIN_QMAIL_PORT_WITH_QMAILQUEUE_PATCH_BARRIER=	yes
 
diff -ruN ./misc/callid.orig/Makefile ./misc/callid/Makefile
--- ./misc/callid.orig/Makefile	Sat Jun 26 13:07:08 2004
+++ ./misc/callid/Makefile	Sat Jun 26 13:07:27 2004
@@ -16,6 +16,7 @@
 USE_MYSQL=	yes
 USE_PHP=	yes
 WANT_PHP_WEB=	yes
+USE_PERL5=	yes
 
 NO_BUILD=	yes
 
diff -ruN ./net/beacon.orig/Makefile ./net/beacon/Makefile
--- ./net/beacon.orig/Makefile	Sat Jun 26 13:07:40 2004
+++ ./net/beacon/Makefile	Sat Jun 26 13:07:56 2004
@@ -17,6 +17,8 @@
 BUILD_DEPENDS=	${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net
 RUN_DEPENDS=	${BUILD_DEPENDS}
 
+USE_PERL5=	yes
+
 WWW_DIR?=	${PREFIX}/www/
 PLIST_SUB+=	VERSION=${PORTVERSION}
 
diff -ruN ./net/wping.orig/Makefile ./net/wping/Makefile
--- ./net/wping.orig/Makefile	Sat Jun 26 13:10:03 2004
+++ ./net/wping/Makefile	Sat Jun 26 13:10:17 2004
@@ -16,6 +16,7 @@
 RUN_DEPENDS=	${SITE_PERL}/${PERL_ARCH}/GD.pm:${PORTSDIR}/graphics/p5-GD \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 
+USE_PERL5=	yes
 USE_BZIP2=	yes
 NO_BUILD=	yes
 
diff -ruN ./news/cleanfeed.orig/Makefile ./news/cleanfeed/Makefile
--- ./news/cleanfeed.orig/Makefile	Sat Jun 26 13:08:11 2004
+++ ./news/cleanfeed/Makefile	Sat Jun 26 13:08:36 2004
@@ -16,6 +16,8 @@
 
 RUN_DEPENDS=	${LOCALBASE}/news/bin/innd:${PORTSDIR}/news/inn
 
+USE_PERL5=	yes
+
 NO_BUILD=	yes
 BINOWN=		news
 BINGRP=		news
diff -ruN ./print/muttprint.orig/Makefile ./print/muttprint/Makefile
--- ./print/muttprint.orig/Makefile	Sat Jun 26 13:08:52 2004
+++ ./print/muttprint/Makefile	Sat Jun 26 13:44:07 2004
@@ -30,6 +30,8 @@
 		espgs:${PORTSDIR}/print/cups-pstoraster
 .endif
 
+USE_PERL5=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
diff -ruN ./russian/muttprint.orig/Makefile ./russian/muttprint/Makefile
--- ./russian/muttprint.orig/Makefile	Sat Jun 26 13:09:29 2004
+++ ./russian/muttprint/Makefile	Sat Jun 26 13:09:44 2004
@@ -14,6 +14,7 @@
 MASTERDIR=	${.CURDIR}/../../print/muttprint
 ADD_TRANS=	${.CURDIR}/files/translation-??.pl
 USE_REINPLACE=	yes
+USE_PERL5=	yes
 
 pre-build:
 	@${REINPLACE_CMD} '/^\\\\usepackage\[T1\]{fontenc}/d' ${WRKSRC}/${PORTNAME}
diff -ruN ./sysutils/munin-main.orig/Makefile ./sysutils/munin-main/Makefile
--- ./sysutils/munin-main.orig/Makefile	Sat Jun 26 13:10:32 2004
+++ ./sysutils/munin-main/Makefile	Sat Jun 26 13:44:21 2004
@@ -21,6 +21,8 @@
 		${SITE_PERL}/Net/Domain.pm:${PORTSDIR}/net/p5-Net \
 		${SITE_PERL}/HTML/Template.pm:${PORTSDIR}/www/p5-HTML-Template
 
+USE_PERL5=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} <= 500800
diff -ruN ./sysutils/munin-node.orig/Makefile ./sysutils/munin-node/Makefile
--- ./sysutils/munin-node.orig/Makefile	Sat Jun 26 13:10:59 2004
+++ ./sysutils/munin-node/Makefile	Sat Jun 26 13:44:31 2004
@@ -19,6 +19,8 @@
 BUILD_DEPENDS=	${RUN_DEPENDS}
 RUN_DEPENDS=	${SITE_PERL}/Net/Server/Fork.pm:${PORTSDIR}/net/p5-Net-Server
 
+USE_PERL5=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800
diff -ruN ./sysutils/stalepid.orig/Makefile ./sysutils/stalepid/Makefile
--- ./sysutils/stalepid.orig/Makefile	Sat Jun 26 13:11:26 2004
+++ ./sysutils/stalepid/Makefile	Sat Jun 26 13:44:52 2004
@@ -14,13 +14,13 @@
 MAINTAINER=	roam@FreeBSD.org
 COMMENT=	Check for stale pid files and remove them
 
+USE_PERL5_RUN=	yes
+
 .include <bsd.port.pre.mk>
 RUN_DEPENDS=	${SITE_PERL}/Error.pm:${PORTSDIR}/lang/p5-Error
 .if ${PERL_LEVEL} < 500600
 RUN_DEPENDS+=	${SITE_PERL}/Errno.pm:${PORTSDIR}/devel/p5-Errno
 .endif
-
-USE_PERL5_RUN=	yes
 
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
--- ./www/p5-CGI-Cache/Makefile.orig	Sat Jan 17 03:40:11 2004
+++ ./www/p5-CGI-Cache/Makefile	Sat Jun 26 13:59:27 2004
@@ -19,6 +19,8 @@
 		${SITE_PERL}/Cache/SizeAwareFileCache.pm:${PORTSDIR}/devel/p5-Cache-Cache \
 		${SITE_PERL}/${PERL_ARCH}/Storable.pm:${PORTSDIR}/devel/p5-Storable
 
+PERL_CONFIGURE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} <= 500600
@@ -26,8 +28,6 @@
 .endif
 
 RUN_DEPENDS=	${BUILD_DEPENDS}
-
-PERL_CONFIGURE=	yes
 
 MAN3=		CGI::Cache.3
 
diff -ruN ./www/slash.orig/Makefile ./www/slash/Makefile
--- ./www/slash.orig/Makefile	Sat Jun 26 13:15:28 2004
+++ ./www/slash/Makefile	Sat Jun 26 13:38:20 2004
@@ -20,6 +20,8 @@
 RUN_DEPENDS=	${BUILD_DEPENDS} \
 		${LOCALBASE}/libexec/apache/libperl.so:${PORTSDIR}/www/mod_perl
 
+USE_PERL5=	yes
+
 DOCS=		README INSTALL
 
 CONFLICTS=	metalist
diff -ruN ./x11-toolkits/p5-qt.orig/Makefile ./x11-toolkits/p5-qt/Makefile
--- ./x11-toolkits/p5-qt.orig/Makefile	Sat Jun 26 13:16:58 2004
+++ ./x11-toolkits/p5-qt/Makefile	Sat Jun 26 13:17:14 2004
@@ -33,6 +33,8 @@
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}
 MAN3=	Qt.3
 
+USE_PERL5=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
diff -ruN ./textproc/sgmlformat.orig/Makefile ./textproc/sgmlformat/Makefile
--- ./textproc/sgmlformat.orig/Makefile	Sat Jun 26 13:14:24 2004
+++ ./textproc/sgmlformat/Makefile	Sat Jun 26 13:14:47 2004
@@ -18,6 +18,8 @@
 # Jade is preferred, but it currently doesn't compile on 2.1.x
 # system, so use sp in that case.
 
+USE_PERL5_RUN=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${MACHINE_ARCH} != "i386"
@@ -35,7 +37,6 @@
 		${PREFIX}/share/sgml/docbook:${PORTSDIR}/textproc/docbook
 
 USE_REINPLACE=	yes
-USE_PERL5_RUN=	yes
 
 MAN1=		instant.1 sgmlfmt.1
 MAN5=		transpec.5
diff -ruN ./french/plgrenouille.orig/Makefile ./french/plgrenouille/Makefile
--- ./french/plgrenouille.orig/Makefile	Sat Jun 26 12:24:28 2004
+++ ./french/plgrenouille/Makefile	Sat Jun 26 13:45:25 2004
@@ -18,6 +18,8 @@
 RUN_DEPENDS=	${SITE_PERL}/Net/FTP.pm:${PORTSDIR}/net/p5-Net \
 		${SITE_PERL}/${PERL_ARCH}/Time/HiRes.pm:${PORTSDIR}/devel/p5-Time-HiRes
 
+USE_PERL5=	yes
+
 .include <bsd.port.pre.mk>
 .if ${PERL_LEVEL} < 500600
 RUN_DEPENDS+=	${SITE_PERL}/Net/SNMP.pm:${PORTSDIR}/net-mgmt/p5-Net-SNMP3
@@ -30,7 +32,6 @@
 .endif
 
 NO_BUILD=	yes
-USE_PERL5=	yes
 USE_REINPLACE=	yes
 USE_RC_SUBR=	yes
 SCRIPTS_ENV=	PKG_PREFIX=${PREFIX}
diff -ruN ./japanese/wikicker.orig/Makefile ./japanese/wikicker/Makefile
--- ./japanese/wikicker.orig/Makefile	Sat Jun 26 12:54:09 2004
+++ ./japanese/wikicker/Makefile	Sat Jun 26 13:45:46 2004
@@ -34,6 +34,8 @@
 			${SITE_PERL}/URI.pm:${PORTSDIR}/net/p5-URI \
 			${SITE_PERL}/Log/Log4perl.pm:${PORTSDIR}/devel/p5-Log-Log4perl
 
+USE_PERL5=		yes
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500800