10 files changed, 27 insertions, 66 deletions

diff --git a/www/calamaris/Makefile b/www/calamaris/Makefile
index 44b2caba774f..df888f6dac42 100644
--- a/www/calamaris/Makefile
+++ b/www/calamaris/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	calmaris
-# Date created:				25 December 1998
-# Whom:					Dima Sivachenko <dima@Chg.RU>
-#
+# Created by: Dima Sivachenko <dima@Chg.RU>
 # $FreeBSD$
-#
 
 PORTNAME=	calamaris
 PORTVERSION=	2.59
@@ -16,10 +12,10 @@ COMMENT=	A perl script to produce statistics out of Squid log files
 
 USE_PERL5=	yes
 NO_BUILD=	yes
-MAN1=		calamaris.1
+USES=		shebangfix
+SHEBANG_FILES=	calamaris
 
-post-patch:
-	@ ${PERL} -pi -e 's#/usr/bin/perl#${PERL}#' ${WRKSRC}/calamaris
+MAN1=		calamaris.1
 
 do-install:
 	@ ${INSTALL_MAN} ${WRKSRC}/calamaris.1 ${PREFIX}/man/man1/calamaris.1
diff --git a/www/p5-AMF-Perl/Makefile b/www/p5-AMF-Perl/Makefile
index e60a900b0b81..46562412d94b 100644
--- a/www/p5-AMF-Perl/Makefile
+++ b/www/p5-AMF-Perl/Makefile
@@ -29,7 +29,7 @@ MAN3=		AMF::Perl.3 AMF::Perl::App::Executive.3 \
 		AMF::Perl::Util::RemotingService.3
 
 post-patch:
-	@${PERL} -pi -e 's/=(?==head)//g' ${WRKSRC}/lib/AMF/Perl.pm
+	@${PERL} -pi.bak -e 's/=(?==head)//g' ${WRKSRC}/lib/AMF/Perl.pm
 
 post-configure:
 # dirty hack to deceive irritable pod2man
diff --git a/www/p5-Catalyst-Action-RenderView/Makefile b/www/p5-Catalyst-Action-RenderView/Makefile
index f0879cd5991a..ad8f2fdf2a8c 100644
--- a/www/p5-Catalyst-Action-RenderView/Makefile
+++ b/www/p5-Catalyst-Action-RenderView/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	www/p5-Catalyst-Action-RenderView
-# Date created:				July 11, 2006
-# Whom:					Lars Balker Rasmussen <lbr@FreeBSD.org>
-#
+# Created by: Lars Balker Rasmussen <lbr@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Catalyst-Action-RenderView
 PORTVERSION=	0.16
@@ -28,6 +24,6 @@ PERL_CONFIGURE=	yes
 MAN3=	Catalyst::Action::RenderView.3
 
 post-extract:
-	@${PERL} -i.bak -ne 'print unless /^(test_requires|auto_install|recommends|configure_requires)/' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -i '' '/test_requires/d' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
index 28072d20f8af..f20369f29527 100644
--- a/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
+++ b/www/p5-Catalyst-Component-ACCEPT_CONTEXT/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	www/p5-Catalyst-Component-ACCEPT_CONTEXT
-# Date created:				26 April 2007
-# Whom:					Lars Thegler <lth@FreeBSD.org>
-#
+# Created by: Lars Thegler <lth@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Catalyst-Component-ACCEPT_CONTEXT
 PORTVERSION=	0.07
@@ -24,6 +20,7 @@ PERL_CONFIGURE=	yes
 MAN3=	Catalyst::Component::ACCEPT_CONTEXT.3
 
 post-patch:
-	${PERL} -pi -e '$$_="" if /auto_install|Devel::Cycle/' ${WRKSRC}/Makefile.PL
+	${REINPLACE_CMD} -i '' -e '/auto_install/d' \
+		-e '/Devel::Cycle/d' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/www/p5-HTML-Template-JIT/Makefile b/www/p5-HTML-Template-JIT/Makefile
index 6791c8c93536..b8faefd034a6 100644
--- a/www/p5-HTML-Template-JIT/Makefile
+++ b/www/p5-HTML-Template-JIT/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-HTML-Template-JIT
-# Date Created:				2004/04/30
-# Whom:					alex@kapranoff.ru
-#
+# Created by: alex@kapranoff.ru
 # $FreeBSD$
-#
 
 PORTNAME=	HTML-Template-JIT
 PORTVERSION=	0.05
@@ -28,8 +24,7 @@ MAN3=		HTML::Template::JIT.3 HTML::Template::JIT::Compiler.3 \
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${PERL} -i -pe 's/indent -kr/indent/' \
+	@${REINPLACE_CMD} -i '' -e 's/indent -kr/indent/' \
 			${WRKSRC}/JIT/Compiler.pm
-	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 .include <bsd.port.post.mk>
diff --git a/www/p5-URI-Fetch/Makefile b/www/p5-URI-Fetch/Makefile
index f2e97b67dff4..c277f927ae73 100644
--- a/www/p5-URI-Fetch/Makefile
+++ b/www/p5-URI-Fetch/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	www/p5-URI-Fetch
-# Date created:				30 July 2005
-# Whom:					Lars Thegler <lth@FreeBSD.org>
-#
+# Created by: Lars Thegler <lth@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	URI-Fetch
 PORTVERSION=	0.090
@@ -37,7 +33,4 @@ MAN3=	URI::Fetch.3 \
 RUN_DEPENDS+=	p5-Cache>=0:${PORTSDIR}/devel/p5-Cache
 .endif
 
-post-patch:
-	${PERL} -pi -e '$$_ = "" if m|auto_install|' ${WRKSRC}/Makefile.PL
-
 .include <bsd.port.post.mk>
diff --git a/www/p5-WebService-NoPaste/Makefile b/www/p5-WebService-NoPaste/Makefile
index 7231d6eac8d0..29d684aad050 100644
--- a/www/p5-WebService-NoPaste/Makefile
+++ b/www/p5-WebService-NoPaste/Makefile
@@ -16,6 +16,8 @@ BUILD_DEPENDS=	p5-IO-All>=0:${PORTSDIR}/devel/p5-IO-All \
 RUN_DEPENDS:=	${BUILD_DEPENDS}
 
 PERL_CONFIGURE=	yes
+USES=		shebangfix
+SHEBANG_FILES=	nopaste
 
 MAN3=		WebService::NoPaste.3
 
@@ -31,7 +33,6 @@ EXTRA_PATCHES+=	${FILESDIR}/extrapatch-lib-WebService-NoPaste.pm
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s|/usr/bin/perl|${PERL}|;" ${WRKSRC}/nopaste
 .if ! ${PORT_OPTIONS:MX11}
 	@${RM} ${WRKSRC}/lib/WebService/NoPaste.pm.orig
 .endif
diff --git a/www/syndigator/Makefile b/www/syndigator/Makefile
index 3c9d337ea8c5..f1e745335bd6 100644
--- a/www/syndigator/Makefile
+++ b/www/syndigator/Makefile
@@ -1,11 +1,6 @@
-# ex:ts=8
-# Ports collection Makefile for: 	syndigator
-# Date created:			Apr 20, 2004
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#   $MCom: ports/www/syndigator/Makefile,v 1.4 2007/09/09 22:45:27 mezz Exp $
-#
+# $MCom: ports/www/syndigator/Makefile,v 1.4 2007/09/09 22:45:27 mezz Exp $
 
 PORTNAME=	syndigator
 PORTVERSION=	0.15.1
@@ -32,9 +27,9 @@ NO_BUILD=	yes
 GNOMEDIR=	${PREFIX}/share
 
 post-patch:
-	@${PERL} -pi -e 's|./lib|${PREFIX}/${SITE_PERL_REL}/${PORTNAME}|g' \
+	@${REINPLACE_CMD} -i '' -e 's|./lib|${PREFIX}/${SITE_PERL_REL}/${PORTNAME}|' \
 		${WRKSRC}/syndigator
-	@${PERL} -pi -e 's|./images/|${GNOMEDIR}/pixmaps/${PORTNAME}/|g' \
+	@${REINPLACE_CMD} -i '' -e 's|./images/|${GNOMEDIR}/pixmaps/${PORTNAME}/|' \
 		${WRKSRC}/lib/RSSReader/Gtk2UI/IconFactory.pm
 
 do-install:
diff --git a/www/webstats/Makefile b/www/webstats/Makefile
index 2c60a819dfe9..8a3752f8148a 100644
--- a/www/webstats/Makefile
+++ b/www/webstats/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   webstats
-# Date created:        12 February 2003
-# Whom:                Kevin Golding <kevin@caomhin.demon.co.uk>
-#
+# Created by: Kevin Golding <kevin@caomhin.demon.co.uk>
 # $FreeBSD$
-#
 
 PORTNAME=	webstats
 PORTVERSION=	0.3
@@ -23,15 +19,11 @@ NO_BUILD=	yes
 USE_PERL5=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
-	   ${WRKSRC}/configfiles/serverwide/webstats.ini
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
-	   ${WRKSRC}/configfiles/vhosts/analog.cfg
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
-	   ${WRKSRC}/configfiles/vhosts/rmagic.ini
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
-	   ${WRKSRC}/scripts/perl/webstats
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' \
+	@${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' \
+	   ${WRKSRC}/configfiles/serverwide/webstats.ini \
+	   ${WRKSRC}/configfiles/vhosts/analog.cfg \
+	   ${WRKSRC}/configfiles/vhosts/rmagic.ini \
+	   ${WRKSRC}/scripts/perl/webstats \
 	   ${WRKSRC}/scripts/php/webstats.php
 
 do-install:
diff --git a/x11/keylaunch/Makefile b/x11/keylaunch/Makefile
index 4d4008098153..df2bc7d3d2b6 100644
--- a/x11/keylaunch/Makefile
+++ b/x11/keylaunch/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    keylaunch
-# Date created:         Sat Nov 17 10:10:07 CDT 2001
-# Whom:                 mwm@mired.org
-#
+# Created by: mwm@mired.org
 # $FreeBSD$
-#
 
 PORTNAME=	keylaunch
 PORTVERSION=	1.3.0
@@ -22,7 +18,7 @@ USE_XORG=	x11
 PKGMESSAGE=	${WRKSRC}/pkg-message
 
 post-patch:
-	@${PERL} -pi -e 's,%%LOCALBASE%%,${LOCALBASE},g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -i '' -e 's|%%LOCALBASE%%|${LOCALBASE}|' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/keylaunch ${PREFIX}/bin