29 files changed, 82 insertions, 51 deletions

diff --git a/devel/SpecTcl/Makefile b/devel/SpecTcl/Makefile
index 1ec77850ed01..83e9fb414811 100644
--- a/devel/SpecTcl/Makefile
+++ b/devel/SpecTcl/Makefile
@@ -16,11 +16,12 @@ MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	wish8.0:${PORTSDIR}/x11-toolkits/tk80
 
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/specJava
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/specTcl
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/specJava
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/bin/specTcl
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/specJava ${PREFIX}/bin
diff --git a/devel/asl/Makefile b/devel/asl/Makefile
index 938c84ca8396..6404fac5c855 100644
--- a/devel/asl/Makefile
+++ b/devel/asl/Makefile
@@ -14,13 +14,15 @@ MASTER_SITE_SUBDIR=	devel/lang/assemblers
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 MAN1=	asl.1 p2bin.1 p2hex.1 pbind.1 plist.1
 
 post-extract:
 	${CP} ${FILESDIR}/Makefile.def ${WRKSRC}
 
 post-patch:
-	${PERL} -pi -e 's/mkdirhier/mkdir \-p/' ${WRKSRC}/install.sh
+	${REINPLACE_CMD} -e 's/mkdirhier/mkdir \-p/' ${WRKSRC}/install.sh
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/doc/asl
diff --git a/devel/boehm-gc/Makefile b/devel/boehm-gc/Makefile
index 9441f8d7f9dc..2a6c86b88aa3 100644
--- a/devel/boehm-gc/Makefile
+++ b/devel/boehm-gc/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 ONLY_FOR_ARCHS=	i386	# XXX can't figure out whether to define
 #			# XXX SEARCH_FOR_DATA_START on other platforms
 
+USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
@@ -23,7 +24,7 @@ CONFIGURE_ARGS=	--prefix=${PREFIX}
 MAN3=		gc.3
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/gc.man
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/gc.man
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/include/gc.h ${PREFIX}/include
diff --git a/devel/cvs2p4/Makefile b/devel/cvs2p4/Makefile
index d94145e196ab..3431eb158589 100644
--- a/devel/cvs2p4/Makefile
+++ b/devel/cvs2p4/Makefile
@@ -13,16 +13,18 @@ EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
 
 PERFORCE_PORT?=	1666
 
 post-patch:
-	${PERL} -pi \
+	@${REINPLACE_CMD} \
 		-e 's,!!PREFIX!!,${PREFIX},g;' \
 		-e 's,!!PERFORCE_PORT!!,${PERFORCE_PORT},g;' \
 		${WRKSRC}/test/config
-	find ${WRKSRC} -name '*.orig' -delete
+	@${FIND} ${WRKSRC} -name '*.orig' -delete
 
 do-install:
 	${MKDIR} ${PREFIX}/${PORTNAME}
diff --git a/devel/dia2code/Makefile b/devel/dia2code/Makefile
index de001f567b8e..4b368df4eedb 100644
--- a/devel/dia2code/Makefile
+++ b/devel/dia2code/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
 XML_CONFIG=	${LOCALBASE}/bin/xml2-config
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib" \
@@ -26,7 +27,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		dia2code.1
 
 post-patch:
-	@${PERL} -pi -e 's|#include <malloc.h>||' ${WRKSRC}/dia2code/dia2code.h
+	@${REINPLACE_CMD} -e 's|#include <malloc.h>||' ${WRKSRC}/dia2code/dia2code.h
 
 post-install:
 	@${INSTALL_MAN} ${WRKSRC}/dia2code.1 ${MANPREFIX}/man/man1
diff --git a/devel/dmake/Makefile b/devel/dmake/Makefile
index e3264fc524fc..c7278290c361 100644
--- a/devel/dmake/Makefile
+++ b/devel/dmake/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PORTNAME}-v${PORTVERSION}-src-export.all-unknown-all
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CC=${CC}
 MAKEFILE=	makefile
@@ -27,7 +28,7 @@ post-extract:
 .endfor
 
 post-patch:
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/unix/startup.h
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/unix/startup.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dmake ${PREFIX}/bin
diff --git a/devel/dotconf/Makefile b/devel/dotconf/Makefile
index 697c416037df..acf769d08a46 100644
--- a/devel/dotconf/Makefile
+++ b/devel/dotconf/Makefile
@@ -13,13 +13,14 @@ MASTER_SITES=	http://www.azzit.de/dotconf/download/v1.0/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 pre-patch:
-	@${PERL} -pi -e 's|-Wall -g||' ${WRKSRC}/configure
-	@${PERL} -pi -e 's|-release $(LT_RELEASE)||' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|-Wall -g||' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-release $(LT_RELEASE)||' ${WRKSRC}/src/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/elfio/Makefile b/devel/elfio/Makefile
index d32935a1ec06..e98d0c63710a 100644
--- a/devel/elfio/Makefile
+++ b/devel/elfio/Makefile
@@ -16,10 +16,11 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/ELFIO/ELFIO
 MAKEFILE=	makefile
+USE_REINPLACE=	yes
 ALL_TARGET=	# empty
 
 post-patch:
-	@${PERL} -pi -e "s,^CXXFLAGS,#CXXFLAGS,g" ${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e "s,^CXXFLAGS,#CXXFLAGS,g" ${WRKSRC}/makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/libELFIO.a ${PREFIX}/lib
diff --git a/devel/flux/Makefile b/devel/flux/Makefile
index c727e756f957..db773d5b7543 100644
--- a/devel/flux/Makefile
+++ b/devel/flux/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.copyleft.no/projects/fluxlib/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_AUTOMAKE_VER=14
 USE_LIBTOOL=	yes
@@ -21,19 +22,19 @@ REGEX=		"s@EXTRA_DIST \+@EXTRA_DIST @g"
 
 pre-configure:
 .for M in examples include src util
-	@${PERL} -pi -e ${REGEX} ${WRKSRC}/${M}/Makefile.am
+	@${REINPLACE_CMD} -e ${REGEX} ${WRKSRC}/${M}/Makefile.am
 .endfor
 .for M in build cgi cipher comm fifobuf fstring log mem misc mt nvtp ph proc \
 	random smtp sock tn url xml
-	@${PERL} -pi -e ${REGEX} ${WRKSRC}/src/${M}/Makefile.am
+	@${REINPLACE_CMD} -e ${REGEX} ${WRKSRC}/src/${M}/Makefile.am
 .endfor
 .for M in framework/application framework/application/src test
-	@${PERL} -pi -e ${REGEX} ${WRKSRC}/util/${M}/Makefile.am
+	@${REINPLACE_CMD} -e ${REGEX} ${WRKSRC}/util/${M}/Makefile.am
 .endfor
 .for M in smtp
-	@${PERL} -pi -e ${REGEX} ${WRKSRC}/examples/${M}/Makefile.am
+	@${REINPLACE_CMD} -e ${REGEX} ${WRKSRC}/examples/${M}/Makefile.am
 .endfor
-	${PERL} -pi -e "s@autoheader,@${AUTOHEADER},@g" ${WRKSRC}/aclocal.m4
+	@${REINPLACE_CMD} -e "s@autoheader,@${AUTOHEADER},@g" ${WRKSRC}/aclocal.m4
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/freescope/Makefile b/devel/freescope/Makefile
index f96cd2506b8d..a9bea9a1dd23 100644
--- a/devel/freescope/Makefile
+++ b/devel/freescope/Makefile
@@ -17,12 +17,13 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 MAN1=	freescope.1
 
 pre-patch:
-	@${PERL} -pi -e 's|CFLAGS=.*$$|CFLAGS="\$$CFLAGS"|g ; \
+	@${REINPLACE_CMD} -e 's|CFLAGS=.*$$|CFLAGS="\$$CFLAGS"|g ; \
 		 s|CXXFLAGS=.*$$|CXXFLAGS="\$$CXXFLAGS"|g ; \
 		 s|bindir="/usr/local/bin"||g' ${WRKSRC}/configure
 
diff --git a/devel/g2c/Makefile b/devel/g2c/Makefile
index 18162ed8d8c8..9b172ae36c24 100644
--- a/devel/g2c/Makefile
+++ b/devel/g2c/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GTK=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
@@ -26,10 +27,10 @@ USE_GNOME=	yes
 .endif
 
 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 ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
 
 .include <bsd.port.post.mk>
diff --git a/devel/getxml/Makefile b/devel/getxml/Makefile
index 252c8f4df239..f7259d09ecfd 100644
--- a/devel/getxml/Makefile
+++ b/devel/getxml/Makefile
@@ -16,10 +16,11 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	xml.5:${PORTSDIR}/textproc/libxml
 
+USE_REINPLACE=	yes
 USE_GLIB=	yes
 GNU_CONFIGURE=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,glib-config,${GLIB_CONFIG},g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,glib-config,${GLIB_CONFIG},g" ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/devel/lbpp/Makefile b/devel/lbpp/Makefile
index e37e27e102aa..f13024e9ced9 100644
--- a/devel/lbpp/Makefile
+++ b/devel/lbpp/Makefile
@@ -14,15 +14,16 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
 
 post-patch:
 	@${GREP} -lR "malloc.h" ${WRKSRC} | ${XARGS} \
-		${PERL} -pi -e "s/malloc.h/stdlib.h/g"
+		${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/g"
 	@${FIND} ${WRKSRC} -name "Makefile*" | ${XARGS} \
-		${PERL} -pi -e "s,^CC,#CC,g ; s,^CFLAGS =,CFLAGS+=,g ; \
+		${REINPLACE_CMD} -e "s,^CC,#CC,g ; s,^CFLAGS =,CFLAGS+=,g ; \
 				s,-Wall -g,,g"
 
 do-install:
diff --git a/devel/leoarg/Makefile b/devel/leoarg/Makefile
index ba041c693f84..da216585dbd5 100644
--- a/devel/leoarg/Makefile
+++ b/devel/leoarg/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	LeoArg-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
@@ -24,7 +25,7 @@ MAN3=	LeoArg.3 LeoArg__InvalidOption.3 LeoArg__InvalidSetting.3 \
 
 post-patch:
 .for file in Makefile.in doc/Makefile.in
-	@${PERL} -pi -e 's|^docdir|#docdir|g ; \
+	@${REINPLACE_CMD} -e 's|^docdir|#docdir|g ; \
 		 s| install-data-local||g' ${WRKSRC}/${file}
 .endfor
 
diff --git a/devel/libafterbase/Makefile b/devel/libafterbase/Makefile
index 39b831bf245e..6f6a5f07353c 100644
--- a/devel/libafterbase/Makefile
+++ b/devel/libafterbase/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	libAfterBase-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
@@ -22,7 +23,7 @@ CONFIGURE_ARGS=	--enable-sharedlibs --with-x
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|g'
 
 .include <bsd.port.mk>
diff --git a/devel/libformat/Makefile b/devel/libformat/Makefile
index ab5a6bc3ff35..d5bc9a66597a 100644
--- a/devel/libformat/Makefile
+++ b/devel/libformat/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	Format-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
@@ -22,7 +23,7 @@ INSTALLS_SHLIB=	yes
 MAN3=	Format.3
 
 post-patch:
-	@${PERL} -pi -e 's| install-data-local||g' ${WRKSRC}/doc/Makefile.in
+	@${REINPLACE_CMD} -e 's| install-data-local||g' ${WRKSRC}/doc/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/libshbuf/Makefile b/devel/libshbuf/Makefile
index 83c092661a3b..ffe57284c797 100644
--- a/devel/libshbuf/Makefile
+++ b/devel/libshbuf/Makefile
@@ -14,11 +14,12 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/devel/linguist/Makefile b/devel/linguist/Makefile
index 86d14eb70edc..75350d8d579b 100644
--- a/devel/linguist/Makefile
+++ b/devel/linguist/Makefile
@@ -17,6 +17,7 @@ BUILD_DEPENDS=	tmake:${PORTSDIR}/devel/tmake
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USE_REINPLACE=	yes
 USE_QT_VER=	2
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -34,14 +35,14 @@ CFLAGS+=	-O0
 .endif
 
 pre-configure:
-	@find ${WRKSRC} -name '*.pro' | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name '*.pro' | ${XARGS} ${REINPLACE_CMD} -E -e \
 		's/(^CONFIG.*)/\1 thread/'
 
 post-configure:
-	@${PERL} -pi -e 's|\$\(SUBDIRS\):.*tmake_all|\$\(SUBDIRS\):|' \
+	@${REINPLACE_CMD} -e 's|\$$(SUBDIRS):.*tmake_all|\$$(SUBDIRS):|' \
 		${WRKSRC}/Makefile
-	@find ${WRKSRC} -name "Makefile" -type f | xargs ${PERL} -pi -e \
-		's|TARGET.*=.*\$\(QTDIR\)/bin/|TARGET=|'
+	@${FIND} ${WRKSRC} -name "Makefile" -type f | ${XARGS} ${REINPLACE_CMD} -e \
+		's|TARGET.*=.*\$$(QTDIR)/bin/|TARGET=|'
 
 do-install:
 .for file in linguist lrelease lupdate qm2ts
diff --git a/devel/log4cpp/Makefile b/devel/log4cpp/Makefile
index 000ca42a0784..a2ef7c829767 100644
--- a/devel/log4cpp/Makefile
+++ b/devel/log4cpp/Makefile
@@ -14,12 +14,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's, endl, std::endl,g' ${WRKSRC}/tests/Clock.cpp \
+	@${REINPLACE_CMD} -e 's, endl, std::endl,g' ${WRKSRC}/tests/Clock.cpp \
 		${WRKSRC}/tests/testbench.cpp
 
 .include <bsd.port.mk>
diff --git a/devel/openzz/Makefile b/devel/openzz/Makefile
index ff482a134861..b8c337a55c43 100644
--- a/devel/openzz/Makefile
+++ b/devel/openzz/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes
@@ -21,9 +22,9 @@ INSTALLS_SHLIB=	yes
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${PERL} -pi -e "s/cfree/free/g" ${WRKSRC}/src/list.c
+	@${REINPLACE_CMD} -e "s/cfree/free/g" ${WRKSRC}/src/list.c
 .if ${OSVERSION} <= 500027
-	@${FIND} ${WRKSRC}/src -type f | ${XARGS} ${PERL} -pi \
+	@${FIND} ${WRKSRC}/src -type f | ${XARGS} ${REINPLACE_CMD} \
 		-e 's|<stdint.h>|<inttypes.h>|'
 .endif
 
diff --git a/devel/pcre++/Makefile b/devel/pcre++/Makefile
index 38f807be7961..681f7eea28cf 100644
--- a/devel/pcre++/Makefile
+++ b/devel/pcre++/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	pcre.0:${PORTSDIR}/devel/pcre
 
 PCRE_CONFIG?=	${LOCALBASE}/bin/pcre-config
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="`${PCRE_CONFIG} --cflags`" \
@@ -26,9 +27,9 @@ INSTALLS_SHLIB=	yes
 MAN3=	Pcre.3
 
 post-patch:
-	@${PERL} -pi -e 's|-I/usr/local/include||g ; \
+	@${REINPLACE_CMD} -e 's|-I/usr/local/include||g ; \
 		 s|-L/usr/local/lib||g' ${WRKSRC}/configure
-	@${PERL} -pi -e 's|-O -g|\@CXXFLAGS\@|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-O -g|\@CXXFLAGS\@|g' ${WRKSRC}/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/py-mx-experimental/Makefile b/devel/py-mx-experimental/Makefile
index 20d811bb53cf..ca357632d0b8 100644
--- a/devel/py-mx-experimental/Makefile
+++ b/devel/py-mx-experimental/Makefile
@@ -19,10 +19,11 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	${PREFIX}/include/gmp.h:${PORTSDIR}/math/libgmp4
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/mx/BeeBase/BeeBase.py:${PORTSDIR}/lang/py-mx-base
 
+USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
 
 post-patch:
-	@${PERL} -pi  -e "s|LIBGMPH|${PREFIX}/include|" ${WRKSRC}/mxEXPERIMENTAL.py
+	@${REINPLACE_CMD} -e "s|LIBGMPH|${PREFIX}/include|" ${WRKSRC}/mxEXPERIMENTAL.py
 
 .include <bsd.port.mk>
diff --git a/devel/qtk/Makefile b/devel/qtk/Makefile
index c2c67a7ad866..5e81f1fc99cf 100644
--- a/devel/qtk/Makefile
+++ b/devel/qtk/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	${LOCALBASE}/bin/wish8.2:${PORTSDIR}/x11-toolkits/tk82
 
+USE_REINPLACE=	yes
 EXTRACT_CMD=	${CP}
 EXTRACT_BEFORE_ARGS=	# empty
 EXTRACT_AFTER_ARGS=	.
@@ -28,7 +29,7 @@ USE_X_PREFIX=	yes
 WISH=		${LOCALBASE}/bin/wish8.2
 
 do-configure:
-	@${PERL} -pi.dist \
+	@${REINPLACE_CMD} \
 		-e 's|/usr/bin/wish|${WISH}|;' \
 		-e 's|keepnewline wish|keepnewline ${WISH}|' ${WRKSRC}/qtk
 
diff --git a/devel/styx/Makefile b/devel/styx/Makefile
index 7bf19c212b26..c2193f082d37 100644
--- a/devel/styx/Makefile
+++ b/devel/styx/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_FLAGS}" \
@@ -27,7 +28,7 @@ post-extract:
 	@${RM} -f ${WRKSRC}/config.cache
 
 post-patch:
-	@${PERL} -pi -e "s,-lrt,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,-lrt,${PTHREAD_LIBS},g" ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/devel/terminality/Makefile b/devel/terminality/Makefile
index 40b02226e16d..1bbde2c90949 100644
--- a/devel/terminality/Makefile
+++ b/devel/terminality/Makefile
@@ -14,13 +14,14 @@ DISTNAME=	tn-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CPP=${CXX} INSTALL="${INSTALL}" INSTALL_DATA="${INSTALL_DATA}"
 
 post-patch:
-	@find ${WRKSRC} -name Makefile | xargs \
-		${PERL} -pi -e "s, -lstdc\\+\\+,,g"
-	@${PERL} -pi -e "s,make,gmake,g ; \
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
+		${REINPLACE_CMD} -e "s, -lstdc\\+\\+,,g"
+	@${REINPLACE_CMD} -e "s,make,gmake,g ; \
 		s,/usr/local,${PREFIX},g" ${WRKSRC}/Makefile
 
 .if !defined(NOPORTDOCS)
diff --git a/devel/titano/Makefile b/devel/titano/Makefile
index 080d7e04d4de..85dbe96d78c6 100644
--- a/devel/titano/Makefile
+++ b/devel/titano/Makefile
@@ -18,17 +18,18 @@ LIB_DEPENDS=	gtkeditor.0:${PORTSDIR}/x11-toolkits/libgtkeditor
 
 WRKSRC=		${WRKDIR}/${DISTNAME:S/b//}
 
+USE_REINPLACE=	yes
 USE_GNOMELIBS=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 
 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 ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
 
 post-install:
 	${MKDIR} ${PREFIX}/share/gnome/pixmaps/titano
diff --git a/devel/tvision/Makefile b/devel/tvision/Makefile
index 9980d12c5697..5964e837477e 100644
--- a/devel/tvision/Makefile
+++ b/devel/tvision/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	devel/lang/c++
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 INSTALLS_SHLIB=	yes
@@ -23,9 +24,9 @@ post-extract:
 	@${MV} ${WRKSRC}/myendian.h ${WRKSRC}/lib
 
 post-patch:
-	@${PERL} -pi -e 's,myendian.h,tvision/myendian.h,g' \
+	@${REINPLACE_CMD} -e 's,myendian.h,tvision/myendian.h,g' \
 		${WRKSRC}/lib/drawbuf.h ${WRKSRC}/lib/system.h
-	@${PERL} -pi -e 's,menus.h msgbox.h,menus.h msgbox.h myendian.h,' \
+	@${REINPLACE_CMD} -e 's,menus.h msgbox.h,menus.h msgbox.h myendian.h,' \
 		${WRKSRC}/lib/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/devel/uisp/Makefile b/devel/uisp/Makefile
index 9121c4efefe2..1ab6e6fbd58e 100644
--- a/devel/uisp/Makefile
+++ b/devel/uisp/Makefile
@@ -16,10 +16,11 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 
 post-patch:
-	${PERL} -pi -e "s@-O3@${CFLAGS}@g; \
+	@${REINPLACE_CMD} -e "s@-O3@${CFLAGS}@g; \
 			s@g\+\+@${CXX}@g" ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/devel/xparam/Makefile b/devel/xparam/Makefile
index 9a50e2aca2a0..d824d023f6b7 100644
--- a/devel/xparam/Makefile
+++ b/devel/xparam/Makefile
@@ -16,12 +16,13 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	libtool:${PORTSDIR}/devel/libtool
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-dynamic
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,-ldl,,g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,-ldl,,g" ${WRKSRC}/configure
 
 .include <bsd.port.mk>