- switch simple inline replacement from perl to sed

  and remove where is no need in this anymore.
- trim Makefile header

Approved by:	bapt@ (portmrg@)

12 files changed, 29 insertions, 68 deletions

diff --git a/devel/p5-Search-Binary/Makefile b/devel/p5-Search-Binary/Makefile
index f2709e7..24a0f46 100644
--- a/devel/p5-Search-Binary/Makefile
+++ b/devel/p5-Search-Binary/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	devel/p5-Search-Binary
-# Date created:				03 January 2001
-# Whom:					Anton Berezin <tobez@tobez.org>
-#
+# Created by: Anton Berezin <tobez@tobez.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Search-Binary
 PORTVERSION=	0.95
@@ -19,6 +15,7 @@ PERL_CONFIGURE=	yes
 MAN3=		Search::Binary.3
 
 pre-patch:
-	@${PERL} -pi -e 's|Seach|Search|' ${WRKSRC}/Binary.pm
+	@${REINPLACE_CMD} -i '' -e 's|Seach|Search|' \
+		${WRKSRC}/Binary.pm
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Storable/Makefile b/devel/p5-Storable/Makefile
index 335b01d..b18e0ef 100644
--- a/devel/p5-Storable/Makefile
+++ b/devel/p5-Storable/Makefile
@@ -15,6 +15,6 @@ PERL_CONFIGURE=	yes
 MAN3=		Storable.3
 
 post-patch:
-	@${PERL} -pi -e '$$_="" if /MAN3PODS|INSTALLDIRS/' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -i '' -e 's|INSTALLDIRS|' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-SubCalls/Makefile b/devel/p5-Test-SubCalls/Makefile
index 307aae7..ee8e6a2 100644
--- a/devel/p5-Test-SubCalls/Makefile
+++ b/devel/p5-Test-SubCalls/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	devel/p5-Test-SubCalls
-# Date created:				08 October 2005
-# Whom:					Lars Thegler <lth@FreeBSD.org>
-#
+# Created by: Lars Thegler <lth@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Test-SubCalls
 PORTVERSION=	1.09
@@ -23,7 +19,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=	Test::SubCalls.3
 
-post-patch:
-	@${PERL} -pi -e '$$_="" if m/Test::More/' ${WRKSRC}/Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/devel/p5-Test-YAML-Valid/Makefile b/devel/p5-Test-YAML-Valid/Makefile
index 693e140..38e26c3 100644
--- a/devel/p5-Test-YAML-Valid/Makefile
+++ b/devel/p5-Test-YAML-Valid/Makefile
@@ -22,7 +22,8 @@ OPTIONS_DEFINE=	YAMLSYCK
 YAMLSYCK_DESC=	Use YAML::Syck for testing
 
 post-patch:
-	${PERL} -pi -e '$$_="" if /auto_install/' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -i '' -e '/auto_install.*/d' \
+		${WRKSRC}/Makefile.PL
 
 .include <bsd.port.options.mk>
 
diff --git a/devel/p5-prefork/Makefile b/devel/p5-prefork/Makefile
index 890f727..cc7987c 100644
--- a/devel/p5-prefork/Makefile
+++ b/devel/p5-prefork/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	prefork
-# Date created:	   14 November 2004
-# Whom:		   Sergey Skvortsov <skv@protey.ru>
-#
+# Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	prefork
 PORTVERSION=	1.04
@@ -22,7 +18,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		prefork.3
 
-post-patch:
-	@${PERL} -pi -e 's/^auto_install.*$$//' ${WRKSRC}/Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/dns/sleuth/Makefile b/dns/sleuth/Makefile
index e40a43b..81b582c 100644
--- a/dns/sleuth/Makefile
+++ b/dns/sleuth/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sleuth
-# Date created:			Jun 15, 2001
-# Whom:				Mark Pulford <mark@kyne.com.au>
-#
+# Created by: Mark Pulford <mark@kyne.com.au>
 # $FreeBSD$
-#
 
 PORTNAME=	sleuth
 PORTVERSION=	1.4.4
@@ -16,12 +12,14 @@ COMMENT=	A tool for checking DNS zones
 RUN_DEPENDS=	p5-Net-DNS>=0:${PORTSDIR}/dns/p5-Net-DNS
 
 USE_PERL5=	yes
+USES=		shebangfix
+SHEBANG_FILES=	sleuth
 
 PLIST_FILES=	bin/sleuth etc/sleuth.conf.sample
 
 post-patch:
-	${PERL} -pi -e "s|/etc/sleuth.conf|${PREFIX}/etc/sleuth.conf|g; \
-		s|#!/usr/bin/perl|#!${PERL}|g;" ${WRKSRC}/sleuth
+	@${REINPLACE_CMD} -i '' -e 's|/etc/sleuth.conf|${PREFIX}/etc/sleuth.conf|' \
+		${WRKSRC}/sleuth
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sleuth ${PREFIX}/bin
diff --git a/finance/ledgersmb/Makefile b/finance/ledgersmb/Makefile
index 5787ee9..acbed1a 100644
--- a/finance/ledgersmb/Makefile
+++ b/finance/ledgersmb/Makefile
@@ -17,16 +17,9 @@ NO_BUILD=	yes
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 PKGMESSAGE=	${WRKDIR}/pkg-message
-
-post-patch:
-	@${PERL} -pi -e 's|/usr/bin/perl|${PERL}|' \
-		`${FIND} ${WRKSRC} -name \*.pl`
-	@${PERL} -pe 's|%%PREFIX%%|${PREFIX}|g' \
-		${FILESDIR}/${PORTNAME}-httpd.conf.in \
-		> ${WRKDIR}/${PORTNAME}-httpd.conf
-	@${PERL} -pe 's|%%PREFIX%%|${PREFIX}|g' \
-		${PKGDIR}/pkg-message \
-		> ${PKGMESSAGE}
+USES=		shebangfix
+SHEBANG_FILES=	*.pl locale/*/*.pl bin/*/*.pl utils/*/*.pl
+SUB_FILES=	${PORTNAME}-httpd.conf.in pkg-message.in
 
 do-install:
 	@cd ${WRKDIR} ; \
diff --git a/finance/ledgersmb/pkg-message b/finance/ledgersmb/files/pkg-message.in
index 485c368..485c368 100644
--- a/finance/ledgersmb/pkg-message
+++ b/finance/ledgersmb/files/pkg-message.in
diff --git a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
index 97946d7..619d7cb 100644
--- a/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
+++ b/finance/p5-Business-OnlinePayment-PaymenTech/Makefile
@@ -20,7 +20,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		Business::OnlinePayment::PaymenTech.3
 
-post-extract:
-	@${PERL} -i.bak -ne 'print unless /^(test_requires|auto_install|recommends|configure_requires)/' ${WRKSRC}/Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/finance/sql-ledger/Makefile b/finance/sql-ledger/Makefile
index 71ded90..6317027 100644
--- a/finance/sql-ledger/Makefile
+++ b/finance/sql-ledger/Makefile
@@ -18,10 +18,8 @@ NO_BUILD=	yes
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 SUB_FILES=	pkg-message sql-ledger-httpd.conf
-
-post-patch:
-	@${PERL} -pi -e 's|/usr/bin/perl|${PERL}|' \
-		`${FIND} ${WRKSRC} -name \*.pl`
+USES=		shebangfix
+SHEBANG_FILES=	*.pl locale/*/*.pl bin/*/*.pl
 
 do-install:
 	@cd ${WRKDIR} ; \
diff --git a/ftp/ftplocate/Makefile b/ftp/ftplocate/Makefile
index 8c719ee..e2f1c42 100644
--- a/ftp/ftplocate/Makefile
+++ b/ftp/ftplocate/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Ftplocate
-# Date created:				7 December 1999
-# Whom:					tung@turtle.ee.ncku.edu.tw
-#
+# Created by: tung@turtle.ee.ncku.edu.tw
 # $FreeBSD$
-#
 
 PORTNAME=	ftplocate
 PORTVERSION=	2.02
@@ -19,19 +15,14 @@ RUN_DEPENDS=	glimpse:${PORTSDIR}/textproc/glimpse \
 USE_PERL5=	yes
 NO_BUILD=	yes
 
-PL_FILES=	install.pl bin/dcollect.pl bin/dindex.pl bin/dsearch.pl \
-		bin/flcollect.pl bin/flfilter.pl bin/flhistory.pl \
-		bin/flindex.pl bin/flmap.pl bin/flsearch.pl \
-		bin/flserv.pl bin/flsummary.pl bin/fltop.pl \
-		bin/fltrain.pl bin/flcatsite.pl template/ftplocate
+USES=		shebangfix
+SHEBANG_FILES=	bin/*.pl template/ftplocate
 
 post-extract:
-.for f in ${PL_FILES}
-	@${PERL} -pi -e 's,/usr/bin/perl,${PERL},' ${WRKSRC}/${f}
-.endfor
-	@${PERL} -pi -e 's,(/usr/local/www|/usr/local/apache/share),${PREFIX}/www,g' ${WRKSRC}/install.pl
-	@${PERL} -pi -e 's,/usr/local/bin/ftplocate,${PREFIX}/bin/ftplocate,g' ${WRKSRC}/install.pl
-	@${PERL} -pi -e 's,htdocs,data,g' ${WRKSRC}/install.pl
+	@${REINPLACE_CMD} -i '' -e 's|/usr/local/www|${PREFIX}/www|' \
+		-e 's|/usr/local/apache/share|${PREFIX}/www|' ${WRKSRC}/install.pl
+	@${REINPLACE_CMD} -i '' -e 's|/usr/local/bin/ftplocate|${PREFIX}/bin/ftplocate|' \
+		-e 's|htdocs|data|' -e 's|/usr/bin/perl|${PERL}|' ${WRKSRC}/install.pl
 
 do-install:
 	@${MKDIR} ${PREFIX}/www/data ${PREFIX}/www/cgi-bin
diff --git a/ftp/ftpmirror/Makefile b/ftp/ftpmirror/Makefile
index 92d6f52..e0f2da9 100644
--- a/ftp/ftpmirror/Makefile
+++ b/ftp/ftpmirror/Makefile
@@ -18,15 +18,15 @@ USE_PERL5=	yes
 GNU_CONFIGURE=	yes
 MAKE_JOBS_SAFE=	yes
 
+USES=		shebangfix
+SHEBANG_FILES=	ftpmirror rotate
+
 CONFIGURE_ENV+=	PERL="${PERL}" INSTALL_PROGRAM="${INSTALL_SCRIPT}"
 
 PORTDOCS=	README.jis RELEASE.jis
 
 post-configure:
-	@${PERL} -i.bak -pe 's,%%PREFIX%%,${PREFIX},g' ${WRKSRC}/Fan/Fan.pm
-.for f in ftpmirror rotate
-	@${PERL} -i.bak -pe 's,^#!.*$$,#!${PERL}, if $$. == 1' ${WRKSRC}/${f}
-.endfor
+	@${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/Fan/Fan.pm
 
 .include <bsd.port.pre.mk>