6 files changed, 17 insertions, 10 deletions

diff --git a/comms/hylafax/Makefile b/comms/hylafax/Makefile
index dfe8d680305c..a89547744ad6 100644
--- a/comms/hylafax/Makefile
+++ b/comms/hylafax/Makefile
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=--nointeractive
 .endif
 MAKE_ARGS+=	OPTIMIZER="" -EOPTIMIZER
 
+USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ENV=	ENVOPTS="${CFLAGS}"
 
@@ -73,7 +74,7 @@ post-install:
 
 .if ${LOCALBASE} != /usr/local
 post-patch:
-	${PERL} -pi -e 's^/usr/local^${LOCALBASE}^g' \
+	${REINPLACE_CMD} -e 's^/usr/local^${LOCALBASE}^g' \
 		`find work/hylafax-4.1 -type f -print0 | \
 			xargs -0 fgrep -l --mmap /usr/local`
 .endif
diff --git a/devel/ecgi/Makefile b/devel/ecgi/Makefile
index d7fbdab1ce0c..ae660aa27dce 100644
--- a/devel/ecgi/Makefile
+++ b/devel/ecgi/Makefile
@@ -13,13 +13,14 @@ MASTER_SITES=   http://www.global-owl.com/ecgi/download/
 MAINTAINER=	ports@freebsd.org
 
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 INSTALLS_SHLIB=	yes
 
 HEADER_FILES=	ecgi.h ecgitk.h include/memfile.h
 
 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/src/memfile.c
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/src/memfile.c
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/libecgi.a ${PREFIX}/lib
diff --git a/devel/tkcon/Makefile b/devel/tkcon/Makefile
index d64e551e6b38..dd61e84b978f 100644
--- a/devel/tkcon/Makefile
+++ b/devel/tkcon/Makefile
@@ -15,10 +15,12 @@ MAINTAINER=	ports@freebsd.org
 
 RUN_DEPENDS=	wish8.3:${PORTSDIR}/x11-toolkits/tk83
 
+USE_REINPLACE=	yes
 NO_BUILD=	yes
+REINPLACE_ARGS=	-i.bak -E
 
 post-patch:
-	@${PERL} -pi \
+	@${REINPLACE_CMD} \
 		-e 's,docs\s+"([^"]+)",docs	"file:${PREFIX}/share/doc/tkcon/index.html\\n\1",' ${WRKSRC}/tkcon.tcl
 
 do-install:
diff --git a/lang/itcl/Makefile b/lang/itcl/Makefile
index 1c67b768a5e3..10f002a28a5b 100644
--- a/lang/itcl/Makefile
+++ b/lang/itcl/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	ports@freebsd.org
 LIB_DEPENDS=	tcl83:${PORTSDIR}/lang/tcl83
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/itcl
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 PKGINSTALL=	${PORTSDIR}/lang/tcl83/pkg-install.tclsh
 PKGDEINSTALL=	${PORTSDIR}/lang/tcl83/pkg-deinstall.tclsh
@@ -47,7 +48,7 @@ post-extract:
 	${RM} ${WRKSRC}/pkgIndex.tcl
 
 post-patch:
-	${PERL} -pi \
+	${REINPLACE_CMD} \
 		-e 's,package require Itcl,load [glob \
 			${WRKSRC}/${ITCL_LIB}.${SHLIB_MAJOR}*],;' \
 		${WRKSRC}/tests/*.test
diff --git a/x11-toolkits/itk/Makefile b/x11-toolkits/itk/Makefile
index 7bdfa7df68b4..a248ac40037d 100644
--- a/x11-toolkits/itk/Makefile
+++ b/x11-toolkits/itk/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	ports@freebsd.org
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83 \
 		itcl${MAJOR}${MINOR}.1:${PORTSDIR}/lang/itcl
 
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/itcl${MAJOR}.${MINOR}/itk
 INSTALLS_SHLIB=	yes
 MAKE_ENV+=	${PLIST_SUB} \
@@ -44,11 +45,11 @@ post-extract:
 	${RM} ${WRKSRC}/pkgIndex.tcl
 
 post-patch:
-	${PERL} -pi \
+	${REINPLACE_CMD} \
 		-e 's,package require Itk,load \
 			[glob ${WRKSRC}/${ITK_LIB_FILE}*],;' \
 		-e 's,return$$,exit,' ${WRKSRC}/tests/*
-	${PERL} -pi \
+	${REINPLACE_CMD} \
 		-e 's,\@itk_LIB_FILE\@,${ITK_LIB_FILE},' \
 		${WRKSRC}/pkgIndex.tcl.in
 
diff --git a/x11/gdkxft/Makefile b/x11/gdkxft/Makefile
index a20421b909e4..ecd3b745404e 100644
--- a/x11/gdkxft/Makefile
+++ b/x11/gdkxft/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_X_PREFIX=	yes
 USE_GTK=	yes
+USE_REINPLACE=	yes
 WANT_GNOME=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
@@ -40,18 +41,18 @@ CONFIGURE_ARGS+=	--without-gnome
 .endif
 
 post-patch:
-	@${PERL} -pi -e 's|gtk-config --prefix|\$$GTK_CONFIG --prefix|g ; \
+	@${REINPLACE_CMD} -e 's|gtk-config --prefix|\$$GTK_CONFIG --prefix|g ; \
 		 s|libgdk.la|libgdk12.so|g ; \
 		 s|libgdk.so|libgdk12.so|g ; \
 		 s|GDK_DLOPEN_NAME=.*$$|GDK_DLOPEN_NAME="libgdk12.so"|g' \
 			${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
 		's|src capplet|src \@BUILD_CAPPLET_TRUE\@capplet|g ; \
-		 s|DESTDIR\)\$$\(datadir|DESTDIR\)\$$\(pkgdatadir|g ; \
+		 s|DESTDIR)\$$(datadir|DESTDIR\)\$$\(pkgdatadir|g ; \
 		 s|/gnome/apps/|/apps/|g ; \
 		 s|la_LDFLAGS =.*$$|la_LDFLAGS = -module -avoid-version|g'
 .for file in gdkxft_sysinstall.in gdkxft.c generate.pl
-	@${PERL} -pi -e 's|<regex.h>|<gnuregex.h>|g ; \
+	@${REINPLACE_CMD} -e 's|<regex.h>|<gnuregex.h>|g ; \
 		 s|gtk-config |${GTK_CONFIG:T} |g' ${WRKSRC}/src/${file}
 .endfor