PERL -> REINPLACE_CMD

PR:		39938
Submitted by:	Oliver Braun <obraun@informatik.unibw-muenchen.de>

33 files changed, 92 insertions, 58 deletions

diff --git a/graphics/aalib/Makefile b/graphics/aalib/Makefile
index a8ce3c002d4b..152ffea5d156 100644
--- a/graphics/aalib/Makefile
+++ b/graphics/aalib/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	${PORTNAME}-${PORTVERSION:S/.r/rc/}
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-1.4.0
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
@@ -53,10 +54,10 @@ post-extract:
 
 post-patch:
 	@${RM} -f ${WRKSRC}/config.cache
-	@${PERL} -pi -e 's|/usr/local|${LOCALBASE}|g; \
+	@${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g; \
 		s|MAKEINFO=makeinfo|MAKEINFO="makeinfo --no-split"|g' \
 		${WRKSRC}/configure
-	@find ${WRKSRC} \( -name '*.[ch]' \! -name acconfig.h \) \
-		| xargs ${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g'
+	@${FIND} ${WRKSRC} \( -name '*.[ch]' \! -name acconfig.h \) \
+		| ${XARGS} ${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/aview/Makefile b/graphics/aview/Makefile
index 04536c1d639b..5143091984ef 100644
--- a/graphics/aview/Makefile
+++ b/graphics/aview/Makefile
@@ -20,14 +20,15 @@ LIB_DEPENDS=	aa.1:${PORTSDIR}/graphics/aalib
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--with-x=no
 
 MAN1=		asciiview.1 aview.1
 
 post-patch:
-	@${PERL} -pi -e 's|/bash|/sh|g' ${WRKSRC}/asciiview
-	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
+	@${REINPLACE_CMD} -e 's|/bash|/sh|g' ${WRKSRC}/asciiview
+	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/camediaplay/Makefile b/graphics/camediaplay/Makefile
index 0e86fb9e511f..8c3e4fda78b6 100644
--- a/graphics/camediaplay/Makefile
+++ b/graphics/camediaplay/Makefile
@@ -16,12 +16,13 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/build
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OPTFLAG=""
 MAN1=		camediaplay.1
 
 post-patch:
-	@${PERL} -pi -e "s|<sys/dir.h>|<dirent.h>|g" ${WRKSRC}/../src/*.c
+	@${REINPLACE_CMD} -e "s|<sys/dir.h>|<dirent.h>|g" ${WRKSRC}/../src/*.c
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/dc3play/Makefile b/graphics/dc3play/Makefile
index 0b27002ce97b..45d787e2d84d 100644
--- a/graphics/dc3play/Makefile
+++ b/graphics/dc3play/Makefile
@@ -18,11 +18,12 @@ RESTRICTED=	"Beta test period, redistribution prohibited"
 
 WRKSRC=		${WRKDIR}/${PORTNAME}/build
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OPTFLAG=""
 
 post-patch:
-	@${PERL} -pi -e "s|<sys/dir.h>|<dirent.h>|g" ${WRKSRC}/../src/*.c
+	@${REINPLACE_CMD} -e "s|<sys/dir.h>|<dirent.h>|g" ${WRKSRC}/../src/*.c
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/divxcalc/Makefile b/graphics/divxcalc/Makefile
index e81aa310b4ef..d20ebe78107d 100644
--- a/graphics/divxcalc/Makefile
+++ b/graphics/divxcalc/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/share/automake14/automake/install-sh:${PORTSDIR}/devel/automake14
 
+USE_REINPLACE=	yes
 USE_GTK=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -22,7 +23,7 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${PERL} -pi -e "s,Bison ,Bison,g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,Bison ,Bison,g" ${WRKSRC}/configure
 
 pre-configure:
 .for file in config.guess config.sub install-sh missing mkinstalldirs
diff --git a/graphics/dore/Makefile b/graphics/dore/Makefile
index 553ddbed01ec..f042d71d9323 100644
--- a/graphics/dore/Makefile
+++ b/graphics/dore/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 WRKSRC=		${WRKDIR}/dore
@@ -25,7 +26,7 @@ post-extract:
 	@${MKDIR} ${WRKSRC}/lib
 
 post-patch:
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/subsys/*.c
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/subsys/*.c
 
 pre-install:
 	@${MKDIR} ${PREFIX}/share/dore
diff --git a/graphics/ecg2png/Makefile b/graphics/ecg2png/Makefile
index bfc7773cb5a6..c58e48080a24 100644
--- a/graphics/ecg2png/Makefile
+++ b/graphics/ecg2png/Makefile
@@ -17,14 +17,15 @@ LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USE_REINPLACE=	yes
 USE_QT_VER=	2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 QTCPPFLAGS+=	-I${LOCALBASE}/include/gd
 
 pre-patch:
-	@${PERL} -pi -e 's|-lqt$$|-l${QTNAME}|g' ${WRKSRC}/ecg2png/Makefile.in
-	@find ${WRKSRC} -name '*.cpp' | xargs ${PERL} -pi -e \
+	@${REINPLACE_CMD} -e 's|-lqt$$|-l${QTNAME}|g' ${WRKSRC}/ecg2png/Makefile.in
+	@find ${WRKSRC} -name '*.cpp' | xargs ${REINPLACE_CMD} -e \
 		's|#include <qimageio.h>||g'
 	@${CHMOD} ${BINMODE} ${WRKSRC}/missing
 
diff --git a/graphics/gcolor/Makefile b/graphics/gcolor/Makefile
index f1a52fe1e9b7..820cb7678544 100644
--- a/graphics/gcolor/Makefile
+++ b/graphics/gcolor/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
@@ -20,7 +21,7 @@ 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
 
 .include <bsd.port.mk>
diff --git a/graphics/gnofract4d/Makefile b/graphics/gnofract4d/Makefile
index f6e7456ce5cf..e4f251222a7b 100644
--- a/graphics/gnofract4d/Makefile
+++ b/graphics/gnofract4d/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_GNOME=	yes
@@ -22,11 +23,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--enable-compile-warnings=no
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "*Makefile*" | xargs ${PERL} -pi.dist -e \
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "*Makefile*" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|-g -O2 -Wall -D_REENTRANT|\@CXXFLAGS\@|g ; \
-		 s|datadir\)/gnome|datadir\)|g ; \
-		 s|datadir\)/locale|prefix\)/share/locale|g ; \
-		 s|gnofract4d_helpdir\)/images|gnofract4d_helpdir\)|g'
+		 s|datadir)/gnome|datadir)|g ; \
+		 s|datadir)/locale|prefix)/share/locale|g ; \
+		 s|gnofract4d_helpdir)/images|gnofract4d_helpdir)|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/gnofract4d/pkg-plist b/graphics/gnofract4d/pkg-plist
index b7aea77c4301..0db0e9b31d08 100644
--- a/graphics/gnofract4d/pkg-plist
+++ b/graphics/gnofract4d/pkg-plist
@@ -112,6 +112,6 @@ share/locale/fr/LC_MESSAGES/gnofract4d.mo
 @dirrm share/gnome/pixmaps/gnofract4d
 @dirrm share/gnome/maps/gnofract4d
 @dirrm share/gnome/maps
-@dirrm share/gnome/help/gnofract4d/C/stylesheet-image
+@dirrm share/gnome/help/gnofract4d/C/stylesheet-images
 @dirrm share/gnome/help/gnofract4d/C
 @dirrm share/gnome/help/gnofract4d
diff --git a/graphics/gnomeiconedit/Makefile b/graphics/gnomeiconedit/Makefile
index 9b23396de18f..9dbf216431af 100644
--- a/graphics/gnomeiconedit/Makefile
+++ b/graphics/gnomeiconedit/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	gnome-iconedit-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GNOME=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
@@ -24,10 +25,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>
diff --git a/graphics/gsculpt/Makefile b/graphics/gsculpt/Makefile
index cd8dc4e9659a..7c7b4ab63f0f 100644
--- a/graphics/gsculpt/Makefile
+++ b/graphics/gsculpt/Makefile
@@ -16,11 +16,12 @@ DISTNAME=	gSculpt-${PORTVERSION}-src
 MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/gSculpt-${PORTVERSION}
+USE_REINPLACE=	yes
 USE_GTK=	yes
 USE_GMAKE=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,-O3 -Wall -Werror,${CXXFLAGS},g ; \
+	@${REINPLACE_CMD} -e "s,-O3 -Wall -Werror,${CXXFLAGS},g ; \
 		s,gtk-config,${GTK_CONFIG},g ; \
 		s,/usr/include/glib.h,${LOCALBASE}/include/glib12/glib.h,g ; \
 		s,/usr/include/gtk/,${X11BASE}/include/gtk12/gtk/,g ; \
diff --git a/graphics/gsubedit/Makefile b/graphics/gsubedit/Makefile
index 912598a18b4c..956d6fcf192d 100644
--- a/graphics/gsubedit/Makefile
+++ b/graphics/gsubedit/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
@@ -23,14 +24,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${PERL} -pi -e 's|Bison |Bison|g ; \
+	@${REINPLACE_CMD} -e 's|Bison |Bison|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|share/pixmaps|share/gnome/pixmaps|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|^gsubeditdoc|#gsubeditdoc|g ; \
 		 s|-g -O2|| ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|'
+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/imlib2/Makefile b/graphics/imlib2/Makefile
index be3ce81a8cdf..a07cdf886e7b 100644
--- a/graphics/imlib2/Makefile
+++ b/graphics/imlib2/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	jpeg.9:${PORTSDIR}/graphics/jpeg \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		ungif.5:${PORTSDIR}/graphics/libungif
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_FREETYPE=	yes
 USE_LIBTOOL=	yes
@@ -34,6 +35,6 @@ CONFIGURE_ARGS=	--enable-mmx
 .endif
 
 post-configure:
-	@${PERL} -pi -e 's|\@localbase\@|${LOCALBASE}|g' ${WRKSRC}/imlib2-config
+	@${REINPLACE_CMD} -e 's|\@localbase\@|${LOCALBASE}|g' ${WRKSRC}/imlib2-config
 
 .include <bsd.port.post.mk>
diff --git a/graphics/libafterimage/Makefile b/graphics/libafterimage/Makefile
index f173c706c092..7cf5a8063c87 100644
--- a/graphics/libafterimage/Makefile
+++ b/graphics/libafterimage/Makefile
@@ -24,6 +24,7 @@ LIB_DEPENDS=	AfterBase.0:${PORTSDIR}/devel/libafterbase \
 		tiff.4:${PORTSDIR}/graphics/tiff \
 		freetype.9:${PORTSDIR}/print/freetype2
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
@@ -52,8 +53,8 @@ post-extract:
 	@${LN} -sf ${WRKSRC} ${WRKDIR}/libAfterImage
 
 post-patch:
-	@${PERL} -pi -e 's|-lgif|-lungif|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name '*.[ch]' | xargs ${PERL} -pi -e \
+	@${REINPLACE_CMD} -e 's|-lgif|-lungif|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|g'
 
 .include <bsd.port.post.mk>
diff --git a/graphics/libexif-gtk/Makefile b/graphics/libexif-gtk/Makefile
index dc872faf1ab8..c7288a3930dc 100644
--- a/graphics/libexif-gtk/Makefile
+++ b/graphics/libexif-gtk/Makefile
@@ -18,12 +18,13 @@ LIB_DEPENDS=	gdk_pixbuf.2:${PORTSDIR}/graphics/gdk-pixbuf \
 		exif.5:${PORTSDIR}/graphics/libexif
 RUN_DEPENDS=	pkg-config:${PORTSDIR}/devel/pkgconfig
 
+USE_REINPLACE=	yes
 USE_GTK=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
-		's|\$$\(libdir\)/pkgconfig|\$$\(prefix\)/libdata/pkgconfig|g'
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\$$(libdir)/pkgconfig|\$$(prefix)/libdata/pkgconfig|g'
 
 .include <bsd.port.mk>
diff --git a/graphics/maverik/Makefile b/graphics/maverik/Makefile
index fe6a49e9424f..34e01c0e4d46 100644
--- a/graphics/maverik/Makefile
+++ b/graphics/maverik/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gtkgl.5:${PORTSDIR}/x11-toolkits/gtkglarea
 
+USE_REINPLACE=	yes
 USE_SUBMAKE=	yes
 USE_MESA=	yes
 WANT_GTK=	yes
@@ -48,7 +49,7 @@ post-extract:
 	@${SETENV} ${SCRIPTS_ENV} ${SH} ${SCRIPTDIR}/genman3list.sh
 
 post-patch:
-	@${PERL} -pi -e "s,%%X11BASE%%,${X11BASE},g ; \
+	@${REINPLACE_CMD} -e "s,%%X11BASE%%,${X11BASE},g ; \
 		s,%%CC%%,${CC},g ; \
 		s,%%CXX%%,${CXX},g ; \
 		s,%%CFLAGS%%,${CFLAGS},g ; \
@@ -56,7 +57,7 @@ post-patch:
 		s,%%PTHREAD_CFLAGS%%,${PTHREAD_CFLAGS},g ; \
 		s,%%PTHREAD_LIBS%%,${PTHREAD_LIBS},g ; \
 		s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/setup
-	@${PERL} -pi -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/examples/misc/GTK/Makefile
+	@${REINPLACE_CMD} -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/examples/misc/GTK/Makefile
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/lib/*.* ${PREFIX}/lib
diff --git a/graphics/mpeg-lib/Makefile b/graphics/mpeg-lib/Makefile
index 3b6fb26e7816..bcd8a34e7b38 100644
--- a/graphics/mpeg-lib/Makefile
+++ b/graphics/mpeg-lib/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	ftp://ftp.bic.mni.mcgill.ca/pub/mpeg/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	OPTIMIZE="${CFLAGS}"
@@ -20,6 +21,6 @@ CONFIGURE_ENV=	OPTIMIZE="${CFLAGS}"
 post-patch:
 	@(cd ${WRKSRC} ; \
 		${GREP} -r -l "<malloc.h>" * | \
-		xargs ${PERL} -pi -e "s/<malloc.h>/<stdlib.h>/")
+		${XARGS} ${REINPLACE_CMD} -e "s/<malloc.h>/<stdlib.h>/")
 
 .include <bsd.port.mk>
diff --git a/graphics/nurbs++/Makefile b/graphics/nurbs++/Makefile
index b2819ca457d8..6f2f96aa8a16 100644
--- a/graphics/nurbs++/Makefile
+++ b/graphics/nurbs++/Makefile
@@ -12,11 +12,12 @@ MASTER_SITES=	http://yukon.genie.uottawa.ca/~lavoie/software/nurbs/
 
 MAINTAINER= 	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 INSTALLS_SHLIB=	yes
 
 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/nurbs/nurbs.cc ${WRKSRC}/nurbs/nurbsS.cc
 
 .include <bsd.port.mk>
diff --git a/graphics/plotmtv/Makefile b/graphics/plotmtv/Makefile
index f0a3b2c91b20..e1fe674a430f 100644
--- a/graphics/plotmtv/Makefile
+++ b/graphics/plotmtv/Makefile
@@ -16,12 +16,13 @@ EXTRACT_SUFX=	.tar.Z
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 ALL_TARGET=	World
 MAN1=		plotmtv.1
 
 post-patch:
-	find ${WRKSRC} -name \*.c | xargs ${PERL} -pi.malloc.h -e 's/<malloc.h>/<stdlib.h>/'
+	@${FIND} ${WRKSRC} -name \*.c | ${XARGS} ${REINPLACE_CMD} -e 's/<malloc.h>/<stdlib.h>/'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/ppm2fli/Makefile b/graphics/ppm2fli/Makefile
index 04277ae5e211..5d427a810a08 100644
--- a/graphics/ppm2fli/Makefile
+++ b/graphics/ppm2fli/Makefile
@@ -12,10 +12,12 @@ MASTER_SITES=	http://vento.pi.tu-berlin.de/ppm2fli/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 MAN1=	ppm2fli.1 unflick.1
 
 pre-patch:
-	@${PERL} -pi -e 's|^C|#C|g ; \
+	@${REINPLACE_CMD} -e 's|^C|#C|g ; \
 		 s|gcc |\$${CC} |g' ${WRKSRC}/Makefile
 
 do-install:
diff --git a/graphics/qglviewer/Makefile b/graphics/qglviewer/Makefile
index fb05901c66d1..b9fabc27c743 100644
--- a/graphics/qglviewer/Makefile
+++ b/graphics/qglviewer/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.qglviewer.de/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 USE_QT_VER=	2
 GNU_CONFIGURE=	yes
@@ -23,7 +24,7 @@ USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,-lqt,-lqt2,g ; \
+	@${REINPLACE_CMD} -e "s,-lqt,-lqt2,g ; \
 		s,-lqgl,-lqtgl,g ; \
 		s,/moc,/moc2,g" ${WRKSRC}/configure
 
diff --git a/graphics/qslim/Makefile b/graphics/qslim/Makefile
index 756003bf5191..33497c7b2b86 100644
--- a/graphics/qslim/Makefile
+++ b/graphics/qslim/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	xforms:${PORTSDIR}/x11-toolkits/xforms \
 		tiff:${PORTSDIR}/graphics/tiff \
 		png:${PORTSDIR}/graphics/png
 
+USE_REINPLACE=	yes
 USE_MESA=	yes
 USE_XLIB=	yes
 CONFIGURE_WRKSRC=	${WRKSRC}/mixkit/build
@@ -30,7 +31,7 @@ USE_GMAKE=	yes
 ALL_TARGET=	# empty
 
 post-patch:
-	@${PERL} -pi -e "s,\@XFORMS_LIBS\@,${X11BASE}/lib/libforms.a,g" ${CONFIGURE_WRKSRC}/mix-config.in
+	@${REINPLACE_CMD} -e "s,\@XFORMS_LIBS\@,${X11BASE}/lib/libforms.a,g" ${CONFIGURE_WRKSRC}/mix-config.in
 
 post-build:
 	@(cd ${BUILD_WRKSRC}/../../tools/qslim ; ${GMAKE} all)
diff --git a/graphics/sane-backends/Makefile b/graphics/sane-backends/Makefile
index 298a45fe3e8d..33cec28f2425 100644
--- a/graphics/sane-backends/Makefile
+++ b/graphics/sane-backends/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	usb-0.1.5:${PORTSDIR}/devel/libusb \
 		jpeg.9:${PORTSDIR}/graphics/jpeg
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
@@ -42,7 +43,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${PERL} -pi -e 's| -I/usr/local/include||g ; \
+	@${REINPLACE_CMD} -e 's| -I/usr/local/include||g ; \
 		 s|gphoto2 2.0.1|gphoto2 2.0|g' ${WRKSRC}/configure
 
 .include "Makefile.man"
diff --git a/graphics/svg2swf/Makefile b/graphics/svg2swf/Makefile
index 01fd43f51525..1e045b903484 100644
--- a/graphics/svg2swf/Makefile
+++ b/graphics/svg2swf/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 RUN_DEPENDS=	${PYTHON_SITELIBDIR}/${PACKAGE_DIR}/sax/saxexts.py:${PORTSDIR}/textproc/py-xml
 
+USE_REINPLACE=	yes
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
@@ -33,7 +34,7 @@ do-extract:
 	@${CP} ${DISTDIR}/${DISTFILES} ${WRKSRC}
 
 post-patch:
-	@${PERL} -pi -e "s,/usr/bin/python,${PYTHON_CMD},g" ${WRKSRC}/svg2swf
+	@${REINPLACE_CMD} -e "s,/usr/bin/python,${PYTHON_CMD},g" ${WRKSRC}/svg2swf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/svg2swf ${PREFIX}/bin
diff --git a/graphics/truevision/Makefile b/graphics/truevision/Makefile
index e5302818bb64..4bf62ffbb5ed 100644
--- a/graphics/truevision/Makefile
+++ b/graphics/truevision/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gtkgl:${PORTSDIR}/x11-toolkits/gtkglarea
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_MESA=	yes
 USE_GNOME=	yes
@@ -26,13 +27,13 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include ${PTHREAD_FLAGS}" \
 		LDFLAGS="-L${LOCALBASE}/lib ${PTHREAD_LIBS}"
 
 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'
-	@${PERL} -pi -e "s,Bison ,Bison,g" ${WRKSRC}/configure
-	@${PERL} -pi -e "s,-lgthread,-lgthread12,g ; \
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
+	@${REINPLACE_CMD} -e "s,Bison ,Bison,g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,-lgthread,-lgthread12,g ; \
 		s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/graphics/white_dune/Makefile b/graphics/white_dune/Makefile
index 4614e452f447..8d13a532af89 100644
--- a/graphics/white_dune/Makefile
+++ b/graphics/white_dune/Makefile
@@ -17,6 +17,7 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
 		jpeg:${PORTSDIR}/graphics/jpeg
 
+USE_REINPLACE=	yes
 USE_BISON=	yes
 USE_MESA=	yes
 USE_MOTIF=	yes
@@ -27,9 +28,9 @@ MAN1=	dune.1
 
 post-patch:
 	@${GREP} -lR "malloc.h" ${WRKSRC} | ${XARGS} \
-		${PERL} -pi -e "s/malloc\.h/stdlib.h/g"
-	@${PERL} -pi -e "s/values\.h/limits.h/g" ${WRKSRC}/stdafx.h
-	@${PERL} -pi -e "s/alloca\.h/stdlib.h/g" ${WRKSRC}/NodeNurbsSurface.cpp
+		${REINPLACE_CMD} -e "s/malloc\.h/stdlib.h/g"
+	@${REINPLACE_CMD} -e "s/values\.h/limits.h/g" ${WRKSRC}/stdafx.h
+	@${REINPLACE_CMD} -e "s/alloca\.h/stdlib.h/g" ${WRKSRC}/NodeNurbsSurface.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/dune ${PREFIX}/bin
diff --git a/graphics/xfig-devel/Makefile b/graphics/xfig-devel/Makefile
index a5c4c5ca87b2..179dcc666c3a 100644
--- a/graphics/xfig-devel/Makefile
+++ b/graphics/xfig-devel/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		xfig.1
@@ -41,7 +42,7 @@ post-extract:
 
 post-patch:
 .if defined(WITHOUT_GHOSTSCRIPT)
-	@${PERL} -pi -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
+	@${REINPLACE_CMD} -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/xfig/Makefile b/graphics/xfig/Makefile
index a5c4c5ca87b2..179dcc666c3a 100644
--- a/graphics/xfig/Makefile
+++ b/graphics/xfig/Makefile
@@ -22,6 +22,7 @@ RUN_DEPENDS=	fig2dev:${PORTSDIR}/print/transfig
 
 WRKSRC=		${WRKDIR}/${PORTNAME}.${PORTVERSION}
 
+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		xfig.1
@@ -41,7 +42,7 @@ post-extract:
 
 post-patch:
 .if defined(WITHOUT_GHOSTSCRIPT)
-	@${PERL} -pi -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
+	@${REINPLACE_CMD} -e 's|-DGSBIT ||g' ${WRKSRC}/Imakefile
 .endif
 
 .include <bsd.port.mk>
diff --git a/graphics/xfpovray/Makefile b/graphics/xfpovray/Makefile
index 990321ed2573..f0ae038c851e 100644
--- a/graphics/xfpovray/Makefile
+++ b/graphics/xfpovray/Makefile
@@ -18,10 +18,11 @@ MAINTAINER=	ports@FreeBSD.org
 LIB_DEPENDS=	forms.1:${PORTSDIR}/x11-toolkits/xforms
 RUN_DEPENDS=	povray:${PORTSDIR}/graphics/povray
 
+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 USE_GMAKE=	yes
 
 post-patch:
-	${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/src/xfpovray.h
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g;" ${WRKSRC}/src/xfpovray.h
 
 .include <bsd.port.mk>
diff --git a/graphics/xfractint/Makefile b/graphics/xfractint/Makefile
index cb7ffacefbc2..8d8c9e4e51ab 100644
--- a/graphics/xfractint/Makefile
+++ b/graphics/xfractint/Makefile
@@ -14,13 +14,14 @@ DISTNAME=	xfrac310
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_ZIP=	yes
 USE_XLIB=	yes
 NO_WRKSUBDIR=	yes
 MAN1=		xfractint.1
 
 pre-patch:
-	@${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "*.c" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|malloc\.h|stdlib.h|'
 
 .include <bsd.port.mk>
diff --git a/multimedia/gsubedit/Makefile b/multimedia/gsubedit/Makefile
index 912598a18b4c..956d6fcf192d 100644
--- a/multimedia/gsubedit/Makefile
+++ b/multimedia/gsubedit/Makefile
@@ -15,6 +15,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
@@ -23,14 +24,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${PERL} -pi -e 's|Bison |Bison|g ; \
+	@${REINPLACE_CMD} -e 's|Bison |Bison|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
 		 s|share/pixmaps|share/gnome/pixmaps|g' ${WRKSRC}/configure
-	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in*" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|^gsubeditdoc|#gsubeditdoc|g ; \
 		 s|-g -O2|| ; \
-		 s|\$$\(datadir\)/locale|\$$\(prefix\)/share/locale|'
+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|'
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/multimedia/ppm2fli/Makefile b/multimedia/ppm2fli/Makefile
index 04277ae5e211..5d427a810a08 100644
--- a/multimedia/ppm2fli/Makefile
+++ b/multimedia/ppm2fli/Makefile
@@ -12,10 +12,12 @@ MASTER_SITES=	http://vento.pi.tu-berlin.de/ppm2fli/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 MAN1=	ppm2fli.1 unflick.1
 
 pre-patch:
-	@${PERL} -pi -e 's|^C|#C|g ; \
+	@${REINPLACE_CMD} -e 's|^C|#C|g ; \
 		 s|gcc |\$${CC} |g' ${WRKSRC}/Makefile
 
 do-install: