87 files changed, 199 insertions, 100 deletions

diff --git a/archivers/unadf/Makefile b/archivers/unadf/Makefile
index cf778f160f70..d83e3c023d1c 100644
--- a/archivers/unadf/Makefile
+++ b/archivers/unadf/Makefile
@@ -14,10 +14,11 @@ DISTNAME=	adflib
 MAINTAINER=	wigren@home.se
 
 NO_WRKSUBDIR=	yes
+USE_REINPLACE=	yes
 USE_ZIP=	yes
 
 pre-build:
-	@${PERL} -pi -e "s@tests lib demo@lib demo@g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s@tests lib demo@lib demo@g" ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/Demo/unadf ${PREFIX}/bin
diff --git a/audio/libmusicbrainz/Makefile b/audio/libmusicbrainz/Makefile
index 79e6289a166f..44f4aa2493b7 100644
--- a/audio/libmusicbrainz/Makefile
+++ b/audio/libmusicbrainz/Makefile
@@ -14,11 +14,12 @@ MAINTAINER=	roman@xpert.com
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|^CFLAGS=|#CFLAGS=|g ; \
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
 		 s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz3/Makefile b/audio/libmusicbrainz3/Makefile
index 79e6289a166f..44f4aa2493b7 100644
--- a/audio/libmusicbrainz3/Makefile
+++ b/audio/libmusicbrainz3/Makefile
@@ -14,11 +14,12 @@ MAINTAINER=	roman@xpert.com
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|^CFLAGS=|#CFLAGS=|g ; \
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
 		 s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz4/Makefile b/audio/libmusicbrainz4/Makefile
index 79e6289a166f..44f4aa2493b7 100644
--- a/audio/libmusicbrainz4/Makefile
+++ b/audio/libmusicbrainz4/Makefile
@@ -14,11 +14,12 @@ MAINTAINER=	roman@xpert.com
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|^CFLAGS=|#CFLAGS=|g ; \
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
 		 s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/libmusicbrainz5/Makefile b/audio/libmusicbrainz5/Makefile
index 79e6289a166f..44f4aa2493b7 100644
--- a/audio/libmusicbrainz5/Makefile
+++ b/audio/libmusicbrainz5/Makefile
@@ -14,11 +14,12 @@ MAINTAINER=	roman@xpert.com
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|^CFLAGS=|#CFLAGS=|g ; \
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
 		 s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/musicbrainz/Makefile b/audio/musicbrainz/Makefile
index 79e6289a166f..44f4aa2493b7 100644
--- a/audio/musicbrainz/Makefile
+++ b/audio/musicbrainz/Makefile
@@ -14,11 +14,12 @@ MAINTAINER=	roman@xpert.com
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|^CFLAGS=|#CFLAGS=|g ; \
+	@${REINPLACE_CMD} -e 's|^CFLAGS=|#CFLAGS=|g ; \
 		 s|^CPPFLAGS=|#CPPFLAGS=|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/benchmarks/dbench/Makefile b/benchmarks/dbench/Makefile
index f70dc13c8bd6..0884674ccc99 100644
--- a/benchmarks/dbench/Makefile
+++ b/benchmarks/dbench/Makefile
@@ -13,9 +13,10 @@ MASTER_SITES=	ftp://samba.org/pub/tridge/dbench/
 MAINTAINER=	nyxo@dnuc.polyn.kiae.su
 
 WRKSRC=		${WRKDIR}/dbench
+USE_REINPLACE=	yes
 
 post-patch:
-	@${PERL} -pi -e 's/^CFLAGS.+//g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's/^CFLAGS.+//g' ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dbench ${PREFIX}/bin/dbench
diff --git a/biology/deft/Makefile b/biology/deft/Makefile
index cda1ba957472..c8442a259b01 100644
--- a/biology/deft/Makefile
+++ b/biology/deft/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	rmiya@cc.hirosaki-u.ac.jp
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/source
+USE_REINPLACE=	yes
 
 .include <bsd.port.pre.mk>
 
@@ -31,7 +32,7 @@ LFLAGS+=	-L/usr/local/mpich/lib -lmpich
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g"\
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g"\
 		${WRKDIR}/${DISTNAME}/examples/DeFT
 .if !defined(USEMPICH)
 	@echo "******************************"
diff --git a/biology/dna-qc/Makefile b/biology/dna-qc/Makefile
index 700cc1ca2122..0b2aea9b7e4a 100644
--- a/biology/dna-qc/Makefile
+++ b/biology/dna-qc/Makefile
@@ -15,16 +15,17 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	tonym@biolateral.com.au
 
 NO_WRKSUBDIR=	true
+USE_REINPLACE=	yes
 
 EXAMPLES=	README script.compare script.limits \
 		bact.all chromosomeIII.all human.all worm.all
 PROGRAMS=	counter hybridize normalize random_clip random_line
 
 post-patch:
-	@${PERL} -pi -e 's,^CFLAGS,#CFLAGS,' ${WRKSRC}/Makefile
-	@${PERL} -pi -e 's,malloc.h,stdlib.h,' ${WRKSRC}/normalize.c
-	@${PERL} -pi -e 's,fname\*,fname,' ${WRKSRC}/random_line.c
-	@${PERL} -pi -e 's,static void allocate_pool,void allocate_pool,' \
+	@${REINPLACE_CMD} -e 's,^CFLAGS,#CFLAGS,' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's,malloc.h,stdlib.h,' ${WRKSRC}/normalize.c
+	@${REINPLACE_CMD} -e 's,fname\*,fname,' ${WRKSRC}/random_line.c
+	@${REINPLACE_CMD} -e 's,static void allocate_pool,void allocate_pool,' \
 		${WRKSRC}/stringpool.c
 
 do-install:
diff --git a/biology/flip/Makefile b/biology/flip/Makefile
index dc48360a0059..c4ce9c456b3b 100644
--- a/biology/flip/Makefile
+++ b/biology/flip/Makefile
@@ -12,12 +12,14 @@ MASTER_SITES=	ftp://megasun.bch.umontreal.ca/pub/flip/
 
 MAINTAINER=	tonym@biolateral.com.au
 
+USE_REINPLACE=	yes
+
 MAN1=		flip.1
 
 # make it respect CFLAGS
 
 post-configure:
-	@${PERL} -pi.orig -e 's/CFLAGS=//' ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's/CFLAGS=//' ${WRKSRC}/${MAKEFILE}
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flip ${PREFIX}/bin
diff --git a/biology/wise/Makefile b/biology/wise/Makefile
index 2c99524ff8c9..c7d9fad149f4 100644
--- a/biology/wise/Makefile
+++ b/biology/wise/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	tonym@biolateral.com.au
 
 WRKTOP=		${WRKDIR}/${DISTNAME}
 WRKSRC=		${WRKTOP}/src
+USE_REINPLACE=	yes
 MAKEFILE=	makefile
 
 #
@@ -49,17 +50,17 @@ EXFILES=	README db.hmm hn_est.fa human.genomic \
 #
 
 post-configure:
-	@${PERL} -pi.orig \
+	@${REINPLACE_CMD} \
 		-e s'#^CFLAGS = -c -O#CFLAGS ?= -c -O#;' \
 		-e s'#\tcsh welcome.csh##;' \
 		${WRKSRC}/${MAKEFILE}
-	@${PERL} -pi.orig \
+	@${REINPLACE_CMD} \
 		-e s'#CFLAGS\) $?#CFLAGS\) -c $?#;' \
 		${WRKSRC}/base/${MAKEFILE}
-	@${PERL} -pi.orig \
+	@${REINPLACE_CMD} \
 		-e s'#INCFLAGS\) $?#INCFLAGS\) -c $?#;' \
 		${WRKSRC}/dynlibsrc/${MAKEFILE}
-	@${PERL} -pi.orig \
+	@${REINPLACE_CMD} \
 		-e s'#INCFLAGS\) $?#INCFLAGS\) -c $?#;' \
 		-e s'#CFLAGS\) estwise.c#CFLAGS\) -c estwise.c#;' \
 		-e s'#CFLAGS\) estwiseb.c#CFLAGS\) -c estwiseb.c#;' \
diff --git a/chinese/big5con/Makefile b/chinese/big5con/Makefile
index e69f0040a9fe..ee198857291a 100644
--- a/chinese/big5con/Makefile
+++ b/chinese/big5con/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	woju@freebsd.ee.ntu.edu.tw
 ONLY_FOR_ARCHS=	i386
 
 EXTRACT_ONLY=	${DISTNAME}.tgz
+USE_REINPLACE=	yes
 
 # With the help from pa@freebsd.ee.ntu.edu.tw
 # +0.92d use kc-fonts, whcih can be included in cdrom, instead of taipei-fonts.
@@ -30,7 +31,7 @@ EXTRACT_ONLY=	${DISTNAME}.tgz
 .include <bsd.port.pre.mk>
 post-patch:
 .if ${OSVERSION} > 500012
-	@${PERL} -pi -e 's,machine/console.h>,sys/consio.h>\n#include\t<sys/kbio.h>\n,' ${WRKSRC}/include/* ${WRKSRC}/src/*
+	@${REINPLACE_CMD} -e 's,machine/console.h>,sys/consio.h>\n#include\t<sys/kbio.h>\n,' ${WRKSRC}/include/* ${WRKSRC}/src/*
 .endif
 pre-install:
 	@if [ ! -f ${PREFIX}/lib/fonts/kc16.smf ]; then \
diff --git a/chinese/cce/Makefile b/chinese/cce/Makefile
index 0aab9d9bc1d1..4a475bd7c2ff 100644
--- a/chinese/cce/Makefile
+++ b/chinese/cce/Makefile
@@ -18,8 +18,10 @@ PATCH_DIST_ARGS=	-d ${WRKSRC} -p1
 
 MAINTAINER=	statue@freebsd.sinica.edu.tw
 
-MAN1=		cce.1
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
+USE_REINPLACE=	yes
+
+MAN1=		cce.1
 
 pre-configure:
 	(cd ${WRKSRC} && ${LN} -fs Makefile.FreeBSD Makefile )
@@ -27,6 +29,6 @@ pre-configure:
 .include <bsd.port.pre.mk>
 post-patch:
 .if ${OSVERSION} > 500012
-	@${FIND} ${WRKSRC}/src/ -name "*.c" | ${XARGS} ${PERL} -pi.bak -e 's,machine/console.h>,sys/consio.h>\n#include <sys/fbio.h>\n#include <sys/kbio.h>\n,'
+	@${FIND} ${WRKSRC}/src/ -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e 's,machine/console.h>,sys/consio.h>\n#include <sys/fbio.h>\n#include <sys/kbio.h>\n,'
 .endif
 .include <bsd.port.post.mk>
diff --git a/chinese/hc/Makefile b/chinese/hc/Makefile
index 7e737ac6b68f..dc210192f17a 100644
--- a/chinese/hc/Makefile
+++ b/chinese/hc/Makefile
@@ -16,13 +16,14 @@ DISTFILES=	hc-30.tar.gz  hc-supp.tab
 
 MAINTAINER=	obrien@FreeBSD.org
 
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/hc3
 EXTRACT_ONLY=	hc-30.tar.gz
 ALL_TARGET=	hc b2g g2b
 MAN1=		hc.1
 
 pre-patch:
-	@${PERL} -pi -e 's|malloc.h|stdlib.h|' ${WRKSRC}/hclib.c
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/hclib.c
 
 do-install:
 	@${MKDIR} ${PREFIX}/share/chinese
diff --git a/chinese/zhcon/Makefile b/chinese/zhcon/Makefile
index 29db3c3bc81e..0df5a24c7ae6 100644
--- a/chinese/zhcon/Makefile
+++ b/chinese/zhcon/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-included-gettext=${LOCALBASE}
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 MAN1=		zhcon.1
 
@@ -26,7 +27,7 @@ MAN1=		zhcon.1
 
 post-patch:
 .if ${OSVERSION} > 500012
-	@${FIND} ${WRKSRC}/src/ -name "*.cpp" | ${XARGS} ${PERL} -pi.bak -e 's,machine/console.h>,sys/consio.h>\n#include <sys/fbio.h>\n#include <sys/kbio.h>\n,'
+	@${FIND} ${WRKSRC}/src/ -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -e 's,machine/console.h>,sys/consio.h>\n#include <sys/fbio.h>\n#include <sys/kbio.h>\n,'
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/comms/ixj/Makefile b/comms/ixj/Makefile
index 9e289a2848d8..3e0cbf7500cd 100644
--- a/comms/ixj/Makefile
+++ b/comms/ixj/Makefile
@@ -16,11 +16,12 @@ MAINTAINER=	roger@freebsd.org
 ONLY_FOR_ARCHS=	i386
 
 WRKSRC=         ${WRKDIR}/ixj_freebsd
+USE_REINPLACE=	yes
 MAKEFILE=	Makefile.BSD
 
 post-patch:
 	${CP} ${FILESDIR}/ixj.sh ${WRKSRC}
-	${PERL} -pi.orig -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/ixj.sh
+	${REINPLACE_CMD} -e "s@%%PREFIX%%@${PREFIX}@g" ${WRKSRC}/ixj.sh
 
 pre-build:
 .if !exists(${SRC_BASE}/sys/Makefile)
diff --git a/databases/libodbc++/Makefile b/databases/libodbc++/Makefile
index 78588dce9e70..aecbf360d073 100644
--- a/databases/libodbc++/Makefile
+++ b/databases/libodbc++/Makefile
@@ -17,6 +17,7 @@ BROKEN=		"Does not compile"
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 # libodbc++ needs an ODBC driver manager to be installed, and it supports
@@ -56,7 +57,7 @@ PLIST_SUB+=	PLIST_GUI="@comment " PLIST_NOGUI=""
 
 post-patch:
 .for docdir in doc doc/progref
-	@ ${PERL} -pi.orig -e \
+	@ ${REINPLACE_CMD} -e \
 	  "s#\@docdir\@/\@PACKAGE\@-\@VERSION\@/#\@docdir\@/\@PACKAGE\@/#" \
 	  ${WRKSRC}/${docdir}/Makefile.in
 .endfor
diff --git a/devel/cvsgraph/Makefile b/devel/cvsgraph/Makefile
index e1e8b903fbe8..85cba8dfb589 100644
--- a/devel/cvsgraph/Makefile
+++ b/devel/cvsgraph/Makefile
@@ -27,6 +27,7 @@ DOCDIR=		share/doc/${PORTNAME}
 DOCS=		ChangeLog LICENSE README
 EXAMPLES=	cvsgraphwrapper.php3 mkimage.php3
 PLIST=		${WRKDIR}/pkg-plist
+USE_REINPLACE=	yes
 USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-freetype2-inc=${X11BASE}/include/freetype2/freetype \
@@ -46,11 +47,11 @@ CONFIGURE_ARGS=	--with-freetype2-inc=${X11BASE}/include/freetype2/freetype \
 		--with-z
 
 pre-patch:
-	${PERL} -pi -e "s:/home/bertho/tmp/cvstest:/home/ncvs:g" \
+	${REINPLACE_CMD} -e "s:/home/bertho/tmp/cvstest:/home/ncvs:g" \
 		${WRKSRC}/cvsgraph.conf
 
 post-configure:
-	${PERL} -pi -e \
+	${REINPLACE_CMD} -e \
 		"s|CFLAGS	=|CFLAGS += -I${LOCALBASE}/include \
 		-I${LOCALBASE}/include/gd|g" \
 		${WRKSRC}/Makefile
diff --git a/devel/devtodo/Makefile b/devel/devtodo/Makefile
index a936432f519f..bf78918804fe 100644
--- a/devel/devtodo/Makefile
+++ b/devel/devtodo/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://devtodo.sourceforge.net/?${PORTVERSION}/
 MAINTAINER=	petef@FreeBSD.org
 
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 # Note: without this define util/regex.c doesn't compile due to redeclaration
 # of malloc and realloc functions. Adding this define was the simplest
@@ -25,7 +26,7 @@ MLINKS=	devtodo.1 tda.1 devtodo.1 tdd.1 devtodo.1 tde.1 devtodo.1 tdr.1 \
 MANCOMPRESSED=	yes
 
 post-patch:
-	@${PERL} -pi -e 's/^\ttest -f.*todorc.*\n//' ${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's/^\ttest -f.*todorc.*\n//' ${WRKSRC}/doc/Makefile.in
 
 post-install:
 	@${MKDIR} ${EXAMPLESDIR}
diff --git a/devel/patch/Makefile b/devel/patch/Makefile
index 9e767128f476..7f7a77ff7292 100644
--- a/devel/patch/Makefile
+++ b/devel/patch/Makefile
@@ -15,11 +15,12 @@ MAINTAINER=	petef@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--program-prefix=g
+USE_REINPLACE=	yes
 
 MAN1=		gpatch.1
 
 post-patch:
-	@${PERL} -pi -e 's!HAVE_SETMODE!HAVE_SETMODE_DISABLE!' \
+	@${REINPLACE_CMD} -e 's!HAVE_SETMODE!HAVE_SETMODE_DISABLE!' \
 		${WRKSRC}/config.hin
 
 .include <bsd.port.mk>
diff --git a/devel/prcs/Makefile b/devel/prcs/Makefile
index 7b1adc7690dc..83115b36a8b8 100644
--- a/devel/prcs/Makefile
+++ b/devel/prcs/Makefile
@@ -15,6 +15,8 @@ MAINTAINER=	sam@inf.enst.fr
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
+
 MAN1=		prcs.1
 
 .include <bsd.port.pre.mk>
@@ -27,7 +29,7 @@ PLIST_SUB+=	EMACS='@comment '
 
 pre-configure:
 .if !exists(${LOCALBASE}/bin/emacs)
-	${PERL} -pi -e "s@^(SUBDIRS = .*) emacs (.*)@\1 \2@" \
+	${REINPLACE_CMD} -e "s@^(SUBDIRS = .*) emacs (.*)@\1 \2@" \
 		${WRKSRC}/Makefile.in
 .endif
 
diff --git a/devel/tdl/Makefile b/devel/tdl/Makefile
index 4d899b8a4726..5cd192671c25 100644
--- a/devel/tdl/Makefile
+++ b/devel/tdl/Makefile
@@ -12,10 +12,12 @@ MASTER_SITES=	http://www.rrbcurnow.freeuk.com/tdl/
 
 MAINTAINER=	petef@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 MAN1=	tdl.1
 
 post-patch:
-	@${PERL} -pi -e 's,/usr/local,${PREFIX},; s,gcc,${CC},; \
+	@${REINPLACE_CMD} -e 's,/usr/local,${PREFIX},; s,gcc,${CC},; \
 		s,-O2,${CFLAGS},' ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/dns/dhid/Makefile b/dns/dhid/Makefile
index abe318814d5d..01e9efed30ff 100644
--- a/dns/dhid/Makefile
+++ b/dns/dhid/Makefile
@@ -14,13 +14,14 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=		oryx@ungulate.net
 
+USE_REINPLACE=	yes
 OLDWRKSRC=		${WRKDIR}/${PORTNAME}-3.1
 
 MAN8=			dhid.8
 
 post-patch:
 	@${ECHO} "===>   Patching dhid.h"
-	${PERL} -i -p -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dhid.h
+	${REINPLACE_CMD} -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dhid.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin
diff --git a/ftp/bftpd/Makefile b/ftp/bftpd/Makefile
index 5346fde047c1..bfcf360a02e9 100644
--- a/ftp/bftpd/Makefile
+++ b/ftp/bftpd/Makefile
@@ -15,15 +15,16 @@ MAINTAINER=	petef@FreeBSD.org
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-pam
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 MAN8=		bftpd.8
 
 post-patch:
-	@${PERL} -pi -e "s@chmod 644 /var@#chmod 644 /var@g; \
+	@${REINPLACE_CMD} -e "s@chmod 644 /var@#chmod 644 /var@g; \
 			s@touch /var@#touch /var@g; \
 			s@DESTDIR\)/etc@prefix\)/etc@g; \
 			s@bftpd.conf @bftpd.conf.sample @g" ${WRKSRC}/Makefile.in
-	@${PERL} -pi -e "s@-ldl@@" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s@-ldl@@" ${WRKSRC}/configure
 	@${CP} ${WRKSRC}/bftpd.conf ${WRKSRC}/bftpd.conf.sample
 
 post-install:
diff --git a/ftp/ftpproxy/Makefile b/ftp/ftpproxy/Makefile
index 0a7d9953a94f..c8e0a2815429 100644
--- a/ftp/ftpproxy/Makefile
+++ b/ftp/ftpproxy/Makefile
@@ -17,13 +17,14 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	philippe@le-berre.com
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+USE_REINPLACE=	yes
 
 MAN1=		ftp.proxy.1
 MANCOMPRESSED=	no
 
 pre-patch:
 	@${RM} -Rf ${WRKSRC}/*.o ${WRKSRC}/src/ftp.proxy
-	@${PERL} -pi.orig -e 's|SOL_TCP|SOL_SOCKET|' ${WRKSRC}/ftp.c
+	@${REINPLACE_CMD} -e 's|SOL_TCP|SOL_SOCKET|' ${WRKSRC}/ftp.c
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/ftp.proxy ${PREFIX}/sbin
diff --git a/ftp/wget+ipv6/Makefile b/ftp/wget+ipv6/Makefile
index f6c3647585d5..3c6aaf64cd8d 100644
--- a/ftp/wget+ipv6/Makefile
+++ b/ftp/wget+ipv6/Makefile
@@ -31,6 +31,7 @@ USE_OPENSSL=	yes
 CONFIGURE_ARGS=	--with-ssl=${OPENSSLBASE}
 .endif
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -48,8 +49,8 @@ post-patch:
 	${MV} po/zh_TW.po po/zh_TW.po.utf-8; \
 	${LOCALBASE}/bin/iconv -f UTF-8 -t BIG5 po/zh_TW.po.utf-8 |\
 		${SED} -e 's/utf-8/big5/' |\
-		${PERL} -p -e 's{([\x81-\xfe])\\}{$$1\\\\}g' |\
-		${PERL} -p -e 's,\\\\([nt\"]),\\$$1,g' \
+		${REINPLACE_CMD} -e 's{([\x81-\xfe])\\}{$$1\\\\}g' |\
+		${REINPLACE_CMD} -e 's,\\\\([nt\"]),\\$$1,g' \
 		> po/zh_TW.po)
 
 pre-build:
diff --git a/games/nonsense/Makefile b/games/nonsense/Makefile
index 8f2edccd2405..bb293004c27b 100644
--- a/games/nonsense/Makefile
+++ b/games/nonsense/Makefile
@@ -14,11 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	roam@FreeBSD.org
 
 NO_BUILD=	defined
+USE_REINPLACE=	yes
 
 MAN6=		nonsense.6
 
 post-configure:
-		${PERL} -pi -e "s,/usr/local,${PREFIX}," ${WRKSRC}/nonsense
+		${REINPLACE_CMD} -e "s,/usr/local,${PREFIX}," ${WRKSRC}/nonsense
 		${SED} -e "s^%%PREFIX%%^${PREFIX}^g" \
 			< ${FILESDIR}/${MAN6} > ${WRKSRC}/${MAN6}
 
diff --git a/graphics/giftrans/Makefile b/graphics/giftrans/Makefile
index 20af43345ac3..aceabdc79e71 100644
--- a/graphics/giftrans/Makefile
+++ b/graphics/giftrans/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	nakai@FreeBSD.org
 
 DIST_SUBDIR=	giftrans
 NO_WRKSUBDIR=	yes
+USE_REINPLACE=	yes
 
 MAN1=		giftrans.1
 
@@ -25,7 +26,7 @@ do-extract:
 	done
 
 post-patch:
-	@${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/giftrans.c
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/giftrans.c
 
 do-build:
 	(cd ${WRKSRC}; ${CC} ${CFLAGS} giftrans.c -o giftrans)
diff --git a/graphics/mplayer-skins/Makefile b/graphics/mplayer-skins/Makefile
index 72df53320318..b2e7b010fbbc 100644
--- a/graphics/mplayer-skins/Makefile
+++ b/graphics/mplayer-skins/Makefile
@@ -21,6 +21,7 @@ MAINTAINER=	riggs@rrr.de
 
 USE_SUBMAKE=	yes
 USE_BZIP2=	yes
+USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}"
diff --git a/graphics/svgalib/Makefile b/graphics/svgalib/Makefile
index 2c72140560be..526396b78c3c 100644
--- a/graphics/svgalib/Makefile
+++ b/graphics/svgalib/Makefile
@@ -14,6 +14,7 @@ MASTER_SITES=	http://www.svgalib.org/
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 ALL_TARGET=	shared static
@@ -33,7 +34,7 @@ MAN${i}!=	/bin/cat ${FILESDIR}/man${i}
 .endfor
 
 pre-patch:
-	${PERL} -pi -e 's.\x0D..' ${WRKSRC}/utils/gtf/*
+	${REINPLACE_CMD} -e 's.\x0D..' ${WRKSRC}/utils/gtf/*
 	${MKDIR} ${WRKSRC}/include/linux
 
 post-install:
diff --git a/japanese/edict-sdic/Makefile b/japanese/edict-sdic/Makefile
index 26858fa2c5dc..aed688fdb1a4 100644
--- a/japanese/edict-sdic/Makefile
+++ b/japanese/edict-sdic/Makefile
@@ -26,6 +26,7 @@ GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-emacs=mule \
 		--with-lispdir=${PREFIX}/share/emacs/site-lisp \
 		--with-dictdir=${PREFIX}/share/dict
+USE_PERL5=	yes
 
 post-extract:
 	${CP} -f ${DISTDIR}/edict.gz ${WRKSRC}
diff --git a/japanese/linux-JM/Makefile b/japanese/linux-JM/Makefile
index b8c4726c0047..4bc0efdd5152 100644
--- a/japanese/linux-JM/Makefile
+++ b/japanese/linux-JM/Makefile
@@ -19,6 +19,7 @@ NO_MTREE=	yes
 NO_WRKSUBDIR=	yes
 PLIST=		${WRKDIR}/PLIST
 SCRIPTS_ENV+=	MANSECS="${MANSECS}"
+USE_PERL5=	yes
 
 DATESPEC=	20010415
 MANPAGES_GNU=	bash gdbm
diff --git a/japanese/today/Makefile b/japanese/today/Makefile
index bfad24f88275..9009763c76b6 100644
--- a/japanese/today/Makefile
+++ b/japanese/today/Makefile
@@ -23,6 +23,7 @@ EXTRACT_BEFORE_ARGS=	xfqw=${WRKDIR}
 EXTRACT_AFTER_ARGS=	# empty
 
 NO_WRKSUBDIR=	yes
+USE_REINPLACE=	yes
 
 post-extract:
 	@${ECHO_MSG} "===>  Extracting tbl file for ${DISTNAME}"
@@ -43,6 +44,6 @@ pre-patch:
 	@(${CP} ${FILESDIR}/Makefile ${WRKSRC})
 
 post-patch:
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/*.cnf
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/*.cnf
 
 .include <bsd.port.mk>
diff --git a/java/javel/Makefile b/java/javel/Makefile
index f8d012c3fc49..5785d7bcf25a 100644
--- a/java/javel/Makefile
+++ b/java/javel/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 MAINTAINER=	znerd@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
+USE_REINPLACE=	yes
 MAKEFILE=	makefile
 
 MAN1=	javel.1
@@ -26,7 +27,7 @@ BROKEN=		"Does not compile on 5.0"
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s,^CC,#CC,g ; s,^CFLAGS,#CFLAGS,g ; \
+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; s,^CFLAGS,#CFLAGS,g ; \
 		s,CC,CXX,g ; s,CFLAGS,CXXFLAGS,g" ${WRKSRC}/${MAKEFILE}
 
 do-install:
diff --git a/java/openjit/Makefile b/java/openjit/Makefile
index aa6bbfd674ba..27d8eb207624 100644
--- a/java/openjit/Makefile
+++ b/java/openjit/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=	${JAVADIR}/bin/java:${PORTSDIR}/java/jdk11
 
 ONLY_FOR_ARCHS=	i386
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-jdk=${JAVADIR}
@@ -28,7 +29,7 @@ JAVALIBDIR=	${PREFIX}/lib/OpenJIT
 DOCDIR=		${PREFIX}/share/OpenJIT
 
 post-configure:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/INSTALL
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/INSTALL
 
 do-install:
 	@${MKDIR} ${JAVALIBDIR}
diff --git a/java/shujit/Makefile b/java/shujit/Makefile
index 0adbdd1c29a0..04939679d744 100644
--- a/java/shujit/Makefile
+++ b/java/shujit/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 WRKSRC=		${WRKDIR}/${PORTNAME}
 ONLY_FOR_ARCHS=	i386
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAKEFILE=	GNUmakefile
@@ -31,7 +32,7 @@ CONFIGURE_ARGS+=	--with-jdk="${JAVADIR}"
 MAKE_ENV=	JAVADIR="${JAVADIR}"
 
 post-configure:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/README
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/README
 
 do-install:
 	@${MKDIR} ${JAVALIBDIR}
diff --git a/java/tya/Makefile b/java/tya/Makefile
index e7e74779a4da..057bcf6ef6c8 100644
--- a/java/tya/Makefile
+++ b/java/tya/Makefile
@@ -20,6 +20,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME:S/a1/a1./}
 
 ONLY_FOR_ARCHS=	i386
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--with-jdk=${JAVADIR}
 
@@ -27,7 +28,7 @@ JAVADIR?=	${LOCALBASE}/jdk1.1.8
 JAVALIBDIR=	${PREFIX}/lib/tya
 
 post-configure:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/README
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/README
 
 do-install:
 	@${MKDIR} ${JAVALIBDIR}
diff --git a/lang/o2c/Makefile b/lang/o2c/Makefile
index b725bdb57880..9bc63a8868d5 100644
--- a/lang/o2c/Makefile
+++ b/lang/o2c/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ob@breuninger.org
 # does not support 64-bit platforms
 ONLY_FOR_ARCHS=	i386
 
+USE_REINPLACE=	yes
 MAKE_ENV= 	MAKEOBJDIR=.
 MAN1=	o2b.1 o2c.1 o2ef.1 o2whereis.1
 
@@ -22,7 +23,8 @@ post-extract:
 	@${CP} ${FILESDIR}/o2 ${WRKSRC}
 
 post-patch:
-	@/usr/bin/perl -pi -e "s|\@PREFIX\@|${PREFIX}|g;" ${WRKSRC}/system/o2c.red.template
+	@${REINPLACE_CMD} -e \
+		"s|\@PREFIX\@|${PREFIX}|g;" ${WRKSRC}/system/o2c.red.template
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/system/o2c.red.template ${PREFIX}/lib/o2c-1.16
diff --git a/lang/starlogo/Makefile b/lang/starlogo/Makefile
index 4d13c2b1582e..564573bd9ef6 100644
--- a/lang/starlogo/Makefile
+++ b/lang/starlogo/Makefile
@@ -15,10 +15,12 @@ MAINTAINER=	noway@nohow.demon.co.uk
 RUN_DEPENDS=	javavm:${PORTSDIR}/java/javavmwrapper \
 		${LOCALBASE}/etc/javavms:${PORTSDIR}/java/jre
 
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 
 do-configure:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g" \
+	@${REINPLACE_CMD} -e \
+		"s|%%PREFIX%%|${PREFIX}|g ; s|%%LOCALBASE%%|${LOCALBASE}|g" \
 		${WRKSRC}/starlogo-unix
 
 do-install:
diff --git a/mail/autorespond/Makefile b/mail/autorespond/Makefile
index 11e0594957b9..3c8de78f0918 100644
--- a/mail/autorespond/Makefile
+++ b/mail/autorespond/Makefile
@@ -12,6 +12,8 @@ MASTER_SITES=	http://www.inter7.com/devel/
 
 MAINTAINER=	roam@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 440003 || ${OSVERSION} >= 500000 && ${OSVERSION} < 500027
@@ -19,7 +21,7 @@ CFLAGS+=	-DNEED_STRCASESTR
 .endif
 
 post-patch:
-	${PERL} -pi.fbsd -e "s|^(DEFS =.*)|\1 ${CFLAGS}|" ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e "s|^(DEFS =.*)|\1 ${CFLAGS}|" ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/autorespond ${PREFIX}/bin/
diff --git a/mail/courier-imap/Makefile b/mail/courier-imap/Makefile
index c54ab3e776b1..76a279277224 100644
--- a/mail/courier-imap/Makefile
+++ b/mail/courier-imap/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	courier
 
 MAINTAINER=	nbm@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	YES
 USE_GMAKE=	YES
 
@@ -130,7 +131,8 @@ EXTRA_DOCS=	README INSTALL AUTHORS imap/ChangeLog
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@perl -i.nbm -pe 'm#^\timapd.cnf pop3d.cnf# && s@[ip][mo][ap][p3]d.cnf@@g;' \
+	@${REINPLACE_CMD} -e \
+		'm#^\timapd.cnf pop3d.cnf# && s@[ip][mo][ap][p3]d.cnf@@g;' \
 		${WRKSRC}/Makefile.in
 
 post-install:
diff --git a/mail/exim-old/Makefile b/mail/exim-old/Makefile
index cb036e5fac46..d5b890c5c5dd 100644
--- a/mail/exim-old/Makefile
+++ b/mail/exim-old/Makefile
@@ -16,6 +16,7 @@ DISTFILES=	exim-3.36.tar.bz2 exim-texinfo-3.30.tar.bz2
 MAINTAINER=	sheldonh@FreeBSD.org
 
 USE_BZIP2=	yes
+USE_PERL5=	yes
 
 .if defined(NOPORTDOCS)
 PKGMESSAGE=	${FILESDIR}/POST-INSTALL-NOTES
diff --git a/mail/exim/Makefile b/mail/exim/Makefile
index d048582038e5..e9128a5cf6fd 100644
--- a/mail/exim/Makefile
+++ b/mail/exim/Makefile
@@ -24,6 +24,7 @@ DISTFILES+=	exiscan-${EXISCAN_VERSION}.tar.bz2
 MAINTAINER=	sheldonh@FreeBSD.org
 
 USE_BZIP2=	yes
+USE_PERL5=	yes
 MAN8=		exim.8
 
 EXIM_VERSION=	4.10
diff --git a/mail/nmh/Makefile b/mail/nmh/Makefile
index e8d0e28e2374..802ddc39a1b8 100644
--- a/mail/nmh/Makefile
+++ b/mail/nmh/Makefile
@@ -61,6 +61,7 @@ MASTER_SITE_SUBDIR=	jkoshy
 
 MAINTAINER=	scott+ports@sabami.seaslug.org
 
+USE_REINPLACE=	yes
 USE_AUTOCONF_VER=213
 CONFIGURE_ARGS=	--libdir=${PREFIX}/libexec/nmh \
 		--sysconfdir=${PREFIX}/etc/nmh
@@ -109,7 +110,7 @@ MLINKS=	mh-profile.5 mh_profile.5
 MAN8=	ap.8 conflict.8 dp.8 fmtdump.8 install-mh.8 mh-mts.8 post.8
 
 post-patch:
-	@${PERL} -pi -e "s|autoconf|${AUTOCONF}|;\
+	@${REINPLACE_CMD} -e "s|autoconf|${AUTOCONF}|;\
 		s|autoheader|${AUTOHEADER}|" ${WRKSRC}/Makefile.in
 
 post-install:
diff --git a/mail/pgen/Makefile b/mail/pgen/Makefile
index e165552527f2..341c57d28e9f 100644
--- a/mail/pgen/Makefile
+++ b/mail/pgen/Makefile
@@ -13,13 +13,14 @@ MASTER_SITES=	http://www.myrddin.demon.co.uk/dist/
 MAINTAINER=	petef@FreeBSD.org
 
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 NO_BUILD=	yes
 
 MAN1=	pgen.1
 
 post-patch:
-	@${PERL} -pi -e 's!\{INSTALL_PROGRAM\}!\{INSTALL_SCRIPT\}!g' \
+	@${REINPLACE_CMD} -e 's!\{INSTALL_PROGRAM\}!\{INSTALL_SCRIPT\}!g' \
 		${WRKSRC}/configure ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/mail/regm/Makefile b/mail/regm/Makefile
index d5a337a7139f..cb1006a522cd 100644
--- a/mail/regm/Makefile
+++ b/mail/regm/Makefile
@@ -12,11 +12,12 @@ MASTER_SITES=	http://perso.linuxfr.org/jdumont/regm/
 
 MAINTAINER=	petef@FreeBSD.org
 
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 USE_PYTHON=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|^#!/usr/bin/env python|#!${PYTHON_CMD}|' \
+	@${REINPLACE_CMD} -e 's|^#!/usr/bin/env python|#!${PYTHON_CMD}|' \
 		${WRKSRC}/regm.py
 
 do-install:
diff --git a/mail/sigit/Makefile b/mail/sigit/Makefile
index 167d7bb2ff88..3c3dae2e52c5 100644
--- a/mail/sigit/Makefile
+++ b/mail/sigit/Makefile
@@ -13,13 +13,14 @@ DISTNAME=	Sigit-${PORTVERSION}
 
 MAINTAINER=	petef@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 WRKSRC=	${WRKDIR}/sigit-${PORTVERSION}
 
 MAN1=	sigit.1 sigit.rc.1
 
 post-patch:
-	@${PERL} -pi -e 's,/etc/sigit.rc,${PREFIX}/etc/sigit.rc,; \
+	@${REINPLACE_CMD} -e 's,/etc/sigit.rc,${PREFIX}/etc/sigit.rc,; \
 		s,/usr/share/sigit,${DATADIR},' ${WRKSRC}/config.h
 
 post-install:
diff --git a/misc/libelysium/Makefile b/misc/libelysium/Makefile
index 7f547a5c5d89..d9c60515135a 100644
--- a/misc/libelysium/Makefile
+++ b/misc/libelysium/Makefile
@@ -16,11 +16,12 @@ USE_GNOMENG=	yes
 USE_GNOME=	glib12
 INSTALLS_SHLIB=	yes
 USE_LIBTOOL=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
 	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
 		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
diff --git a/misc/patanjali/Makefile b/misc/patanjali/Makefile
index cb0470bf7e55..5ebf48642003 100644
--- a/misc/patanjali/Makefile
+++ b/misc/patanjali/Makefile
@@ -13,10 +13,12 @@ EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	trevor@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 PLIST=		${WRKDIR}/pkg-plist
 
 do-patch:
-	@${PERL} -pi -e 's:internet:Internet:g' \
+	@${REINPLACE_CMD} -e 's:internet:Internet:g' \
 		${WRKSRC}/patanjali-sutras-english.txt
 
 pre-build:
diff --git a/multimedia/mplayer-skins/Makefile b/multimedia/mplayer-skins/Makefile
index 72df53320318..b2e7b010fbbc 100644
--- a/multimedia/mplayer-skins/Makefile
+++ b/multimedia/mplayer-skins/Makefile
@@ -21,6 +21,7 @@ MAINTAINER=	riggs@rrr.de
 
 USE_SUBMAKE=	yes
 USE_BZIP2=	yes
+USE_PERL5=	yes
 NO_WRKSUBDIR=	yes
 NO_BUILD=	yes
 SCRIPTS_ENV=	WRKDIRPREFIX="${WRKDIRPREFIX}"
diff --git a/net-im/jabber/Makefile b/net-im/jabber/Makefile
index 40d814be49b4..811439600711 100644
--- a/net-im/jabber/Makefile
+++ b/net-im/jabber/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	seanc@FreeBSD.org
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
+USE_PERL5=	yes
 
 CONFIGURE_ARGS+=	--enable-ssl
 
diff --git a/net-mgmt/NeTraMet/Makefile b/net-mgmt/NeTraMet/Makefile
index 892b8fc72f7b..f4b8ec694505 100644
--- a/net-mgmt/NeTraMet/Makefile
+++ b/net-mgmt/NeTraMet/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/NeTraMet${PORTVERSION:S/.//}
 
+USE_REINPLACE=	yes
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 
@@ -27,6 +28,6 @@ PLIST_SUB=	MOTIF="@comment "
 .endif
 
 post-patch:
-	${PERL} -pi -e "s|"/etc/mib.txt"|${LOCALBASE}/share/NeTraMet/mibs/mib.txt|g;" ${WRKSRC}/src/snmplib/mib.c
+	${REINPLACE_CMD} -e "s|"/etc/mib.txt"|${LOCALBASE}/share/NeTraMet/mibs/mib.txt|g;" ${WRKSRC}/src/snmplib/mib.c
 
 .include <bsd.port.mk>
diff --git a/net-mgmt/p0f/Makefile b/net-mgmt/p0f/Makefile
index f60bb02bfce5..754f87fbfaee 100644
--- a/net-mgmt/p0f/Makefile
+++ b/net-mgmt/p0f/Makefile
@@ -14,12 +14,13 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		trevor@FreeBSD.org
 
+USE_REINPLACE=		yes
 DOCFILES=		COPYING CREDITS ChangeLog README
 MAN1=			p0f.1
 PLIST=			${WRKDIR}/pkg-plist
 
 post-patch:
-	${PERL} -pi -e "s=/etc=${PREFIX}/etc=g" \
+	${REINPLACE_CMD} -e "s=/etc=${PREFIX}/etc=g" \
 		${WRKSRC}/README \
 		${WRKSRC}/p0f.c
 
diff --git a/net/NeTraMet/Makefile b/net/NeTraMet/Makefile
index 892b8fc72f7b..f4b8ec694505 100644
--- a/net/NeTraMet/Makefile
+++ b/net/NeTraMet/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	olgeni@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/NeTraMet${PORTVERSION:S/.//}
 
+USE_REINPLACE=	yes
 USE_AUTOCONF=	yes
 USE_GMAKE=	yes
 
@@ -27,6 +28,6 @@ PLIST_SUB=	MOTIF="@comment "
 .endif
 
 post-patch:
-	${PERL} -pi -e "s|"/etc/mib.txt"|${LOCALBASE}/share/NeTraMet/mibs/mib.txt|g;" ${WRKSRC}/src/snmplib/mib.c
+	${REINPLACE_CMD} -e "s|"/etc/mib.txt"|${LOCALBASE}/share/NeTraMet/mibs/mib.txt|g;" ${WRKSRC}/src/snmplib/mib.c
 
 .include <bsd.port.mk>
diff --git a/net/dhid/Makefile b/net/dhid/Makefile
index abe318814d5d..01e9efed30ff 100644
--- a/net/dhid/Makefile
+++ b/net/dhid/Makefile
@@ -14,13 +14,14 @@ DISTFILES=		${DISTNAME}${EXTRACT_SUFX} \
 
 MAINTAINER=		oryx@ungulate.net
 
+USE_REINPLACE=	yes
 OLDWRKSRC=		${WRKDIR}/${PORTNAME}-3.1
 
 MAN8=			dhid.8
 
 post-patch:
 	@${ECHO} "===>   Patching dhid.h"
-	${PERL} -i -p -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dhid.h
+	${REINPLACE_CMD} -e "s^__PREFIX__^${PREFIX}^g" ${WRKSRC}/dhid.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dhid ${PREFIX}/sbin
diff --git a/net/fspd/Makefile b/net/fspd/Makefile
index 03cd87b391a1..51758c385391 100644
--- a/net/fspd/Makefile
+++ b/net/fspd/Makefile
@@ -16,13 +16,14 @@ MAINTAINER=	trevor@FreeBSD.org
 ALL_TARGET=	fspserver
 DOCDIR=		share/doc/${PORTNAME}
 DOCFILES=	BETA.README ChangeLog FILES INFO TODO INSTALL MACHINES
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 MAN1=		fspd.1
 PLIST=		${WRKDIR}/pkg-plist
 WRKSRC=		${WRKDIR}/2.8.1
 
 do-patch:
-	${PERL} -pi -e "s:/usr/fsp:${LOCALBASE}/etc:g" \
+	${REINPLACE_CMD} -e "s:/usr/fsp:${LOCALBASE}/etc:g" \
 		${WRKSRC}/include/server_conf.h
 
 pre-install:
diff --git a/net/hlmaster/Makefile b/net/hlmaster/Makefile
index ae1ea5221016..cb54b6fea56b 100644
--- a/net/hlmaster/Makefile
+++ b/net/hlmaster/Makefile
@@ -14,14 +14,15 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	pat@FreeBSD.org
 
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 MAN1=		${PORTNAME}.1 ${PORTNAME}.gameserver.1 \
 		${PORTNAME}.filter.1 ${PORTNAME}.list.1
 
 pre-patch:
-	@${PERL} -pi -e 's|-O2||' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${PERL} \
-		-pi.orig -e 's|CXXFLAGS = -O2 -Wall||'
+	@${REINPLACE_CMD} -e 's|-O2||' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name Makefile.in | \
+		${XARGS} ${REINPLACE_CMD} -e 's|CXXFLAGS = -O2 -Wall||'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/net/iplog/Makefile b/net/iplog/Makefile
index 6994ebcfe0a4..1cdaac1a2e60 100644
--- a/net/iplog/Makefile
+++ b/net/iplog/Makefile
@@ -16,6 +16,7 @@ MASTER_SITE_SUBDIR=	ojnk
 MAINTAINER=	udo.schweigert@siemens.com
 
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 MAN5=	iplog.conf.5
@@ -24,7 +25,7 @@ MAN8=	iplog.8
 .include <bsd.port.pre.mk>
 post-patch:
 .for file in example-iplog.conf iplog.8 iplog.conf.5 src/iplog.h
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/${file}
 .endfor
 
 post-install:
diff --git a/net/jabber/Makefile b/net/jabber/Makefile
index 40d814be49b4..811439600711 100644
--- a/net/jabber/Makefile
+++ b/net/jabber/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	seanc@FreeBSD.org
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 USE_OPENSSL=	yes
+USE_PERL5=	yes
 
 CONFIGURE_ARGS+=	--enable-ssl
 
diff --git a/net/ldapsdk/Makefile b/net/ldapsdk/Makefile
index 5ef97f518e55..428dd9be4c3b 100644
--- a/net/ldapsdk/Makefile
+++ b/net/ldapsdk/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	paul@FreeBSD.org
 WRKSRC=			${WRKDIR}/mozilla
 MAKEFILE=	${WRKSRC}/directory/ldapsdk.mk
 USE_GMAKE=	yes
+USE_PERL5=	yes
 
 MAKE_ENV+=	MOZILLA_CLIENT=1 NO_MDUPDATE=1 MOZ_LDAP_SDK=1
 ALL_TARGET=		build
diff --git a/net/mudix/Makefile b/net/mudix/Makefile
index 73bd4bd78d3b..28e16c6a0b83 100644
--- a/net/mudix/Makefile
+++ b/net/mudix/Makefile
@@ -13,10 +13,11 @@ MASTER_SITES=	http://dw.nl.eu.org/mudix/
 MAINTAINER=	scorpio@drkshdw.org
 
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 ALL_TARGET=	# none
 
 pre-patch:
-	@${PERL} -pi -e 's|-O -g|\@CFLAGS\@|g ; \
+	@${REINPLACE_CMD} -e 's|-O -g|\@CFLAGS\@|g ; \
 		 s|mudix.h conf.h||g' ${WRKSRC}/src/Makefile.in
 
 do-install:
diff --git a/net/p0f/Makefile b/net/p0f/Makefile
index f60bb02bfce5..754f87fbfaee 100644
--- a/net/p0f/Makefile
+++ b/net/p0f/Makefile
@@ -14,12 +14,13 @@ EXTRACT_SUFX=		.tgz
 
 MAINTAINER=		trevor@FreeBSD.org
 
+USE_REINPLACE=		yes
 DOCFILES=		COPYING CREDITS ChangeLog README
 MAN1=			p0f.1
 PLIST=			${WRKDIR}/pkg-plist
 
 post-patch:
-	${PERL} -pi -e "s=/etc=${PREFIX}/etc=g" \
+	${REINPLACE_CMD} -e "s=/etc=${PREFIX}/etc=g" \
 		${WRKSRC}/README \
 		${WRKSRC}/p0f.c
 
diff --git a/net/passlogd/Makefile b/net/passlogd/Makefile
index 1bae91dca26c..5c3bd7d949dd 100644
--- a/net/passlogd/Makefile
+++ b/net/passlogd/Makefile
@@ -12,8 +12,10 @@ MASTER_SITES=	http://www.morphine.com/src/
 
 MAINTAINER=	petef@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 post-patch:
-	${PERL} -pi -e "s|.\(CXX\)|${CC} ${CFLAGS}|g" ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e "s|.\(CXX\)|${CC} ${CFLAGS}|g" ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/passlogd ${PREFIX}/sbin
diff --git a/net/py-google/Makefile b/net/py-google/Makefile
index 752537f90f21..0f33dc0fc907 100644
--- a/net/py-google/Makefile
+++ b/net/py-google/Makefile
@@ -19,6 +19,7 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/_xmlplus/sax/__init__.py:${PORTSDIR}/textproc/
 USE_PYTHON=	yes
 USE_ZIP=	yes
 USE_PYDISTUTILS=	yes
+USE_REINPLACE=	yes
 EXTRACT_BEFORE_ARGS=	-q -aa
 
 WRKSRC=		${WRKDIR}/pygoogle
@@ -28,11 +29,11 @@ post-patch:
 # www/py-websvcs has an incompatible version of SOAP.py
 	@${MV} ${WRKSRC}/SOAP.py ${WRKSRC}/SOAPgoogle.py
 	@cd ${WRKSRC}; for f in *.py; do \
-		${PERL} -pi -e 's,import SOAP,import SOAPgoogle as SOAP,g' $$f; \
+		${REINPLACE_CMD} -e 's,import SOAP,import SOAPgoogle as SOAP,g' $$f; \
 	done
 	@${MKDIR} ${WRKSRC}/tests
 	@${MV} ${WRKSRC}/*test*.py ${WRKSRC}/tests
-	@${PERL} -pi -e 's,.*extra_path.*,,g' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's,.*extra_path.*,,g' ${WRKSRC}/setup.py
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/net/tdetect/Makefile b/net/tdetect/Makefile
index 30fb3f68db5f..9679f8e57111 100644
--- a/net/tdetect/Makefile
+++ b/net/tdetect/Makefile
@@ -14,12 +14,14 @@ MASTER_SITES=	http://sb.123.org/ \
 
 MAINTAINER=	shipley@dis.org
 
+USE_REINPLACE=	yes
+
 .include <bsd.port.pre.mk>
 
 pre-configure:
-	${PERL} -pi.dist -e 's/trdetect/tdetect/g' ${WRKSRC}/config.h
+	${REINPLACE_CMD} -e 's/trdetect/tdetect/g' ${WRKSRC}/config.h
 .if ${OSVERSION} > 330002
-	${PERL} -pi.orig -e 's/LOG_AUTHPRIV/LOG_SECURITY/g' ${WRKSRC}/config.h
+	${REINPLACE_CMD} -e 's/LOG_AUTHPRIV/LOG_SECURITY/g' ${WRKSRC}/config.h
 .endif
 
 do-install:
diff --git a/net/trafshow/Makefile b/net/trafshow/Makefile
index 7580bba2cde9..47800cb82c4e 100644
--- a/net/trafshow/Makefile
+++ b/net/trafshow/Makefile
@@ -20,6 +20,7 @@ MAINTAINER=	ryan@sasknow.com
 LIB_DEPENDS=	ncurses.5:${PORTSDIR}/devel/ncurses
 .endif
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -28,7 +29,7 @@ ALL_TARGET=	trafshow
 MAN1=		trafshow.1
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin
diff --git a/net/trafshow3/Makefile b/net/trafshow3/Makefile
index 7580bba2cde9..47800cb82c4e 100644
--- a/net/trafshow3/Makefile
+++ b/net/trafshow3/Makefile
@@ -20,6 +20,7 @@ MAINTAINER=	ryan@sasknow.com
 LIB_DEPENDS=	ncurses.5:${PORTSDIR}/devel/ncurses
 .endif
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -28,7 +29,7 @@ ALL_TARGET=	trafshow
 MAN1=		trafshow.1
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin
diff --git a/net/trafshow4/Makefile b/net/trafshow4/Makefile
index 7580bba2cde9..47800cb82c4e 100644
--- a/net/trafshow4/Makefile
+++ b/net/trafshow4/Makefile
@@ -20,6 +20,7 @@ MAINTAINER=	ryan@sasknow.com
 LIB_DEPENDS=	ncurses.5:${PORTSDIR}/devel/ncurses
 .endif
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include/ncurses -I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -28,7 +29,7 @@ ALL_TARGET=	trafshow
 MAN1=		trafshow.1
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.c
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/trafshow ${PREFIX}/bin
diff --git a/news/slrn/Makefile b/news/slrn/Makefile
index 14321852f082..60341774e3eb 100644
--- a/news/slrn/Makefile
+++ b/news/slrn/Makefile
@@ -25,6 +25,7 @@ LIB_DEPENDS=	slang.1:${PORTSDIR}/devel/libslang \
 
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-ipv6 --disable-inews --with-slrnpull \
@@ -41,7 +42,7 @@ ALL_TARGET=	all
 MAN1=		slrn.1 slrnpull.1
 
 post-patch:
-	@${PERL} -pi -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
+	@${REINPLACE_CMD} -e 's,/usr/lib/sendmail,/usr/sbin/sendmail,' \
 		${WRKSRC}/src/slrnfeat.h
 
 do-install:
diff --git a/print/acroread/Makefile b/print/acroread/Makefile
index dc399c479efe..bf595a7404a5 100644
--- a/print/acroread/Makefile
+++ b/print/acroread/Makefile
@@ -30,6 +30,7 @@ RUN_DEPENDS=	/compat/osf1/usr/shlib/libc.so:${PORTSDIR}/emulators/osf1_base
 ONLY_FOR_ARCHS=	i386 alpha
 
 NO_FILTER_SHLIBS=	yes
+USE_REINPLACE=	yes
 
 .if ${ARCH} == "i386"
 WRKSRC=		${WRKDIR}/ILINXR.install
@@ -41,9 +42,9 @@ PLIST_SUB=	"ARCHDIR=alphaosf"
 
 pre-configure:
 .if ${ARCH} == "i386"
-	@${PERL} -pi.fbsd -e 's:Linux\):FreeBSD|Linux):g' ${WRKSRC}/INSTALL
+	@${REINPLACE_CMD} -e 's:Linux\):FreeBSD|Linux):g' ${WRKSRC}/INSTALL
 .elif ${ARCH} == "alpha"
-	@${PERL} -pi.fbsd -e 's:OSF1\):FreeBSD|OSF1):g' ${WRKSRC}/INSTALL
+	@${REINPLACE_CMD} -e 's:OSF1\):FreeBSD|OSF1):g' ${WRKSRC}/INSTALL
 .endif
 
 do-build:
@@ -55,10 +56,10 @@ do-install:
 
 post-install:
 .if ${ARCH} == "i386"
-	@${PERL} -pi -e 's:Linux\):FreeBSD|Linux):g' ${PREFIX}/Acrobat3/bin/acroread
+	@${REINPLACE_CMD} -e 's:Linux\):FreeBSD|Linux):g' ${PREFIX}/Acrobat3/bin/acroread
 	@brandelf -t Linux ${PREFIX}/Acrobat3/Reader/intellinux/bin/acroread
 .elif ${ARCH} == "alpha"
-	@${PERL} -pi -e 's:OSF1\):FreeBSD|OSF1):g' ${PREFIX}/Acrobat3/bin/acroread
+	@${REINPLACE_CMD} -e 's:OSF1\):FreeBSD|OSF1):g' ${PREFIX}/Acrobat3/bin/acroread
 .endif
 	@cd ${PREFIX}/Acrobat3/bin && \
 	  ${PATCH} --quiet < ${FILESDIR}/acroread.diff && \
diff --git a/print/ttf2pt1/Makefile b/print/ttf2pt1/Makefile
index 59c01f03518e..3735fe5e02a0 100644
--- a/print/ttf2pt1/Makefile
+++ b/print/ttf2pt1/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	freetype:${PORTSDIR}/print/freetype2
 
 FREETYPE_CONFIG?=	${LOCALBASE}/bin/freetype-config
 MAKE_ENV=	FREETYPE_CONFIG="${FREETYPE_CONFIG}"
+USE_PERL5=	yes
 
 MAN1=	ttf2pt1.1 ttf2pt1_convert.1 ttf2pt1_x2gs.1
 
diff --git a/security/labrea/Makefile b/security/labrea/Makefile
index 798b32a09620..c6c815bac815 100644
--- a/security/labrea/Makefile
+++ b/security/labrea/Makefile
@@ -18,9 +18,10 @@ BUILD_DEPENDS+= ${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
 
 WRKSRC=		${WRKDIR}/LaBrea
 ALL_TARGET=	LaBrea
+USE_REINPLACE=	yes
 
 pre-build:
-	${PERL} -pi -e "s@PREFIX=/usr/local@PREFIX=${PREFIX}@g;\
+	${REINPLACE_CMD} -e "s@PREFIX=/usr/local@PREFIX=${PREFIX}@g;\
 		s@LOCALBASE=/usr/local@LOCALBASE=${LOCALBASE}@g" \
 		${WRKSRC}/Makefile
 
diff --git a/security/vlog/Makefile b/security/vlog/Makefile
index 13086ee7bc51..a0d09bec6678 100644
--- a/security/vlog/Makefile
+++ b/security/vlog/Makefile
@@ -18,11 +18,12 @@ ALL_TARGET=	it
 MAKE_ARGS=	CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS}" \
 		LIBS="${PTHREAD_LIBS} -lcurses"
 WRKSRC=		${WRKDIR}/vlog
+USE_REINPLACE=	yes
 
 MAN1=		vlog.1
 MANCOMPRESSED=	no
 
 post-patch:
-	${PERL} -pi -e "s@/usr/local@${PREFIX}@g" ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e "s@/usr/local@${PREFIX}@g" ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/shells/zsh-devel/Makefile b/shells/zsh-devel/Makefile
index dc53d33b952e..c8f2bee73015 100644
--- a/shells/zsh-devel/Makefile
+++ b/shells/zsh-devel/Makefile
@@ -20,7 +20,8 @@ DISTNAME=	${PORTNAME}-${ZSH_VER}-dev-${ZSH_DEV_REV}
 
 MAINTAINER=	shige@FreeBSD.org
 
-USE_AUTOCONF=	yes
+USE_AUTOCONF=   yes
+USE_REINPLACE=	yes
 
 ZSH_VER=	4.1.0
 ZSH_DEV_REV=	5
@@ -50,7 +51,7 @@ PLIST_SUB+=	NO_STATIC=""
 .endif
 
 post-patch:
-	@${PERL} -pi -e 's!\$\(htmldir\)!\$\(prefix\)/share/doc/zsh!' \
+	@${REINPLACE_CMD} -e 's!\$\(htmldir\)!\$\(prefix\)/share/doc/zsh!' \
 		${WRKSRC}/Doc/Makefile.in
 
 post-build:
diff --git a/sysutils/extipl/Makefile b/sysutils/extipl/Makefile
index 28f94b15aeb1..a6477f99f254 100644
--- a/sysutils/extipl/Makefile
+++ b/sysutils/extipl/Makefile
@@ -18,13 +18,14 @@ BUILD_DEPENDS=	nasm:${PORTSDIR}/devel/nasm
 ONLY_FOR_ARCHS=	i386
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
+USE_REINPLACE=	yes
 
 MAN8=		extipl.8
 MANCOMPRESSED=	yes
 
 post-patch:
 	cd ${WRKSRC}; \
-	${PERL} -pi -e 's/^(CC)\t=/$$1?=/;' \
+	${REINPLACE_CMD} -e 's/^(CC)\t=/$$1?=/;' \
 		-e 's/(DIR)[\t]*[?]=/$$1=/;' Makefile
 
 .include <bsd.port.mk>
diff --git a/sysutils/fcron/Makefile b/sysutils/fcron/Makefile
index bd0130392cc5..69c3820796e3 100644
--- a/sysutils/fcron/Makefile
+++ b/sysutils/fcron/Makefile
@@ -17,6 +17,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}.src
 MAINTAINER=	svenasse@polaris.ca
 
 USE_AUTOCONF=	yes
+USE_PERL5=	yes
 CONFIGURE_ARGS=	--with-etcdir=${PREFIX}/etc --with-cflags="${CFLAGS}" \
 		--with-rootname=root --with-rootgroup=wheel \
 		--with-answer-all=yes
diff --git a/sysutils/safecat/Makefile b/sysutils/safecat/Makefile
index c95f77eb4275..d02e22c0b3fe 100644
--- a/sysutils/safecat/Makefile
+++ b/sysutils/safecat/Makefile
@@ -12,12 +12,14 @@ MASTER_SITES=	http://www.nb.net/~lbudney/linux/software/safecat/
 
 MAINTAINER=	roam@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 MAN1=		safecat.1 maildir.1
 
 do-configure:
-		${PERL} -pi.fbsd -e "s,/usr/local,${PREFIX}," ${WRKSRC}/conf-root
-		${PERL} -pi.fbsd -e "s,cc -O2,${CC} ${CFLAGS}," ${WRKSRC}/conf-cc
-		${PERL} -pi.fbsd -e "s,cc -s,${CC} ${CFLAGS} ${STRIP}," ${WRKSRC}/conf-ld
+		${REINPLACE_CMD} -e "s,/usr/local,${PREFIX}," ${WRKSRC}/conf-root
+		${REINPLACE_CMD} -e "s,cc -O2,${CC} ${CFLAGS}," ${WRKSRC}/conf-cc
+		${REINPLACE_CMD} -e "s,cc -s,${CC} ${CFLAGS} ${STRIP}," ${WRKSRC}/conf-ld
 
 ALL_TARGET=	it
 INSTALL_TARGET=	setup check
diff --git a/sysutils/ssync/Makefile b/sysutils/ssync/Makefile
index e067ce9bf137..1129058a2b2b 100644
--- a/sysutils/ssync/Makefile
+++ b/sysutils/ssync/Makefile
@@ -15,14 +15,15 @@ MAINTAINER=	nyxo@dnuc.polyn.kiae.su
 ALL_TARGET=	default
 USE_GMAKE=	yes
 MAKEFILE=	makefile
+USE_REINPLACE=	yes
 
 MAN1=		ssync.1
 
 post-patch:
-	@${PERL} -pi -e 's@/etc/init.d/ssyncd@\$$0@g' ${WRKSRC}/ssyncd.init
-	@${PERL} -pi -e "s@/etc@${PREFIX}/etc@g;s@/usr/sbin@${PREFIX}/sbin@g;" \
+	@${REINPLACE_CMD} -e 's@/etc/init.d/ssyncd@\$$0@g' ${WRKSRC}/ssyncd.init
+	@${REINPLACE_CMD} -e "s@/etc@${PREFIX}/etc@g;s@/usr/sbin@${PREFIX}/sbin@g;" \
 		${WRKSRC}/ssyncd.init ${WRKSRC}/ssyncd.conf ${WRKSRC}/daemon.c
-	@${PERL} -pi -e "s@ +CFLAGS.+@@g; s@ +LDFLAGS.+@@g;" ${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e "s@ +CFLAGS.+@@g; s@ +LDFLAGS.+@@g;" ${WRKSRC}/makefile
 
 do-install:
 	@${INSTALL_PROGRAM} ${WRKSRC}/ssync ${PREFIX}/bin/ssync
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 677ddae36420..8d2d2f2e209f 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -18,11 +18,12 @@ MAN5=		syslog-ng.conf.5
 MAN8=		syslog-ng.8
 
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
 post-patch:
-	@${PERL} -pi -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h
+	@${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h
 
 post-build:
 	@${SED} -e 's,__PREFIX__,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
diff --git a/sysutils/syslog-ng1/Makefile b/sysutils/syslog-ng1/Makefile
index 677ddae36420..8d2d2f2e209f 100644
--- a/sysutils/syslog-ng1/Makefile
+++ b/sysutils/syslog-ng1/Makefile
@@ -18,11 +18,12 @@ MAN5=		syslog-ng.conf.5
 MAN8=		syslog-ng.8
 
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 
 PKGMESSAGE=	${WRKDIR}/MESSAGE
 
 post-patch:
-	@${PERL} -pi -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h
+	@${REINPLACE_CMD} -e 's:__PREFIX__:${PREFIX}:g' ${WRKSRC}/src/syslog-ng.h
 
 post-build:
 	@${SED} -e 's,__PREFIX__,${PREFIX},g' ${PKGDIR}/pkg-message > ${PKGMESSAGE}
diff --git a/textproc/diffutils/Makefile b/textproc/diffutils/Makefile
index feb830ec0999..20664a5d15a8 100644
--- a/textproc/diffutils/Makefile
+++ b/textproc/diffutils/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	diffutils
 
 MAINTAINER=	rooneg@electricjellyfish.net
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --program-prefix=g
 
@@ -26,7 +27,7 @@ remove-info-files:
 post-patch: patch-makeinfo
 
 patch-makeinfo:
-	@${PERL} -pi.fbsd -e 's|makeinfo|makeinfo --no-split|g' \
+	@${REINPLACE_CMD} -e 's|makeinfo|makeinfo --no-split|g' \
 		${WRKSRC}/Makefile.in
 
 post-install: install-info
diff --git a/textproc/py-4suite/Makefile b/textproc/py-4suite/Makefile
index c73685a261cb..62b1df93b16e 100644
--- a/textproc/py-4suite/Makefile
+++ b/textproc/py-4suite/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	wjv@FreeBSD.org
 BUILD_DEPENDS=	${PYXML}
 RUN_DEPENDS=	${PYXML}
 
+USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 PYDISTUTILS_INSTALLARGS=	-c -O1 --prefix=${PREFIX} \
@@ -31,12 +32,12 @@ PLIST_SUB+=	PACKAGE_DIR=_xmlplus PYTHON2_ONLY=""
 .endif
 
 post-patch:
-	@ ${PERL} -pi -e \
+	@ ${REINPLACE_CMD} -e \
 	  's#(copy_to=.)docs#$$1doc/${PORTNAME}#; \
 	   s#(copy_to=.)(test_suite|demo)#$$1examples/${PORTNAME}/$$2#' \
 	  ${WRKSRC}/setup.py
 .if defined(NOPORTDOCS)
-	@ ${PERL} -pi -e 's/(data_files=)data_files/$$1/' \
+	@ ${REINPLACE_CMD} -e 's/(data_files=)data_files/$$1/' \
 	  ${WRKSRC}/setup.py
 .endif
 
diff --git a/www/amyc/Makefile b/www/amyc/Makefile
index 26408e575cd9..8267e74513bf 100644
--- a/www/amyc/Makefile
+++ b/www/amyc/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	petef@FreeBSD.org
 
 LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
+USE_REINPLACE=	yes
 USE_AUTOCONF=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV+=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -35,7 +36,7 @@ PLIST_SUB=	WITH_GTK="@comment "
 .endif
 
 post-patch:
-	@${PERL} -pi -e 's!\(datadir\)/locale!(prefix)/share/locale!' \
+	@${REINPLACE_CMD} -e 's!\(datadir\)/locale!(prefix)/share/locale!' \
 		${WRKSRC}/po/Makefile.in.in
 
 .include <bsd.port.post.mk>
diff --git a/www/mdw/Makefile b/www/mdw/Makefile
index 7b93bbeb55cb..cc50a05baad9 100644
--- a/www/mdw/Makefile
+++ b/www/mdw/Makefile
@@ -13,11 +13,12 @@ MASTER_SITES=	http://redbrick.dcu.ie/~colmmacc/mdw/
 MAINTAINER=	petef@FreeBSD.org
 
 USE_AUTOCONF=	yes
+USE_REINPLACE=	yes
 
 MAN1=	mdw.1
 
 post-patch:
-	@${PERL} -pi -e 's!quite!quiet!ig; s!.BR md5sum \(1\),\n!!' \
+	@${REINPLACE_CMD} -e 's!quite!quiet!ig; s!.BR md5sum \(1\),\n!!' \
 		${WRKSRC}/doc/mdw.1
 
 post-install:
diff --git a/www/micro_httpd/Makefile b/www/micro_httpd/Makefile
index 20f78fef59b1..e68a4cc4b952 100644
--- a/www/micro_httpd/Makefile
+++ b/www/micro_httpd/Makefile
@@ -14,15 +14,16 @@ DISTNAME=	${PORTNAME}_15dec00
 
 MAINTAINER=	user@unknown.nu
 
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAN8=		micro_httpd.8
 
 post-patch:
-	@${PERL} -pi -e "s:/usr/local/sbin:${PREFIX}/sbin:g; \
+	@${REINPLACE_CMD} -e "s:/usr/local/sbin:${PREFIX}/sbin:g; \
 		s:/usr/local/man/man8:${MAN8PREFIX}/man/man8:g; \
 		s:^(CC|CFLAGS) =.+::g;" \
 		${WRKSRC}/Makefile
-	@${PERL} -pi -e "s/^.TH micro_httpd 1/.TH micro_httpd 8/g" \
+	@${REINPLACE_CMD} -e "s/^.TH micro_httpd 1/.TH micro_httpd 8/g" \
 		${WRKSRC}/micro_httpd.8
 
 .include <bsd.port.mk>
diff --git a/www/mod_cvs/Makefile b/www/mod_cvs/Makefile
index d10a5e819180..a6fa3c529704 100644
--- a/www/mod_cvs/Makefile
+++ b/www/mod_cvs/Makefile
@@ -16,12 +16,13 @@ MAINTAINER=	petef@FreeBSD.org
 BUILD_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 RUN_DEPENDS=	${APXS}:${PORTSDIR}/www/apache13
 
+USE_REINPLACE=	yes
 MAKE_ARGS+=	APXS="${APXS}"
 
 APXS?=	${LOCALBASE}/sbin/apxs
 
 post-patch:
-	@${PERL} -pi -e 's,apxs,${APXS},g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's,apxs,${APXS},g' ${WRKSRC}/Makefile
 
 do-install:
 	${APXS} -i -A -n cvs ${WRKSRC}/mod_cvs.so
diff --git a/www/waccess/Makefile b/www/waccess/Makefile
index 3307f5356165..42348320cf09 100644
--- a/www/waccess/Makefile
+++ b/www/waccess/Makefile
@@ -13,12 +13,13 @@ MASTER_SITES=	http://www.tundraware.com/Software/waccess/
 MAINTAINER=	tundra@tundraware.com
 
 USE_PYTHON=	yes
+USE_REINPLACE=	yes
 
 MAN1=	waccess.1
 MANCOMPRESSED=	yes
 
 post-patch:
-	@${PERL} -pi -e 's,^#!/usr/local/bin/python,#!${PYTHON_CMD},' \
+	@${REINPLACE_CMD} -e 's,^#!/usr/local/bin/python,#!${PYTHON_CMD},' \
 		${WRKSRC}/waccess
 
 do-install: