70 files changed, 462 insertions, 605 deletions

diff --git a/Mk/bsd.gecko.mk b/Mk/bsd.gecko.mk
index 24760cb3b1c3..4f627410c481 100644
--- a/Mk/bsd.gecko.mk
+++ b/Mk/bsd.gecko.mk
@@ -448,14 +448,14 @@ MOZ_SED_ARGS+=	-e's|@CPPFLAGS@|${CPPFLAGS}|g'		\
 		-e 's|@LDFLAGS@|${LDFLAGS}|g'		\
 		-e 's|@LIBS@|${LIBS}|g'			\
 		-e 's|@LOCALBASE@|${LOCALBASE}|g'	\
-		-e 's|@PERL@|${PERL5}|g'			\
+		-e 's|@PERL@|${PERL}|g'			\
 		-e 's|@MOZDIR@|${PREFIX}/lib/${MOZILLA}|g'	\
 		-e 's|%%PREFIX%%|${PREFIX}|g'		\
 		-e 's|%%CFLAGS%%|${CFLAGS}|g'		\
 		-e 's|%%LDFLAGS%%|${LDFLAGS}|g'		\
 		-e 's|%%LIBS%%|${LIBS}|g'		\
 		-e 's|%%LOCALBASE%%|${LOCALBASE}|g'	\
-		-e 's|%%PERL%%|${PERL5}|g'		\
+		-e 's|%%PERL%%|${PERL}|g'		\
 		-e 's|%%MOZILLA%%|${MOZILLA}|g'		\
 		-e 's|%%MOZILLA_BIN%%|${MOZILLA_BIN}|g'	\
 		-e 's|%%MOZDIR%%|${PREFIX}/lib/${MOZILLA}|g'
diff --git a/archivers/rpm2cpio/Makefile b/archivers/rpm2cpio/Makefile
index b0a6d587f105..0e6727d7825d 100644
--- a/archivers/rpm2cpio/Makefile
+++ b/archivers/rpm2cpio/Makefile
@@ -13,7 +13,8 @@ COMMENT=	Convert .rpm files for extraction with /usr/bin/cpio, needs just perl
 
 NO_WRKSUBDIR=	yes
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${PORTNAME}
 NO_BUILD=	yes
 NO_ARCH=	yes
 REINPLACE_ARGS=
@@ -22,7 +23,7 @@ PLIST_FILES=	bin/rpm2cpio.pl
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
-	@${REINPLACE_CMD} -e 's|^#!/usr/bin/perl|#!${PERL}|' ${FILESDIR}/${PORTNAME} >${WRKDIR}/${PORTNAME}
+	@${CP} ${FILESDIR}/${PORTNAME} ${WRKDIR}/${PORTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}.pl
diff --git a/benchmarks/dbs/Makefile b/benchmarks/dbs/Makefile
index 8b994817bc8a..d5f1478f585f 100644
--- a/benchmarks/dbs/Makefile
+++ b/benchmarks/dbs/Makefile
@@ -26,10 +26,6 @@ PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-post-patch:
-	@${REINPLACE_CMD} -e \
-		's|/usr/local/bin/perl|${PERL}|' ${WRKSRC}/script/dbs_view
-
 pre-build:
 	cd ${WRKSRC}/src; ${MAKE} dir
 
diff --git a/converters/nomyso/Makefile b/converters/nomyso/Makefile
index 7fb2268eb3df..18409f88f803 100644
--- a/converters/nomyso/Makefile
+++ b/converters/nomyso/Makefile
@@ -10,19 +10,14 @@ DISTNAME=	${PORTNAME}${PORTVERSION:S/.//}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Convert MASM/TASM files to NASM compatible sources
 
-USES=		perl5 zip
+USES=		perl5 zip dos2unix shebangfix
+SHEBANG_FILES=	nomyso.pl
 USE_PERL5=	run
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 
 PLIST_FILES=	bin/${PORTNAME}.pl
 
-post-patch:
-	@${REINPLACE_CMD} -E \
-		-e 's|[[:cntrl:]]$$||' \
-		-e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/${PORTNAME}.pl
-
 do-install:
 	@${INSTALL_SCRIPT} \
 		${WRKSRC}/${PORTNAME}.pl \
diff --git a/devel/p5-Sys-Virt/Makefile b/devel/p5-Sys-Virt/Makefile
index c56d6c8ca751..93287585f71e 100644
--- a/devel/p5-Sys-Virt/Makefile
+++ b/devel/p5-Sys-Virt/Makefile
@@ -21,7 +21,8 @@ TEST_DEPENDS=	p5-CPAN-Changes>=0:${PORTSDIR}/devel/p5-CPAN-Changes \
 		p5-Test-Pod>=0:${PORTSDIR}/devel/p5-Test-Pod \
 		p5-Test-Pod-Coverage>=0:${PORTSDIR}/devel/p5-Test-Pod-Coverage
 
-USES=		perl5 pkgconfig
+USES=		perl5 pkgconfig shebangfix
+SHEBANG_FILES=	examples/*.pl
 USE_PERL5=	configure
 MAKE_JOBS_UNSAFE=	yes
 
@@ -29,11 +30,6 @@ OPTIONS_DEFINE=	EXAMPLES
 
 PORTEXAMPLES=	*
 
-.include <bsd.port.options.mk>
-
-post-patch:
-	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/examples/*.pl
-
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/Sys/Virt/Virt.so
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
diff --git a/dns/ddclient/Makefile b/dns/ddclient/Makefile
index 1acedc4ec93a..045da491dfa4 100644
--- a/dns/ddclient/Makefile
+++ b/dns/ddclient/Makefile
@@ -36,9 +36,7 @@ PLIST_FILES=	etc/ddclient.conf.sample etc/periodic/daily/ddclient_force \
 post-patch:
 	@${GREP} -lR '/usr' ${WRKSRC} | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr|${PREFIX}|g'
-	@${REINPLACE_CMD} -e \
-		's|%%PERL%%|${PERL}| ; \
-		 s|%%ETCDIR%%|${PREFIX}/etc| ; \
+	@${REINPLACE_CMD} -e 's|%%ETCDIR%%|${PREFIX}/etc| ; \
 		 s|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/ddclient
 
 do-install:
diff --git a/dns/ddclient/files/patch-ddclient b/dns/ddclient/files/patch-ddclient
index a1b387838737..0891470636ac 100644
--- a/dns/ddclient/files/patch-ddclient
+++ b/dns/ddclient/files/patch-ddclient
@@ -1,12 +1,5 @@
 --- ./ddclient.orig	2011-07-25 19:41:39.000000000 -0700
 +++ ./ddclient	2011-07-25 19:41:48.000000000 -0700
-@@ -1,5 +1,4 @@
--#!/usr/bin/perl -w
--#!/usr/local/bin/perl -w
-+#!%%PERL%% -w
- ######################################################################
- # $Id: ddclient 157 2013-12-26 09:02:05Z wimpunk $
- #
 @@ -19,6 +18,7 @@
  use Getopt::Long;
  use Sys::Hostname;
diff --git a/german/BBBike/Makefile b/german/BBBike/Makefile
index e17637af196b..0e1aa6b6ff38 100644
--- a/german/BBBike/Makefile
+++ b/german/BBBike/Makefile
@@ -66,8 +66,8 @@ post-patch:
 	@${RM} ${WRKSRC}/tmp/.keep_me
 
 do-build:
-	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} all install
-	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL5} clean
+	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL} all install
+	cd ${WRKSRC}/ext && ${MAKE} PERL=${PERL} clean
 	${FIND} ${WRKSRC}/lib -name "*.so" | ${XARGS} ${CHMOD} u+w
 	${FIND} ${WRKSRC}/lib -name "*.so" | ${XARGS} ${STRIP_CMD}
 	${FIND} ${WRKSRC}/lib -name "*.so" | ${XARGS} ${CHMOD} u-w
diff --git a/graphics/ImageMagick/Makefile b/graphics/ImageMagick/Makefile
index b5cf1d4e6f19..85ce4b137da8 100644
--- a/graphics/ImageMagick/Makefile
+++ b/graphics/ImageMagick/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	6.9.2-8
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
@@ -106,7 +107,7 @@ _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--with-perl=${PERL5} \
+CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa
diff --git a/graphics/ImageMagick7/Makefile b/graphics/ImageMagick7/Makefile
index ed09f0f5cb6d..75e2a816b766 100644
--- a/graphics/ImageMagick7/Makefile
+++ b/graphics/ImageMagick7/Makefile
@@ -2,6 +2,7 @@
 
 PORTNAME=	ImageMagick
 DISTVERSION=	7.0.0-0~beta${DATE}
+PORTREVISION=	1
 CATEGORIES=	graphics perl5
 MASTER_SITES=	http://www.imagemagick.org/download/ \
 		http://www.imagemagick.org/download/beta/ \
@@ -112,7 +113,7 @@ _IMAGEMAGICK_THREADS_IGNORE_MSG=. Define WITH_THREADS
 .endif
 
 .if ${PORT_OPTIONS:MPERL}
-CONFIGURE_ARGS+=	--with-perl=${PERL5} \
+CONFIGURE_ARGS+=	--with-perl=${PERL} \
 			--with-perl-options="MAKE=${MAKE_CMD}"
 PLIST_SUB+=		WITH_PERL=''
 # PerlMagick does not work with threads, if perl is not threaded, and vice versa
diff --git a/graphics/cadubi/Makefile b/graphics/cadubi/Makefile
index dc1fdbd8bafe..33fdc6b51c90 100644
--- a/graphics/cadubi/Makefile
+++ b/graphics/cadubi/Makefile
@@ -28,10 +28,8 @@ PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
-do-configure:
-	@${REINPLACE_CMD} -e \
-		's|/usr/local/stow/perl-5.8.x/bin/perl|${PERL}|; \
-		s|$$Bin/help|${DATADIR}/help|' \
+post-patch:
+	@${REINPLACE_CMD} -e 's|$$Bin/help|${DATADIR}/help|' \
 		${WRKSRC}/cadubi
 
 do-install:
diff --git a/graphics/cbview/Makefile b/graphics/cbview/Makefile
index aad0167c3da9..1bff2133c015 100644
--- a/graphics/cbview/Makefile
+++ b/graphics/cbview/Makefile
@@ -19,17 +19,14 @@ RUN_DEPENDS=	unrar:${PORTSDIR}/archivers/unrar \
 		p5-String-ShellQuote>=0:${PORTSDIR}/textproc/p5-String-ShellQuote
 
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${PORTNAME}
 
 PLIST_FILES=	bin/${PORTNAME}
 
 PORTDOCS=	Changes README TODO
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl -w|${PERL}|' \
-		${WRKSRC}/${PORTNAME}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
 
diff --git a/graphics/p5-ming/Makefile b/graphics/p5-ming/Makefile
index 658bde4fc54f..a87e533f20df 100644
--- a/graphics/p5-ming/Makefile
+++ b/graphics/p5-ming/Makefile
@@ -24,7 +24,8 @@ OPTIONS_DEFINE=	EXAMPLES
 
 CONFIGURE_ARGS=	--enable-perl
 GNU_CONFIGURE=	yes
-USES=		autoreconf bison gmake libtool localbase perl5
+USES=		autoreconf bison gmake libtool localbase perl5 shebangfix
+SHEBANG_FILES=	examples/*.cgi
 
 PORTEXAMPLES=	*
 
@@ -39,7 +40,6 @@ post-patch:
 	@${REINPLACE_CMD} -e '/ming_is_compiled()/ s|^|#|; /LIBS/d' ${WRKSRC}/Makefile.PL
 	@${REINPLACE_CMD} -e 's|\.3pm|.3|g' ${WRKSRC}/Makefile.PL ${WRKSRC}/mkdoc
 	@${REINPLACE_CMD} -e 's|GvCV(\(.*\)) = \(.*\);|GvCV_set(\1, \2);|' ${WRKSRC}/Exports.c
-	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/examples/*.cgi
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/SWF/SWF.so
diff --git a/irc/pisg/Makefile b/irc/pisg/Makefile
index f62412f395b0..3685293e78b5 100644
--- a/irc/pisg/Makefile
+++ b/irc/pisg/Makefile
@@ -10,7 +10,8 @@ MASTER_SITES=	SF
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Perl IRC Statistics Generator
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	pisg
 NO_BUILD=	YES
 
 OPTIONS_DEFINE=	LOGCHARSET DOCS
@@ -28,7 +29,6 @@ pre-patch:
 	@${REINPLACE_CMD} -e 's|lang.txt|${PREFIX}/share/pisg/lang.txt|; \
 		s|layout/|${PREFIX}/share/pisg/layout/|' \
 		${WRKSRC}/modules/Pisg.pm
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/pisg
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/etc/pisg
diff --git a/irc/xchat-mircryption/Makefile b/irc/xchat-mircryption/Makefile
index 85b26a842497..c6f6525e679b 100644
--- a/irc/xchat-mircryption/Makefile
+++ b/irc/xchat-mircryption/Makefile
@@ -4,7 +4,7 @@
 
 PORTNAME=	mircryption
 DISTVERSION=	0.3.3
-PORTREVISION=	4
+PORTREVISION=	5
 PORTEPOCH=	1
 CATEGORIES=	irc security
 MASTER_SITES=	http://mircryption.sourceforge.net/Downloads/
@@ -16,7 +16,8 @@ COMMENT=	Free encryption add-on for the popular XChat irc client
 
 RUN_DEPENDS=	xchat:${PORTSDIR}/irc/xchat
 
-USES=		zip dos2unix
+USES=		zip dos2unix shebangfix
+SHEBANG_FILES=	extras/mcps_masterkey_on_start.pl
 ALL_TARGET=	freebsd
 CFLAGS+=	-fPIC
 USE_LDCONFIG=	yes
@@ -40,9 +41,6 @@ post-patch:
 		-e 's|^(LDFLAGS.+)"$$|\1 ${LDFLAGS}"|' \
 		-e 's|^(LOAD).*$$|LOAD=${CXX}|' \
 		${WRKSRC}/${MAKEFILE}
-	${REINPLACE_CMD} -E \
-		-e 's|/usr/bin/perl|${PERL5}|' \
-		${WRKSRC}/extras/mcps_masterkey_on_start.pl
 
 do-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/lib/xchat/plugins
diff --git a/mail/adcomplain/Makefile b/mail/adcomplain/Makefile
index ee6ce6177865..4b7d77ffb19c 100644
--- a/mail/adcomplain/Makefile
+++ b/mail/adcomplain/Makefile
@@ -11,7 +11,8 @@ EXTRACT_SUFX=	.uu
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Complain about inappropriate commercial use (f.e. SPAM) of usenet/e-mail
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	adcomplain.pl
 
 EXTRACT_CMD=	/usr/bin/uudecode
 EXTRACT_BEFORE_ARGS=	<
@@ -20,10 +21,9 @@ NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/adcomplain
 
-post-patch:
-	cd ${WRKSRC}; \
-	${CP} adcomplain.pl adcomplain.pl.old; \
-	${SED} 's=%PERL5%=${PERL}=' < adcomplain.pl.old > adcomplain.pl
+# fix-shebang normally runs before the patches in ${FILESDIR} are applied.  In
+# this case, we need it to run after, so that it can fix the right shebang.
+TARGET_ORDER_OVERRIDE= 750:fix-shebang
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/adcomplain.pl \
diff --git a/mail/adcomplain/files/patch-adcomplain.pl b/mail/adcomplain/files/patch-adcomplain.pl
index 44054e48a201..2fbe371df03b 100644
--- a/mail/adcomplain/files/patch-adcomplain.pl
+++ b/mail/adcomplain/files/patch-adcomplain.pl
@@ -1,326 +1,302 @@
-*** adcomplain.pl.orig	Mon Feb 21 03:23:03 2000
---- adcomplain.pl	Mon Feb 21 03:24:27 2000
-***************
-*** 1,3 ****
---- 1,4 ----
-+ #!%PERL5%
-  #! /bin/sh -- # -*- perl -*-
-  # first line invokes sh.  Some systems may need to refer to perl directly, i.e.:
-  
-***************
-*** 7,14 ****
-  # allows perl to be _anywhere_ in the user's path.  The intent is to reduce
-  # the need to edit this file.
-  
-! eval 'exec perl $0 ${1+"$@"}'
-! if 0;  # tee hee! This is on a separate line, so /bin/sh never sees it.
-  
-  # use strict;
-  
---- 8,15 ----
-  # allows perl to be _anywhere_ in the user's path.  The intent is to reduce
-  # the need to edit this file.
-  
-! #eval 'exec perl $0 ${1+"$@"}'
-! #if 0;  # tee hee! This is on a separate line, so /bin/sh never sees it.
-  
-  # use strict;
-  
-***************
-*** 533,538 ****
---- 534,540 ----
-    $quiet, 		# control flag, limits interaction and output
-    %rematch_aliases,	# heuristic list, resets priority of another header
-    $response, 		# text of letter we will send
-+   @rusu_3level,         # 3rd level .RU/.SU exceptions
-    $site, 		# site we will send the complaint to
-    @site_exceptions,	# sites that have irregular syntactic form
-    $subject, 		# subject header of the ad
-***************
-*** 2520,2526 ****
-    ($site2 = $host) =~ s/.*\.(.*\..*)/$1/;
-    ($site3 = $host) =~ s/.*\.(.*\..*\..*)/$1/;
-    ($junk = $host) =~ s/.*\.(.*)/$1/;
-!   if (length($junk) >= 3) {
-      ($junk = $site3) =~ s/(\W)/\\$1/g;	# remove special characters
-  
-      if (grep(/^$junk$/, @site_exceptions) != 0) {
---- 2522,2538 ----
-    ($site2 = $host) =~ s/.*\.(.*\..*)/$1/;
-    ($site3 = $host) =~ s/.*\.(.*\..*\..*)/$1/;
-    ($junk = $host) =~ s/.*\.(.*)/$1/;
-!   if ($junk eq "ru" || $junk eq "su") {
-!     ($junk = $site2) =~ s/(\W)/\\$1/g;	# remove special characters
-! 
-!     if (grep(/^$junk$/, @rusu_3level) != 0) {
-!       $site = $site3;
-!       }
-!     else {
-!       $site = $site2;
-!       }
-!   }
-!   elsif (length($junk) >= 3) {
-      ($junk = $site3) =~ s/(\W)/\\$1/g;	# remove special characters
-  
-      if (grep(/^$junk$/, @site_exceptions) != 0) {
-***************
-*** 2618,2623 ****
---- 2630,2636 ----
-    # Pick the alias with the _most_ dots
-    local($alias);
-    foreach $alias (split(' ', $aliases)) {
-+     $alias =~ s/\.$//;    # this adcomplain cannot deal with "foo.bar.com."
-      $cd = ($alias =~ tr/././);
-      if ($cd > $nd) {
-        $result = $alias;
-***************
-*** 3077,3082 ****
---- 3090,3337 ----
-  	'xs4all.nl',
-  	);
-      @site_exceptions = sort @site_exceptions; # needed for bsearch to work
-+ 
-+     @rusu_3level = (
-+ 	'abkhazia.su',
-+ 	'adygeya.ru',
-+ 	'adygeya.su',
-+ 	'aktyubinsk.su',
-+ 	'alma-ata.su',
-+ 	'altai.ru',
-+ 	'altai.su',
-+ 	'amur.ru',
-+ 	'amur.su',
-+ 	'amursk.ru',
-+ 	'arkhangelsk.ru',
-+ 	'arkhangelsk.su',
-+ 	'armenia.su',
-+ 	'ashgabad.su',
-+ 	'astrakhan.ru',
-+ 	'astrakhan.su',
-+ 	'azerbaijan.su',
-+ 	'baikal.ru',
-+ 	'balashov.su',
-+ 	'bashkiria.ru',
-+ 	'bashkiria.su',
-+ 	'belgorod.ru',
-+ 	'belgorod.su',
-+ 	'bir.ru',
-+ 	'bishkek.su',
-+ 	'bryansk.ru',
-+ 	'bryansk.su',
-+ 	'bukhara.su',
-+ 	'buriatia.su',
-+ 	'buryatia.ru',
-+ 	'cbg.ru',
-+ 	'chel.ru',
-+ 	'chel.su',
-+ 	'chelyabinsk.ru',
-+ 	'chimkent.su',
-+ 	'chita.ru',
-+ 	'chita.su',
-+ 	'chukotka.ru',
-+ 	'chuvashia.ru',
-+ 	'chuvashia.su',
-+ 	'cmw.ru',
-+ 	'com.ru',
-+ 	'dagestan.ru',
-+ 	'dagestan.su',
-+ 	'dubna.su',
-+ 	'dudinka.ru',
-+ 	'e-burg.ru',
-+ 	'e-burg.su',
-+ 	'east-kazakhstan.su',
-+ 	'engels.su',
-+ 	'fareast.ru',
-+ 	'georgia.su',
-+ 	'grozny.ru',
-+ 	'grozny.su',
-+ 	'irkutsk.ru',
-+ 	'irkutsk.su',
-+ 	'ivanovo.ru',
-+ 	'ivanovo.su',
-+ 	'izhevsk.ru',
-+ 	'jamal.ru',
-+ 	'jambyl.su',
-+ 	'jar.ru',
-+ 	'joshkar-ola.ru',
-+ 	'k-uralsk.ru',
-+ 	'kalmykia.ru',
-+ 	'kalmykia.su',
-+ 	'kaluga.ru',
-+ 	'kaluga.su',
-+ 	'kamchatka.ru',
-+ 	'kamchatka.su',
-+ 	'karacol.su',
-+ 	'karaganda.su',
-+ 	'karakol.su',
-+ 	'karelia.ru',
-+ 	'karelia.su',
-+ 	'kazan.ru',
-+ 	'kazan.su',
-+ 	'kchr.ru',
-+ 	'kemerovo.ru',
-+ 	'kemerovo.su',
-+ 	'khabarovsk.ru',
-+ 	'khabarovsk.su',
-+ 	'khakassia.ru',
-+ 	'khakassia.su',
-+ 	'khv.ru',
-+ 	'kirov.ru',
-+ 	'kms.ru',
-+ 	'koenig.ru',
-+ 	'koenig.su',
-+ 	'komi.ru',
-+ 	'komi.su',
-+ 	'kostroma.ru',
-+ 	'kostroma.su',
-+ 	'krasnodar.su',
-+ 	'krasnoyarsk.ru',
-+ 	'krasnoyarsk.su',
-+ 	'kuban.ru',
-+ 	'kuban.su',
-+ 	'kurgan.ru',
-+ 	'kurgan.su',
-+ 	'kursk.ru',
-+ 	'kursk.su',
-+ 	'kustanai.ru',
-+ 	'kustanai.su',
-+ 	'kuzbass.ru',
-+ 	'lipetsk.ru',
-+ 	'lipetsk.su',
-+ 	'magadan.ru',
-+ 	'magadan.su',
-+ 	'magnitka.ru',
-+ 	'mangyshlak.su',
-+ 	'mari-el.ru',
-+ 	'mari.ru',
-+ 	'mari.su',
-+ 	'marine.ru',
-+ 	'marine.su',
-+ 	'moldova.su',
-+ 	'mordovia.ru',
-+ 	'mordovia.su',
-+ 	'mosreg.ru',
-+ 	'msk.ru',
-+ 	'msk.su',
-+ 	'murmansk.ru',
-+ 	'murmansk.su',
-+ 	'mytis.ru',
-+ 	'nakhodka.ru',
-+ 	'nalchik.ru',
-+ 	'nalchik.su',
-+ 	'naryn.su',
-+ 	'navoi.su',
-+ 	'net.ru',
-+ 	'nkz.ru',
-+ 	'nnov.ru',
-+ 	'nnov.su',
-+ 	'norilsk.ru',
-+ 	'north-kazakhstan.su',
-+ 	'nov.ru',
-+ 	'nov.su',
-+ 	'novosibirsk.ru',
-+ 	'nsk.ru',
-+ 	'nsk.su',
-+ 	'obninsk.su',
-+ 	'omsk.ru',
-+ 	'omsk.su',
-+ 	'orenburg.ru',
-+ 	'orenburg.su',
-+ 	'org.ru',
-+ 	'oryol.ru',
-+ 	'oryol.su',
-+ 	'osh.su',
-+ 	'oskol.ru',
-+ 	'palana.ru',
-+ 	'pavlodar.su',
-+ 	'penza.ru',
-+ 	'penza.su',
-+ 	'perm.ru',
-+ 	'perm.su',
-+ 	'pokrovsk.su',
-+ 	'pp.ru',
-+ 	'pskov.ru',
-+ 	'pskov.su',
-+ 	'ptz.ru',
-+ 	'pyatigorsk.ru',
-+ 	'pyatigorsk.su',
-+ 	'rnd.ru',
-+ 	'rostov-na-donu.su',
-+ 	'rubtsovsk.ru',
-+ 	'ryazan.ru',
-+ 	'ryazan.su',
-+ 	'sakhalin.ru',
-+ 	'sakhalin.su',
-+ 	'samara.ru',
-+ 	'samara.su',
-+ 	'saratov.ru',
-+ 	'saratov.su',
-+ 	'semsk.su',
-+ 	'serpukhov.su',
-+ 	'simbirsk.ru',
-+ 	'simbirsk.su',
-+ 	'smolensk.ru',
-+ 	'smolensk.su',
-+ 	'sochi.su',
-+ 	'spb.ru',
-+ 	'spb.su',
-+ 	'stavropol.ru',
-+ 	'stavropol.su',
-+ 	'stv.ru',
-+ 	'surgut.ru',
-+ 	'surgut.su',
-+ 	'syzran.ru',
-+ 	'tambov.ru',
-+ 	'tambov.su',
-+ 	'tashkent.su',
-+ 	'tatarstan.ru',
-+ 	'termez.su',
-+ 	'togliatti.su',
-+ 	'tom.ru',
-+ 	'tomsk.ru',
-+ 	'tomsk.su',
-+ 	'troitsk.su',
-+ 	'tsaritsyn.ru',
-+ 	'tsaritsyn.su',
-+ 	'tselinograd.su',
-+ 	'tsk.ru',
-+ 	'tula.ru',
-+ 	'tula.su',
-+ 	'tuva.ru',
-+ 	'tuva.su',
-+ 	'tver.ru',
-+ 	'tver.su',
-+ 	'tyumen.ru',
-+ 	'tyumen.su',
-+ 	'udm.ru',
-+ 	'udmurtia.ru',
-+ 	'udmurtia.su',
-+ 	'ulan-ude.ru',
-+ 	'vdonsk.ru',
-+ 	'vladikavkaz.ru',
-+ 	'vladikavkaz.su',
-+ 	'vladimir.ru',
-+ 	'vladimir.su',
-+ 	'vladivostok.ru',
-+ 	'volgograd.ru',
-+ 	'vologda.ru',
-+ 	'vologda.su',
-+ 	'voronezh.ru',
-+ 	'voronezh.su',
-+ 	'vrn.ru',
-+ 	'vyatka.ru',
-+ 	'vyatka.su',
-+ 	'yakutia.ru',
-+ 	'yakutia.su',
-+ 	'yamal.ru',
-+ 	'yaroslavl.ru',
-+ 	'yaroslavl.su',
-+ 	'yekaterinburg.ru',
-+ 	'yuzhno-sakhalinsk.ru',
-+ 	'zgrad.ru',
-+ 	'zgrad.su',
-+     );
-  
-      %rematch_aliases = (
-      'nonexistent.com',  'X-NNTP-Posting-Host:',
+--- adcomplain.pl.orig	2015-12-17 16:02:13 UTC
++++ adcomplain.pl
+@@ -1,15 +1,5 @@
+-#! /bin/sh -- # -*- perl -*-
+-# first line invokes sh.  Some systems may need to refer to perl directly, i.e.:
+-
+ #! /bin/perl
+ 
+-# But the first way is preferable, because we have a trick (below) that
+-# allows perl to be _anywhere_ in the user's path.  The intent is to reduce
+-# the need to edit this file.
+-
+-eval 'exec perl $0 ${1+"$@"}'
+-if 0;  # tee hee! This is on a separate line, so /bin/sh never sees it.
+-
+ # use strict;
+ 
+ #-----------------------------------------------
+@@ -533,6 +523,7 @@ local(
+   $quiet, 		# control flag, limits interaction and output
+   %rematch_aliases,	# heuristic list, resets priority of another header
+   $response, 		# text of letter we will send
++  @rusu_3level,         # 3rd level .RU/.SU exceptions
+   $site, 		# site we will send the complaint to
+   @site_exceptions,	# sites that have irregular syntactic form
+   $subject, 		# subject header of the ad
+@@ -2520,7 +2511,17 @@ sub find_site {
+   ($site2 = $host) =~ s/.*\.(.*\..*)/$1/;
+   ($site3 = $host) =~ s/.*\.(.*\..*\..*)/$1/;
+   ($junk = $host) =~ s/.*\.(.*)/$1/;
+-  if (length($junk) >= 3) {
++  if ($junk eq "ru" || $junk eq "su") {
++    ($junk = $site2) =~ s/(\W)/\\$1/g;	# remove special characters
++
++    if (grep(/^$junk$/, @rusu_3level) != 0) {
++      $site = $site3;
++      }
++    else {
++      $site = $site2;
++      }
++  }
++  elsif (length($junk) >= 3) {
+     ($junk = $site3) =~ s/(\W)/\\$1/g;	# remove special characters
+ 
+     if (grep(/^$junk$/, @site_exceptions) != 0) {
+@@ -2618,6 +2619,7 @@ sub fqdn_name {
+   # Pick the alias with the _most_ dots
+   local($alias);
+   foreach $alias (split(' ', $aliases)) {
++    $alias =~ s/\.$//;    # this adcomplain cannot deal with "foo.bar.com."
+     $cd = ($alias =~ tr/././);
+     if ($cd > $nd) {
+       $result = $alias;
+@@ -3078,6 +3080,248 @@ sub get_constants_and_environment {
+ 	);
+     @site_exceptions = sort @site_exceptions; # needed for bsearch to work
+ 
++    @rusu_3level = (
++	'abkhazia.su',
++	'adygeya.ru',
++	'adygeya.su',
++	'aktyubinsk.su',
++	'alma-ata.su',
++	'altai.ru',
++	'altai.su',
++	'amur.ru',
++	'amur.su',
++	'amursk.ru',
++	'arkhangelsk.ru',
++	'arkhangelsk.su',
++	'armenia.su',
++	'ashgabad.su',
++	'astrakhan.ru',
++	'astrakhan.su',
++	'azerbaijan.su',
++	'baikal.ru',
++	'balashov.su',
++	'bashkiria.ru',
++	'bashkiria.su',
++	'belgorod.ru',
++	'belgorod.su',
++	'bir.ru',
++	'bishkek.su',
++	'bryansk.ru',
++	'bryansk.su',
++	'bukhara.su',
++	'buriatia.su',
++	'buryatia.ru',
++	'cbg.ru',
++	'chel.ru',
++	'chel.su',
++	'chelyabinsk.ru',
++	'chimkent.su',
++	'chita.ru',
++	'chita.su',
++	'chukotka.ru',
++	'chuvashia.ru',
++	'chuvashia.su',
++	'cmw.ru',
++	'com.ru',
++	'dagestan.ru',
++	'dagestan.su',
++	'dubna.su',
++	'dudinka.ru',
++	'e-burg.ru',
++	'e-burg.su',
++	'east-kazakhstan.su',
++	'engels.su',
++	'fareast.ru',
++	'georgia.su',
++	'grozny.ru',
++	'grozny.su',
++	'irkutsk.ru',
++	'irkutsk.su',
++	'ivanovo.ru',
++	'ivanovo.su',
++	'izhevsk.ru',
++	'jamal.ru',
++	'jambyl.su',
++	'jar.ru',
++	'joshkar-ola.ru',
++	'k-uralsk.ru',
++	'kalmykia.ru',
++	'kalmykia.su',
++	'kaluga.ru',
++	'kaluga.su',
++	'kamchatka.ru',
++	'kamchatka.su',
++	'karacol.su',
++	'karaganda.su',
++	'karakol.su',
++	'karelia.ru',
++	'karelia.su',
++	'kazan.ru',
++	'kazan.su',
++	'kchr.ru',
++	'kemerovo.ru',
++	'kemerovo.su',
++	'khabarovsk.ru',
++	'khabarovsk.su',
++	'khakassia.ru',
++	'khakassia.su',
++	'khv.ru',
++	'kirov.ru',
++	'kms.ru',
++	'koenig.ru',
++	'koenig.su',
++	'komi.ru',
++	'komi.su',
++	'kostroma.ru',
++	'kostroma.su',
++	'krasnodar.su',
++	'krasnoyarsk.ru',
++	'krasnoyarsk.su',
++	'kuban.ru',
++	'kuban.su',
++	'kurgan.ru',
++	'kurgan.su',
++	'kursk.ru',
++	'kursk.su',
++	'kustanai.ru',
++	'kustanai.su',
++	'kuzbass.ru',
++	'lipetsk.ru',
++	'lipetsk.su',
++	'magadan.ru',
++	'magadan.su',
++	'magnitka.ru',
++	'mangyshlak.su',
++	'mari-el.ru',
++	'mari.ru',
++	'mari.su',
++	'marine.ru',
++	'marine.su',
++	'moldova.su',
++	'mordovia.ru',
++	'mordovia.su',
++	'mosreg.ru',
++	'msk.ru',
++	'msk.su',
++	'murmansk.ru',
++	'murmansk.su',
++	'mytis.ru',
++	'nakhodka.ru',
++	'nalchik.ru',
++	'nalchik.su',
++	'naryn.su',
++	'navoi.su',
++	'net.ru',
++	'nkz.ru',
++	'nnov.ru',
++	'nnov.su',
++	'norilsk.ru',
++	'north-kazakhstan.su',
++	'nov.ru',
++	'nov.su',
++	'novosibirsk.ru',
++	'nsk.ru',
++	'nsk.su',
++	'obninsk.su',
++	'omsk.ru',
++	'omsk.su',
++	'orenburg.ru',
++	'orenburg.su',
++	'org.ru',
++	'oryol.ru',
++	'oryol.su',
++	'osh.su',
++	'oskol.ru',
++	'palana.ru',
++	'pavlodar.su',
++	'penza.ru',
++	'penza.su',
++	'perm.ru',
++	'perm.su',
++	'pokrovsk.su',
++	'pp.ru',
++	'pskov.ru',
++	'pskov.su',
++	'ptz.ru',
++	'pyatigorsk.ru',
++	'pyatigorsk.su',
++	'rnd.ru',
++	'rostov-na-donu.su',
++	'rubtsovsk.ru',
++	'ryazan.ru',
++	'ryazan.su',
++	'sakhalin.ru',
++	'sakhalin.su',
++	'samara.ru',
++	'samara.su',
++	'saratov.ru',
++	'saratov.su',
++	'semsk.su',
++	'serpukhov.su',
++	'simbirsk.ru',
++	'simbirsk.su',
++	'smolensk.ru',
++	'smolensk.su',
++	'sochi.su',
++	'spb.ru',
++	'spb.su',
++	'stavropol.ru',
++	'stavropol.su',
++	'stv.ru',
++	'surgut.ru',
++	'surgut.su',
++	'syzran.ru',
++	'tambov.ru',
++	'tambov.su',
++	'tashkent.su',
++	'tatarstan.ru',
++	'termez.su',
++	'togliatti.su',
++	'tom.ru',
++	'tomsk.ru',
++	'tomsk.su',
++	'troitsk.su',
++	'tsaritsyn.ru',
++	'tsaritsyn.su',
++	'tselinograd.su',
++	'tsk.ru',
++	'tula.ru',
++	'tula.su',
++	'tuva.ru',
++	'tuva.su',
++	'tver.ru',
++	'tver.su',
++	'tyumen.ru',
++	'tyumen.su',
++	'udm.ru',
++	'udmurtia.ru',
++	'udmurtia.su',
++	'ulan-ude.ru',
++	'vdonsk.ru',
++	'vladikavkaz.ru',
++	'vladikavkaz.su',
++	'vladimir.ru',
++	'vladimir.su',
++	'vladivostok.ru',
++	'volgograd.ru',
++	'vologda.ru',
++	'vologda.su',
++	'voronezh.ru',
++	'voronezh.su',
++	'vrn.ru',
++	'vyatka.ru',
++	'vyatka.su',
++	'yakutia.ru',
++	'yakutia.su',
++	'yamal.ru',
++	'yaroslavl.ru',
++	'yaroslavl.su',
++	'yekaterinburg.ru',
++	'yuzhno-sakhalinsk.ru',
++	'zgrad.ru',
++	'zgrad.su',
++    );
++
+     %rematch_aliases = (
+     'nonexistent.com',  'X-NNTP-Posting-Host:',
+     'nym.alias.net', 'Message-Id:',
diff --git a/mail/assp/Makefile b/mail/assp/Makefile
index f8fd638c54f2..29eedd03698b 100644
--- a/mail/assp/Makefile
+++ b/mail/assp/Makefile
@@ -15,7 +15,8 @@ RUN_DEPENDS=	p5-Net-DNS>=0.68:${PORTSDIR}/dns/p5-Net-DNS \
 		p5-libwww>=6.04:${PORTSDIR}/www/p5-libwww \
 		p5-HTML-Parser>=3.69:${PORTSDIR}/www/p5-HTML-Parser
 
-USES=		perl5 zip:infozip
+USES=		perl5 zip:infozip shebangfix
+SHEBANG_FILES=	*.pl
 NO_BUILD=	yes
 USE_PERL5=	run
 
@@ -122,9 +123,6 @@ RUN_DEPENDS+=	p5-IO-Socket-INET6>=2.69:${PORTSDIR}/net/p5-IO-Socket-INET6
 
 EXTRACT_AFTER_ARGS=	-d ${PORTNAME}-${PORTVERSION}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/*.pl
-
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/images \
 		${STAGEDIR}${DATADIR}/logs ${STAGEDIR}${DATADIR}/reports
diff --git a/mail/bogofilter/Makefile b/mail/bogofilter/Makefile
index a98bd3f66079..60616271b515 100644
--- a/mail/bogofilter/Makefile
+++ b/mail/bogofilter/Makefile
@@ -23,8 +23,8 @@ UNICODE_DESC=		Normalize tokens to Unicode (UTF-8) (recommended)
 CONFLICTS_INSTALL?=	bogofilter-sqlite-[0-9]* bogofilter-qdbm-[0-9]* bogofilter-tc-[0-9]* [a-z][a-z]-bogofilter-[0-9]*
 
 USES=		cpe perl5 shebangfix tar:bzip2
-SHEBANG_FILES=	contrib/randomtrain.sh \
-		contrib/scramble.sh
+SHEBANG_FILES=	contrib/randomtrain.sh contrib/scramble.sh \
+		src/tests/unsort.pl contrib/*.pl
 USE_PERL5=	run
 GNU_CONFIGURE=	yes
 
@@ -55,9 +55,6 @@ CONFIGURE_ENV+=	PERL="${PERL}"
 INSTALL_TARGET=	install-strip prefix=${PREFIX} mandir=${MANPREFIX}/man
 
 post-patch:
-	${REINPLACE_CMD} -e 's|^#!.*perl|#! ${PERL}|' \
-		${WRKSRC}/src/tests/unsort.pl \
-		${WRKSRC}/contrib/*.pl
 	${REINPLACE_CMD} -e 's/INTEGRITY_TESTS = t.lock1 t.lock3 t.valgrind/INTEGRITY_TESTS = t.lock1/' \
 		-e 's/ENVIRON_TESTS = t.abort/ENVIRON_TESTS =/' \
 		${WRKSRC}/src/tests/Makefile.am
diff --git a/mail/cyrus-imapd23/Makefile b/mail/cyrus-imapd23/Makefile
index 197b7c60fcd1..3fb11b5d75ec 100644
--- a/mail/cyrus-imapd23/Makefile
+++ b/mail/cyrus-imapd23/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.3.19
-#PORTREVISION=	10
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/
 PKGNAMESUFFIX=	23
@@ -32,7 +32,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-bdb=${BDB_LIB_NAME} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
-		--with-perl=${PERL5}
+		--with-perl=${PERL}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
diff --git a/mail/cyrus-imapd24/Makefile b/mail/cyrus-imapd24/Makefile
index de76be68ad39..4929259d5211 100644
--- a/mail/cyrus-imapd24/Makefile
+++ b/mail/cyrus-imapd24/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.4.18
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-bdb=${BDB_LIB_NAME} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
-		--with-perl=${PERL5}
+		--with-perl=${PERL}
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
 MAKE_JOBS_UNSAFE=	yes
diff --git a/mail/cyrus-imapd25/Makefile b/mail/cyrus-imapd25/Makefile
index 22ef3f3d7481..aa3bec0c4c81 100644
--- a/mail/cyrus-imapd25/Makefile
+++ b/mail/cyrus-imapd25/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	cyrus-imapd
 PORTVERSION=	2.5.7
-#PORTREVISION=	0
+PORTREVISION=	1
 CATEGORIES=	mail ipv6
 MASTER_SITES=	ftp://ftp.cyrusimap.org/cyrus-imapd/ \
 		http://cyrusimap.org/releases/
@@ -33,7 +33,7 @@ CONFIGURE_ARGS=	--sysconfdir=${PREFIX}/etc \
 		--with-bdb=${BDB_LIB_NAME} \
 		--with-com_err \
 		--with-openssl=${OPENSSLBASE} \
-		--with-perl=${PERL5}
+		--with-perl=${PERL}
 CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib"
 CPPFLAGS+=	-I${LOCALBASE}/include
 MAKE_JOBS_UNSAFE=	yes
diff --git a/mail/cyrus2dovecot/Makefile b/mail/cyrus2dovecot/Makefile
index cff4ffc2b717..d7cea2cb6e7b 100644
--- a/mail/cyrus2dovecot/Makefile
+++ b/mail/cyrus2dovecot/Makefile
@@ -16,15 +16,13 @@ LICENSE_COMB=	dual
 
 PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${DISTNAME}
 NO_WRKSUBDIR=	yes
 
 post-extract:
 	@${CP} -v ${DISTDIR}/${DISTNAME} ${WRKSRC}
 
-post-patch:
-	@${REINPLACE_CMD} -e '1s,^#!.*,#!${PERL},' ${WRKSRC}/${DISTNAME}
-
 do-build:
 	pod2man --section=1 --release=${PORTVERSION} \
 		--name=${PORTNAME} --center=${PORTNAME}" user guide" \
diff --git a/mail/dkimproxy/Makefile b/mail/dkimproxy/Makefile
index 9e0df0b8feab..f517e5ba2e14 100644
--- a/mail/dkimproxy/Makefile
+++ b/mail/dkimproxy/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS:=	${BUILD_DEPENDS}
 OPTIONS_DEFINE=	IPV6
 
 GNU_CONFIGURE=	yes
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=  scripts/*
 NO_ARCH=	yes
 USE_RC_SUBR=	dkimproxy_in dkimproxy_out
 
@@ -39,8 +40,4 @@ IPV6_EXTRA_PATCHES=	${FILESDIR}/extra-patch-scripts-dkimproxy.out
 IPV6_EXTRA_PATCHES=	${FILESDIR}/extra-patch-scripts-dkimproxy_in.conf.example
 IPV6_EXTRA_PATCHES=	${FILESDIR}/extra-patch-scripts-dkimproxy_out.conf.example
 
-post-patch:
-	@${GREP} -Ril 'perl' ${WRKDIR} | ${XARGS} ${REINPLACE_CMD} -i '' \
-		-e 's|/usr/bin/perl|${PERL}|' -e 's|@PERL@|${PERL}|'
-
 .include <bsd.port.mk>
diff --git a/mail/elmo-devel/Makefile b/mail/elmo-devel/Makefile
index 321462fcedff..006b5ce5918c 100644
--- a/mail/elmo-devel/Makefile
+++ b/mail/elmo-devel/Makefile
@@ -14,7 +14,8 @@ COMMENT=	Receive, filter, read, compose, and send mail at the text console
 CONFLICTS=	elmo-[0-9]*
 
 GNU_CONFIGURE=	yes
-USES=		iconv perl5
+USES=		iconv perl5 shebangfix
+SHEBANG_FILES=	src/elmoconf.pl
 USE_OPENSSL=	yes
 USE_PERL5=	run
 
@@ -48,8 +49,6 @@ pre-everything::
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e "s|/usr/bin/env perl|${PERL} -w|" \
-		${WRKSRC}/src/elmoconf.pl
 	@${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' -e 's|== "|= "|g' ${WRKSRC}/configure
 	@${REINPLACE_CMD} -e 's|gpgme4|gpgme|g' ${WRKSRC}/src/pgp.c
 
diff --git a/mail/exipick/Makefile b/mail/exipick/Makefile
index 157ba937cd17..e045ed0e0b8e 100644
--- a/mail/exipick/Makefile
+++ b/mail/exipick/Makefile
@@ -13,21 +13,22 @@ COMMENT=	Display messages from Exim queue based on a variety of criteria
 
 PLIST_FILES=	bin/${PORTNAME}
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${DISTNAME}
 USE_PERL5=	run
+NO_BUILD=	yes
 
 do-extract:
 	@${RM} -rf ${WRKDIR}
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}
 
-do-build:
-	@${SED} -e '1s|/usr/bin/perl|${PERL}|' \
-		-e 's;\/local\/exim\/spool;\/var\/spool\/exim;g' \
-		${WRKSRC}/${DISTNAME} > ${WRKSRC}/${PORTNAME}.pl
+post-patch:
+	@${REINPLACE_CMD} -e 's;\/local\/exim\/spool;\/var\/spool\/exim;g' \
+		${WRKSRC}/${DISTNAME}
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl \
+	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} \
 		${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/mail/imapsync/Makefile b/mail/imapsync/Makefile
index 16240d609fe2..ad718740e0b1 100644
--- a/mail/imapsync/Makefile
+++ b/mail/imapsync/Makefile
@@ -19,7 +19,8 @@ RUN_DEPENDS=	p5-Mail-IMAPClient>0:${PORTSDIR}/mail/p5-Mail-IMAPClient \
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTNAME}-${PORTVERSION}
 
-USES=		cpe perl5 tar:tgz
+USES=		cpe perl5 tar:tgz shebangfix
+SHEBANG_FILES=	${PORTNAME}
 USE_GITHUB=	yes
 GH_ACCOUNT=	imapsync
 
@@ -32,11 +33,6 @@ PLIST_FILES=	bin/${PORTNAME} man/man1/${PORTNAME}.1.gz
 
 POD2MAN?=	pod2man
 
-do-patch:
-	${REINPLACE_CMD} \
-		-e 's|/usr/bin/perl|${PERL}|g' \
-		${WRKSRC}/${PORTNAME}
-
 do-install:
 	${POD2MAN} ${WRKSRC}/${PORTNAME} ${WRKSRC}/${PORTNAME}.1
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index b4851ae09da6..f7a85ea326bc 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		mailagent
 PORTVERSION=		3.1.78
-PORTREVISION=		1
+PORTREVISION=		2
 CATEGORIES=		mail
 MASTER_SITES=		http://eron.info/
 
@@ -25,7 +25,7 @@ CONFIGURE_ARGS=		-dres \
 			-Dprefix='${PREFIX}' \
 			-Dmansrc='${STAGEDIR}${PREFIX}/man/man1'
 MAKE_JOBS_UNSAFE=	yes
-MAKE_ENV=	PATH=`dirname ${PERL5}`:${PATH} INSTALL_PREFIX=${STAGEDIR}
+MAKE_ENV=	PATH=`dirname ${PERL}`:${PATH} INSTALL_PREFIX=${STAGEDIR}
 INSTALL_TARGET=	install install.man
 
 SUB_LIST+=	ORGFILE="${ORGFILE}"
diff --git a/mail/pflogstats/Makefile b/mail/pflogstats/Makefile
index e7a8a9132696..44aeee3f9b81 100644
--- a/mail/pflogstats/Makefile
+++ b/mail/pflogstats/Makefile
@@ -22,12 +22,12 @@ RUN_DEPENDS=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc \
 		p5-XML-Dumper>=0:${PORTSDIR}/textproc/p5-XML-Dumper
 
 NO_BUILD=	yes
-USES=		perl5
-SITE_PERL_INST=	${SITE_PERL:S/${LOCALBASE}/${PREFIX}/}
+USES=		perl5 shebangfix
+SHEBANG_FILES=	*.pl
+SITE_PERL_INST=	${PREFIX}/${SITE_PERL_REL}
 
 post-patch:
 	@${REINPLACE_CMD} \
-		-e 's|/usr/bin/perl.*|${PERL}|' \
 		-e 's|/usr/local/lib/pflogstats|${SITE_PERL_INST}/Pflogstats|' \
 			${WRKSRC}/apachelogiostats.pl \
 			${WRKSRC}/pflogstats.pl \
diff --git a/mail/qmhandle/Makefile b/mail/qmhandle/Makefile
index cf18b6caa0d5..03a58f69746c 100644
--- a/mail/qmhandle/Makefile
+++ b/mail/qmhandle/Makefile
@@ -12,7 +12,8 @@ COMMENT=	Tool to view and manage a qmail queue
 
 LICENSE=	GPLv2
 
-USES=		qmail:run perl5 tar:bzip2
+USES=		qmail:run perl5 tar:bzip2 shebangfix
+SHEBANG_FILES=	qmHandle
 
 NO_BUILD=	yes
 NO_ARCH=	yes
@@ -22,8 +23,7 @@ PORTDOCS=	HISTORY README
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
-	@${REINPLACE_CMD} -e 's,^#!/usr/bin/perl,#!${PERL},g' \
-			  -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
+	@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},g' \
 			  -e '/^##* *USER *CONFIGURATION *BEGIN *##*$$/,/^##* *USER *CONFIGURATION *END *##*$$/s/^\(#*\)my/\1our/g' \
 		${WRKSRC}/qmHandle
 	@${SED} -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${FILESDIR}/qmHandle.conf.in > \
diff --git a/mail/rlytest/Makefile b/mail/rlytest/Makefile
index 5e715947db5d..16d35cdd5f5b 100644
--- a/mail/rlytest/Makefile
+++ b/mail/rlytest/Makefile
@@ -16,13 +16,11 @@ EXTRACT_AFTER_ARGS=	> ${WRKSRC}/${PORTNAME}
 
 NO_WRKSUBDIR=	yes
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${PORTNAME}
 
 PLIST_FILES=	bin/rlytest man/man1/rlytest.1.gz
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^#!.*|#!${PERL}|' ${WRKSRC}/${PORTNAME}
-
 do-build:
 	@cd ${WRKSRC} && pod2man ${PORTNAME} > ${PORTNAME}.1
 
diff --git a/mail/sqlgrey/Makefile b/mail/sqlgrey/Makefile
index 6e486c4810be..96e2d85997e7 100644
--- a/mail/sqlgrey/Makefile
+++ b/mail/sqlgrey/Makefile
@@ -57,7 +57,7 @@ RUN_DEPENDS+=	p5-Date-Calc>=0:${PORTSDIR}/devel/p5-Date-Calc
 .endif
 
 post-patch:
-	@${REINPLACE_CMD} -e 's-#!/usr/bin/perl-#!${PERL}-' -e 's!/etc/sqlgrey!${PREFIX}/${ETCDIR}!g' ${WRKSRC}/sqlgrey
+	@${REINPLACE_CMD} -e 's!/etc/sqlgrey!${PREFIX}/${ETCDIR}!g' ${WRKSRC}/sqlgrey
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/sqlgrey-logstats.pl ${STAGEDIR}/${PREFIX}/bin
diff --git a/mail/swaks/Makefile b/mail/swaks/Makefile
index 0cad84106e90..bd0582b0f978 100644
--- a/mail/swaks/Makefile
+++ b/mail/swaks/Makefile
@@ -18,28 +18,16 @@ PERL_NET_DNS_DESC=	Add MX lookup support
 PERL_NET_SSLEAY_DESC=	Add TLS support
 PERL_AUTHEN_NTLM_DESC=	Add support for AUTH NTLM
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${PORTNAME}
 USE_PERL5=	run
+NO_BUILD=	yes
 
-.include <bsd.port.pre.mk>
-
-.if ${PORT_OPTIONS:MPERL_NET_DNS}
-RUN_DEPENDS+=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
-.endif
-
-.if ${PORT_OPTIONS:MPERL_NET_SSLEAY}
-RUN_DEPENDS+=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
-.endif
-
-.if ${PORT_OPTIONS:MPERL_AUTHEN_NTLM}
-RUN_DEPENDS+=	p5-Authen-NTLM>=0:${PORTSDIR}/security/p5-Authen-NTLM
-.endif
-
-do-build:
-	@${SED} -e '1s|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/${PORTNAME} > ${WRKSRC}/${PORTNAME}.pl
+PERL_NET_DNS_RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
+PERL_NET_SSLEAY_RUN_DEPENDS=	p5-Net-SSLeay>=0:${PORTSDIR}/security/p5-Net-SSLeay
+PERL_AUTHEN_NTLM_RUN_DEPENDS=	p5-Authen-NTLM>=0:${PORTSDIR}/security/p5-Authen-NTLM
 
 do-install:
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}.pl ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
+	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
-.include <bsd.port.post.mk>
+.include <bsd.port.mk>
diff --git a/math/abacus/Makefile b/math/abacus/Makefile
index 539016a40119..2f296da58b4e 100644
--- a/math/abacus/Makefile
+++ b/math/abacus/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	abacus
 DISTVERSION=	3.2betaU1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	http://www.informatik.uni-koeln.de/abacus/
 
@@ -20,7 +20,7 @@ USES=		gmake perl5
 USE_PERL5=	build
 USE_LDCONFIG=	yes
 ALL_TARGET=	abacus
-MAKE_ARGS=	CCC="${CXX}" PERL="${PERL5}" STRIP="${STRIP_CMD} -x" \
+MAKE_ARGS=	CCC="${CXX}" PERL="${PERL}" STRIP="${STRIP_CMD} -x" \
 		ARCHIVE="${AR} ${ARFLAGS}" CCFLAG_DEBOPT="${CXXFLAGS}" \
 		OSI_INCLUDE="${LOCALBASE}/include/coin"
 
diff --git a/math/p5-NetCDF/Makefile b/math/p5-NetCDF/Makefile
index c9d8f7d2459d..00f90a75b82b 100644
--- a/math/p5-NetCDF/Makefile
+++ b/math/p5-NetCDF/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	NetCDF
 PORTVERSION=	1.2.4
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	math perl5
 MASTER_SITES=	ftp://ftp.unidata.ucar.edu/pub/netcdf-perl/
 PKGNAMEPREFIX=	p5-
@@ -19,7 +19,7 @@ USES=		perl5 fakeroot
 WRKSRC_SUBDIR=		src
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPP_NETCDF=-I${LOCALBASE}/include LD_NETCDF=-lnetcdf \
-		PERL_MANDIR=${STAGEDIR}${SITE_PERL}/man PERL=${PERL5}
+		PERL_MANDIR=${STAGEDIR}${SITE_PERL}/man PERL=${PERL}
 
 pre-install:
 	@${PERL5} -pi -e 's/ doc_(perl|site|\$$\(INSTALLDIRS\))_install$$//' ${WRKSRC}/perl/Makefile
diff --git a/misc/biblical-curse/Makefile b/misc/biblical-curse/Makefile
index ec02adbb8a7a..42ccd864f25a 100644
--- a/misc/biblical-curse/Makefile
+++ b/misc/biblical-curse/Makefile
@@ -10,18 +10,15 @@ DISTFILES=	# none
 MAINTAINER=	tobez@FreeBSD.org
 COMMENT=	Fake biblical curse generator
 
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	biblical-curse
 NO_BUILD=	yes
-WRKSRC=		${WRKDIR}/src
 
 SRC=		${.CURDIR}/src
 
-pre-patch:
-	@${CP} -R ${SRC} ${WRKDIR}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/biblical-curse
+do-extract:
+	@${CP} -R ${SRC}/ ${WRKSRC}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/biblical-curse ${STAGEDIR}${PREFIX}/bin/biblical-curse
diff --git a/misc/kenny/Makefile b/misc/kenny/Makefile
index 32fd136ef934..2c0cb55a9862 100644
--- a/misc/kenny/Makefile
+++ b/misc/kenny/Makefile
@@ -17,13 +17,13 @@ LICENSE=	ART10
 
 CONFLICTS=	filters-*
 
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	extract build run
+SHEBANG_FILES=	${PORTNAME}
 EXTRACT_CMD=	${GZCAT}
 EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	> ${WRKSRC}/${PORTNAME}
 NO_ARCH=	yes
-NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	bin/kenny \
@@ -31,8 +31,7 @@ PLIST_FILES=	bin/kenny \
 
 POD2MAN?=	${LOCALBASE}/bin/pod2man
 
-post-extract:
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/${PORTNAME}
+do-build:
 	@${POD2MAN} ${WRKSRC}/${PORTNAME} > ${WRKSRC}/${PORTNAME}.1
 
 do-install:
diff --git a/misc/rfc/Makefile b/misc/rfc/Makefile
index 5c9b42c231ec..999ef7f8030a 100644
--- a/misc/rfc/Makefile
+++ b/misc/rfc/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	rfc
 PORTVERSION=	3.2.3
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc
 MASTER_SITES=	http://www.dewn.com/rfc/
 
@@ -13,6 +13,9 @@ COMMENT=	Perl script to search for RFC's
 RUN_DEPENDS=	w3m:${PORTSDIR}/www/w3m
 
 NO_BUILD=	yes
+USES=	perl5 shebangfix
+USE_PERL5=	run
+SHEBANG_FILES=	${PORTNAME}-${PORTVERSION}
 
 PLIST_FILES=	bin/rfc man/man1/rfc.1.gz
 
@@ -21,8 +24,8 @@ do-configure:
 		s|/usr/local/etc/nmap|${PREFIX}/share/misc/nmap| ; \
 		s|400k|1024k| ; \
 		s|http://ftp.isi.edu/in-notes|http://www.ietf.org/rfc| ; \
-		s|http://www.iana|ftp://ftp.iana| ; \
-		s|/usr/bin/perl|${PERL}|' ${WRKSRC}/${PORTNAME}-${PORTVERSION}
+		s|http://www.iana|ftp://ftp.iana|' \
+		${WRKSRC}/${PORTNAME}-${PORTVERSION}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME}-${PORTVERSION} \
diff --git a/multimedia/ffmpeg/Makefile b/multimedia/ffmpeg/Makefile
index 885eedb790e1..d641123f66ac 100644
--- a/multimedia/ffmpeg/Makefile
+++ b/multimedia/ffmpeg/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	2.8.3
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -19,9 +19,10 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 
 HAS_CONFIGURE=	yes
 CONFIGURE_LOG=	config.err
-USES=		compiler cpe gmake perl5 pkgconfig tar:bzip2
+USES=		compiler cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
 USE_LDCONFIG=	yes
 USE_PERL5=	build
+SHEBANG_FILES=	doc/texi2pod.pl
 
 OPTIONS_DEFINE= AACPLUS ALSA AMR_NB AMR_WB ASS BS2B CACA CDIO CELT DC1394 \
 		DEBUG DOCS FAAC FDK_AAC FFSERVER FLITE FONTCONFIG \
@@ -448,8 +449,6 @@ post-patch:
 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
 		-e 's|freetype/freetype.h|freetype.h|g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
-		${WRKSRC}/doc/texi2pod.pl
 
 post-patch-SDL-on:
 	@${REINPLACE_CMD} -E \
diff --git a/multimedia/ffmpeg0/Makefile b/multimedia/ffmpeg0/Makefile
index 563ee4d6d830..1d35314d5009 100644
--- a/multimedia/ffmpeg0/Makefile
+++ b/multimedia/ffmpeg0/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ffmpeg
 PORTVERSION=	0.7.17
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	1
 CATEGORIES=	multimedia audio ipv6 net
 MASTER_SITES=	http://ffmpeg.org/releases/
@@ -23,9 +23,10 @@ BUILD_DEPENDS=	yasm:${PORTSDIR}/devel/yasm \
 
 PORTSCOUT=	limit:^0\.7.*
 
-USES=		cpe gmake perl5 pkgconfig tar:bzip2
+USES=		cpe gmake perl5 pkgconfig tar:bzip2 shebangfix
 USE_LDCONFIG=	${PREFIX}/lib/ffmpeg${FFMPEG_SUFFIX}
 USE_PERL5=	build
+SHEBANG_FILES=	doc/texi2pod.pl
 
 FFMPEG_SUFFIX=	0
 HAS_CONFIGURE=	yes
@@ -323,8 +324,6 @@ post-patch:
 		-e 's|opencv opencv/cxcore.h|opencv-core opencv2/core/core_c.h|g' \
 		-e 's|check_ldflags -Wl,--as-needed||' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL5}|g' \
-		${WRKSRC}/doc/texi2pod.pl
 .if ${PORT_OPTIONS:MSDL}
 	@${REINPLACE_CMD} -E \
 		-e 's|sdl-config|${SDL_CONFIG}|g' \
diff --git a/net-im/jabberd/Makefile b/net-im/jabberd/Makefile
index d4cc5e434f0a..c757fcd412cc 100644
--- a/net-im/jabberd/Makefile
+++ b/net-im/jabberd/Makefile
@@ -137,8 +137,6 @@ post-patch:
 	router.xml s2s.xml sm.xml templates/roster.xml
 	@${MV} ${WRKSRC}/etc/${FILE}.dist.in ${WRKSRC}/etc/${FILE}.sample.in
 .endfor
-	@${REINPLACE_CMD} -e 's|%%PERL%%|${PERL}|g' \
-		${WRKSRC}/tools/jabberd.in
 #.if ${PORT_OPTIONS:MCYRUS}
 #	@${REINPLACE_CMD} -e '/^#error /d' \
 #		${WRKSRC}/sx/sasl_cyrus.c
diff --git a/net-im/ttytter/Makefile b/net-im/ttytter/Makefile
index d335f3186cb1..b8277ba5986a 100644
--- a/net-im/ttytter/Makefile
+++ b/net-im/ttytter/Makefile
@@ -22,8 +22,9 @@ RUN_DEPENDS=	curl:${PORTSDIR}/ftp/curl \
 		p5-TimeDate>=0:${PORTSDIR}/devel/p5-TimeDate
 
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	${PORTVERSION}.txt
 
 OPTIONS_DEFINE=	READLINE RLTTYTTER
 OPTIONS_DEFAULT=READLINE
@@ -47,9 +48,6 @@ do-extract:
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${PORTVERSION}.txt ${WRKSRC}
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/license.txt ${WRKSRC}
 
-post-patch:
-	@${REINPLACE_CMD} -e 's|^\#!/usr/bin/perl|\#!${PERL}|' ${WRKSRC}/${PORTVERSION}.txt
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTVERSION}.txt ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
diff --git a/net-mgmt/mrtg-ping-probe/Makefile b/net-mgmt/mrtg-ping-probe/Makefile
index 3bb1968b4cd8..4b3abf3f1498 100644
--- a/net-mgmt/mrtg-ping-probe/Makefile
+++ b/net-mgmt/mrtg-ping-probe/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mrtg-ping-probe
 PORTVERSION=	2.2.0
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	net-mgmt
 MASTER_SITES=	ftp://ftp.pwo.de/pub/pwo/mrtg/${PORTNAME}/
 
@@ -14,11 +14,8 @@ RUN_DEPENDS=	${LOCALBASE}/bin/mrtg:${PORTSDIR}/net-mgmt/mrtg
 
 FETCH_BEFORE_ARGS=	-p      # MASTER_SITE needs PASSIVE FTP.
 
-USES=		perl5
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|%%PERL%%|${PERL5}|' ${WRKSRC}/${PORTNAME}
-	@${CHMOD} +x ${WRKSRC}/${PORTNAME}
+USES=		perl5 shebangfix
+SHEBANG_FILES=	mrtg-ping-probe
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
diff --git a/net-mgmt/mrtg-ping-probe/files/patch-mrtg-ping-probe b/net-mgmt/mrtg-ping-probe/files/patch-mrtg-ping-probe
index 600a64ec2fc9..10928fbb3fea 100644
--- a/net-mgmt/mrtg-ping-probe/files/patch-mrtg-ping-probe
+++ b/net-mgmt/mrtg-ping-probe/files/patch-mrtg-ping-probe
@@ -1,11 +1,5 @@
 --- mrtg-ping-probe.orig	2003-09-14 03:20:24.000000000 +0900
 +++ mrtg-ping-probe	2009-03-10 08:01:20.000000000 +0900
-@@ -1,4 +1,4 @@
--#!/bin/perl
-+#!%%PERL%%
- ##################################################################
- # @(#) $Id: mrtg-ping-probe,v 2.5 2003/09/13 18:04:29 pwo Exp $
- # @(#) mrtg-ping-probe release $Name: Release_2_2_0 $
 @@ -284,7 +284,7 @@
  
  	# try to find packet loss
diff --git a/news/ubh/Makefile b/news/ubh/Makefile
index 2c1841ed5b39..9f2a0b4e8801 100644
--- a/news/ubh/Makefile
+++ b/news/ubh/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	ubh
 PORTVERSION=	2.5
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	news graphics
 MASTER_SITES=	http://ubh.sourceforge.net/download/
 
@@ -18,15 +18,11 @@ RUN_DEPENDS=	\
 	p5-String-CRC32>=0:${PORTSDIR}/devel/p5-String-CRC32
 
 NO_BUILD=	YES
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	ubh
 
 OPTIONS_DEFINE=	DOCS
 
-pre-patch:
-	@${MV} ${WRKSRC}/ubh ${WRKSRC}/ubh.old
-	@${SED} -e '1,1s:/usr/bin/perl:${PERL5}:' \
-		${WRKSRC}/ubh.old > ${WRKSRC}/ubh
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ubh ${STAGEDIR}${PREFIX}/bin
 	${CP} -R ${WRKSRC}/examples ${STAGEDIR}${PREFIX}/share/ubh
diff --git a/ports-mgmt/pkg_cutleaves/Makefile b/ports-mgmt/pkg_cutleaves/Makefile
index b8d47a5cd164..10ed92bc501b 100644
--- a/ports-mgmt/pkg_cutleaves/Makefile
+++ b/ports-mgmt/pkg_cutleaves/Makefile
@@ -13,9 +13,9 @@ COMMENT=	Interactive script for deinstalling 'leaf' packages
 LICENSE=	BSD2CLAUSE
 
 NO_BUILD=	yes
-USES=		perl5
-
-WRKSRC=		${WRKDIR}
+USES=		perl5 shebangfix
+SHEBANG_FILES=	pkg_cutleaves
+NO_WRKSUBDIR=	yes
 
 PLIST_FILES=	sbin/pkg_cutleaves man/man1/pkg_cutleaves.1.gz
 
@@ -31,7 +31,6 @@ post-patch:
 	  -e 's,/usr/local/etc/pkg_leaves.exclude,${PREFIX}/etc/pkg_leaves.exclude,' \
 	  -e 's,/usr/local/sbin/pkg delete -y,${PKG_DELETE},' \
 	  -e 's,/usr/local/sbin/pkg query,${PKG_QUERY},' \
-	  -e 's,/usr/bin/perl,${PERL},' \
 	  ${WRKSRC}/pkg_cutleaves
 
 do-install:
diff --git a/ports-mgmt/pkg_tree/Makefile b/ports-mgmt/pkg_tree/Makefile
index fc8148f2cbd8..ddabcc663555 100644
--- a/ports-mgmt/pkg_tree/Makefile
+++ b/ports-mgmt/pkg_tree/Makefile
@@ -3,14 +3,15 @@
 
 PORTNAME=	pkg_tree
 PORTVERSION=	1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	ports-mgmt
 MASTER_SITES=	http://www.mavetju.org/download/
 
 MAINTAINER=	edwin@mavetju.org
 COMMENT=	Get a 'graphical' tree-overview of installed packages
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	pkg_tree
 
 NO_ARCH=	yes
 
@@ -20,7 +21,5 @@ post-patch:
 	@${REINPLACE_CMD} -e 's|__PREFIX__|${STAGEDIR}${PREFIX}|g ; \
 		s|__INSTALL_MAN__|${INSTALL_MAN}|g ; \
 		s|__INSTALL_SCRIPT__|${INSTALL_SCRIPT}|g' ${WRKSRC}/Makefile
-	@${REINPLACE_CMD} -e 's|#!/usr/bin/perl -w|#!${PERL5} -w|' \
-		${WRKSRC}/pkg_tree
 
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portlint/Makefile b/ports-mgmt/portlint/Makefile
index 02018037df27..1105549da127 100644
--- a/ports-mgmt/portlint/Makefile
+++ b/ports-mgmt/portlint/Makefile
@@ -17,7 +17,8 @@ LICENSE_PERMS=	auto-accept dist-mirror dist-sell pkg-mirror pkg-sell
 
 NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/src
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	*.pl
 USE_PERL5=	run
 
 SRC=		${.CURDIR}/src
@@ -29,13 +30,8 @@ PORTEXAMPLES=	portlintgrep
 
 OPTIONS_DEFINE=	EXAMPLES
 
-pre-patch:
-	@${CP} -R ${SRC} ${WRKDIR}
-
-post-patch:
-	@${REINPLACE_CMD} -e 's|/usr/bin/perl|${PERL}|' \
-		${WRKSRC}/portlint.pl \
-		${WRKSRC}/portlintgrep.pl
+do-extract:
+	@${CP} -R ${SRC}/ ${WRKSRC}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/portlint.pl \
diff --git a/print/cdlabelgen/Makefile b/print/cdlabelgen/Makefile
index af347bb4d660..7cab91c30494 100644
--- a/print/cdlabelgen/Makefile
+++ b/print/cdlabelgen/Makefile
@@ -9,7 +9,9 @@ MASTER_SITES=	http://www.aczoom.com/pub/tools/
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Generate postscript for frontcards and traycards for CDs
 
-USES=		perl5 tar:tgz
+USES=		perl5 tar:tgz shebangfix
+SHEBANG_FILES=	cdlabelgen
+NO_BUILD=	yes
 MAKE_ARGS=	BASE_DIR="${STAGEDIR}${PREFIX}" \
 		LIB_DIR="${STAGEDIR}${DATADIR}" \
 		INSTALL="${INSTALL_SCRIPT}" \
@@ -18,7 +20,4 @@ MAKE_ARGS=	BASE_DIR="${STAGEDIR}${PREFIX}" \
 		INSTALL_MAN="${INSTALL_MAN}" \
 		MAN_DIR="${STAGEDIR}${PREFIX}/man"
 
-do-build:
-	${PERL5} -i.bak -p -e "if (1 .. 1) {s-^#!/usr/bin/perl-#!${PERL}-;}" ${WRKSRC}/cdlabelgen
-
 .include <bsd.port.mk>
diff --git a/security/amavisd-new/Makefile b/security/amavisd-new/Makefile
index 8355807c4e22..f841a75106b5 100644
--- a/security/amavisd-new/Makefile
+++ b/security/amavisd-new/Makefile
@@ -25,7 +25,8 @@ RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
 
 USES=		perl5 shebangfix tar:xz
 USE_PERL5=	run
-SHEBANG_FILES=	amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl
+SHEBANG_FILES=	amavisd-agent amavisd-nanny amavisd-release p0f-analyzer.pl \
+		amavisd-snmp-subagent amavisd
 
 NO_BUILD=	yes
 
@@ -234,11 +235,10 @@ post-patch:
 	@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-agent
 	@${REINPLACE_CMD} "s|/var/amavis/db|${AMAVISDIR}/db|" ${WRKSRC}/amavisd-nanny
 	@${REINPLACE_CMD} -e "s|/var/amavis/db|${AMAVISDIR}/db|" \
-			-e "s|/usr/bin/perl|${PERL}|" ${WRKSRC}/amavisd-snmp-subagent
+			 ${WRKSRC}/amavisd-snmp-subagent
 	@${REINPLACE_CMD} "s|/var/amavis/amavisd.sock|${AMAVISDIR}/amavisd.sock|" \
 			${WRKSRC}/amavisd-release
 	@${REINPLACE_CMD} -e "s|/etc/amavisd.conf|${PREFIX}/etc/amavisd.conf|" \
-				-e "s|/usr/bin/perl|${PERL}|" \
 				-e "s|/var/amavis|${AMAVISDIR}|g" \
 				-e 's|$$localhost_name = .localhost.;|$$localhost_name = $$myhostname;|' \
 			${WRKSRC}/amavisd
diff --git a/security/ipfcount/Makefile b/security/ipfcount/Makefile
index 4e695c940b97..bf78b74b9749 100644
--- a/security/ipfcount/Makefile
+++ b/security/ipfcount/Makefile
@@ -13,16 +13,14 @@ COMMENT=	Summarise ipf logs by counting and sorting the fields
 
 PLIST_FILES=	bin/ipfcount man/man1/ipfcount.1.gz
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	ipfcount
 
 OPTIONS_DEFINE=	EXAMPLES
 
 PORTEXAMPLES=	100.ipfcount
 SUB_FILES=	pkg-message
 
-post-patch:
-	@${REINPLACE_CMD} -e '1s,^#![^ ]*,#!${PERL},' ${WRKSRC}/ipfcount
-
 do-build:
 	cd ${WRKSRC} && pod2man ipfcount > ipfcount.1
 
diff --git a/security/ipfwcount/Makefile b/security/ipfwcount/Makefile
index 557de58c9d73..ecef488ed45d 100644
--- a/security/ipfwcount/Makefile
+++ b/security/ipfwcount/Makefile
@@ -11,7 +11,8 @@ MASTER_SITES=	http://deathbeforedecaf.net/misc/ports/ \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Summarise ipfw logs by counting and sorting the fields
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	ipfwcount
 
 PLIST_FILES=	bin/ipfwcount man/man1/ipfwcount.1.gz
 PORTEXAMPLES=	100.ipfwcount
@@ -20,9 +21,6 @@ SUB_FILES=	pkg-message
 
 OPTIONS_DEFINE=	EXAMPLES
 
-post-patch:
-	${REINPLACE_CMD} -e '1s,^#![^ ]*,#!${PERL},' ${WRKSRC}/ipfwcount
-
 do-build:
 	cd ${WRKSRC} && pod2man ipfwcount > ipfwcount.1
 
diff --git a/security/nikto/Makefile b/security/nikto/Makefile
index 06c33881ac67..c79d18d320f0 100644
--- a/security/nikto/Makefile
+++ b/security/nikto/Makefile
@@ -28,7 +28,6 @@ SHEBANG_FILES=	nikto.pl
 
 post-patch:	.SILENT
 	${REINPLACE_CMD} -e \
-		's|/usr/local/bin/perl|${PERL}| ; \
 		 s|/etc/nikto.conf|${PREFIX}/etc/nikto.conf|' ${WRKSRC}/nikto.pl
 	${REINPLACE_CMD} -Ee \
 		's|# (EXECDIR=).*/nikto|\1${DATADIR}| ; \
diff --git a/security/oinkmaster/Makefile b/security/oinkmaster/Makefile
index d81a9fb70e54..0627823a8afb 100644
--- a/security/oinkmaster/Makefile
+++ b/security/oinkmaster/Makefile
@@ -17,8 +17,9 @@ RUN_DEPENDS=	wget:${PORTSDIR}/ftp/wget
 OPTIONS_DEFINE=	DOCS
 
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	oinkmaster.pl
 
 PLIST_FILES=	bin/oinkmaster \
 		etc/oinkmaster.conf.sample \
@@ -26,11 +27,6 @@ PLIST_FILES=	bin/oinkmaster \
 
 PORTDOCS=	README
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,/usr/bin/perl,${PERL},g' \
-		-e 's,"tPf","tf",' \
-		${WRKSRC}/oinkmaster.pl
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/oinkmaster.pl ${STAGEDIR}${PREFIX}/bin/oinkmaster
 	${INSTALL_DATA} ${WRKSRC}/oinkmaster.conf ${STAGEDIR}${PREFIX}/etc/oinkmaster.conf.sample
diff --git a/security/p5-App-Genpass/Makefile b/security/p5-App-Genpass/Makefile
index 7b846ad48fe7..18ed1cf05ea2 100644
--- a/security/p5-App-Genpass/Makefile
+++ b/security/p5-App-Genpass/Makefile
@@ -28,9 +28,5 @@ TEST_DEPENDS=	p5-List-MoreUtils>=0:${PORTSDIR}/lang/p5-List-MoreUtils \
 NO_ARCH=	yes
 USE_PERL5=	configure
 USES=		perl5
-REINPLACE_ARGS=	-i ''
-
-post-patch:
-	@${REINPLACE_CMD} -e '1 s|.*|#!${PERL}|' ${WRKSRC}/bin/genpass
 
 .include <bsd.port.mk>
diff --git a/security/racoon2/Makefile b/security/racoon2/Makefile
index 546fbab97d9f..408c038a7096 100644
--- a/security/racoon2/Makefile
+++ b/security/racoon2/Makefile
@@ -61,7 +61,6 @@ post-patch-DOCS-on:
 post-configure:
 	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e '/INSTALL/s|\$$([a-z].*dir)|${STAGEDIR}&|'
 	@${REINPLACE_CMD} -e '/INSTALL/s|\$$(prefix)|${STAGEDIR}&|' ${WRKSRC}/pskgen/Makefile
-	@${REINPLACE_CMD} -e '1s|/usr/bin/perl|${PERL}|' ${WRKSRC}/pskgen/pskgen
 	@${REINPLACE_CMD} -e '/^prefix=/s|/usr/local|${STAGEDIR}${PREFIX}|;/\/var\/run\/racoon2/d' ${WRKSRC}/samples/Makefile
 
 post-install:
diff --git a/security/regripper/Makefile b/security/regripper/Makefile
index 7784ace47542..113a3ab2562a 100644
--- a/security/regripper/Makefile
+++ b/security/regripper/Makefile
@@ -16,14 +16,15 @@ RUN_DEPENDS=	p5-Parse-Win32Registry>=0:${PORTSDIR}/devel/p5-Parse-Win32Registry
 
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-USES=		dos2unix perl5 zip
+USES=		dos2unix perl5 zip shebangfix
+SHEBANG_FILES=	rip.pl
+perl_OLD_CMD=	c:\\\\perl\\\\bin\\\\perl.exe
 USE_PERL5=	run
 
 PLIST_FILES=	bin/rip.pl
 
 post-patch:
-	${REINPLACE_CMD} -e 's|#! c:\\perl\\bin\\perl.exe|#!${PERL}| ; \
-		s|plugindir = $$str|plugindir = "${DATADIR}"| ; \
+	${REINPLACE_CMD} -e 's|plugindir = $$str|plugindir = "${DATADIR}"| ; \
 		s|require "plugins/|require "${DATADIR}plugins/|' ${WRKSRC}/rip.pl
 
 do-install:
diff --git a/security/smtpscan/Makefile b/security/smtpscan/Makefile
index 5c119baffe5a..2617e8bc5b82 100644
--- a/security/smtpscan/Makefile
+++ b/security/smtpscan/Makefile
@@ -18,8 +18,9 @@ RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 WRKSRC=		${WRKDIR}/${PORTNAME}
 NO_BUILD=	yes
 
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	src/smtpscan
 
 PLIST_FILES=	bin/smtpscan \
 		man/man1/smtpscan.1.gz \
@@ -28,8 +29,7 @@ PLIST_FILES=	bin/smtpscan \
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|^#!.*|#!${PERL}| ; \
-		 s|/usr/local/share|${PREFIX}/share| ; \
+		's|/usr/local/share|${PREFIX}/share| ; \
 		 s|@VERSION@|${PORTVERSION}|' ${WRKSRC}/src/smtpscan
 	@${REINPLACE_CMD} -e \
 		's|@VERSION@|${PORTVERSION}| ; \
diff --git a/security/sshblock/Makefile b/security/sshblock/Makefile
index e1f985dfd6ff..cd372d962684 100644
--- a/security/sshblock/Makefile
+++ b/security/sshblock/Makefile
@@ -25,10 +25,6 @@ EXTRACT_AFTER_ARGS=	${WRKSRC}
 SUB_FILES+=	pkg-message
 SHEBANG_FILES=	${WRKSRC}/sshblock-${PORTVERSION}.pl
 
-do-patch:
-	@${REINPLACE_CMD} -e "s@/usr/bin/perl@${PERL}@" \
-		${WRKSRC}/sshblock-${PORTVERSION}.pl
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sshblock-${PORTVERSION}.pl \
 		${STAGEDIR}${PREFIX}/sbin/sshblock
diff --git a/security/sshit/Makefile b/security/sshit/Makefile
index 56b34337a7a3..36ee1f175120 100644
--- a/security/sshit/Makefile
+++ b/security/sshit/Makefile
@@ -17,16 +17,14 @@ RUN_DEPENDS=	p5-Unix-Syslog>=0:${PORTSDIR}/sysutils/p5-Unix-Syslog \
 		p5-Proc-PID-File>=0:${PORTSDIR}/devel/p5-Proc-PID-File
 
 NO_BUILD=	yes
-USES=		perl5
+USES=		perl5 shebangfix
 USE_PERL5=	run
+SHEBANG_FILES=	sshit
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 PKGMESSAGE=	${WRKDIR}/pkg-message
 SUB_FILES=	pkg-message
 
-post-patch:
-	@${REINPLACE_CMD} -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/sshit
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/sbin/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/${PORTNAME}.conf ${STAGEDIR}${PREFIX}/etc/${PORTNAME}.conf-dist
diff --git a/textproc/cdif/Makefile b/textproc/cdif/Makefile
index 309234d95baa..9f72be513618 100644
--- a/textproc/cdif/Makefile
+++ b/textproc/cdif/Makefile
@@ -10,7 +10,8 @@ EXTRACT_SUFX=		# empty
 MAINTAINER=		sanpei@FreeBSD.org
 COMMENT=		Word context diff
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	${DISTNAME}
 
 NO_WRKSUBDIR=		yes
 NO_BUILD=		yes
@@ -18,12 +19,7 @@ NO_BUILD=		yes
 PLIST_FILES=	bin/cdif
 
 do-extract:
-	${MKDIR} ${WRKSRC}
-	${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${DISTNAME}.dist
-
-do-patch:
-	${SED} -e '1s@/usr/local/bin/perl@${PERL}@' \
-		< ${WRKSRC}/${DISTNAME}.dist > ${WRKSRC}/${DISTNAME}
+	${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}/${DISTNAME}
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${DISTNAME} ${STAGEDIR}${PREFIX}/bin/cdif
diff --git a/textproc/man2html/Makefile b/textproc/man2html/Makefile
index da5790a0308c..24cbc655ebbb 100644
--- a/textproc/man2html/Makefile
+++ b/textproc/man2html/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	man2html
 PORTVERSION=	3.0.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	textproc
 MASTER_SITES=	http://hydra.nac.uci.edu/indiv/ehood/tar/ \
 		ftp://ftp.cpan.org/pub/CPAN/modules/by-authors/Earl_Hood/ \
@@ -20,10 +20,6 @@ CGIDIR=		${PREFIX}/www/cgi-bin
 
 PLIST_FILES=	bin/man2html man/man1/man2html.1.gz www/cgi-bin/man.cgi
 
-post-patch:
-	${REINPLACE_CMD} -e "s#/usr/local/bin/perl#${PERL5}#" ${WRKSRC}/man2html
-	${REINPLACE_CMD} -e "s#/usr/bin/perl5.00503#${PERL5}#" ${WRKSRC}/man.cgi
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/man2html ${STAGEDIR}/${PREFIX}/bin
 	${INSTALL_MAN} ${WRKSRC}/doc/man2html.1 ${STAGEDIR}/${PREFIX}/man/man1
diff --git a/textproc/man2html/files/patch-man.cgi b/textproc/man2html/files/patch-man.cgi
index 323a2425df80..e61412256bb8 100644
--- a/textproc/man2html/files/patch-man.cgi
+++ b/textproc/man2html/files/patch-man.cgi
@@ -1,11 +1,5 @@
 --- man.cgi.orig	Wed Aug 13 01:19:18 1997
 +++ man.cgi	Sat Sep 30 00:46:55 2000
-@@ -1,4 +1,4 @@
--#!/usr/local/bin/perl
-+#!/usr/bin/perl5.00503
- ##---------------------------------------------------------------------------##
- ##  File:
- ##      @(#) man.cgi 1.2 97/08/12 12:58:26 @(#)
 @@ -59,8 +59,8 @@
  ##  systems.  If using Tom Christiansen's Perl man program, than
  ##  define use "".
diff --git a/textproc/sarep/Makefile b/textproc/sarep/Makefile
index 2d790210fce5..0a1fada33689 100644
--- a/textproc/sarep/Makefile
+++ b/textproc/sarep/Makefile
@@ -14,11 +14,12 @@ BROKEN=		unfetchable
 
 RUN_DEPENDS=	p5-Text-CSV_XS>=0:${PORTSDIR}/textproc/p5-Text-CSV_XS
 
-EXTRACT_CMD=	$(SED)
-EXTRACT_BEFORE_ARGS=	's=^\#!/usr/bin/perl =\#!${PERL} =' <
-EXTRACT_AFTER_ARGS=	| ${TR} -d '\r' > ${WRKSRC}/sarep
+EXTRACT_CMD=	${CP}
+EXTRACT_BEFORE_ARGS=	# empty
+EXTRACT_AFTER_ARGS=	${WRKSRC}/sarep
 
-USES=		perl5
+USES=		perl5 dos2unix shebangfix
+SHEBANG_FILES=	sarep
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 PLIST_FILES=	bin/sarep
diff --git a/www/adzap/Makefile b/www/adzap/Makefile
index 8557cb57b9b6..e6f86e4f4685 100644
--- a/www/adzap/Makefile
+++ b/www/adzap/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	adzap
 PORTVERSION=	20110915
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www perl5
 MASTER_SITES=	http://adzapper.sourceforge.net/
 
@@ -12,7 +12,8 @@ COMMENT=	Filter out animated ad banners from web pages
 
 LICENSE=	BSD3CLAUSE
 
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	scripts/squid_redirect-nodata scripts/wrapzap scripts/zapchain
 NO_BUILD=	yes
 USE_PERL5=	run
 
@@ -22,11 +23,8 @@ PORTDOCS=	index.html update-instructions.txt TODO my-bsd-license.html
 PORTEXAMPLES=	*
 SUB_FILES=	adzap.conf pkg-message
 
-do-configure:
-.for FILE in squid_redirect-nodata wrapzap zapchain
-	@${REINPLACE_CMD} -e "s:/usr/bin/perl:${PERL5}:g" \
-			-e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/scripts/${FILE}
-.endfor
+post-patch:
+	@${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:g" ${WRKSRC}/scripts/wrapzap
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/scripts/squid_redirect-nodata ${STAGEDIR}${PREFIX}/libexec/squid_redirect
diff --git a/www/jspacker/Makefile b/www/jspacker/Makefile
index 9d0a6bbfd483..276b510acae5 100644
--- a/www/jspacker/Makefile
+++ b/www/jspacker/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	jspacker
 DISTVERSION=	1.00b
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	www
 MASTER_SITES=	http://nivi.interfree.it/distfiles/${PORTNAME}/ \
 		http://deanedwards.googlecode.com/svn/trunk/download/
@@ -25,7 +25,7 @@ perl_OLD_CMD=	perl
 
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	JSPACKER=${JSPACKER} \
-		PERL5=${PERL5}
+		PERL5=${PERL}
 
 OPTIONS_DEFINE=	EXAMPLES
 
diff --git a/www/p5-Net-eBay/Makefile b/www/p5-Net-eBay/Makefile
index ac703b2e7070..810fcbf8c8ad 100644
--- a/www/p5-Net-eBay/Makefile
+++ b/www/p5-Net-eBay/Makefile
@@ -31,14 +31,14 @@ OPTIONS_DEFINE=	EXAMPLES
 
 NO_ARCH=	yes
 USE_PERL5=	configure
-USES=		perl5
+USES=		perl5 shebangfix
+SHEBANG_FILES=	examples/*.pl
 
 PORTEXAMPLES=	*
 
 post-patch:
 	@${MKDIR} ${WRKSRC}/examples/
 	@${MV} ${WRKSRC}/*.pl ${WRKSRC}/examples/
-	@${REINPLACE_CMD} -e '1 s|/usr/bin/perl|${PERL}|' ${WRKSRC}/examples/*.pl
 
 post-install:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/
diff --git a/www/p5-libapreq2/Makefile b/www/p5-libapreq2/Makefile
index 440a7ddfb232..d2457190374d 100644
--- a/www/p5-libapreq2/Makefile
+++ b/www/p5-libapreq2/Makefile
@@ -2,7 +2,7 @@
 
 PORTNAME=	libapreq2
 PORTVERSION=	2.13
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	www perl5 devel
 MASTER_SITES=	APACHE_HTTPD/libapreq
 DISTFILE=	libapreq2-${PORTVERSION}
@@ -20,7 +20,7 @@ USE_LDCONFIG=	yes
 USE_AUTOTOOLS=	autoconf
 CONFIGURE_ARGS+=	--with-apache2-apxs=${APXS} \
 			--with-expat=${LOCALBASE} \
-			--enable-perl-glue --with-perl=${PERL5}
+			--enable-perl-glue --with-perl=${PERL}
 
 MAKE_ENV+=     MAKE=${GMAKE} ## MakeMaker blows it without this
 
diff --git a/x11-fm/gprename/Makefile b/x11-fm/gprename/Makefile
index 5ee707c08e9b..4bd1930aa08b 100644
--- a/x11-fm/gprename/Makefile
+++ b/x11-fm/gprename/Makefile
@@ -21,7 +21,8 @@ RUN_DEPENDS=	p5-Gtk2>=0:${PORTSDIR}/x11-toolkits/p5-Gtk2 \
 WRKSRC=		${WRKDIR}/${PORTNAME}/trunk
 
 USE_PERL5=	run
-USES=		gettext perl5 tar:bzip2
+USES=		gettext perl5 tar:bzip2 shebangfix
+SHEBANG_FILES=	bin/gprename
 NO_BUILD=	yes
 
 post-extract:
@@ -29,8 +30,6 @@ post-extract:
 
 post-patch:
 	@${REINPLACE_CMD} -e \
-		'/^#!/s|/.*|${PERL}|' ${WRKSRC}/bin/gprename
-	@${REINPLACE_CMD} -e \
 		's|/usr/local|${PREFIX}| ; \
 		 s|(DESTDIR)|(DESTDIR)${PREFIX}| ; \
 		 s|$$(CURDIR)|$$(.CURDIR)| ; \
diff --git a/x11/xkbset/Makefile b/x11/xkbset/Makefile
index 03ae54f69f4f..078821a41ee2 100644
--- a/x11/xkbset/Makefile
+++ b/x11/xkbset/Makefile
@@ -35,7 +35,4 @@ PLIST_SUB=	GUI="@comment "
 MAKE_ARGS+=	INSTALL_SCRIPT=:
 .endif
 
-post-build:
-	@${REINPLACE_CMD} "s%#!/usr/bin/perl%#!${PERL}%" ${WRKSRC}/xkbset-gui
-
 .include <bsd.port.mk>