6 files changed, 15 insertions, 9 deletions

diff --git a/editors/dedit/Makefile b/editors/dedit/Makefile
index 8fa191c7837a..caaf33106605 100644
--- a/editors/dedit/Makefile
+++ b/editors/dedit/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GNOME=	gnomelibs gnomeprefix gnomehack gtk12 glib12 orbit
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -29,8 +30,8 @@ MAN1=		dedit.1
 MANLANG=	"" ja
 
 pre-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\(\$$(datadir)/\)gnome/|\1|g ; \
 		 s|dedit.ja.1||'
 
 post-install:
diff --git a/editors/gnotepad+/Makefile b/editors/gnotepad+/Makefile
index 6335fd8904e4..bebb134d3e25 100644
--- a/editors/gnotepad+/Makefile
+++ b/editors/gnotepad+/Makefile
@@ -21,6 +21,7 @@ COMMENT=	Simple GTK-based text/HTML editor
 DOCVERSION=	1.2.0
 
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_XPM=	yes
 WANT_GNOME=	yes
 USE_GNOME=	gtk12
@@ -33,7 +34,7 @@ MAN1=	gnp.1
 .include <bsd.port.pre.mk>
 
 post-patch:
-	@${PERL} -pi.fbsd -e 's|use_gtkhtml=yes|use_gtkhtml=no|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|\(use_gtkhtml=\)yes|\1no|g' ${WRKSRC}/configure.in
 
 .if !defined(NOPORTDOCS)
 post-extract:
diff --git a/editors/gxedit/Makefile b/editors/gxedit/Makefile
index 9f5c92b1aafa..ac9423cabdab 100644
--- a/editors/gxedit/Makefile
+++ b/editors/gxedit/Makefile
@@ -16,12 +16,13 @@ MAINTAINER=	dom@happygiraffe.net
 COMMENT=	A simple GTK+ editor
 
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 USE_GNOME=	gtk12
 
 ALL_TARGET=	gxedit
 
 post-patch:
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/config.h
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/config.h
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/gtk-shell ${PREFIX}/bin
diff --git a/editors/jext/Makefile b/editors/jext/Makefile
index 5b3e701d3e10..52f07a8029f7 100644
--- a/editors/jext/Makefile
+++ b/editors/jext/Makefile
@@ -20,6 +20,7 @@ RUN_DEPENDS=	${JAVAVM}:${PORTSDIR}/java/javavmwrapper \
 
 WRKSRC=		${WRKDIR}
 USE_XLIB=	yes
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 
 JAVAVM?=	${LOCALBASE}/bin/javavm
@@ -27,8 +28,8 @@ JAVAVM?=	${LOCALBASE}/bin/javavm
 INSTSBDR=	${PREFIX}/share/java/jext
 
 do-configure:
-	@${PERL} -pi -e 's|%%JAVAVM%%|${JAVAVM}|g ; \
-			 s|%%JEXT_HOME%%|${INSTSBDR}|g'	${WRKSRC}/bin/jext
+	@${REINPLACE_CMD} -e 's|%%JAVAVM%%|${JAVAVM}|g ; \
+		s|%%JEXT_HOME%%|${INSTSBDR}|g'	${WRKSRC}/bin/jext
 
 do-install:
 	@${MKDIR} ${INSTSBDR}
diff --git a/editors/staroffice5/Makefile b/editors/staroffice5/Makefile
index 1166d97f04cf..ab3547ce2fbd 100644
--- a/editors/staroffice5/Makefile
+++ b/editors/staroffice5/Makefile
@@ -23,6 +23,7 @@ ONLY_FOR_ARCHS=	i386
 NO_CDROM=	'Must be downloaded direct from Sun via www interface'
 
 USE_LINUX=	yes
+USE_REINPLACE=	yes
 IS_INTERACTIVE=	yes
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 EXTRACT_CMD=	${CAT}
@@ -57,7 +58,7 @@ post-extract:
 	@${GZIP_CMD} -d ${WRKDIR}/applicat.rdb.gz
 
 post-configure:
-	@${PERL} -pi.orig -e 's|DefaultDestPath = "Office51";|DefaultDestPath = "${PREFIX}/Office51";|' ${WRKSRC}/office51/setup.ins
+	@${REINPLACE_CMD} -e 's|\(DefaultDestPath = \)"Office51";|\1"${PREFIX}/Office51";|' ${WRKSRC}/office51/setup.ins
 
 do-install:
 	@${CP} /compat/linux/etc/ld.so.conf ${TMPDIR}/ld.so.conf.tmp
@@ -76,7 +77,7 @@ do-install:
 	@${CHMOD} 100755 ${PREFIX}/Office51/lib/libsdb517li.so
 	@${PATCH} -s ${PREFIX}/Office51/bin/setup ${FILESDIR}/setup.patch
 	@${PATCH} -s ${PREFIX}/Office51/bin/soffice ${FILESDIR}/soffice.patch
-	@${PERL} -pi -e 's|DefaultDestPath = "${PREFIX}/Office51";|DefaultDestPath = "~/Office51";|' ${PREFIX}/Office51/instdb.ins
+	@${REINPLACE_CMD} -e 's|\(DefaultDestPath = \)"${PREFIX}/Office51";|\1"~/Office51";|' ${PREFIX}/Office51/instdb.ins
 
 install-user:
 	${PREFIX}/Office51/bin/setup
diff --git a/editors/staroffice52/Makefile b/editors/staroffice52/Makefile
index 3d96142f233e..c016d31c6245 100644
--- a/editors/staroffice52/Makefile
+++ b/editors/staroffice52/Makefile
@@ -39,6 +39,7 @@ NO_CDROM=	'Must be downloaded direct from Sun via www interface'
 CD_MOUNTPT=	'/cdrom'
 IS_INTERACTIVE=	yes
 NO_BUILD=	yes
+USE_REINPLACE=	yes
 DIST_SUBDIR=	staroffice52
 WRKSRC=		${WRKDIR}/office52
 TMPDIR=		${WRKDIR}/tmp
@@ -179,7 +180,7 @@ do-extract:
 .endif
 
 post-configure:
-	@${PERL} -pi.orig -e 's|DefaultDestPath = "office52";|DefaultDestPath = "${PREFIX}/office52";|' ${WRKSRC}/setup.ins
+	@${REINPLACE_CMD} -e 's|\(DefaultDestPath = \)"office52";|\1"${PREFIX}/office52";|' ${WRKSRC}/setup.ins
 
 do-install:
 .if !defined(DISPLAY) || ${DISPLAY} == ""