20 files changed, 51 insertions, 123 deletions
diff --git a/devel/cvslines/Makefile b/devel/cvslines/Makefile
index b3c54a1b894..62efd26f746 100644
--- a/devel/cvslines/Makefile
+++ b/devel/cvslines/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for: 	cvslines
-# Date created:				24 Aug 1998
-# Whom:					jkoshy
-#
+# Created by: jkoshy
 # $FreeBSD$
-#
 
 PORTNAME=		cvslines
 PORTVERSION=		1.6.9
@@ -16,6 +12,8 @@ COMMENT=		Wrapper to ease merging of changes between CVS branches
 WRKSRC=			${WRKDIR}/${PORTNAME}
 USE_PERL5=		yes
 NO_BUILD=		yes
+USES=			shebangfix
+SHEBANG_FILES=		cvslines
 .for ii in s s_check s-check s-commit s-config s-status
 PLIST_FILES+=	bin/cvsline${ii}
 .endfor
@@ -23,8 +21,7 @@ PLIST_FILES+=	bin/cvsline${ii}
 MAN1=	cvslines.1
 
 pre-patch:
-	${PERL} -pi -e "s:usr/bin/perl5:${PERL5}:g" ${WRKSRC}/cvslines
-	${PERL} -pi -e "s:the the:the:g" ${WRKSRC}/cvslines.1
+	@${REINPLACE_CMD} -i '' -e 's|the the|the|' ${WRKSRC}/cvslines.1
 
 do-install:
 	PREFIX=${PREFIX} ${PERL5} ${WRKSRC}/INSTALL ${WRKSRC}/CONFIG
diff --git a/devel/cvslines/pkg-descr b/devel/cvslines/pkg-descr
index 1a202f23bfe..177ea2cba69 100644
--- a/devel/cvslines/pkg-descr
+++ b/devel/cvslines/pkg-descr
@@ -5,4 +5,4 @@ cvslines is a "wrapper" facility that helps out with merging changes
 between various cvs branches, where the branches represent different
 lines of development.
 
-WWW:  http://cvslines.sourceforge.net/menu.html
+WWW: http://cvslines.sourceforge.net/menu.html
diff --git a/devel/cvsplot/Makefile b/devel/cvsplot/Makefile
index d058cc18143..1f1485f606c 100644
--- a/devel/cvsplot/Makefile
+++ b/devel/cvsplot/Makefile
@@ -1,10 +1,5 @@
-# ex:ts=8
-# Ports collection makefile for:	cvsplot
-# Date created:			May 31, 2002
-# Whom:				ijliao
-#
+# Created by: ijliao
 # $FreeBSD$
-#
 
 PORTNAME=	cvsplot
 PORTVERSION=	1.7.4
@@ -22,9 +17,8 @@ RUN_DEPENDS=	p5-Date-Manip>=0:${PORTSDIR}/devel/p5-Date-Manip \
 USE_PERL5=	yes
 NO_BUILD=	yes
 PLIST_FILES=	bin/cvsplot
-
-post-patch:
-	@${PERL} -pi -e "s,^#!/usr/bin/perl -w,#!/usr/bin/env perl -w,g" ${WRKSRC}/cvsplot.pl
+USES=		shebangfix
+SHEBANG_FILES=	cvsplot.pl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cvsplot.pl ${PREFIX}/bin/cvsplot
diff --git a/devel/cvsstat/Makefile b/devel/cvsstat/Makefile
index 145dee687ca..657d1ba0e69 100644
--- a/devel/cvsstat/Makefile
+++ b/devel/cvsstat/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cvsstat
-# Date created:				27 August 2001
-# Whom:					petef
-#
+# Created by: petef
 # $FreeBSD$
-#
 
 PORTNAME=	cvsstat
 PORTVERSION=	2.24
@@ -26,7 +22,7 @@ do-extract:
 	@${CP} -p ${DISTDIR}/${DIST_SUBDIR}/${DISTNAME} ${WRKSRC}
 
 post-patch:
-	@${PERL} -pi -e 's,^#!/usr/bin/perl,#!${PERL},' ${WRKSRC}/cvsstat
+	@${REINPLACE_CMD} -i '' -e 's|perl -S|${PERL} -S|' ${WRKSRC}/cvsstat
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/cvsstat ${PREFIX}/bin
diff --git a/devel/cvsweb/Makefile b/devel/cvsweb/Makefile
index 0fd25a760e1..7d567623576 100644
--- a/devel/cvsweb/Makefile
+++ b/devel/cvsweb/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cvsweb
-# Date created:		27 Jun 1999
-# Whom:			SADA Kenji <sada@FreeBSD.org>
-#
+# Created by: SADA Kenji <sada@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cvsweb
 PORTVERSION=	2.0.6
@@ -55,14 +51,12 @@ SUB_FILES=	pkg-message
 SUB_LIST=	PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}"
 
 post-patch:
-	${PERL} -i -pe "\
-		s'!!PERL!!'${PERL}'g; \
-		s'!!PREFIX!!'${PREFIX}'g;" \
+	@${REINPLACE_CMD} -i '' -e 's,!!PERL!!,${PERL},' \
+			-e 's,!!PREFIX!!,${PREFIX},' \
 		${WRKSRC}/cvsweb.cgi
-	${PERL} -i -pe "\
-		s'!!PREFIX!!'${PREFIX}'g; \
-		s'!!CVSROOT!!'${CVSROOT}'g; \
-		s'!!TITLE!!'${TITLE}'g;" \
+	@${REINPLACE_CMD} -i '' -e 's,!!PREFIX!!,${PREFIX},' \
+			-e 's,!!CVSROOT!!,${CVSROOT},' \
+			-e 's,!!TITLE!!,${TITLE},' \
 		${WRKSRC}/cvsweb.conf
 
 do-install:
diff --git a/devel/cvsweb/pkg-descr b/devel/cvsweb/pkg-descr
index e529dbba570..22ac5a46e92 100644
--- a/devel/cvsweb/pkg-descr
+++ b/devel/cvsweb/pkg-descr
@@ -11,4 +11,4 @@ brought it back to the FreeBSD community and made further
 improvements.
 
 Author:	The FreeBSD Project <freebsd-cvsweb at FreeBSD dot org>
-WWW:	http://www.FreeBSD.org/projects/cvsweb.html
+WWW: http://www.FreeBSD.org/projects/cvsweb.html
diff --git a/devel/cvsweb3/Makefile b/devel/cvsweb3/Makefile
index 41f1bd03770..69e64068294 100644
--- a/devel/cvsweb3/Makefile
+++ b/devel/cvsweb3/Makefile
@@ -1,9 +1,5 @@
-# New ports collection makefile for:	cvsweb
-# Date created:		27 Jun 1999
-# Whom:			SADA Kenji <sada@FreeBSD.org>
-#
+# Created by: SADA Kenji <sada@FreeBSD.org>
 # $FreeBSD$
-#
 
 PORTNAME=	cvsweb
 PORTVERSION=	3.0.6
@@ -79,14 +75,12 @@ SUB_FILES=	pkg-message
 SUB_LIST=	PREFIX="${PREFIX}" DOCSDIR="${DOCSDIR}"
 
 post-patch:
-	${PERL} -i -pe "\
-		s'!!PERL!!'${PERL}'g; \
-		s'!!PREFIX!!'${PREFIX}'g;" \
+	@${REINPLACE_CMD} -i '' -e 's,!!PERL!!,${PERL},' \
+			-e 's,!!PREFIX!!,${PREFIX},' \
 		${WRKSRC}/cvsweb.cgi
-	${PERL} -i -pe "\
-		s'!!PREFIX!!'${PREFIX}'g; \
-		s'!!CVSROOT!!'${CVSROOT}'g; \
-		s'!!TITLE!!'${TITLE}'g;" \
+	@${REINPLACE_CMD} -i '' -e 's,!!PREFIX!!,${PREFIX},' \
+			-e 's,!!CVSROOT!!,${CVSROOT},' \
+			-e 's,!!TITLE!!,${TITLE},' \
 		${WRKSRC}/cvsweb.conf
 
 do-install:
diff --git a/devel/cvsweb3/pkg-descr b/devel/cvsweb3/pkg-descr