- switch simple inline replacement from perl to sed

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

Approved by:  bapt@ (portmrg@)

18 files changed, 43 insertions, 93 deletions

diff --git a/net/p5-Filesys-SmbClient/Makefile b/net/p5-Filesys-SmbClient/Makefile
index 4424a87317f6..2d0c7c39bf3a 100644
--- a/net/p5-Filesys-SmbClient/Makefile
+++ b/net/p5-Filesys-SmbClient/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	sysutils/p5-Filesys-SmbClient
-# Date created:				August 10, 2003
-# Whom:					Erwin Lansing <erwin@FreeBSD.org>
-#
+# Created by: Erwin Lansing <erwin@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Filesys-SmbClient
 PORTVERSION=	3.2
@@ -22,7 +18,7 @@ PERL_CONFIGURE=	yes
 MAN3=		Filesys::SmbClient.3
 
 post-patch:
-	${PERL} -pi -e 's!%%LOCALBASE%%!${LOCALBASE}!g' \
+	@${REINPLACE_CMD} -i '' -e 's!%%LOCALBASE%%!${LOCALBASE}!g' \
 		${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Google-SafeBrowsing2/Makefile b/net/p5-Net-Google-SafeBrowsing2/Makefile
index f812721d5845..2887e4744a37 100644
--- a/net/p5-Net-Google-SafeBrowsing2/Makefile
+++ b/net/p5-Net-Google-SafeBrowsing2/Makefile
@@ -58,7 +58,4 @@ BUILD_DEPENDS+=	p5-DBD-Pg>=2:${PORTSDIR}/databases/p5-DBD-Pg
 RUN_DEPENDS+=	p5-DBD-Pg>=2:${PORTSDIR}/databases/p5-DBD-Pg
 .endif
 
-post-patch:
-	@${PERL} -pi -e 's/CPAN/ExtUtils/' ${WRKSRC}/Makefile.PL
-
 .include <bsd.port.mk>
diff --git a/net/p5-Net-Google/Makefile b/net/p5-Net-Google/Makefile
index 9a262178c891..451be128c4df 100644
--- a/net/p5-Net-Google/Makefile
+++ b/net/p5-Net-Google/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Net-Google
-# Date created:	   04 June 2002
-# Whom:		   Sergey Skvortsov <skv@protey.ru>
-#
+# Created by: Sergey Skvortsov <skv@protey.ru>
 # $FreeBSD$
-#
 
 PORTNAME=	Net-Google
 PORTVERSION=	1.0.1
@@ -24,6 +20,6 @@ MAN3=		Net::Google.3 Net::Google::Cache.3 Net::Google::Response.3 \
 		Net::Google::Spelling.3 Net::Google::tool.3
 
 post-patch:
-	@${PERL} -pi -e 's/CPAN/ExtUtils/' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -i '' -e 's/CPAN/ExtUtils/g' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/net/p5-Net-SNPP/Makefile b/net/p5-Net-SNPP/Makefile
index bda56850d09e..02137d90a0f1 100644
--- a/net/p5-Net-SNPP/Makefile
+++ b/net/p5-Net-SNPP/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	Net-SNPP
-# Date created:		6 Jun 2002
-# Whom:			devin@spamcop.net
-#
+# Created by: devin@spamcop.net
 # $FreeBSD$
-#
 
 PORTNAME=	Net-SNPP
 PORTVERSION=	1.17
@@ -20,8 +16,7 @@ MAN3=		Net::SNPP.3 \
 		Net::SNPP::Server.3
 
 post-patch:
-	@${PERL} -pi -e '$$_="" if /warnings/;' \
+	@${REINPLACE_CMD} -i '' -e '/warnings/d' \
 		${WRKSRC}/lib/Net/SNPP/Server.pm
-	@${RM} ${WRKSRC}/lib/Net/SNPP/Server.pm.orig
 
 .include <bsd.port.mk>
diff --git a/net/p5-POE-Component-Server-Twirc/Makefile b/net/p5-POE-Component-Server-Twirc/Makefile
index b79639d6819d..1d64617b2808 100644
--- a/net/p5-POE-Component-Server-Twirc/Makefile
+++ b/net/p5-POE-Component-Server-Twirc/Makefile
@@ -42,6 +42,6 @@ MAN3=		App::Twirc.3 \
 		POE::Component::Server::Twirc.3
 
 post-patch:
-	@${PERL} -pi -e '$$_="" if m/auto_install/' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -i '' -e '/auto_install/d' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/net/p5-PlRPC/Makefile b/net/p5-PlRPC/Makefile
index afbaa883024c..dd2a0a87351d 100644
--- a/net/p5-PlRPC/Makefile
+++ b/net/p5-PlRPC/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-PlRPC
-# Date Created:				27 Feb 2000
-# Whom:					Vanilla I. Shu <vanilla@FreeBSD.org>
-#
+# Created by: Vanilla I. Shu <vanilla@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	PlRPC
 PORTVERSION=	0.2020
@@ -28,6 +24,7 @@ MAN3=		Bundle::PlRPC.3 \
 
 post-patch:
 	@${FIND} ${WRKSRC} -name ".svn" | ${XARGS} ${RM} -rf
-	@${PERL} -pi -e 's/perldoc -t/echo perldoc -t/' ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -i '' -e 's/perldoc -t/echo perldoc -t/' \
+		${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/net/p5-Samba-LDAP/Makefile b/net/p5-Samba-LDAP/Makefile
index a8ac7cc035ed..b4041625c8ba 100644
--- a/net/p5-Samba-LDAP/Makefile
+++ b/net/p5-Samba-LDAP/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Samba-LDAP
-# Date created:		2006-09-18
-# Whom:			Gea-Suan Lin <gslin@gslin.org>
-#
+# Created by: Gea-Suan Lin <gslin@gslin.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Samba-LDAP
 PORTVERSION=	0.05
@@ -35,6 +31,6 @@ MAN3=		Samba::LDAP.3 Samba::LDAP::Base.3 Samba::LDAP::Config.3 \
 		Samba::LDAP::User.3
 
 post-patch:
-		${PERL} -pi -e '$$_ = "" if m|auto_install|' ${WRKSRC}/Makefile.PL
+		@${REINPLACE_CMD} -i '' -e '/auto_install/d' ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.mk>
diff --git a/net/p5-ZeroMQ/Makefile b/net/p5-ZeroMQ/Makefile
index fa268ee0f5ff..6eb28893f262 100644
--- a/net/p5-ZeroMQ/Makefile
+++ b/net/p5-ZeroMQ/Makefile
@@ -47,6 +47,6 @@ TEST_DEPENDS+=	p5-Test-Simple>=0.98:${PORTSDIR}/devel/p5-Test-Simple
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s/lib => 'zmq',//" ${WRKSRC}/Makefile.PL
+	@${REINPLACE_CMD} -i '' -e "s/lib => 'zmq',//" ${WRKSRC}/Makefile.PL
 
 .include <bsd.port.post.mk>
diff --git a/net/tightvnc/Makefile b/net/tightvnc/Makefile
index 4e06e1311140..6847c4c72e9e 100644
--- a/net/tightvnc/Makefile
+++ b/net/tightvnc/Makefile
@@ -22,7 +22,8 @@ CONFLICTS=	tridiavnc-[0-9]* vnc-[0-9]*
 
 WRKSRC=		${WRKDIR}/vnc_unixsrc
 
-USES=		imake
+USES=		imake shebangfix
+SHEBANG_FILES=	vncserver
 CFLAGS+=	-Wno-return-type
 USE_GCC=	yes
 USE_BZIP2=	yes
@@ -61,11 +62,11 @@ IGNORE=		vnc has already been installed, please uninstall it first
 
 post-patch:
 .for file in vncviewer/Imakefile Xvnc/config/cf/vnclibs.def
-	@${PERL} -pi -e "s,%%LOCALBASE%%,${PREFIX},g" ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -i '' -e "s|%%LOCALBASE%%|${PREFIX}|g" ${WRKSRC}/${file}
 .endfor
-	@${PERL} -pi -e "s,/usr/local/vnc/classes,${DATADIR}/classes,g ; \
-		s,^#!/usr/bin/perl,#!${PERL},g" ${WRKSRC}/vncserver
-	@${PERL} -pi -e "s,%%CC%%,${CC},g ; \
+	@${REINPLACE_CMD} -i '' -e "s|/usr/local/vnc/classes|${DATADIR}/classes|g" \
+		${WRKSRC}/vncserver
+	@${REINPLACE_CMD} -i '' -e "s|%%CC%%|${CC}|g ; \
 		s|%%CFLAGS%%|${CFLAGS}|g" ${WRKSRC}/Xvnc/config/cf/FreeBSD.cf
 
 do-install:
diff --git a/net/tridiavnc/Makefile b/net/tridiavnc/Makefile
index 5ddfe23054ad..86d05a030d80 100644
--- a/net/tridiavnc/Makefile
+++ b/net/tridiavnc/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	tridiavnc
-# Date created:		14 June 2001
-# Whom:			dwcjr
-#
+# Created by: dwcjr
 # $FreeBSD$
-#
 
 PORTNAME=	tridiavnc
 PORTVERSION=	1.4
@@ -21,7 +17,8 @@ LICENSE=	GPLv2
 
 USE_PERL5=	yes
 WRKSRC=		${WRKDIR}/unix/vnc_unixsrc
-USES=		imake
+USES=		imake shebangfix
+SHEBANG_FILES=	vncserver
 USE_XORG=	ice sm x11 xaw xext xmu xt xpm
 ALL_TARGET=	World
 NO_INSTALL_MANPAGES=	yes
@@ -47,10 +44,10 @@ PLIST_SUB+=	XVNC=""
 
 post-patch:
 .for file in vncviewer/Imakefile Xvnc/config/cf/vnclibs.def Xvnc/config/cf/Imake.tmpl
-	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/${file}
+	${REINPLACE_CMD} -i '' -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/${file}
 .endfor
-	@${PERL} -pi -e "s,/usr/local/vnc/classes,${DATADIR}/classes,g ; \
-		s,^#!/usr/bin/perl,#!${PERL},g" ${WRKSRC}/vncserver
+	${REINPLACE_CMD} -i '' -e 's|/usr/local/vnc/classes|${DATADIR}/classes|' \
+		${WRKSRC}/vncserver
 
 # We have to frob a few things, and we want our own permissions, so it's easier
 # to do the install ourselves.
diff --git a/news/p5-News-Newsrc/Makefile b/news/p5-News-Newsrc/Makefile
index 8c20c6010a5d..aab2e332d1ef 100644
--- a/news/p5-News-Newsrc/Makefile
+++ b/news/p5-News-Newsrc/Makefile
@@ -17,7 +17,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		News::Newsrc.3
 
-pre-patch:
-	@${PERL} -pi -e '$$_ = "" if /^use 5.6/' ${WRKSRC}/Newsrc.pm
-
 .include <bsd.port.mk>
diff --git a/ports-mgmt/portcheckout/Makefile b/ports-mgmt/portcheckout/Makefile
index d35d1915f39b..425f5bfe7b0e 100644
--- a/ports-mgmt/portcheckout/Makefile
+++ b/ports-mgmt/portcheckout/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:    portcheckout
-# Date created:         1 November 1998
-# Whom:                 wosch
-#
+# Created by: wosch
 # $FreeBSD$
-#
 
 PORTNAME=	portcheckout
 PORTVERSION=	2.0
@@ -15,11 +11,10 @@ MAINTAINER=	wosch@FreeBSD.org
 COMMENT=	Checkout and build ports and all depending ports
 
 USE_PERL5=	yes
+USES=		shebangfix
+SHEBANG_FILES=	portcheckout.pl
 MAN1=		portcheckout.1
 MANCOMPRESSED=	maybe
 PLIST_FILES=	bin/portcheckout
 
-post-patch:
-	${PERL} -pi -e 's^\#\!${PREFIX}/bin/perl^#!${PERL5}^' ${WRKSRC}/portcheckout.pl
-
 .include <bsd.port.mk>
diff --git a/security/l0phtcrack/Makefile b/security/l0phtcrack/Makefile
index cf124e9ed2fc..f1c89063a700 100644
--- a/security/l0phtcrack/Makefile
+++ b/security/l0phtcrack/Makefile
@@ -18,11 +18,11 @@ NO_WRKSUBDIR=	yes
 PLIST=		${WRKDIR}/pkg-plist
 USE_PERL5_BUILD=yes
 USE_ZIP=	yes
+USE_DOS2UNIX=	yes
 
 post-extract:
 	${RM} ${WRKDIR}/*exe
-	${PERL} -pi -e "s:\r::g" ${WRKDIR}/*
-	${PERL} -pi -e "s:ommited:omitted:g" ${WRKDIR}/util.c
+	${REINPLACE_CMD} -i '' -e 's|ommited|omitted|' ${WRKDIR}/util.c
 
 do-build:
 	cd ${WRKDIR} && ${CC} ${CFLAGS} -DMPU8086 *.c -o lc_CLI
diff --git a/security/p5-Digest-MD5-M4p/Makefile b/security/p5-Digest-MD5-M4p/Makefile
index 0c25aa0aadba..6cd826d65706 100644
--- a/security/p5-Digest-MD5-M4p/Makefile
+++ b/security/p5-Digest-MD5-M4p/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	p5-Digest-MD5-M4p
-# Date created:        27 June 2004
-# Whom:                Lars Thegler <lth@FreeBSD.org>
-#
+# Created by: Lars Thegler <lth@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	Digest-MD5-M4p
 PORTVERSION=	0.01
@@ -19,7 +15,4 @@ PERL_CONFIGURE=	yes
 
 MAN3=		Digest::MD5::M4p.3
 
-post-extract:
-	@${PERL} -pi -e 's/\r//g' ${WRKSRC}/M4p.xs
-
 .include <bsd.port.mk>
diff --git a/security/sig2dot/Makefile b/security/sig2dot/Makefile
index a34021c18044..a76b41e9e45f 100644
--- a/security/sig2dot/Makefile
+++ b/security/sig2dot/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	sig2dot
-# Date created:			Aug 8, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	sig2dot
 PORTVERSION=	0.35
@@ -25,9 +20,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}/sig2dot.pl
+USES=		shebangfix
+SHEBANG_FILES=	sig2dot.pl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/sig2dot.pl ${PREFIX}/bin/sig2dot
diff --git a/security/snort-rep/Makefile b/security/snort-rep/Makefile
index 69946f4f2c64..2cf38d4c0019 100644
--- a/security/snort-rep/Makefile
+++ b/security/snort-rep/Makefile
@@ -12,10 +12,8 @@ COMMENT=	A Snort reporting tool that can produce text or HTML from logs
 
 USE_PERL5=	yes
 MAN1=		snort-rep.1
-
-post-patch:
-	@${PERL} -pi -e "s|#!/usr/bin/perl|#!${PERL}|" \
-		${WRKSRC}/snort-rep ${WRKSRC}/snort-rep-mail
+USES=		shebangfix
+SHEBANG_FILES=	snort-rep snort-rep-mail
 
 do-build:
 	cd ${BUILD_WRKSRC} ; pod2man --lax snort-rep > snort-rep.1
diff --git a/security/tripwire12/Makefile b/security/tripwire12/Makefile
index 70870d0c06de..e192fe409844 100644
--- a/security/tripwire12/Makefile
+++ b/security/tripwire12/Makefile
@@ -23,8 +23,8 @@ post-extract:
 	@ (cd ${WRKDIR}; tar xpf T1.2.tar)
 
 post-patch:
-	@${PERL} -pi -e 's|/secureplace/bin|${PREFIX}/bin|g;' \
-		-e 's|/usr/man|${PREFIX}/man|g;' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -i '' -e 's|/secureplace/bin|${PREFIX}/bin|' \
+		-e 's|/usr/man|${PREFIX}/man|' ${WRKSRC}/Makefile
 	${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
 	    's|bs_ntohl|ntohl|g;s|bs_htonl|htonl|g'
 
diff --git a/sysutils/colorize/Makefile b/sysutils/colorize/Makefile
index 3ea83f26d52f..1796ff2aaa9d 100644
--- a/sysutils/colorize/Makefile
+++ b/sysutils/colorize/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	colorize
-# Date created:				12 June 2001
-# Whom:					petef@FreeBSD.org
-#
+# Created by: petef@FreeBSD.org
 # $FreeBSD$
-#
 
 PORTNAME=	colorize
 PORTVERSION=	0.3.4
@@ -22,13 +18,15 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/_/-/}
 NO_BUILD=	yes
 USE_PERL5=	yes
 SUB_FILES=	pkg-message
+USES=		shebangfix
+SHEBANG_FILES=	colorize
 
 MAN1=		colorize.1
 MANCOMPRESSED=	yes
 
 post-patch:
-	@${PERL} -pi -e "s|/etc/colorizerc|${PREFIX}/etc/colorizerc|; \
-		s|#!/usr/bin/perl|#!${PERL}|g" ${WRKSRC}/colorize
+	@${REINPLACE_CMD} -i '' -e 's|/etc/colorizerc|${PREFIX}/etc/colorizerc|' \
+		${WRKSRC}/colorize
 
 do-install:
 	@${INSTALL_SCRIPT} ${WRKSRC}/colorize ${PREFIX}/bin