${PERL} -> ${REINPLACE_CMD}

PR: 40784 Submitted by: corecode@corecode.ath.cx Reviewed by: flynn@energyhq.homeip.net
svn path=/head/; revision=65426
2025-07-18 17:59:20 -04:00 · 2002-09-01 16:07:59 +00:00 · 2002-09-01 16:07:59 +00:00 · 534fffca27 · 2021-03-31 03:12:20 +00:00
commit 534fffca27
parent 5bc499ce47
92 changed files with 258 additions and 157 deletions
--- a/audio/snack/Makefile
+++ b/audio/snack/Makefile
@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83

 WRKSRC=		${WRKDIR}/${DISTNAME}/unix
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-tcl=${LOCALBASE}/lib/tcl8.3 \
 		--with-tk=${LOCALBASE}/lib/tk8.3 \
@ -43,7 +44,7 @@ pre-everything:
 .endif

 post-patch:
-	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile.in

 .if !defined(NOPORTDOCS)
 post-install:
--- a/audio/xmpeg3/Makefile
+++ b/audio/xmpeg3/Makefile
@ -17,11 +17,13 @@ MAINTAINER=	ports@FreeBSD.org
 RUN_DEPENDS=	amp:${PORTSDIR}/audio/amp \
 		wish8.2:${PORTSDIR}/x11-toolkits/tk82

+USE_REINPLACE=	yes
+
 WRKSRC=		${WRKDIR}/xmpeg3
 NO_BUILD=	yes

 post-patch:
-	@/usr/bin/perl -pi -e "s|\@\@PREFIX\@\@|${PREFIX}|;" ${WRKSRC}/xmpeg3
+	@${REINPLACE_CMD} -e 's|@@PREFIX@@|${PREFIX}|' ${WRKSRC}/xmpeg3

 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/xmpeg3 ${PREFIX}/bin
--- a/comms/acfax/Makefile
+++ b/comms/acfax/Makefile
@ -18,13 +18,14 @@ RUN_DEPENDS=	${X11BASE}/lib/libXaw3d.a:${PORTSDIR}/x11-toolkits/Xaw3d

 WRKSRC=		${WRKDIR}/acfax
 USE_IMAKE=	yes
+USE_REINPLACE=	yes

 post-patch:
-	@${PERL} -pi -e 's|setup_fax\(120, 288|setup_fax(120, 576|' \
+	@${REINPLACE_CMD} -e 's|setup_fax(120, 288|setup_fax(120, 576|' \
 		${WRKSRC}/acfax.c
-	@${PERL} -pi -e 's|ixoc = 288|ixoc = 576|' ${WRKSRC}/fax_funcs.c
-	@${PERL} -pi -e 's|regex.h|gnuregex.h|' ${WRKSRC}/RegExp.h
-	@${PERL} -pi -e 's|-lm|-lm -lgnuregex|' ${WRKSRC}/Imakefile
+	@${REINPLACE_CMD} -e 's|ixoc = 288|ixoc = 576|' ${WRKSRC}/fax_funcs.c
+	@${REINPLACE_CMD} -e 's|regex.h|gnuregex.h|' ${WRKSRC}/RegExp.h
+	@${REINPLACE_CMD} -e 's|-lm|-lm -lgnuregex|' ${WRKSRC}/Imakefile

 post-configure:
 		${TOUCH} ${WRKSRC}/acfax.man
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix

 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}

 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}

 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure

 .include <bsd.port.mk>
--- a/databases/db41/Makefile
+++ b/databases/db41/Makefile
@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix

 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}

 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}

 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure

 .include <bsd.port.mk>
--- a/databases/db42/Makefile
+++ b/databases/db42/Makefile
@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix

 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}

 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}

 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure

 .include <bsd.port.mk>
--- a/databases/db43/Makefile
+++ b/databases/db43/Makefile
@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix

 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}

 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}

 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure

 .include <bsd.port.mk>
--- a/databases/db44/Makefile
+++ b/databases/db44/Makefile
@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix

 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}

 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}

 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure

 .include <bsd.port.mk>
--- a/databases/db45/Makefile
+++ b/databases/db45/Makefile
@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix

 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}

 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}

 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure

 .include <bsd.port.mk>
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix

 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}

 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}

 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure

 .include <bsd.port.mk>
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix

 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}

 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}

 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure

 .include <bsd.port.mk>
--- a/databases/dbtool/Makefile
+++ b/databases/dbtool/Makefile
@ -29,6 +29,7 @@ CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${DB_INC}"

 USE_GMAKE=	yes
+USE_REINPLACE=	yes

 MAN1=	dbtool.1

@ -42,8 +43,8 @@ post-extract:

 post-patch:
 .for file in dbtool.cc engine.cc engine.h
-	@${PERL} -pi -e "s,stdin,input,g" ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/${file}
 .endfor
-	@${PERL} -pi -e "s,==,=,g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,==,=,g" ${WRKSRC}/configure

 .include <bsd.port.mk>
--- a/databases/dbview/Makefile
+++ b/databases/dbview/Makefile
@ -18,9 +18,10 @@ LIB_DEPENDS=		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt

 MAN1=			dbview.1

+USE_REINPLACE=		yes

 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/db_dump.c

 do-install:
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@ -18,6 +18,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv

 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=4.2
@ -42,10 +43,10 @@ PLIST_SUB+=	ODBC="@comment "
 .endif

 post-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/freetds.conf|/freetds.conf.dist|g ; \
-		 s|glib-config|\$$\(GLIB_CONFIG\)|g ; \
-		 s|-lglib|`\$$\(GLIB_CONFIG\) --libs glib`|g ; \
+		 s|glib-config|$$(GLIB_CONFIG)|g ; \
+		 s|-lglib|`$$(GLIB_CONFIG) --libs glib`|g ; \
 		 s| common.h||g'

 post-install:
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@ -18,6 +18,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv

 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=4.2
@ -42,10 +43,10 @@ PLIST_SUB+=	ODBC="@comment "
 .endif

 post-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/freetds.conf|/freetds.conf.dist|g ; \
-		 s|glib-config|\$$\(GLIB_CONFIG\)|g ; \
-		 s|-lglib|`\$$\(GLIB_CONFIG\) --libs glib`|g ; \
+		 s|glib-config|$$(GLIB_CONFIG)|g ; \
+		 s|-lglib|`$$(GLIB_CONFIG) --libs glib`|g ; \
 		 s| common.h||g'

 post-install:
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@ -13,6 +13,7 @@ CATEGORIES=	databases
 MAINTAINER=	ports@FreeBSD.org

 INSTALLS_SHLIB= YES
+USE_PERL5=	YES

 # Not free for commercial use.
 NO_PACKAGE=	YES
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@ -13,6 +13,7 @@ CATEGORIES=	databases
 MAINTAINER=	ports@FreeBSD.org

 INSTALLS_SHLIB= YES
+USE_PERL5=	YES

 # Not free for commercial use.
 NO_PACKAGE=	YES
--- a/databases/typhoon/Makefile
+++ b/databases/typhoon/Makefile
@ -15,6 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org

 HAS_CONFIGURE=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes

 MAN1=	ddlp.1
@ -25,7 +26,7 @@ MAN3=	d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \
 	d_recread.3 d_recwrite.3 d_setfiles.3

 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/util/dbdview.c

 post-install:
--- a/databases/xmbase-grok/Makefile
+++ b/databases/xmbase-grok/Makefile
@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org

 BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src

+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 MAKE_ENV=	MYCC="${CC}" DEBUG="${CFLAGS}" YO="" INCDIR="" \
@ -26,7 +27,7 @@ MAN1=		grok.1
 DATADIR=	${PREFIX}/lib/X11/xmbase-grok

 pre-patch:
-	@${PERL} -pi -e 's|^GBIN =|#GBIN =|g ; \
+	@${REINPLACE_CMD} -e 's|^GBIN =|#GBIN =|g ; \
 		 s|^GLIB =|#GLIB =|g ; \
 		 s|^DEBUG =|#DEBUG =|g' ${BUILD_WRKSRC}/Makefile

--- a/devel/orbitcpp/Makefile
+++ b/devel/orbitcpp/Makefile
@ -20,13 +20,14 @@ LIB_DEPENDS=	ORBit.2:${PORTSDIR}/devel/ORBit
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 INSTALLS_SHLIB=	yes

 INSTALL_CMD=	/usr/bin/install -c -o ${BINOWN} -g ${BINGRP}

 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|\@INSTALL\@|${INSTALL_CMD}|g'
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|@INSTALL@|${INSTALL_CMD}|g'

 .include <bsd.port.mk>
--- a/devel/pedisassem/Makefile
+++ b/devel/pedisassem/Makefile
@ -16,10 +16,11 @@ MAINTAINER=	ports@FreeBSD.org
 NO_WRKSUBDIR=	yes

 USE_ZIP=	yes
+USE_REINPLACE=	yes
 MAKEFILE=	${FILESDIR}/Makefile

 post-patch:
-	@${PERL} -pi -e "s|\x0D|| ; s|malloc\.h|stdlib.h|" \
+	@${REINPLACE_CMD} -e "s|`/usr/bin/printf '\r'`|| ; s|malloc\.h|stdlib.h|" \
 		${WRKSRC}/*.[ch] ${WRKSRC}/readme.txt

 post-install:
--- a/dns/walker/Makefile
+++ b/dns/walker/Makefile
@ -15,10 +15,11 @@ MAINTAINER=	ports@FreeBSD.org

 RUN_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/net/bind9

+USE_REINPLACE=	yes
 NO_BUILD=	yes

 post-patch:
-	@${PERL} -pi -e "s,\`dig,\`${LOCALBASE}/bin/dig,g" ${WRKSRC}/walker
+	@${REINPLACE_CMD} -e 's,`dig,`${LOCALBASE}/bin/dig,g' ${WRKSRC}/walker

 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/walker ${PREFIX}/bin
--- a/emulators/vice/Makefile
+++ b/emulators/vice/Makefile
@ -15,6 +15,7 @@ RESTRICTED=	ROMs are copyrighted by Commodore Business Machines
 NO_CDROM=	${RESTRICTED}
 NO_PACKAGE=	${RESTRICTED}

+USE_REINPLACE=	yes
 USE_XPM=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
@ -44,7 +45,7 @@ post-extract:
 	@${RM} -f ${WRKSRC}/doc/vice.info*

 post-patch:
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/man/vice.1
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/man/vice.1

 post-install:
 	@${LN} -sf vice_toc.html ${DOCSDIR}/index.html
--- a/emulators/vx68k/Makefile
+++ b/emulators/vx68k/Makefile
@ -20,6 +20,7 @@ USE_MESA=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
 USE_LIBTOOL=	yes
+USE_REINPLACE=	yes
 LIBTOOLFILES=	configure vx68k-gtk/configure
 LIBTOOLFLAGS=	--disable-ltlibs --release-ignore
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}"
@ -31,6 +32,6 @@ LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lGL -lGLU -lglut \
 		${PTHREAD_LIBS}

 post-patch:
-	@${PERL} -pi -e "s,Bison ,Bison,g" ${WRKSRC}/vx68k-gtk/configure
+	@${REINPLACE_CMD} -e "s,Bison ,Bison,g" ${WRKSRC}/vx68k-gtk/configure

 .include <bsd.port.mk>
--- a/ftp/afd/Makefile
+++ b/ftp/afd/Makefile
@ -18,15 +18,16 @@ MAINTAINER=	ports@FreeBSD.org
 FORBIDDEN=	"Installs 88 setuid root applications; disaster waiting to happen"

 USE_MOTIF=	yes
+USE_REINPLACE=	yes
 MAKE_ENV=	BINMODE=${BINMODE} \
 		PTHREAD_CFLAGS=${PTHREAD_CFLAGS} PTHREAD_LIBS=${PTHREAD_LIBS}

 post-patch:
-	@find ${WRKSRC} -name Makefile | xargs \
-		${PERL} -pi -e "s,^(INST(ALL)?DIR *)= .*,\1= ${PREFIX}/bin,g ; \
-				s,cp -p,cp,g"
-	@${PERL} -pi -e "s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/Include.mk.freebsd
-	@${PERL} -pi -e "s,^SBINDIR  = .*,SBINDIR  = ${PREFIX}/sbin,g" ${WRKSRC}/afd_mon/Makefile
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} \
+		${REINPLACE_CMD} -E -e 's,^(INST(ALL)?DIR *)= .*,\1= ${PREFIX}/bin,g ; \
+				s,cp -p,cp,g'
+	@${REINPLACE_CMD} -e "s,%%CFLAGS%%,${CFLAGS},g" ${WRKSRC}/Include.mk.freebsd
+	@${REINPLACE_CMD} -e "s,^SBINDIR  = .*,SBINDIR  = ${PREFIX}/sbin,g" ${WRKSRC}/afd_mon/Makefile

 pre-build:
 	@(cd ${WRKSRC} ; ${RM} -f Include.mk ; \
--- a/games/gltron/Makefile
+++ b/games/gltron/Makefile
@ -24,6 +24,7 @@ SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CPPFLAGS}" LDFLAGS="${LDFLAGS}" \
 		SDL_CONFIG="${SDL_CONFIG}"
@ -32,7 +33,7 @@ CPPFLAGS=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
 LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lXext ${PTHREAD_LIBS}

 post-patch:
-	${PERL} -pi -e "s+#include <SDL\/+#include <+g" ${WRKSRC}/*.[ch]
+	${REINPLACE_CMD} -e "s+#include <SDL/+#include <+g" ${WRKSRC}/*.[ch]

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gltron ${PREFIX}/bin
--- a/games/kpuzzle/Makefile
+++ b/games/kpuzzle/Makefile
@ -15,13 +15,14 @@ MAINTAINER=	kde@freebsd.org
 USE_KDELIBS_VER=	2
 USE_BZIP2=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes

 post-patch:
-	@${PERL} -pi -e 's|-O2||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-O2||g' ${WRKSRC}/configure
 .for file in highscore.cpp kpuzzleapp.cpp
-	@${PERL} -pi -e 's|#include <malloc.h>||g' ${WRKSRC}/kpuzzle/${file}
+	@${REINPLACE_CMD} -e 's|#include <malloc.h>||g' ${WRKSRC}/kpuzzle/${file}
 .endfor
-	@${PERL} -pi -e 's|default|en|g' ${WRKSRC}/kpuzzle/doc/en/Makefile.in
+	@${REINPLACE_CMD} -e 's|default|en|g' ${WRKSRC}/kpuzzle/doc/en/Makefile.in

 .include <bsd.port.mk>
--- a/games/powerpak/Makefile
+++ b/games/powerpak/Makefile
@ -21,13 +21,14 @@ LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 SDL_CONFIG=	${LOCALBASE}/bin/sdl11-config

 USE_FREETYPE=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 MAKE_ENV=	SDL_CONFIG="${SDL_CONFIG}"
 MAKEFILE=	Makefile.UNIX

 post-extract:
-	@ /usr/bin/find ${WRKSRC} -type f | xargs ${PERL} -pi -e 's/\r//g ; \
-		s|"SDL/|"|g ; s|<SDL/|<|g'
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e "s/`/usr/bin/printf '\r'`//g ; \
+		s|\"SDL/|\"|g ; s|<SDL/|<|g"

 do-install:
 	@ ${INSTALL_DATA} ${WRKSRC}/libPP.a ${PREFIX}/lib
--- a/games/xlines/Makefile
+++ b/games/xlines/Makefile
@ -15,13 +15,14 @@ MAINTAINER=	ports@FreeBSD.org

 USE_QT_VER=	1
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 NO_WRKSUBDIR=	yes

 pre-patch:
-	@find ${WRKSRC} -type f | xargs ${PERL} -pi -e "s|\r\n|\n|g"
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e "s|`/usr/bin/printf '\r'`||g"

 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.cpp
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/*.cpp

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xlines ${PREFIX}/bin
--- a/graphics/flip/Makefile
+++ b/graphics/flip/Makefile
@ -17,17 +17,18 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	mpeg_encode:${PORTSDIR}/graphics/mpeg_encode

 USE_QT_VER=	2
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:R}
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV=	MOC="${MOC}" QTDIR="${X11BASE}"

 post-patch:
-	@${PERL} -pi -e "s,^CC,#CC,g ; s,^CXX,#CXX,g ; \
+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; s,^CXX,#CXX,g ; \
 		s,^CFLAGS,#CFLAGS,g ; s,^CXXFLAGS,#CXXFLAGS,g ; \
 		s,^MOC,#MOC,g ; s,lqt,lqt2,g ; \
 		s,/usr/X11R6,${X11BASE},g ; \
 		s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
-	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Config.cpp
+	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Config.cpp

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flip ${PREFIX}/bin
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@ -29,6 +29,7 @@ BUILD_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2

 FREETYPE_CONFIG?=       ${LOCALBASE}/bin/freetype-config

+USE_REINPLACE=	yes
 MAKE_ENV=	FREETYPE_CONFIG="${FREETYPE_CONFIG}"
 INSTALLS_SHLIB=	yes

@ -49,7 +50,7 @@ post-extract:
 		> ${WRKSRC}/gd_gif_in.c

 post-patch:
-	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/gdcache.h
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/gdcache.h

 post-install:
 .if !defined(NOPORTDOCS)
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@ -29,6 +29,7 @@ BUILD_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2

 FREETYPE_CONFIG?=       ${LOCALBASE}/bin/freetype-config

+USE_REINPLACE=	yes
 MAKE_ENV=	FREETYPE_CONFIG="${FREETYPE_CONFIG}"
 INSTALLS_SHLIB=	yes

@ -49,7 +50,7 @@ post-extract:
 		> ${WRKSRC}/gd_gif_in.c

 post-patch:
-	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/gdcache.h
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/gdcache.h

 post-install:
 .if !defined(NOPORTDOCS)
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@ -17,11 +17,12 @@ MAINTAINER=	ports@FreeBSD.org

 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd

+USE_REINPLACE=	yes
 MAKEFILE=	makefile
 WRKSRC=		${WRKDIR}/${DISTNAME}

 post-patch:
-	${PERL} -i -pe 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' ${WRKSRC}/*.[ch]
+	${REINPLACE_CMD} -e 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' ${WRKSRC}/*.[ch]

 do-install:
 	${INSTALL_DATA}	${WRKSRC}/libgdchart.a ${PREFIX}/lib
--- a/graphics/kisomandel/Makefile
+++ b/graphics/kisomandel/Makefile
@ -16,15 +16,16 @@ MAINTAINER=	kde@freebsd.org
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png

 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 USE_QT_VER=	2
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes

 post-patch:
-	@${PERL} -pi -e "s,-lqt,-lqt2,g" ${WRKSRC}/configure
-	@find ${WRKSRC} -name Makefile.in | xargs \
-		${PERL} -pi -e "s,-lqt,-lqt2,g"
-	@${PERL} -pi -e "s,malloc.h,stdlib.h,g" ${WRKSRC}/kisomandel/fractal.cpp
+	@${REINPLACE_CMD} -e "s,-lqt,-lqt2,g" ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
+		${REINPLACE_CMD} -e "s,-lqt,-lqt2,g"
+	@${REINPLACE_CMD} -e "s,malloc.h,stdlib.h,g" ${WRKSRC}/kisomandel/fractal.cpp

 .include <bsd.port.mk>
--- a/graphics/kuickshow-kde4/Makefile
+++ b/graphics/kuickshow-kde4/Makefile
@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org

 GNU_CONFIGURE=	yes

+USE_REINPLACE=	yes
 USE_IMLIB=	yes
 USE_KDELIBS_VER=	2
 USE_GMAKE=	yes
@ -24,7 +25,7 @@ CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
 CONFIGURE_ARGS+=	--with-imlib-config=${X11BASE}/bin

 post-patch:
-	@${PERL} -pi -e 's,-O2,,g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,-O2,,g' ${WRKSRC}/configure

 .if !defined(NOPORTDOCS)
 post-install:
--- a/graphics/kuickshow/Makefile
+++ b/graphics/kuickshow/Makefile
@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org

 GNU_CONFIGURE=	yes

+USE_REINPLACE=	yes
 USE_IMLIB=	yes
 USE_KDELIBS_VER=	2
 USE_GMAKE=	yes
@ -24,7 +25,7 @@ CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
 CONFIGURE_ARGS+=	--with-imlib-config=${X11BASE}/bin

 post-patch:
-	@${PERL} -pi -e 's,-O2,,g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,-O2,,g' ${WRKSRC}/configure

 .if !defined(NOPORTDOCS)
 post-install:
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@ -15,11 +15,13 @@ MAINTAINER=	ports@FreeBSD.org

 MAN1=		mpeg_encode.1

+USE_REINPLACE=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}

 post-patch:
 	@(${GREP} -R -l "malloc.h" ${WRKSRC}/* | \
-	    ${XARGS} ${PERL} -pi -e "s/malloc.h/stdlib.h/")
+	    ${XARGS} ${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/")

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpeg_encode ${PREFIX}/bin
--- a/graphics/mpgtx/Makefile
+++ b/graphics/mpgtx/Makefile
@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}

+USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 ALL_TARGET=	default
@ -30,9 +31,9 @@ MLINKS=	mpgtx.1 mpgcat.1 \
 	mpgtx.1 mpgsplit.1

 pre-patch:
-	@${PERL} -pi -e 's|CFLAGS=|CFLAGS\+=|g ; \
-		 s|\$$cflags \$$optimization_cflags|\$$cflags|g ; \
-		 s|g\+\+|${CXX}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|CFLAGS=|CFLAGS\+=|g ; \
+		 s|\$$cflags \$$optimization_cflags|$$cflags|g ; \
+		 s|g++|${CXX}|g' ${WRKSRC}/configure

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpgtx ${PREFIX}/bin
--- a/graphics/opendis/Makefile
+++ b/graphics/opendis/Makefile
@ -15,11 +15,12 @@ MASTER_SITE_SUBDIR=	ods

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes

 post-patch:
-	@${PERL} -pi -e 's|-pedantic -W|-pedantic|g' ${WRKSRC}/configure
-	@${PERL} -pi -e 's| -g| \@CFLAGS\@|g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|-pedantic -W|-pedantic|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's| -g| @CFLAGS@|g' ${WRKSRC}/src/Makefile.in

 post-install:
 .if !defined(NOPORTDOCS)
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@ -27,6 +27,7 @@ USE_GMAKE=	yes
 USE_MESA=	yes
 USE_MOTIF=	yes
 USE_XLIB=	yes
+USE_REINPLACE=	yes
 AUTOMAKE_ARGS=	-a -i
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ARCH="" \
@ -41,13 +42,13 @@ post-patch:
 	@${RM} -f ${WRKSRC}/include/stamp-h.in

 post-configure:
-	${PERL} -pi -e "s;flex ;flex -l ;g" ${WRKSRC}/src/uipp/dxuilib/Makefile
+	${REINPLACE_CMD} -e "s;flex ;flex -l ;g" ${WRKSRC}/src/uipp/dxuilib/Makefile

 post-install:
 	@${ECHO_MSG} "===>   Fixing path in the docs (/usr/lpp -> ${PREFIX})"
 .for dir in doc help html man
-	@find ${PREFIX}/dx/${dir} -type f | \
-	  xargs ${PERL} -pi -e "s;/usr/lpp;${PREFIX};g"
+	@${FIND} ${PREFIX}/dx/${dir} -type f | \
+	  ${XARGS} ${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g"
 .endfor

 .include <bsd.port.mk>
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@ -18,10 +18,11 @@ LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \

 USE_QT_VER=	2
 USE_KDEBASE_VER=	2
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes

 post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/showimg/Makefile.in
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/showimg/Makefile.in

 .include <bsd.port.mk>
--- a/irc/bobot++/Makefile
+++ b/irc/bobot++/Makefile
@ -16,6 +16,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org

 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes

 .if defined(WITH_GUILE)
 LIB_DEPENDS+=	guile:${PORTSDIR}/lang/guile
@ -28,7 +29,7 @@ CONFIGURE_ARGS+=	--enable-telnetserver
 .endif

 post-patch:
-	@${PERL} -pi -e "s,%%GUILE_CONFIG%%,${GUILE_CONFIG},g ; \
+	@${REINPLACE_CMD} -e "s,%%GUILE_CONFIG%%,${GUILE_CONFIG},g ; \
 		s,%%PTHREAD_CFLAGS%%,${PTHREAD_CFLAGS},g ; \
 		s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g" ${WRKSRC}/configure

--- a/japanese/xklock/Makefile
+++ b/japanese/xklock/Makefile
@ -24,10 +24,11 @@ MAINTAINER=	ports@FreeBSD.org
 NO_WRKSUBDIR=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
+USE_REINPLACE=	yes

 pre-configure:
 .for file in jnames.c xklock.h
-	@${PERL} -pi -e "s:%%PREFIX%%:${PREFIX}:" ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e "s:%%PREFIX%%:${PREFIX}:" ${WRKSRC}/${file}
 .endfor

 do-install:
--- a/lang/icon/Makefile
+++ b/lang/icon/Makefile
@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 ONLY_FOR_ARCHS=	alpha i386

 USE_XLIB=	yes
+USE_REINPLACE=	yes
 MAKE_ARGS=	CC="${CC}" CFLAGS="${CFLAGS} -I${X11BASE}/include" \
 		XLIBS="-L${X11BASE}/lib -lX11"
 ALL_TARGET=	All
@ -27,10 +28,10 @@ ARCH_NAME=	${ARCH:S/i386/intel/}_${OPSYS:L}
 ICONDIR=	${PREFIX}/lib/${PORTNAME}

 pre-patch:
-	@${PERL} -pi -e 's|^CC|#CC|g ; \
+	@${REINPLACE_CMD} -e 's|^CC|#CC|g ; \
 		 s|^CFLAGS|#CFLAGS|g ; \
 		 s|^XLIBS|#XLIBS|g' ${WRKSRC}/config/unix/${ARCH_NAME}/Makedefs
-	@${PERL} -pi -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin
+	@${REINPLACE_CMD} -e 's|/opt/icon|${ICONDIR}|g' ${WRKSRC}/ipl/BuildBin

 do-configure:
 	@(cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${MAKE} ${MAKE_FLAGS} \
--- a/mail/cyrus/Makefile
+++ b/mail/cyrus/Makefile
@ -19,6 +19,7 @@ LIB_DEPENDS=	tcl82.1:${PORTSDIR}/lang/tcl82
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend \
 		${LOCALBASE}/sbin/pwcheck:${PORTSDIR}/security/cyrus-sasl

+USE_REINPLACE=	yes
 GNU_CONFIGURE=	YES
 CONFIGURE_ARGS=	--with-cyrus-prefix=${PREFIX}/cyrus \
 		--with-cyrus-group=cyrus \
@ -35,7 +36,7 @@ MAN8=		arbitron.8 collectnews.8 cyrquota.8 deliver.8 fud.8 \
 		timsieved.8

 post-configure:
-		@ ${SETENV} ${MAKE_ENV} perl -pi -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c
+		@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|' ${WRKSRC}/imap/config.c ${WRKSRC}/imap/krbck.c

 pre-install:
 		@ ${CP} ${WRKSRC}/man/quota.8 ${WRKSRC}/man/cyrquota.8
--- a/math/femlab/Makefile
+++ b/math/femlab/Makefile
@ -16,12 +16,13 @@ MAINTAINER=	ports@FreeBSD.org

 BUILD_DEPENDS=	${X11BASE}/lib/libsx.a:${PORTSDIR}/x11/libsx

+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes

 FEMLAB_HOME=	${PREFIX}/lib/X11/femlab

 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 	${WRKSRC}/source/graph.c ${WRKSRC}/source/y.tab.c \
 	${WRKSRC}/source/newdata.c ${WRKSRC}/source/post.c \
 	${WRKSRC}/source/kraftwerk.c ${WRKSRC}/source/list.c \
--- a/misc/kdeaddons/Makefile
+++ b/misc/kdeaddons/Makefile
@ -19,6 +19,7 @@ BUILD_DEPENDS=	autoconf213:${PORTSDIR}/devel/autoconf213 \
 LIB_DEPENDS+=	noatun.0:${PORTSDIR}/audio/kdemultimedia2 \
 		SDL-1.1.4:${PORTSDIR}/devel/sdl12

+USE_REINPLACE=	yes
 WITH_SDL=	yes
 USE_KDEBASE_VER=2
 USE_BZIP2=	yes
@ -45,7 +46,7 @@ pre-configure:
 .endfor
 	cd ${WRKSRC} && env PATH=${WRKSRC}/auto-bin:$$PATH \
 		${GMAKE} -f Makefile.cvs
-	find ${WRKSRC} -name Makefile.in | xargs ${PERL} -pi -e \
+	${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} ${REINPLACE_CMD} -e \
 		"s@sdl-config@${LOCALBASE}/bin/sdl11-config@g"

 .include <bsd.port.post.mk>
--- a/misc/kwatch/Makefile
+++ b/misc/kwatch/Makefile
@ -17,10 +17,11 @@ MAINTAINER=	kde@freebsd.org

 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext

+USE_REINPLACE=	yes
 USE_KDELIBS_VER=	2
 GNU_CONFIGURE=	yes

 post-patch:
-	@${PERL} -pi -e 's|-O2 ||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-O2 ||g' ${WRKSRC}/configure

 .include <bsd.port.mk>
--- a/misc/pybliographer/Makefile
+++ b/misc/pybliographer/Makefile
@ -22,7 +22,6 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/gtk-1.2/_gnomemodule.so:${PORTSDIR}/x11-toolki
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
 USE_PYTHON=	yes
-USE_GNOME=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 USE_REINPLACE=	yes
@ -35,9 +34,9 @@ pre-patch:
 	@${REINPLACE_CMD} 's|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|glib-config|glib12-config|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} \
-		'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:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \
--- a/multimedia/mpeg_encode/Makefile
+++ b/multimedia/mpeg_encode/Makefile
@ -15,11 +15,13 @@ MAINTAINER=	ports@FreeBSD.org

 MAN1=		mpeg_encode.1

+USE_REINPLACE=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}

 post-patch:
 	@(${GREP} -R -l "malloc.h" ${WRKSRC}/* | \
-	    ${XARGS} ${PERL} -pi -e "s/malloc.h/stdlib.h/")
+	    ${XARGS} ${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/")

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpeg_encode ${PREFIX}/bin
--- a/multimedia/mpgtx/Makefile
+++ b/multimedia/mpgtx/Makefile
@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}

+USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 ALL_TARGET=	default
@ -30,9 +31,9 @@ MLINKS=	mpgtx.1 mpgcat.1 \
 	mpgtx.1 mpgsplit.1

 pre-patch:
-	@${PERL} -pi -e 's|CFLAGS=|CFLAGS\+=|g ; \
-		 s|\$$cflags \$$optimization_cflags|\$$cflags|g ; \
-		 s|g\+\+|${CXX}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|CFLAGS=|CFLAGS\+=|g ; \
+		 s|\$$cflags \$$optimization_cflags|$$cflags|g ; \
+		 s|g++|${CXX}|g' ${WRKSRC}/configure

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpgtx ${PREFIX}/bin
--- a/net/rp-pppoe/Makefile
+++ b/net/rp-pppoe/Makefile
@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 BROKEN=	Does not work well with FreeBSD\'s pppd, yet.\
 	Need help to be fixed

+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/src
@ -33,18 +34,18 @@ SCRIPT_FILES=	adsl-connect adsl-init adsl-setup adsl-start \
 		adsl-status adsl-stop

 post-patch:
-	@${PERL} -pi -ne "s!/etc/ppp!${PREFIX}/etc/ppp!g" ${WRKSRC}/man/*
-	@${PERL} -pi -ne 's!/etc/ppp!\$$\(prefix)/etc/ppp!g' \
+	@${REINPLACE_CMD} -e "s!/etc/ppp!${PREFIX}/etc/ppp!g" ${WRKSRC}/man/*
+	@${REINPLACE_CMD} -e 's!/etc/ppp!$$(prefix)/etc/ppp!g' \
 		${WRKSRC}/src/Makefile.in
 .for file in adsl-connect adsl-init adsl-setup adsl-start
-	@${PERL} -pi -ne 's!/etc/+ppp!\$$\{prefix}/etc/ppp!g' \
+	@${REINPLACE_CMD} -e 's!/etc/+ppp!$${prefix}/etc/ppp!g' \
 		${WRKSRC}/scripts/${file}.in
 .endfor
-	@${PERL} -pi -ne 's!pty!tty!g' ${WRKSRC}/scripts/adsl-connect.in
-	@${PERL} -pi -ne 's!/var/lock/subsys/adsl!/var/tmp/rp_pppoe_adsl!g' \
+	@${REINPLACE_CMD} -e 's!pty!tty!g' ${WRKSRC}/scripts/adsl-connect.in
+	@${REINPLACE_CMD} -e 's!/var/lock/subsys/adsl!/var/tmp/rp_pppoe_adsl!g' \
 		${WRKSRC}/scripts/adsl-init.in
 .for file in adsl-status adsl-stop.in
-	@${PERL} -pi -ne "s!/etc/ppp!${PREFIX}/etc/ppp!g" \
+	@${REINPLACE_CMD} -e "s!/etc/ppp!${PREFIX}/etc/ppp!g" \
 		${WRKSRC}/scripts/${file}
 .endfor

--- a/net/walker/Makefile
+++ b/net/walker/Makefile
@ -15,10 +15,11 @@ MAINTAINER=	ports@FreeBSD.org

 RUN_DEPENDS=	${LOCALBASE}/bin/dig:${PORTSDIR}/net/bind9

+USE_REINPLACE=	yes
 NO_BUILD=	yes

 post-patch:
-	@${PERL} -pi -e "s,\`dig,\`${LOCALBASE}/bin/dig,g" ${WRKSRC}/walker
+	@${REINPLACE_CMD} -e 's,`dig,`${LOCALBASE}/bin/dig,g' ${WRKSRC}/walker

 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/walker ${PREFIX}/bin
--- a/print/gfontview/Makefile
+++ b/print/gfontview/Makefile
@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	t1.4:${PORTSDIR}/devel/t1lib

 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GNOME=	yes
 USE_FREETYPE=	yes
 GNU_CONFIGURE=	yes
@ -29,13 +30,13 @@ CONFIGURE_ARGS=	--with-fontdir="${LOCALBASE}/share/ghostscript/fonts" \
 		--with-libungif

 post-patch:
-	@${PERL} -pi -e 's|CXXFLAGS="-O2"|CXXFLAGS="\$$CXXFLAGS"|g ; \
+	@${REINPLACE_CMD} -e 's|CXXFLAGS="-O2"|CXXFLAGS="$$CXXFLAGS"|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
-		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|g' \
+		 s|\$$(top_builddir)/intl/libintl.a|-lintl|g' \
 			${WRKSRC}/configure
-	@${PERL} -pi -e 's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|g ; \
+	@${REINPLACE_CMD} -e 's|\$$(datadir)/gnome/|$$(datadir)/|g ; \
+		 s|\$$(datadir)/locale|$$(prefix)/share/locale|g ; \
 		 s|-I/usr/include/freetype||g' \
 			${WRKSRC}/Makefile.in

--- a/print/xtem/Makefile
+++ b/print/xtem/Makefile
@ -19,6 +19,8 @@ RUN_DEPENDS+=	gv:${PORTSDIR}/print/gv \
 		tex:${PORTSDIR}/print/teTeX
 .endif

+USE_REINPLACE=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}

 MAN1=		hyphen_show.1 xtem.1
@ -30,7 +32,7 @@ post-extract:
 	@${CP} ${FILESDIR}/Makefile ${FILESDIR}/exclude-list ${WRKSRC}

 post-patch:
-	@${PERL} -pi.bak -e \
+	@${REINPLACE_CMD} -e \
 		"s|%%TCLSH%%|${PREFIX}/bin/tclsh8.2|g; \
 		 s|%%WISH%%|${PREFIX}/bin/wish8.2|g; \
 		 s|%%XTEMPATH%%|${PREFIX}/share/xtem|g" ${WRKSRC}/xtem
--- a/security/libmcrypt/Makefile
+++ b/security/libmcrypt/Makefile
@ -18,6 +18,7 @@ LIB_DEPENDS=	ltdl.1:${PORTSDIR}/devel/libtool

 RESTRICTED=	"yes - cryptography"

+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@ -31,8 +32,8 @@ post-extract:
 	${FIND} ${WRKSRC} -name configure -exec ${RM} -f \{\} \;

 pre-patch:
-	@${FIND} ${WRKSRC}/modules -name '*.[ch]' | ${XARGS} ${PERL} -pi -e \
-		's|#ifdef USE_LTDL|#if defined\(USE_LTDL\) && !defined\(__FreeBSD__\)|g'
+	@${FIND} ${WRKSRC}/modules -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
+		's|#ifdef USE_LTDL|#if defined(USE_LTDL) && !defined(__FreeBSD__)|g'

 post-patch:
 	@cd ${WRKSRC}/libltdl && ${LOCALBASE}/bin/autoconf
--- a/sysutils/diskcheckd/Makefile
+++ b/sysutils/diskcheckd/Makefile
@ -20,6 +20,7 @@ STARTUP=	diskcheckd.sh
 MAN8=		diskcheckd.8
 MLINKS=		diskcheckd.8 diskcheckd.conf.5

+USE_REINPLACE=	yes
 NO_WRKSUBDIR=	yes

 CFLAGS+=	-D_PATH_CONF='\"${PREFIX}/etc/diskcheckd.conf\"'
@ -38,8 +39,8 @@ do-extract:
 .endfor

 do-patch:
-	@${PERL} -pi.fbsd -e 's|/usr/local/sbin|${PREFIX}/sbin|g' ${WRKSRC}/Makefile
-	@${PERL} -pi.fbsd -e 's|/usr/local/etc/diskcheckd.conf|${PREFIX}/etc/diskcheckd.conf|g' ${WRKSRC}/diskcheckd.8
+	@${REINPLACE_CMD} -e 's|/usr/local/sbin|${PREFIX}/sbin|g' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e 's|/usr/local/etc/diskcheckd.conf|${PREFIX}/etc/diskcheckd.conf|g' ${WRKSRC}/diskcheckd.8

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/diskcheckd ${PREFIX}/sbin
--- a/sysutils/ltrace/Makefile
+++ b/sysutils/ltrace/Makefile
@ -14,12 +14,13 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-fbsd

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 MAN1=		ltrace.1

 post-patch:
-	${PERL} -pi.bak \
+	${REINPLACE_CMD} \
 		-e 's|"/etc/ltrace.conf"|"${PREFIX}/etc/ltrace.conf"|g' \
 		${WRKSRC}/ltrace.c

--- a/textproc/cwtext/Makefile
+++ b/textproc/cwtext/Makefile
@ -14,12 +14,13 @@ MASTER_SITE_SUBDIR=	${PORTNAME}

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	ALL

 post-patch:
-	@${PERL} -pi -e "s,^PREFIX,#PREFIX,g ; \
+	@${REINPLACE_CMD} -e "s,^PREFIX,#PREFIX,g ; \
 		s,gcc,${CC} ${CFLAGS},g" ${WRKSRC}/${MAKEFILE}

 do-install:
--- a/textproc/gxmlviewer/Makefile
+++ b/textproc/gxmlviewer/Makefile
@ -16,11 +16,12 @@ MAINTAINER=	ports@FreeBSD.org

 LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2

+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	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>
--- a/textproc/html2fo/Makefile
+++ b/textproc/html2fo/Makefile
@ -14,8 +14,10 @@ MASTER_SITE_SUBDIR=	${PORTNAME}

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
+
 post-patch:
-	@${PERL} -pi -e "s,^CC,#CC,g ; \
+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
 		s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile

 do-install:
--- a/textproc/htmltolatex/Makefile
+++ b/textproc/htmltolatex/Makefile
@ -16,13 +16,14 @@ MAINTAINER=	ports@FreeBSD.org

 LIB_DEPENDS=	Magick:${PORTSDIR}/graphics/ImageMagick

+USE_REINPLACE=	yes
 USE_BISON=	yes
 MAKEFILE=	GNUmakefile
 CXXFLAGS+=	-I${LOCALBASE}/include -DUNIX
 USE_GMAKE=	yes

 post-patch:
-	@${PERL} -pi -e "s,^CXXFLAGS,#CXXFLAGS,g ; \
+	@${REINPLACE_CMD} -e "s,^CXXFLAGS,#CXXFLAGS,g ; \
 		s,^CXX,#CXX,g" ${WRKSRC}/${MAKEFILE}

 do-install:
--- a/textproc/libxml++/Makefile
+++ b/textproc/libxml++/Makefile
@ -19,10 +19,11 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"

+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes

 post-patch:
-	@${PERL} -pi -e "s|xml-config|xml2-config|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|xml-config|xml2-config|g" ${WRKSRC}/configure

 .include <bsd.port.mk>
--- a/textproc/libxml++26/Makefile
+++ b/textproc/libxml++26/Makefile
@ -19,10 +19,11 @@ LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include"

+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes

 post-patch:
-	@${PERL} -pi -e "s|xml-config|xml2-config|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|xml-config|xml2-config|g" ${WRKSRC}/configure

 .include <bsd.port.mk>
--- a/textproc/minidom/Makefile
+++ b/textproc/minidom/Makefile
@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	xml2:${PORTSDIR}/textproc/libxml2 \
 		iconv.3:${PORTSDIR}/converters/libiconv

+USE_REINPLACE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	glib12
 USE_LIBTOOL=	yes
@ -26,7 +27,7 @@ CONFIGURE_ARGS=	--with-libxml2=yes
 INSTALLS_SHLIB=	yes

 post-patch:
-	@${PERL} -pi -e 's|-lglib|-lglib12|g ; \
+	@${REINPLACE_CMD} -e 's|-lglib|-lglib12|g ; \
 		 s|glib-config|${GLIB_CONFIG}|g' ${WRKSRC}/configure

 .include <bsd.port.mk>
--- a/textproc/pybook/Makefile
+++ b/textproc/pybook/Makefile
@ -13,11 +13,12 @@ MASTER_SITES=	http://silmarill.org/pybook/

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes

 post-patch:
-	@${PERL} -pi -e "s,python2,python,g" ${WRKSRC}/pybook.py
+	@${REINPLACE_CMD} -e "s,python2,python,g" ${WRKSRC}/pybook.py

 post-install:
 	@${MV} -f ${PREFIX}/bin/pybook.py ${PREFIX}/bin/pybook
--- a/textproc/rtf2htm/Makefile
+++ b/textproc/rtf2htm/Makefile
@ -13,6 +13,8 @@ MASTER_SITES=	http://www.geocities.com/tuorfa/

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 MAKEFILE=	makefile

@ -20,8 +22,8 @@ MANCOMPRESSED=	no
 MAN1=	rtf2htm.1

 post-patch:
-	@${PERL} -pi -e "s,^CC,#CC,g ; s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/${MAKEFILE}
-	@${PERL} -pi -e 's|malloc.h|stdlib.h|' ${WRKSRC}/malloc.c
+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/${MAKEFILE}
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' ${WRKSRC}/malloc.c

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rtf2htm ${PREFIX}/bin
--- a/textproc/tex2im/Makefile
+++ b/textproc/tex2im/Makefile
@ -17,10 +17,12 @@ RUN_DEPENDS=	bash:${PORTSDIR}/shells/bash2 \
 		latex:${PORTSDIR}/print/teTeX \
 		convert:${PORTSDIR}/graphics/ImageMagick

+USE_REINPLACE=	yes
+
 NO_BUILD=	yes

 post-patch:
-	@${PERL} -pi -e "s,^#!/bin/bash,#!${LOCALBASE}/bin/bash,g" ${WRKSRC}/tex2im
+	@${REINPLACE_CMD} -e "s,^#!/bin/bash,#!${LOCALBASE}/bin/bash,g" ${WRKSRC}/tex2im

 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/tex2im ${PREFIX}/bin
--- a/textproc/xmlpp/Makefile
+++ b/textproc/xmlpp/Makefile
@ -13,12 +13,13 @@ MASTER_SITES=	http://www.root.at/download/gpl/

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 FETCH_CMD=	/usr/bin/fetch
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes

 pre-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|/usr/local/share|\$$\(datadir\)|g'
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|/usr/local/share|$$(datadir)|g'

 .include <bsd.port.mk>
--- a/textproc/xmlppm/Makefile
+++ b/textproc/xmlppm/Makefile
@ -20,10 +20,11 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	expat.3:${PORTSDIR}/textproc/expat2

 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}/src
+USE_REINPLACE=	yes
 USE_GMAKE=	yes

 post-patch:
-	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile

 do-install:
 	@(cd ${WRKSRC} ; ${INSTALL_PROGRAM} xmlppm xmlunppm ${PREFIX}/bin)
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@ -21,11 +21,12 @@ NO_PACKAGE=	${NO_CDROM}
 USE_MOTIF=	yes
 WRKSRC=		${WRKDIR}/Mosaic-src
 ALL_TARGET=	bsdi
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes

 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 	${WRKSRC}/libXmx/Xmx.h ${WRKSRC}/libdtm/dtm.c \
 	${WRKSRC}/libdtm/dtm.c ${WRKSRC}/libdtm/dtm.c \
 	${WRKSRC}/libdtm/dtm.c ${WRKSRC}/libdtm/dtminit.c \
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@ -47,6 +47,7 @@ APACHE_VERSION=		1.3.12
 APACHE_SSL_VERSION=	1.40

 USE_OPENSSL=	YES
+USE_PERL5=	YES

 .include <bsd.port.pre.mk>

--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@ -18,13 +18,14 @@ NO_WRKSUBDIR=	yes
 CONFIGURE_WRKSRC=	${WRKDIR}/src
 INSTALL_WRKSRC=		${WRKDIR}/src

+USE_REINPLACE=	yes
 USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		xhtml.1

 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/XHTML.ad
-	@${PERL} -pi -e "s/malloc.h/stdlib.h/g" \
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/XHTML.ad
+	@${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/g" \
 		${WRKSRC}/libhtmlw-2.7b3/HTML-PSformat.c

 do-build:
--- a/www/comline/Makefile
+++ b/www/comline/Makefile
@ -17,10 +17,12 @@ DISTFILES=	w3c-libwww-4.0D.tar.gz \

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
+
 WRKSRC=		${WRKDIR}/WWW

 post-patch:
-	@${PERL} -pi -e 's,strcasestr,strcasestr_,' \
+	@${REINPLACE_CMD} -e 's,strcasestr,strcasestr_,' \
 		${WRKSRC}/Library/Implementation/HTString.*

 do-build:
--- a/www/fhttpd/Makefile
+++ b/www/fhttpd/Makefile
@ -13,6 +13,8 @@ MASTER_SITES=	http://www.fhttpd.org/ \

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
+
 LOGFILE=	share/fhttpd/fhttpd.log
 PLIST_SUB+=	LOGFILE=${LOGFILE}

@ -24,9 +26,9 @@ pre-patch:

 pre-install:
 	${RM} -rf ${WRKSRC}/http-root/pub/dummy_directory
-	${PERL} -pi -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" \
+	${REINPLACE_CMD} -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" \
 		${WRKSRC}/fhttpd.sh ${WRKSRC}/http-root/root-fhttpd.conf
-	${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/http-root/root-fhttpd.conf
+	${REINPLACE_CMD} -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/http-root/root-fhttpd.conf

 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/fhttpd.sh ${PREFIX}/etc/rc.d
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@ -17,8 +17,10 @@ EXTRACT_SUFX=	-src.tar.gz

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
+
 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/src/configure ${WRKSRC}/src/broker/broker.h \
 		${WRKSRC}/src/gatherer/essence/main.c \
 		${WRKSRC}/src/gatherer/include/essence.h \
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@ -21,12 +21,14 @@ EXTRACT_SUFX=	.tgz

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
+
 ALL_TARGET=	# yes, an empty target.
 JDIR=		${PREFIX}/etc/junkbuster
 MAN1=		junkbuster.1

 post-patch:
-	@${PERL} -pi -e 's:\r::' ${WRKSRC}/*
+	@${REINPLACE_CMD} -e "s:`/usr/bin/printf '\r'`::" ${WRKSRC}/*

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/sbin/junkbuster
--- a/www/netraider/Makefile
+++ b/www/netraider/Makefile
@ -16,6 +16,7 @@ DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 MAINTAINER=	kde@freebsd.org

 USE_QT_VER=	2
+USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@ -23,14 +24,14 @@ CFLAGS+=	-DBSD
 SUBST=		${WRKSRC}/konq-embed/src/Makefile.in

 pre-configure:
-	find ${WRKSRC} -name Makefile.am | xargs ${PERL} -pi -e \
+	${FIND} ${WRKSRC} -name Makefile.am | ${XARGS} ${REINPLACE_CMD} -e \
 		"s@-lqt@-lqt @g; s@ -lqt @ -lqt2@g"
 	${CP} ${WRKSRC}/konq-embed/src/konqueror ${WRKSRC}/konq-embed/src/konq-embedded
-	${CP} ${SUBST} ${SUBST}.bak && ${SED} \
-		-e 's,^bindir = $$(prefix),bindir= ${PREFIX}/bin,g' \
+	${REINPLACE_CMD} \
+		-e 's,^bindir = \$$(prefix),bindir= ${PREFIX}/bin,g' \
 		-e 's,bin_SCRIPTS = konqueror,bin_SCRIPTS= konq-embedded,g' \
 		-e 's,-lqt,-lqt ,g' \
 		-e 's, -lqt , -lqt2,g' \
-		${SUBST}.bak > ${SUBST}
+		${WRKSRC}/konq-embed/src/Makefile.in

 .include <bsd.port.mk>
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
@ -21,10 +22,10 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-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 ; \
-		 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.mk>
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@ -19,12 +19,13 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext

 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	# empty

 post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g ; \
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g ; \
 		s,%%LOCALBASE%%,${LOCALBASE},g ; \
 		s,%%PREFIX%%,${PREFIX},g ; \
 		s,^CC,#CC,g ; s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile
--- a/www/sqmgrlog/Makefile
+++ b/www/sqmgrlog/Makefile
@ -12,12 +12,13 @@ MASTER_SITES=	http://web.onda.com.br/orso/

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-prefix=${PREFIX} --with-gcc

 post-patch:
-	@${PERL} -pi -e 's,LDFLAGS="-g",LDFLAGS="",' ${WRKSRC}/configure
-	@${PERL} -pi -e 's,/usr/local/etc/httpd/htdocs/,${PREFIX}/www/data/,; \
+	@${REINPLACE_CMD} -e 's,LDFLAGS="-g",LDFLAGS="",' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,/usr/local/etc/httpd/htdocs/,${PREFIX}/www/data/,; \
 		s,mailx,mail,' ${WRKSRC}/sqmgrlog.conf ${WRKSRC}/log.c

 post-install:
--- a/x11-fonts/xfontselector/Makefile
+++ b/x11-fonts/xfontselector/Makefile
@ -15,6 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:R}-4

 MAINTAINER=	kde@freebsd.org

+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_QT_VER=	2
 MAKE_ENV=	CXX="${CXX} ${QTCPPFLAGS} -I${X11BASE}/include" \
@ -24,9 +25,9 @@ ALL_TARGET=	# empty
 MAN1=	xfontselector.1

 post-patch:
-	@${PERL} -pi -e "s,^CXX,#CXX,g ; s,^CXXFLAGS,#CXXFLAGS,g ; \
+	@${REINPLACE_CMD} -e "s,^CXX,#CXX,g ; s,^CXXFLAGS,#CXXFLAGS,g ; \
 		s,^LIBS=,LIBS+=,g ; s,-lqt,-lqt2,g ; \
-		s,\tmoc,\t${MOC},g" ${WRKSRC}/Makefile
+		s,moc ,${MOC} ,g" ${WRKSRC}/Makefile

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${PREFIX}/bin
--- a/x11-toolkits/plib/Makefile
+++ b/x11-toolkits/plib/Makefile
@ -12,6 +12,7 @@ MASTER_SITES=	http://plib.sourceforge.net/dist/

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GMAKE=	yes
@ -20,6 +21,6 @@ CONFIGURE_ENV=	LIBS="-L${X11BASE}/lib ${PTHREAD_LIBS}"
 CONFIGURE_ARGS=	--with-GL=${X11BASE} --with-x

 post-patch:
-	@${PERL} -pi -e "s| -O6 -Wall||g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s| -O6 -Wall||g" ${WRKSRC}/configure

 .include <bsd.port.mk>
--- a/x11-toolkits/viewklass/Makefile
+++ b/x11-toolkits/viewklass/Makefile
@ -15,11 +15,12 @@ DISTNAME=	ViewKlass-${PORTVERSION}

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 USE_MOTIF=	yes
 GNU_CONFIGURE=	yes

 post-patch:
-	@${PERL} -pi -e "s/^CFLAGS=/CFLAGS+=/g ; s/^CXXFLAGS=/CXXFLAGS+=/g ; \
+	@${REINPLACE_CMD} -e "s/^CFLAGS=/CFLAGS+=/g ; s/^CXXFLAGS=/CXXFLAGS+=/g ; \
 		s/-g -Wall//g" ${WRKSRC}/Makefile.in

 post-install:
--- a/x11-wm/aewm++/Makefile
+++ b/x11-wm/aewm++/Makefile
@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	sapphire

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 CXXFLAGS+=	-I${X11BASE}/include
@ -22,7 +23,7 @@ LIBS+=		-L${X11BASE}/lib
 MAN1=	aewm++.1x

 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,^prefix,#prefix,g ; s,prefix,PREFIX,g ; \
 		s,CC,CXX,g ; s,CFLAGS,CXXFLAGS,g" ${WRKSRC}/Makefile

--- a/x11-wm/xfce/Makefile
+++ b/x11-wm/xfce/Makefile
@ -18,6 +18,7 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf

+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 USE_XPM=	yes
@ -56,13 +57,13 @@ pre-everything::
 .endif

 pre-patch:
-	@${PERL} -pi -e 's|=aclocal|=${TRUE}|g ; \
+	@${REINPLACE_CMD} -e 's|=aclocal|=${TRUE}|g ; \
 		 s|=autoconf|=${TRUE}|g ; \
 		 s|=automake|=${TRUE}|g ; \
 		 s|=autoheader|=${TRUE}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${PERL} -pi -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
-	@${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
+	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
+	@${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in

 post-install:
 	@${LN} -sf ${PREFIX}/share/xfce/help/html/images \
--- a/x11-wm/xfce4/Makefile
+++ b/x11-wm/xfce4/Makefile
@ -18,6 +18,7 @@ LIB_DEPENDS=	audiofile.0:${PORTSDIR}/audio/libaudiofile \
 		iconv.3:${PORTSDIR}/converters/libiconv \
 		gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf

+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 USE_XPM=	yes
@ -56,13 +57,13 @@ pre-everything::
 .endif

 pre-patch:
-	@${PERL} -pi -e 's|=aclocal|=${TRUE}|g ; \
+	@${REINPLACE_CMD} -e 's|=aclocal|=${TRUE}|g ; \
 		 s|=autoconf|=${TRUE}|g ; \
 		 s|=automake|=${TRUE}|g ; \
 		 s|=autoheader|=${TRUE}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@${PERL} -pi -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
-	@${PERL} -pi -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in
+	@${REINPLACE_CMD} -e 's|gtk-config|${GTK_CONFIG:T}|g' ${WRKSRC}/xfce/setup.c
+	@${REINPLACE_CMD} -e 's|xfplay|internal|g' ${WRKSRC}/other/xfsoundrc.in

 post-install:
 	@${LN} -sf ${PREFIX}/share/xfce/help/html/images \
--- a/x11/imwheel/Makefile
+++ b/x11/imwheel/Makefile
@ -12,6 +12,7 @@ MASTER_SITES=	http://jonatkins.org/imwheel/files/

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 USE_GMAKE=	YES
 USE_X_PREFIX=	YES
 GNU_CONFIGURE=	YES
@ -21,7 +22,7 @@ MAN1=		imwheel.1

 post-patch:
 .for i in imwheel.1 util.c
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i}
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/${i}
 .endfor

 post-install:
--- a/x11/tycoon/Makefile
+++ b/x11/tycoon/Makefile
@ -15,12 +15,13 @@ MAINTAINER=	ports@FreeBSD.org

 LIB_DEPENDS=	xforms:${PORTSDIR}/x11-toolkits/xforms

+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes

 post-build:
 	${RM} -f ${WRKSRC}/xbackdrop/backdrops/index~ ;\
-	${PERL} -pi -e 's,/usr/lib,${PREFIX}/lib,' \
+	${REINPLACE_CMD} -e 's,/usr/lib,${PREFIX}/lib,' \
 		${WRKSRC}/xbackdrop/backdrops/index

 .include <bsd.port.mk>
--- a/x11/wdm/Makefile
+++ b/x11/wdm/Makefile
@ -22,6 +22,7 @@ LIB_DEPENDS=	wraster.4:${PORTSDIR}/x11-wm/windowmaker \
 		PropList.2:${PORTSDIR}/devel/libPropList

 DIST_SUBDIR=	wdm
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_AUTOMAKE_VER=14
 AUTOMAKE_ARGS=	--include-deps
@ -62,7 +63,7 @@ pre-everything::
 .endif

 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/*.man
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/doc/*.man

 pre-install:
 	@if [ -e ${PREFIX}/lib/X11/wdm/wdm-config ]; then \
--- a/x11/xbanner/Makefile
+++ b/x11/xbanner/Makefile
@ -14,12 +14,13 @@ DISTNAME=	XBanner${PORTVERSION}

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 #USE_IMAKE=	yes

 post-patch:
-	@${PERL} -pi -e 's|%%X11BASE%%|${X11BASE}|g' \
+	@${REINPLACE_CMD} -e 's|%%X11BASE%%|${X11BASE}|g' \
 		${WRKSRC}/xres.c ${WRKSRC}/samples/XBanner.ad

 post-install:
--- a/x11/xstroke/Makefile
+++ b/x11/xstroke/Makefile
@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org

 LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt

+USE_REINPLACE=	yes
 USE_BISON=	yes
 USE_IMAKE=	yes
 CFLAGS+=	-I${LOCALBASE}/include -I${X11BASE}/include ${PTHREAD_CFLAGS}
@ -24,10 +25,10 @@ LDFLAGS=	-L${LOCALBASE}/lib -L${X11BASE}/lib -lgnugetopt
 MAN1=	xstroke.1

 post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g ; \
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g ; \
 		s,%%CFLAGS%%,${CFLAGS},g ; \
 		s,%%LDFLAGS%%,${LDFLAGS},g" ${WRKSRC}/Imakefile
-	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/etc/Imakefile
-	@${PERL} -pi -e "s,etc/,${PREFIX}/etc/,g" ${WRKSRC}/args.h
+	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/etc/Imakefile
+	@${REINPLACE_CMD} -e "s,etc/,${PREFIX}/etc/,g" ${WRKSRC}/args.h

 .include <bsd.port.mk>