- switch simple inline replacement from perl to sed

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

Approved by:	bapt@ (portmrg@)

19 files changed, 54 insertions, 104 deletions

diff --git a/graphics/pvmpov/Makefile b/graphics/pvmpov/Makefile
index d974cab..e1a4289 100644
--- a/graphics/pvmpov/Makefile
+++ b/graphics/pvmpov/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    pvmpov
-# Date created:         		22 March 2000
-# Whom:                 		Maxim Sobolev <sobomax@FreeBSD.org>
-#
+# Created by: Maxim Sobolev <sobomax@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	pvmpov
 PORTVERSION=	3.1g.2
@@ -41,7 +37,7 @@ pre-configure:
 			 ${TAR} -c -f - povray31 ) \
 			| (cd ${WRKSRC} && ${TAR} --unlink -x -f -)
 		@ cd ${WRKSRC} && ${PATCH} -p0 -s < pvmpov.patch
-		@ ${PERL} -pi -e "s|%LOCALBASE%|${LOCALBASE}|" \
+		@${REINPLACE_CMD} -i '' -e 's|%LOCALBASE%|${LOCALBASE}|' \
 			${BUILDBASE}/Makefile.aimk
 
 do-build:
diff --git a/graphics/springgraph/Makefile b/graphics/springgraph/Makefile
index 14703df..ae56dae 100644
--- a/graphics/springgraph/Makefile
+++ b/graphics/springgraph/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	springgraph
-# Date created:			Aug 8, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	springgraph
 PORTVERSION=	0.88
@@ -28,9 +23,8 @@ EXTRACT_BEFORE_ARGS=
 EXTRACT_AFTER_ARGS=	${WRKDIR}
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-
-post-patch:
-	@${PERL} -pi -e "s|/usr/bin/perl|${PERL}|g" ${WRKSRC}/springgraph.pl
+USES=		shebangfix
+SHEBANG_FILES=	springgraph.pl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/springgraph.pl ${PREFIX}/bin/springgraph
diff --git a/graphics/xmandel/Makefile b/graphics/xmandel/Makefile
index f98244e..cec3816 100644
--- a/graphics/xmandel/Makefile
+++ b/graphics/xmandel/Makefile
@@ -25,6 +25,6 @@ MAN1=		xmandel.1
 PLIST_FILES=	bin/xmandel
 
 pre-patch:
-	@${PERL} -pi.orig -e 's|malloc.h|stdlib.h|' ${WRKSRC}/mandel.c
+	@${REINPLACE_CMD} -i '' -e 's|malloc.h|stdlib.h|' ${WRKSRC}/mandel.c
 
 .include <bsd.port.mk>
diff --git a/irc/xchat1/Makefile b/irc/xchat1/Makefile
index 8828664..3abd17dc 100644
--- a/irc/xchat1/Makefile
+++ b/irc/xchat1/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	xchat
-# Date created:			17 Nov 1998
-# Whom:				Jim Mock <jim@FreeBSD.org>
-#
+# Created by: Jim Mock <jim@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=		xchat
 PORTVERSION=		1.8.11
@@ -66,8 +62,7 @@ CONFIGURE_ARGS+=	--disable-gnome --disable-zvt
 .endif
 
 post-patch:
-	@${PERL} -pi \
-		-e 's|-lpthread|${PTHREAD_LIBS}|g;' \
+	@${REINPLACE_CMD} -i '' -e 's|-lpthread|${PTHREAD_LIBS}|g' \
 		${WRKSRC}/configure
 
 post-install:
diff --git a/japanese/tkhonyaku/Makefile b/japanese/tkhonyaku/Makefile
index 462b63b..db06bb9 100644
--- a/japanese/tkhonyaku/Makefile
+++ b/japanese/tkhonyaku/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tkhonyaku
-# Date created:		10 July 2000
-# Whom:			Daichi GOTO
-#
+# Created by: Daichi GOTO
 # $FreeBSD$
-#
 
 PORTNAME=	tkhonyaku
 PORTVERSION=	1.8
@@ -22,7 +18,7 @@ NO_BUILD=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-patch:
-	${PERL} -i -pe 's,/usr/local/tkhonyaku,${PREFIX}/tkhonyaku,g' \
+	@${REINPLACE_CMD} -i '' -e 's|/usr/local/tkhonyaku|${PREFIX}/tkhonyaku|g' \
 		${WRKSRC}/tkhonyaku ${WRKSRC}/tkhonyaku-readme
 
 do-install:
diff --git a/korean/eterm/Makefile b/korean/eterm/Makefile
index 9d1ed96..a462b84 100644
--- a/korean/eterm/Makefile
+++ b/korean/eterm/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	ko-eterm-0.8.9
-# Date created:        8 Jun 1999
-# Whom:                Oh Junseon <hollywar@mail.holywar.net>
-#
+# Created by: Oh Junseon <hollywar@mail.holywar.net>
 # $FreeBSD$
-#
 
 PORTNAME=	eterm
 PORTVERSION=	0.8.9
@@ -36,7 +32,7 @@ BROKEN=		fails to build with new utmpx
 .endif
 
 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -i '' -e 's|<malloc.h>|<stdlib.h>|' \
 		${WRKSRC}/libmej/debug.c ${WRKSRC}/libmej/strings.c
 
 post-install:
diff --git a/mail/mailagent/Makefile b/mail/mailagent/Makefile
index 5a16299..f8b8661 100644
--- a/mail/mailagent/Makefile
+++ b/mail/mailagent/Makefile
@@ -47,8 +47,7 @@ pre-extract:
 
 post-patch:
 	@(cd ${WRKSRC}; \
-	  ${PERL} -pi.bak \
-	    -e 's|exec perl -S|exec ${PERL} -S|' \
+	  ${REINPLACE_CMD} -i '' -e 's|exec perl -S|exec ${PERL} -S|' \
 	    agent/edusers.SH agent/magent.sh agent/maildist.SH \
 	    agent/mailhelp.SH agent/maillist.SH agent/mailpatch.SH \
 	    agent/package.SH agent/test/TEST agent/test/atail \
diff --git a/mail/mb2md/Makefile b/mail/mb2md/Makefile
index eb0b309..718b7a9 100644
--- a/mail/mb2md/Makefile
+++ b/mail/mb2md/Makefile
@@ -21,12 +21,11 @@ EXTRACT_AFTER_ARGS=	> ${WRKDIR}/${PORTNAME}
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 USE_PERL5=	yes
+USES=		shebangfix
+SHEBANG_FILES=	mb2md
 
 PLIST_FILES=	bin/mb2md
 
-post-patch:
-	@${PERL} -pi -e 's|/usr/bin/perl|${PERL}|g' ${WRKSRC}/${PORTNAME}
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
 
diff --git a/mail/spamstats/Makefile b/mail/spamstats/Makefile
index 8a05461..fa4bfab 100644
--- a/mail/spamstats/Makefile
+++ b/mail/spamstats/Makefile
@@ -19,9 +19,12 @@ USE_PERL5=	yes
 NO_BUILD=	yes
 PORTDOCS=	QUICK README copyright
 PLIST_FILES=	bin/spamstats.pl
+USES=		shebangfix
+SHEBANG_FILES=	${PORTNAME}${PORTVERSION}.pl
 
 post-patch:
-	@${PERL} -pi.bak -e 's,/mail.log,/maillog,g' ${WRKSRC}/${PORTNAME}${PORTVERSION}.pl
+	@${REINPLACE_CMD} -i '' -e 's|mail.log|maillog|g' \
+		${WRKSRC}/${PORTNAME}${PORTVERSION}.pl
 
 .include <bsd.port.options.mk>
 
diff --git a/mail/tlb/Makefile b/mail/tlb/Makefile
index db5fd44..29b34fe 100644
--- a/mail/tlb/Makefile
+++ b/mail/tlb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tlb
-# Date created:			01 July 2001
-# Whom:				Anders Nordby <anders@fix.no>
-#
+# Created by: Anders Nordby <anders@fix.no>
 # $FreeBSD$
-#
 
 PORTNAME=	tlb
 PORTVERSION= 	0.11a
@@ -27,10 +23,13 @@ DOCS=	FAQ INSTALL README README.loglevels README.mungelist TIPS TODO \
 	complete.tlb mj.tlb simple.tlb
 FIXPREFIX=	tlb mungelist complete.tlb mj.tlb simple.tlb
 
+USES=		shebangfix
+SHEBANG_FILES=	${FIXPREFIX}
+perl_OLD_CMD=	/usr/local/bin/perl5
+
 pre-patch:
 .for f in ${FIXPREFIX}
-	${PERL} -pi -e "s@^#!/usr/local/bin/perl5@#!${PERL}@g;\
-		s@/usr/lib/sendmail@/usr/sbin/sendmail@g" ${WRKSRC}/${f}
+	@${PERL} -pi -e "s@/usr/lib/sendmail@/usr/sbin/sendmail@g" ${WRKSRC}/${f}
 .endfor
 
 do-install:
diff --git a/math/algotutor/Makefile b/math/algotutor/Makefile
index e304a08..0466d1d 100644
--- a/math/algotutor/Makefile
+++ b/math/algotutor/Makefile
@@ -23,11 +23,13 @@ LIBFILES=	BST.pm Board.pm Collection.pm Configurable.pm DCEdge.pm \
 		RecCanvas.pm RecDialog.pm TreeNode.pm Vector.pm Vector2.pm \
 		Vector3.pm Vertex.pm basic.pl utilalgo
 
+USES=		shebangfix
+SHEBANG_FILES=	algotutor
+
 post-patch:
-	${REINPLACE_CMD}  -e 's,#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/algotutor
-	${PERL} -pi -e "s'!!PREFIX!!'${PREFIX}'g" ${WRKSRC}/algotutor
-	${REINPLACE_CMD} -e 's,!!SITE_PERL!!,${SITE_PERL},' \
-		${WRKSRC}/algotutor
+	@${REINPLACE_CMD} -e 's,!!SITE_PERL!!,${SITE_PERL},' \
+		-e 's|!!PREFIX!!|${PREFIX}|g' \
+			${WRKSRC}/algotutor
 
 do-install:
 	${MKDIR} ${SITE_PERL}/algotutor
diff --git a/math/naturalmath/Makefile b/math/naturalmath/Makefile
index 7215f21..58d0c5e 100644
--- a/math/naturalmath/Makefile
+++ b/math/naturalmath/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    naturalmath
-# Date created:                1 November 2001
-# Whom:                        Stephen Montgomery-Smith
-#
+# Created by: Stephen Montgomery-Smith
 # $FreeBSD$
-#
 
 PORTNAME=	naturalmath
 PORTVERSION=	0.5
@@ -16,9 +12,8 @@ COMMENT=	Script to turn intuitively written math into latex
 
 USE_PERL5=	yes
 USE_TEX=	latex:build dvipsk:build
-
-post-patch:
-	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/naturalmath
+USES=		shebangfix
+SHEBANG_FILES=	naturalmath
 
 do-build:
 	(cd ${WRKSRC}; ./naturalmath tutor.nat; \
diff --git a/math/p5-Set-Window/Makefile b/math/p5-Set-Window/Makefile
index da2b6cd..77edd6b 100644
--- a/math/p5-Set-Window/Makefile
+++ b/math/p5-Set-Window/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	math/p5-Set-Window
-# Date created:				03 January 2001
-# Whom:					Anton Berezin <tobez@tobez.org>
-#
+# Created by: Anton Berezin <tobez@tobez.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Set-Window
 PORTVERSION=	1.01
@@ -19,6 +15,6 @@ PERL_CONFIGURE=	yes
 MAN3=		Set::Window.3
 
 post-patch:
-	${PERL} -pi -e '$$_="" if /use 5/;' ${WRKSRC}/Window.pm
+	@${REINPLACE_CMD} -i '' '/use 5/d' ${WRKSRC}/Window.pm
 
 .include <bsd.port.mk>
diff --git a/misc/chord2html/Makefile b/misc/chord2html/Makefile
index f5fa7eb..cbc7cea 100644
--- a/misc/chord2html/Makefile
+++ b/misc/chord2html/Makefile
@@ -1,11 +1,5 @@
-# Ports collection makefile for:	chord2html
-# Date created:				Sep 11, 2002
-# Whom:					ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
-# $Tecnik: ports/misc/chord2html/Makefile,v 1.3 2005/12/14 11:41:25 itetcu Exp $
-#
 
 PORTNAME=	chord2html
 PORTVERSION=	1.3
@@ -20,6 +14,8 @@ RUN_DEPENDS=	p5-GD>=0:${PORTSDIR}/graphics/p5-GD
 
 USE_PERL5=	yes
 NO_BUILD=	yes
+USES=		shebangfix
+SHEBANG_FILES=	chord2html
 
 MAN1=	chord2html.1
 
@@ -27,8 +23,7 @@ PLIST_FILES=	bin/chord2html share/chord2html/chord2html.css
 PLIST_DIRS=	share/chord2html
 
 post-patch:
-	@${PERL} -pi -e "s,/usr/bin/perl,${PERL},g ; \
-			 s,%%PREFIX%%,${PREFIX},g ; \
+	@${REINPLACE_CMD} -i '' -e "s,%%PREFIX%%,${PREFIX},g ; \
 			 s,chord2html.css,${PREFIX}/share/chord2html/chord2html.css," \
 		${WRKSRC}/chord2html
 
diff --git a/misc/explosions/Makefile b/misc/explosions/Makefile
index 92f853a..bc47411 100644
--- a/misc/explosions/Makefile
+++ b/misc/explosions/Makefile
@@ -18,10 +18,10 @@ USE_PERL5_BUILD=yes
 .include <bsd.port.options.mk>
 
 post-patch:
-	@${PERL} -pi -e 's!CFLAGS=-Wall -O2!CFLAGS+=-Wall!; \
-		s!sdl-config!${SDL_CONFIG}!' \
+	@${REINPLACE_CMD} -i '' -e 's!CFLAGS=-Wall -O2!CFLAGS+=-Wall!; \
+			s!sdl-config!${SDL_CONFIG}!' \
 		${WRKSRC}/Makefile
-	@${PERL} -pi -e 's!spark%d.png!${DATADIR}/spark%d.png!' \
+	@${REINPLACE_CMD} -i '' -e 's!spark%d.png!${DATADIR}/spark%d.png!' \
 		${WRKSRC}/explosions.c
 
 do-install:
diff --git a/misc/p5-Array-IntSpan/Makefile b/misc/p5-Array-IntSpan/Makefile
index 4aabec3..7708692 100644
--- a/misc/p5-Array-IntSpan/Makefile
+++ b/misc/p5-Array-IntSpan/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Array-IntSpan
-# Date created:				30 Dec 2001
-# Whom:					Seamus Venasse <svenasse@polaris.ca>
-#
+# Created by: Seamus Venasse <svenasse@polaris.ca>
 # $FreeBSD$
-#
 
 PORTNAME=	Array-IntSpan
 PORTVERSION=	2.002
@@ -19,6 +15,6 @@ PERL_CONFIGURE=	yes
 MAN3=	Array::IntSpan.3 Array::IntSpan::Fields.3
 
 post-patch:
-	@${PERL} -pi -e 's/3pm/3/g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -i '' -e 's/3pm/3/g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 .include <bsd.port.mk>
diff --git a/misc/qlas/Makefile b/misc/qlas/Makefile
index 5235005..8cad2a8 100644
--- a/misc/qlas/Makefile
+++ b/misc/qlas/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	qlas
-# Date created:		14 Oct 2000
-# Whom:			Denis Shaposhnikov <dsh@vlink.ru>
-#
+# Created by: Denis Shaposhnikov <dsh@vlink.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	qlas
 PORTVERSION=	1.93
@@ -16,10 +12,9 @@ COMMENT=	Qico FIDO mailer log analyzer and statistic builder
 USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
-
-post-patch:
-	@ ${PERL} -pi -e 's!/usr/bin/perl!${PERL}!; tr/\r//d' ${WRKSRC}/qlas
-	@ ${PERL} -pi -e 'tr/\r//d' ${WRKSRC}/qlas.conf.default
+USES=		shebangfix
+SHEBANG_FILES=	qlas
+USE_DOS2UNIX=	qlas qlas.conf.default
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/qlas ${PREFIX}/bin/
diff --git a/net-p2p/torrentsniff/Makefile b/net-p2p/torrentsniff/Makefile
index e723465..82dfe59 100644
--- a/net-p2p/torrentsniff/Makefile
+++ b/net-p2p/torrentsniff/Makefile
@@ -14,9 +14,8 @@ RUN_DEPENDS=	p5-libwww>=0:${PORTSDIR}/www/p5-libwww \
 
 USE_PERL5=	yes
 NO_BUILD=	yes
-
-post-patch:
-	${PERL} -pi -e "s#/usr/local/bin/perl#${PERL5}#" ${WRKSRC}/torrentsniff
+USES=		shebangfix
+SHEBANG_FILES=	torrentsniff
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/torrentsniff ${LOCALBASE}/bin
diff --git a/net/ip6_int/Makefile b/net/ip6_int/Makefile
index cac1cb5..dda685f 100644
--- a/net/ip6_int/Makefile
+++ b/net/ip6_int/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:   ip6_int
-# Date created:        22 November 2001
-# Whom:                Jean-Yves Lefort <jylefort@brutele.be>
-#
+# Created by: Jean-Yves Lefort <jylefort@brutele.be>
 # $FreeBSD$
-#
 
 PORTNAME=	ip6_int
 PORTVERSION=	1.0
@@ -19,14 +15,13 @@ COMMENT=	Convert an IPv4/IPv6 address to an in-addr.arpa/ip6.int PTR value
 PLIST_FILES=	bin/ip6_int
 NO_BUILD=	yes
 USE_PERL5=	yes
+USES=		shebangfix
+SHEBANG_FILES=	ip6_int
 
 do-extract:
 	@${MKDIR} ${WRKSRC}
 	@${CP} ${DISTDIR}/${DISTNAME} ${WRKSRC}
 
-post-patch:
-	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/ip6_int
-
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/ip6_int ${PREFIX}/bin