18 files changed, 56 insertions, 37 deletions

diff --git a/games/3dpong/Makefile b/games/3dpong/Makefile
index b754695e8a15..9def65cb7e01 100644
--- a/games/3dpong/Makefile
+++ b/games/3dpong/Makefile
@@ -13,10 +13,11 @@ MASTER_SITES=	ftp://ftp.sonic.net/pub/users/nbs/unix/x/3dpong/
 MAINTAINER=	ports@FreeBSD.org
 
 MAKEFILE=	makefile
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 
 post-patch:
-	@${PERL} -pi.fbsd -e 's.\tchmod .\t${CHMOD} .g' \
+	@${REINPLACE_CMD} -e 's.	chmod .	${CHMOD} .g' \
 		${WRKSRC}/makefile
 
 do-install:
diff --git a/games/adgali/Makefile b/games/adgali/Makefile
index ea0bf9f858f4..9e9221ffb9d2 100644
--- a/games/adgali/Makefile
+++ b/games/adgali/Makefile
@@ -23,6 +23,7 @@ LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 
+USE_REINPLACE=	yes
 USE_FREETYPE=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
@@ -35,7 +36,7 @@ CONFIGURE_ARGS=	--enable-compile-type=optim
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|-O3 ||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-O3 ||g' ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/games/cryptoslam/Makefile b/games/cryptoslam/Makefile
index d1bd194d93fa..3c28e99d33f1 100644
--- a/games/cryptoslam/Makefile
+++ b/games/cryptoslam/Makefile
@@ -14,6 +14,8 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=  yes
+
 .include <bsd.port.pre.mk>
 
 .if ${OSVERSION} < 400010
@@ -23,7 +25,7 @@ CFLAGS+=	-nostdinc -I${LOCALBASE}/include/ncurses \
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/cryptoslam ${PREFIX}/bin
diff --git a/games/glife/Makefile b/games/glife/Makefile
index 4034d1cf067d..35f25cbcee1b 100644
--- a/games/glife/Makefile
+++ b/games/glife/Makefile
@@ -15,16 +15,17 @@ DISTNAME=	gLife-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_LIBTOOL=	yes
 USE_GNOME=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" LDFLAGS="-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/games/gno3dtet/Makefile b/games/gno3dtet/Makefile
index d948c727833d..1116d2acfc82 100644
--- a/games/gno3dtet/Makefile
+++ b/games/gno3dtet/Makefile
@@ -14,6 +14,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
@@ -22,11 +23,11 @@ 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'
 
 post-install:
 	${CHOWN} root:games ${PREFIX}/bin/gno3dtet
diff --git a/games/gnomebreakout/Makefile b/games/gnomebreakout/Makefile
index 1ef71cdca6d7..74556a3c7429 100644
--- a/games/gnomebreakout/Makefile
+++ b/games/gnomebreakout/Makefile
@@ -13,6 +13,7 @@ DISTNAME=	gnome-breakout-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
@@ -20,10 +21,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/games/gnomememoryblocks/Makefile b/games/gnomememoryblocks/Makefile
index 4e376c16f6ce..dc6e893732ff 100644
--- a/games/gnomememoryblocks/Makefile
+++ b/games/gnomememoryblocks/Makefile
@@ -14,6 +14,7 @@ DISTNAME=	gnome-memblocks-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_LIBTOOL=	yes
@@ -21,10 +22,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/games/gtkballs/Makefile b/games/gtkballs/Makefile
index 3d0270b9e1d2..19438405ff9c 100644
--- a/games/gtkballs/Makefile
+++ b/games/gtkballs/Makefile
@@ -12,6 +12,7 @@ MASTER_SITES=	http://gtkballs.antex.ru/dist/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GTK=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -22,7 +23,7 @@ CONFIGURE_ARGS=	--localstatedir=${DATADIR}
 MAN6=		gtkballs.6x
 
 post-patch:
-	@${PERL} -pi -e 's|^install-data-local|#install-data-local|g' \
+	@${REINPLACE_CMD} -e 's|^install-data-local|#install-data-local|g' \
 		${WRKSRC}/Makefile.in
 
 post-install:
diff --git a/games/qgo/Makefile b/games/qgo/Makefile
index 5694a89e3b3b..22caa681e895 100644
--- a/games/qgo/Makefile
+++ b/games/qgo/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_QT_VER=	2
 GNU_CONFIGURE=	yes
 QTCPPFLAGS+=	-DDONT_USE_GETOPT
@@ -21,8 +22,8 @@ CONFIGURE_ENV=	QTDIR=${X11BASE}
 USE_GMAKE=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,qt.so,qt2.so,g ; \
+	@${REINPLACE_CMD} -e "s,qt.so,qt2.so,g ; \
 		s,/moc,/moc2,g" ${WRKSRC}/configure
-	@${PERL} -pi -e "s,-lqt,-lqt2,g" ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e "s,-lqt,-lqt2,g" ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/games/tinymux/Makefile b/games/tinymux/Makefile
index 29f46c1dd6d9..ace33bf473a0 100644
--- a/games/tinymux/Makefile
+++ b/games/tinymux/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	gdbm.2:${PORTSDIR}/databases/gdbm
 
 WRKSRC=		${WRKDIR}/src
 
+USE_REINPLACE=	yes
 USE_AUTOCONF=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
@@ -25,7 +26,7 @@ post-extract:
 	@${RM} -f ${WRKSRC}/gdbm.h
 
 post-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/udb_ochunk.c
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' ${WRKSRC}/udb_ochunk.c
 
 #
 # Distribution does not include an install target.  So here it is.
diff --git a/games/tux-aqfh/Makefile b/games/tux-aqfh/Makefile
index dc8c9942477b..4c4c6e5c390b 100644
--- a/games/tux-aqfh/Makefile
+++ b/games/tux-aqfh/Makefile
@@ -14,6 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_MESA=	yes
@@ -24,11 +25,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 CONFIGURE_ARGS=	--with-plib=${X11BASE}
 
 post-patch:
-	@${PERL} -pi -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
+	@${REINPLACE_CMD} -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|datadir/games|datadir|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\(prefix\)/games|\@bindir\@|g ; \
-		 s|\$$\(datadir\)/games|\$$\(datadir\)|g'
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\$$(prefix)/games|\@bindir\@|g ; \
+		 s|\$$(datadir)/games|\$$(datadir)|g'
 
 .include <bsd.port.mk>
diff --git a/games/tuxkart/Makefile b/games/tuxkart/Makefile
index 990f86aa46ab..6aef22554502 100644
--- a/games/tuxkart/Makefile
+++ b/games/tuxkart/Makefile
@@ -14,6 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${X11BASE}/lib/libplibsl.a:${PORTSDIR}/x11-toolkits/plib
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_NEWGCC=	yes
 USE_MESA=	yes
@@ -24,11 +25,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include -I${X11BASE}/include" \
 CONFIGURE_ARGS=	--with-plib=${X11BASE}
 
 post-patch:
-	@${PERL} -pi -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
+	@${REINPLACE_CMD} -e 's|-O6|${PTHREAD_CFLAGS}|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g ; \
 		 s|datadir/games|datadir|g' ${WRKSRC}/configure
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\(prefix\)/games|\@bindir\@|g ; \
-		 s|\$$\(datadir\)/games|\$$\(datadir\)|g'
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\$$(prefix)/games|\@bindir\@|g ; \
+		 s|\$$(datadir)/games|\$$(datadir)|g'
 
 .include <bsd.port.mk>
diff --git a/games/wordplay/Makefile b/games/wordplay/Makefile
index 2c17edfbf903..64f80f3a2185 100644
--- a/games/wordplay/Makefile
+++ b/games/wordplay/Makefile
@@ -14,11 +14,12 @@ EXTRACT_SUFX=	.tar.Z
 MAINTAINER=	ports@FreeBSD.org
 
 NO_WRKSUBDIR=	yes
+USE_REINPLACE=	yes
 MAKEFILE=	makefile
 ALL_TARGET=	wordplay
 
 post-patch:
-	@${PERL} -pi -e \
+	@${REINPLACE_CMD} -e \
 	  "s#words721.txt#${PREFIX}/share/wordplay/words721.txt#" \
 	  ${WRKSRC}/wordplay.c
 
diff --git a/games/xdigger/Makefile b/games/xdigger/Makefile
index 2918ec1b5593..48bee96d92b2 100644
--- a/games/xdigger/Makefile
+++ b/games/xdigger/Makefile
@@ -14,11 +14,12 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 MAN6=		xdigger.6
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/configure.h
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/configure.h
 
 post-install:
 	@${CHMOD} 2755 ${PREFIX}/bin/xdigger
diff --git a/games/xmastermind/Makefile b/games/xmastermind/Makefile
index 6db089b6caf4..fcab790f095c 100644
--- a/games/xmastermind/Makefile
+++ b/games/xmastermind/Makefile
@@ -15,10 +15,11 @@ MAINTAINER=		ports@FreeBSD.org
 
 LIB_DEPENDS=		xforms.0:${PORTSDIR}/x11-toolkits/xforms
 
+USE_REINPLACE=		yes
 USE_X_PREFIX=		yes
 
 pre-patch:
-	@${PERL} -pi.orig -e 's|malloc.h|stdlib.h|' \
+	@${REINPLACE_CMD} -e 's|malloc.h|stdlib.h|' \
 		${WRKSRC}/list.h
 
 do-install:
diff --git a/games/xscrabble/Makefile b/games/xscrabble/Makefile
index a0d4946bf8b6..c0f2305738f3 100644
--- a/games/xscrabble/Makefile
+++ b/games/xscrabble/Makefile
@@ -15,11 +15,12 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=		yes
 USE_IMAKE=		yes
 USE_XPM=		yes
 NO_INSTALL_MANPAGES=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/XScrabble.ad
+	@${REINPLACE_CMD} -e 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/XScrabble.ad
 
 .include <bsd.port.mk>
diff --git a/games/xtic/Makefile b/games/xtic/Makefile
index 8b576bd8abbe..433155931c33 100644
--- a/games/xtic/Makefile
+++ b/games/xtic/Makefile
@@ -14,11 +14,12 @@ DISTNAME=	${PORTNAME}${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		xtic.1
 
 post-patch:
-	@${PERL} -pi -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/configure.h
+	@${REINPLACE_CMD} -e "s|%%X11BASE%%|${X11BASE}|g" ${WRKSRC}/configure.h
 
 .include <bsd.port.mk>
diff --git a/games/xtron/Makefile b/games/xtron/Makefile
index d1ecc89b1b71..f1aa170a2d06 100644
--- a/games/xtron/Makefile
+++ b/games/xtron/Makefile
@@ -14,11 +14,12 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xtronrc
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/xtronrc
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/xtron ${PREFIX}/bin