Index: arm-elf-gcc31/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/arm-elf-gcc31/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- arm-elf-gcc31/Makefile	19 Oct 2002 19:01:14 -0000	1.8
+++ arm-elf-gcc31/Makefile	13 Feb 2003 14:34:04 -0000
@@ -32,6 +32,7 @@
 GCC_REV=	${DISTNAME:S/gcc-//g}
 PLIST_SUB+=	GCC_REV=${GCC_REV}
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 CFLAGS:=	${CFLAGS:C/-m(arch|cpu)=[a-zA-Z0-9]+//}
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} --enable-languages="c,c++,objc"
 .if defined(DEFAULT_CPU)
@@ -53,10 +54,10 @@
 .endif
 
 post-configure:
-	${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=),\1#,' ${WRKSRC}/Makefile
-	${PERL} -pi.bak -e 's,^(install-info:),\1\ndonot-\1,; \
-	    s,\$$\(bindir\)/(\$$\(DEMANGLER_CROSS_NAME\)),./\1,' \
-	    ${WRKSRC}/gcc/Makefile
+	${REINPLACE_CMD} -e 's,^TARGET_CONFIGDIRS[[:space:]]*=,&#,' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e '/install-info:/{h;s/:.*/:/;p;g;s/^/donot-/;};
+		s,\$$(bindir)/\(\$$(DEMANGLER_CROSS_NAME)\),./\1,' \
+		${WRKSRC}/gcc/Makefile
 
 post-install:
 	@${MV} ${PREFIX}/bin/cpp ${PREFIX}/bin/${PKGNAMEPREFIX}cpp
Index: boaconstructor/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/boaconstructor/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- boaconstructor/Makefile	21 Mar 2001 16:11:58 -0000	1.3
+++ boaconstructor/Makefile	13 Feb 2003 12:51:46 -0000
@@ -19,11 +19,12 @@
 
 WRKSRC=		${WRKDIR}/Boa-${PORTVERSION}
 
+USE_REINPLACE=	yes
 USE_ZIP=	yes
 USE_PYTHON=	yes
 
 do-configure:
-	@${PERL} -pi -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' \
+	@${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|' \
 		${WRKSRC}/Explorer.gtk.cfg
 
 do-build:
Index: bugbuddy/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/bugbuddy/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- bugbuddy/Makefile	20 Sep 2002 17:06:24 -0000	1.26
+++ bugbuddy/Makefile	13 Feb 2003 12:52:52 -0000
@@ -16,6 +16,7 @@
 MAINTAINER=	gnome@FreeBSD.org
 
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack libglade gnomevfs
@@ -24,7 +25,7 @@
 		LIBS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|\(DATADIRNAME=\)lib|\1share|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: gide/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gide/Makefile,v
retrieving revision 1.50
diff -u -r1.50 Makefile
--- gide/Makefile	7 Oct 2002 17:52:45 -0000	1.50
+++ gide/Makefile	13 Feb 2003 13:01:58 -0000
@@ -20,6 +20,7 @@
 
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
@@ -30,15 +31,15 @@
 MAN1=		gide.1
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|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' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
-	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/src/*.c
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|\(DATADIRNAME=\)lib|\1share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#&|g ; \
+		 s|\$$(top_builddir)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\(\$$(datadir)/\)gnome/|\1|g ; \
+		 s|\$$(datadir)/locale|$$(prefix)/share/locale|g'
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g; \
+		s|%%X11BASE%%|${X11BASE}|g' ${WRKSRC}/src/*.c
 
 pre-configure:
 	@${LN} -sf ${LOCALBASE}/share/xml-i18n-tools/*.in ${WRKSRC}
Index: glg/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/glg/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- glg/Makefile	20 Sep 2002 21:15:52 -0000	1.6
+++ glg/Makefile	13 Feb 2003 13:03:10 -0000
@@ -16,6 +16,7 @@
 
 MAINTAINER=	lo_gafet@users.sourceforge.net
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gtk12
@@ -28,7 +29,7 @@
 .endif
 
 pre-build:
-	find ${WRKSRC} -name Makefile | xargs ${PERL} \
-		-pi -e "s@gtk-config@${GTK_CONFIG}@g"
+	${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
+		's@gtk-config@${GTK_CONFIG}@g'
 
 .include <bsd.port.post.mk>
Index: glui/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/glui/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- glui/Makefile	17 Oct 2001 18:27:14 -0000	1.1
+++ glui/Makefile	13 Feb 2003 13:08:05 -0000
@@ -19,13 +19,13 @@
 MAKEFILE=	makefile
 ALL_TARGET=	# empty
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 
 post-patch:
-	@${PERL} -pi -e 's:/unc/walk/lib/sgi_irix:${PREFIX}/lib:g' ${WRKSRC}/makefile
-	@${PERL} -pi -e 's:/unc/walk/include:${PREFIX}/include:g' ${WRKSRC}/makefile
-	@${PERL} -pi -e 's:^CFLAGS:#CFLAGS:g' ${WRKSRC}/makefile
-	@${PERL} -pi -e 's:^CC=:CC=gcc #:g' ${WRKSRC}/makefile
-	@${PERL} -pi -e 's:^libs =:libs=-pthread:g' ${WRKSRC}/makefile
+	@${REINPLACE_CMD} -e 's:/unc/walk/lib/sgi_irix:${PREFIX}/lib:g; \
+		s:/unc/walk/include:${PREFIX}/include:g; \
+		s:^CFLAGS:#&:; s:^CC=:CC?=gcc #:; \
+		s:^libs =:&${PTHREAD_LIBS}:' ${WRKSRC}/makefile
 	@${MKDIR} ${WRKSRC}/lib ${WRKSRC}/bin
 
 do-install:
Index: gnomevfs/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gnomevfs/Makefile,v
retrieving revision 1.38
diff -u -r1.38 Makefile
--- gnomevfs/Makefile	20 Sep 2002 17:06:31 -0000	1.38
+++ gnomevfs/Makefile	13 Feb 2003 13:10:51 -0000
@@ -24,6 +24,7 @@
 USE_BZIP2=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomehack gnomeprefix glib12 libxml gtk12 orbit gconf \
 		gnomemimedata gnomelibs
@@ -35,10 +36,10 @@
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name 'xml-i18n-*' | xargs ${REINPLACE_CMD} -e \
+		 s|\(DATADIRNAME=\)lib|\1share|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name 'xml-i18n-*' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/usr/local/bin/perl|${PERL}|g'
-	@${REINPLACE_CMD} -e 's|\%\%LOCALBASE\%\%|${LOCALBASE}|g' \
+	@${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' \
 		${WRKSRC}/libgnomevfs/libcharset/Makefile.in
 
 .include <bsd.port.mk>
Index: gtranslator/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/gtranslator/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- gtranslator/Makefile	12 Nov 2002 02:14:10 -0000	1.24
+++ gtranslator/Makefile	13 Feb 2003 13:11:50 -0000
@@ -16,6 +16,7 @@
 MAINTAINER=	sobomax@FreeBSD.org
 
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOMENG=	yes
 USE_GNOME=	gnomeprefix gnomehack gnomelibs gal gnomevfs
@@ -28,7 +29,7 @@
 MANCOMPRESSED=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|\(DATADIRNAME=\)lib|\1share|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
Index: kelp/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/kelp/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- kelp/Makefile	24 Nov 2002 13:39:18 -0000	1.5
+++ kelp/Makefile	13 Feb 2003 13:19:18 -0000
@@ -21,17 +21,18 @@
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 
 MAKE_ENV=	KELP_HOME=${WRKSRC}
 
-#FIND=		/usr/bin/find
 INST_DIST=	bin dgrid doc dock examples include kelp lib mp++ tools
 INST_KELP_HOME=	${LOCALBASE}/kelp
 
 post-patch:
-	@${PERL} -pi -e 's,API2,./API2, ; \
+	@${REINPLACE_CMD} -e 's,API2,./API2, ; \
 		s,API3,./API3,' ${WRKSRC}/examples/API/makefile
-	@${PERL} -pi -e 's,%LOCALBASE%,${LOCALBASE},' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,%LOCALBASE%,${LOCALBASE},' ${WRKSRC}/configure
 
 do-install:
 	@${MKDIR} ${INST_KELP_HOME}
@@ -41,7 +42,7 @@
 .endfor
 	@${ECHO} "Deleting un-needed files."
 	@cd ${INST_KELP_HOME} ; \
-	find ./ \
+	${FIND} ./ \
 	\( \
 	-name "*.orig" -or -name "*.old" -or -name "*.log" -or -name "*.out" \
 	-or -name "*.o" -or -name "*.bck" -or -name "*.o2k" -or -name "*.ls" \
@@ -51,7 +52,7 @@
 
 	@${ECHO} "Changing mode of files that shouldn't be executable."
 	@cd ${INST_KELP_HOME} ; \
-	find ./ \
+	${FIND} ./ \
 	\( \
 	-name "*.C" -or -name "*.h" -or -name "*.m4" -or -name README \
 	-or -name COPYING -or -name "*.c" -or -name "*.F" -or -name "*.f" \
@@ -59,12 +60,12 @@
 
 	@${ECHO} "Changing executable files mode to 555."
 	@cd ${INST_KELP_HOME} ; \
-	find ./ -type f \( -perm -+x -or -perm 750 \) \
+	${FIND} ./ -type f \( -perm -+x -or -perm 750 \) \
 	-exec ${CHMOD} 555 {} \;
 
 	@${ECHO} "Changing normal files mode to 444."
 	@cd ${INST_KELP_HOME} ; \
-	find ./ -type f \( -perm 644 -or -perm 640 \) \
+	${FIND} ./ -type f \( -perm 644 -or -perm 640 \) \
 	-exec ${CHMOD} 444 {} \;
 
 .if !defined(NOPORTDOCS)
Index: libgii/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/libgii/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- libgii/Makefile	17 Jun 2001 17:20:43 -0000	1.7
+++ libgii/Makefile	13 Feb 2003 13:22:34 -0000
@@ -14,6 +14,7 @@
 
 USE_BZIP2=	yes
 USE_XLIB=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 # NOTE: We can not define USE_LIBTOOL for this port to build.
@@ -39,7 +40,7 @@
 		demos/mhub.c demos/xsendbut.c
 
 post-configure:
-	@${PERL} -p -i.bak -e 's/deplibs -lc/deplibs/;' ${WRKSRC}/libtool
+	@${REINPLACE_CMD} -e 's/\(deplibs\) -lc/\1/;' ${WRKSRC}/libtool
 
 post-install:
 	@${CP} ${WRKSRC}/libgii.conf ${PREFIX}/etc/ggi/libgii.conf.dist
Index: mipsel-linux-gcc/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/mipsel-linux-gcc/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- mipsel-linux-gcc/Makefile	6 Feb 2003 04:06:15 -0000	1.3
+++ mipsel-linux-gcc/Makefile	13 Feb 2003 14:01:58 -0000
@@ -37,6 +37,7 @@
 MAKE_ENV=	PATH=${PREFIX}/bin:${PATH}
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
+USE_REINPLACE=	yes
 LIBTOOLFILES=	configure gcc/configure
 MAN1=		${PKGNAMEPREFIX}g++.1 ${PKGNAMEPREFIX}gcc.1 cpp.1 gcov.1
 
@@ -48,12 +49,12 @@
 BINARIES	= gcc g++ c++ cpp
 
 post-configure:
-	@${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=).+$$,\1,' ${WRKSRC}/Makefile
-	@${PERL} -pi.bak -e 's,^(install-info:),\1\ndonot-\1,' ${WRKSRC}/gcc/Makefile
+	@${REINPLACE_CMD} -e 's,^TARGET_CONFIGDIRS[[:space:]]*=,&#,' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/install-info:/{h;s/:.*/:/;p;g;s/^/donot-/;}' ${WRKSRC}/gcc/Makefile
 
 post-install:
 .for F in ${BINARIES}
-	@strip ${PREFIX}/bin/${PKGNAMEPREFIX}$F
+	@${STRIP_CMD} ${PREFIX}/bin/${PKGNAMEPREFIX}$F
 	@${LN} -f ${PREFIX}/bin/${PKGNAMEPREFIX}$F \
 		${PREFIX}/${PKGNAMEPREFIX:S/-$//}/bin/$F
 .endfor
Index: moonshine/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/moonshine/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- moonshine/Makefile	5 Apr 2001 16:29:00 -0000	1.7
+++ moonshine/Makefile	13 Feb 2003 14:04:32 -0000
@@ -16,6 +16,7 @@
 USE_QT_VER=	2
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 USE_XLIB=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	QTDIR="${X11BASE}"
 QTCPPFLAGS+=	-I${X11BASE}/include
@@ -27,10 +28,10 @@
 .endif
 
 pre-configure:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\{prefix\}/moonshine|\$$\{prefix\}/share/moonshine| ; \
-		 s|\@INSTBIN\@|${PREFIX}/bin| ; s|moc -o|\$$\(MOC\) -o|'
-	@${PERL} -pi -e 's|/usr/share/moonshine|${PREFIX}/share/moonshine|' \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\$${prefix}/moonshine|$${prefix}/share/moonshine| ; \
+		 s|@INSTBIN@|${PREFIX}/bin| ; s|moc -o|$$(MOC) -o|'
+	@${REINPLACE_CMD} -e 's|/usr/share/moonshine|${PREFIX}/share/moonshine|' \
 		${WRKSRC}/include/tags.h
 
 .include <bsd.port.post.mk>
Index: msp430-gcc/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/msp430-gcc/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- msp430-gcc/Makefile	22 Nov 2002 18:53:59 -0000	1.3
+++ msp430-gcc/Makefile	13 Feb 2003 14:06:05 -0000
@@ -28,6 +28,7 @@
 WRKSRC=		${WRKDIR}/${PORTNAME}-${GCCVERSION}
 
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--target=${PKGNAMEPREFIX:S/-$//} \
@@ -43,8 +44,8 @@
 BINARIES=	gcc cpp
 
 post-configure:
-	@${PERL} -pi.bak -e 's,^(TARGET_CONFIGDIRS\s*=).+$$,\1,' ${WRKSRC}/Makefile
-	@${PERL} -pi.bak -e 's,^(install-info:),\1\ndonot-\1,' ${WRKSRC}/gcc/Makefile
+	@${REINPLACE_CMD} -e 's,^TARGET_CONFIGDIRS[[:space:]]*=,&#,' ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e '/install-info:/{h;s/:.*/:/;p;g;s/^/donot-/;}' ${WRKSRC}/gcc/Makefile
 
 post-install:
 .for F in ${BINARIES}
Index: pharmacy/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/pharmacy/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- pharmacy/Makefile	29 Mar 2001 16:33:08 -0000	1.10
+++ pharmacy/Makefile	13 Feb 2003 14:08:05 -0000
@@ -14,6 +14,7 @@
 MAINTAINER=	jedgar@FreeBSD.org
 
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
@@ -21,12 +22,12 @@
 		LIBS="-L${LOCALBASE}/lib"
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|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' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
-		 s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g'
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
+		 s|\(DATADIRNAME=\)lib|\1share|g ; \
+		 s|USE_INCLUDED_LIBINTL=yes|#&|g ; \
+		 s|\$$(top_builddir)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\(\$$(datadir)/\)gnome/|\1|g ; \
+		 s|\$$(datadir)/locale|$$(prefix)/share/locale|g'
 
 .include <bsd.port.mk>
Index: qt-designer/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/qt-designer/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- qt-designer/Makefile	4 Dec 2001 03:47:13 -0000	1.5
+++ qt-designer/Makefile	13 Feb 2003 14:47:25 -0000
@@ -10,21 +10,23 @@
 PORTNAME=	qt-designer
 CATEGORIES=	devel
 
+USE_REINPLACE=	yes
+
 post-patch:
-	${PERL} -pi -e "s@-fno-exceptions@-fno-exceptions -I${X11BASE}/include/qt2@g" ${CONFIG}
+	${REINPLACE_CMD} -e "s@-fno-exceptions@& -I${X11BASE}/include/qt2@g" ${CONFIG}
 
 do-build:
 	(cd ${BUILD_WRKSRC}; ${SETENV} ${MAKE_ENV} ${GMAKE} ${MAKE_FLAGS} ${MAKEFILE} ${MAKE_ARGS} ${ALL_TARGET})
 
 qt-pre-configure:
-	${PERL} -pi -e 's@DESTDIR = \$$\(QTDIR\)/bin@DESTDIR = ../../../bin@g' \
+	${REINPLACE_CMD} -e 's@\(DESTDIR = \)\$$(QTDIR)/bin@\1../../../bin@' \
 		${WRKSRC}/tools/designer/designer/Makefile.in
-	${PERL} -pi -e 's@sub-tools: sub-src @sub-tools: @g' ${WRKSRC}/Makefile
-	${PERL} -pi -e "s@\$$(MAKE) util@@g; s@\$$(MAKE) uic@@g; \
-			s@util \\\@designer@g; s@uic \\\@@g; \
-			s@\t\tdesigner@@g" ${WRKSRC}/tools/designer/Makefile.in
-	${PERL} -pi -e "s@getenv\( \"QTDIR\" \)@QT_PREFIX@g; \
-		s@/tools/designer/templates@/share/qt2/designer/templates@g" \
+	${REINPLACE_CMD} -e 's@\(sub-tools: \)sub-src @\1@' ${WRKSRC}/Makefile
+	${REINPLACE_CMD} -e 's@\$$\(MAKE\) util@@; s@\$$\(MAKE\) uic@@; \
+			s@util \\@designer@g; s@uic \\@@g; \
+			s@'"`printf '\t\t'`"'designer@@g' ${WRKSRC}/tools/designer/Makefile.in
+	${REINPLACE_CMD} -e 's@getenv( "QTDIR" )@QT_PREFIX@g; \
+		s@/tools/designer/templates@/share/qt2/designer/templates@g' \
 		${WRKSRC}/tools/designer/designer/newformimpl.cpp
 
 .include "${MASTERDIR}/Makefile"
Index: tkcvs/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/tkcvs/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- tkcvs/Makefile	10 Aug 2002 13:17:14 -0000	1.22
+++ tkcvs/Makefile	13 Feb 2003 14:25:37 -0000
@@ -15,6 +15,8 @@
 
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
+USE_REINPLACE=	yes
+
 NO_BUILD=	yes
 MAN1=		tkcvs.1
 
@@ -22,9 +24,8 @@
 TCLSH=		tclsh8\.3
 
 post-patch:
-	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/tkcvs/tkcvs.blank
-	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/tkdiff/tkdiff
-	@${PERL} -pi -e 's|wish|${WISH}|g' ${WRKSRC}/doinstall.tcl
+	@${REINPLACE_CMD} -e 's|wish|${WISH}|g' \
+		${WRKSRC}/tkcvs/tkcvs.blank ${WRKSRC}/tkdiff/tkdiff ${WRKSRC}/doinstall.tcl
 
 do-install:
 	cd ${WRKSRC}; ${SETENV} ${MAKE_ENV} ${TCLSH} doinstall.tcl -nox ${PREFIX}
Index: tkp4/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/tkp4/Makefile,v
retrieving revision 1.3
diff -u -r1.3 Makefile
--- tkp4/Makefile	26 May 2002 00:07:00 -0000	1.3
+++ tkp4/Makefile	13 Feb 2003 14:27:36 -0000
@@ -17,6 +17,8 @@
 
 NO_BUILD=	yes
 
+USE_REINPLACE=	yes
+
 do-install:
 	${MKDIR} ${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.tcl ${DATADIR}
@@ -28,9 +30,9 @@
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${PERL} -pi -e 's|wish|wish8.3|' ${WRKSRC}/tkp4
+	${REINPLACE_CMD} -e 's|wish|wish8.3|' ${WRKSRC}/tkp4
 .if defined(PREFIX) && ${PREFIX} != "/usr/local"
-	${PERL} -pi -e 's|/usr/local|${PREFIX}|g' `${GREP} -Fl /usr/local ${WRKSRC}/*`
+	${REINPLACE_CMD} -e 's|/usr/local|${PREFIX}|g' `${GREP} -Fl /usr/local ${WRKSRC}/*`
 .endif
 
 .include <bsd.port.post.mk>
Index: tkref/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/tkref/Makefile,v
retrieving revision 1.12
diff -u -r1.12 Makefile
--- tkref/Makefile	9 Jun 2000 21:58:53 -0000	1.12
+++ tkref/Makefile	13 Feb 2003 14:28:26 -0000
@@ -18,8 +18,10 @@
 
 NO_BUILD=	yes
 
+USE_REINPLACE=	yes
+
 do-patch:
-	perl -pi -e "s|/usr/local/bin/wish4.1|${PREFIX}/bin/wish8.2|;" \
+	${REINPLACE_CMD} -e "s|/usr/local/bin/wish4.1|${LOCALBASE}/bin/wish8.2|;" \
 		${WRKDIR}/TkRef
 
 do-install:
Index: vtcl/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/vtcl/Makefile,v
retrieving revision 1.25
diff -u -r1.25 Makefile
--- vtcl/Makefile	10 Apr 2002 08:34:09 -0000	1.25
+++ vtcl/Makefile	13 Feb 2003 14:28:49 -0000
@@ -18,8 +18,10 @@
 HAS_CONFIGURE=	yes
 NO_BUILD=	yes
 
+USE_REINPLACE=	yes
+
 pre-configure:
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/vtcl ${PREFIX}/bin
Index: whups/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/whups/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- whups/Makefile	21 Jan 2003 00:22:08 -0000	1.2
+++ whups/Makefile	13 Feb 2003 14:30:11 -0000
@@ -18,6 +18,8 @@
 
 NO_BUILD=	yes
 
+USE_REINPLACE=	yes
+
 DOCS=		LICENSE docs/CHANGES
 CONFFILE=	conf.php html.php prefs.php
 SUB_DIRS=	config graphics lib locale po scripts templates
@@ -48,9 +50,9 @@
 	@${CHOWN} -R www:www ${WHUPSDIR}
 	@${CHMOD} -R o-rwx ${CONFDIR}
 	@${CP} -p ${FILESDIR}/httpd.conf.whups ${HORDE_INC}
-	@${PERL} -pi -e "s:/home/httpd/html/horde/whups:${WHUPSDIR}:g" \
+	@${REINPLACE_CMD} -e "s:/home/httpd/html/horde/whups:${WHUPSDIR}:g" \
 		${HORDE_INC}/httpd.conf.whups
-	@${PERL} -pi -e "s://UNCOMMENTWHENINSTWHUPS::" ${HORDEDIR}/config/registry.php
+	@${REINPLACE_CMD} -e "s://UNCOMMENTWHENINSTWHUPS::" ${HORDEDIR}/config/registry.php
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 .for FILE in ${DOCS}