7 files changed, 18 insertions, 11 deletions

diff --git a/cad/felt/Makefile b/cad/felt/Makefile
index 6cad0d6fbb58..49d441480375 100644
--- a/cad/felt/Makefile
+++ b/cad/felt/Makefile
@@ -21,21 +21,22 @@ LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 WRKSRC=		${WRKDIR}/FElt-${PORTVERSION}
 GNU_CONFIGURE=	yes
 USE_X_PREFIX=	yes
+USE_REINPLACE=	yes
 
 MAN1=		burlap.1 corduroy.1 felt.1 patchwork.1 velvet.1 yardstick.1
 MAN3=		Drawing.3
 MAN4=		corduroy.4 felt.4
 
 post-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>, ; s,"malloc.h",<stdlib.h>,' \
-	${WRKSRC}/lib/Felt/parser.c ${WRKSRC}/lib/Felt/parser.c	\
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>, ; s,"malloc.h",<stdlib.h>,' \
+	${WRKSRC}/lib/Felt/parser.c \
 	${WRKSRC}/lib/Widgets/xwd.c ${WRKSRC}/lib/Matrix/data.c	\
 	${WRKSRC}/lib/Matrix/factor.c ${WRKSRC}/lib/Matrix/eigen.c \
 	${WRKSRC}/lib/Matrix/c_data.c ${WRKSRC}/lib/Matrix/c_factor.c \
 	${WRKSRC}/include/allocate.h ${WRKSRC}/src/Velvet/error.c \
 	${WRKSRC}/src/Burlap/allocate.h ${WRKSRC}/src/Burlap/interactive.c \
-	${WRKSRC}/src/Burlap/parser.c ${WRKSRC}/src/Burlap/parser.c \
-	${WRKSRC}/src/Corduroy/parser.c ${WRKSRC}/src/Corduroy/parser.c	\
+	${WRKSRC}/src/Burlap/parser.c \
+	${WRKSRC}/src/Corduroy/parser.c	\
 	${WRKSRC}/src/Patchwork/util.c
 
 post-install:
diff --git a/cad/gnucap/Makefile b/cad/gnucap/Makefile
index cf87f915ca62..ba6b47ad09c5 100644
--- a/cad/gnucap/Makefile
+++ b/cad/gnucap/Makefile
@@ -14,13 +14,14 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	CXX="${CXX}" CXXFLAGS="${CXXFLAGS}"
 
 post-patch:
 .for file in src/Make2.g++ src/Make.aux modelgen/Make.aux
-	@printf ',s|g\+\+|\$$\{CXX\}|g\n,s|-O2|\$$\{CXXFLAGS\}|g\nwq\n' | \
-		ed -s ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e "s|g\+\+|\$$\{CXX\}|g" \
+		-e "s|-O2|\$$\{CXXFLAGS\}|g" ${WRKSRC}/${file}
 .endfor
 
 do-install:
diff --git a/cad/gtkwave/Makefile b/cad/gtkwave/Makefile
index a6ee9dcf2499..3d920c22b793 100644
--- a/cad/gtkwave/Makefile
+++ b/cad/gtkwave/Makefile
@@ -20,11 +20,12 @@ LIB_DEPENDS=	bz2.1:${PORTSDIR}/archivers/bzip2
 .endif
 
 USE_GTK=	yes
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 post-patch:
 	@${GREP} -lR "heapsort" ${WRKSRC}/src | ${XARGS} \
-		${PERL} -pi -e "s/heapsort/hsort/g"
+		${REINPLACE_CMD} -e "s/heapsort/hsort/g"
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/cad/qcad/Makefile b/cad/qcad/Makefile
index ddc37ce1a44d..9f8630db5c81 100644
--- a/cad/qcad/Makefile
+++ b/cad/qcad/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 
 USE_QT_VER=	2
+USE_REINPLACE=	yes
 MAKE_ENV=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
 		QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}"
 
@@ -25,7 +26,7 @@ CFLAGS+=	-O0
 .endif
 
 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}/qcad ${PREFIX}/bin
diff --git a/cad/qcad2/Makefile b/cad/qcad2/Makefile
index ddc37ce1a44d..9f8630db5c81 100644
--- a/cad/qcad2/Makefile
+++ b/cad/qcad2/Makefile
@@ -15,6 +15,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 
 USE_QT_VER=	2
+USE_REINPLACE=	yes
 MAKE_ENV=	MOC="${MOC}" LIBQT="-l${QTNAME}" \
 		QTCPPFLAGS="${QTCPPFLAGS}" QTCFGLIBS="${QTCFGLIBS}"
 
@@ -25,7 +26,7 @@ CFLAGS+=	-O0
 .endif
 
 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}/qcad ${PREFIX}/bin
diff --git a/cad/slffea/Makefile b/cad/slffea/Makefile
index 8ccc02067d56..59a33c40c950 100644
--- a/cad/slffea/Makefile
+++ b/cad/slffea/Makefile
@@ -16,6 +16,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_MESA=	yes
 CFLAGS+=	-I${X11BASE}/include ${PTHREAD_CFLAGS}
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.3
@@ -38,7 +39,7 @@ EXEC=	beam/beam/bm \
 
 post-patch:
 	@(find ${WRKSRC} -name Makefile | xargs \
-	  ${PERL} -pi -e "s,^CC = (.*),CC = ${CC} ${CFLAGS},g ; \
+	  ${REINPLACE_CMD} -E -e "s,^CC = (.*),CC = ${CC} ${CFLAGS},g ; \
 	    s,-lglut,-lglut ${PTHREAD_LIBS},g")
 
 do-install:
diff --git a/cad/xcircuit/Makefile b/cad/xcircuit/Makefile
index 802b8461b8ff..c8e6286c4fd5 100644
--- a/cad/xcircuit/Makefile
+++ b/cad/xcircuit/Makefile
@@ -19,12 +19,13 @@ BUILD_DEPENDS=	gm4:${PORTSDIR}/devel/m4
 USE_BZIP2=	yes
 USE_XPM=	yes
 USE_IMAKE=	yes
+USE_REINPLACE=	yes
 XMKMF=		xmkmf
 
 MAN1=		xcircuit.1
 
 post-patch:
-	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name '*.[ch]' | xargs ${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|g'
 
 post-install: