17 files changed, 36 insertions, 19 deletions

diff --git a/audio/Maaate/Makefile b/audio/Maaate/Makefile
index bc2bfc828c91..12753c98a59b 100644
--- a/audio/Maaate/Makefile
+++ b/audio/Maaate/Makefile
@@ -13,12 +13,13 @@ MASTER_SITES=	http://www.cmis.csiro.au/maaate/packages/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,-ldl,,g ; s,\(CCLD,(CXXLD,g" ${WRKSRC}/demos/Makefile.in
+	@${REINPLACE_CMD} -E -e "s,-ldl,,g ; s,\(CCLD,(CXXLD,g" ${WRKSRC}/demos/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/audio/cheesetracker/Makefile b/audio/cheesetracker/Makefile
index f69ba3b6c021..488b6661c256 100644
--- a/audio/cheesetracker/Makefile
+++ b/audio/cheesetracker/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	sigc:${PORTSDIR}/devel/libsigc++ \
 
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 pre-configure:
 .for file in install-sh missing mkinstalldirs
@@ -27,6 +28,6 @@ pre-configure:
 	@${RM} -f ${WRKSRC}/config.cache
 
 post-patch:
-	@${PERL} -pi -e "s,AFMT_S16_NE,AFMT_S16_LE,g" ${WRKSRC}/waveout/sound_driver_oss.cpp
+	@${REINPLACE_CMD} -e "s,AFMT_S16_NE,AFMT_S16_LE,g" ${WRKSRC}/waveout/sound_driver_oss.cpp
 
 .include <bsd.port.mk>
diff --git a/audio/gdcd/Makefile b/audio/gdcd/Makefile
index 5aaedb86dc33..b42ad51b77af 100644
--- a/audio/gdcd/Makefile
+++ b/audio/gdcd/Makefile
@@ -14,6 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	cdaudio.1:${PORTSDIR}/audio/libcdaudio
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 USE_AUTOMAKE_VER=	15
@@ -25,7 +26,7 @@ pre-configure:
 	@cd ${WRKSRC}; ${ACLOCAL} -I ${X11BASE}/share/aclocal
 
 pre-build:
-	@${PERL} -pi -e "s/autoheader/${AUTOHEADER}/" \
+	@${REINPLACE_CMD} -e "s/autoheader/${AUTOHEADER}/" \
 		${BUILD_WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/audio/ksmp3play/Makefile b/audio/ksmp3play/Makefile
index a324eacb15c7..5cfa02add7bc 100644
--- a/audio/ksmp3play/Makefile
+++ b/audio/ksmp3play/Makefile
@@ -17,6 +17,7 @@ LIB_DEPENDS=	SDL-1.1.4:${PORTSDIR}/devel/sdl12 \
 		smpeg:${PORTSDIR}/graphics/smpeg \
 		gnugetopt:${PORTSDIR}/devel/libgnugetopt
 
+USE_REINPLACE=	yes
 SDL_CONFIG?=	${LOCALBASE}/bin/sdl11-config
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	SDL_CONFIG=${SDL_CONFIG} \
@@ -24,7 +25,7 @@ CONFIGURE_ENV=	SDL_CONFIG=${SDL_CONFIG} \
 MAN1=	ksmp3play.1
 
 post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/configure
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/audio/libmikmod/Makefile b/audio/libmikmod/Makefile
index 006b2eca2e5b..6f740b58ef14 100644
--- a/audio/libmikmod/Makefile
+++ b/audio/libmikmod/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	apps/sound/libs
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_ESOUND=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
@@ -26,7 +27,7 @@ post-extract:
 	@${RM} -f ${WRKSRC}/docs/mikmod.info-*
 
 post-patch:
-	@${PERL} -pi -e 's|\$$CFLAGS -pthread|\$$CFLAGS ${PTHREAD_CFLAGS}|g ; \
+	@${REINPLACE_CMD} -e 's|\$$CFLAGS -pthread|\$$CFLAGS ${PTHREAD_CFLAGS}|g ; \
 		 s|-pthread \$$REENTRANT|\$$REENTRANT ${PTHREAD_CFLAGS}|g ; \
 		 s|-lpthread|${PTHREAD_LIBS:S/"//g}|g ; \
 		 s|-lc_r|${PTHREAD_LIBS:S/"//g}|g' ${WRKSRC}/configure
diff --git a/audio/libsndfile/Makefile b/audio/libsndfile/Makefile
index 0009c15fb990..c426a7d5e075 100644
--- a/audio/libsndfile/Makefile
+++ b/audio/libsndfile/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://www.zip.com.au/~erikd/libsndfile/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ARGS=	--enable-justsrc --disable-gcc-pipe
 INSTALLS_SHLIB=	yes
@@ -21,7 +22,7 @@ PORTDOCS=	ChangeLog NEWS api.html bugs.html index.html libsndfile.jpg \
 		new_file_type.HOWTO sndfile_info.html
 
 pre-patch:
-	@${PERL} -pi -e 's|-g -O2 ||g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|-g -O2 ||g' ${WRKSRC}/configure
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/audio/mhwaveedit/Makefile b/audio/mhwaveedit/Makefile
index 834025640945..16934fee9984 100644
--- a/audio/mhwaveedit/Makefile
+++ b/audio/mhwaveedit/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	sndfile.0:${PORTSDIR}/audio/libsndfile
 
+USE_REINPLACE=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
@@ -32,7 +33,7 @@ CONFIGURE_ARGS+=	--without-sdl
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|^CFLAGS =.*$$|CFLAGS = \@CFLAGS\@|g'
 
 do-install:
diff --git a/audio/midimountain/Makefile b/audio/midimountain/Makefile
index 974339866e05..78d57ff15db9 100644
--- a/audio/midimountain/Makefile
+++ b/audio/midimountain/Makefile
@@ -15,16 +15,17 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 post-patch:
 .for file in midimountain.conf main.cpp
-	@${PERL} -pi -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/midimountain/${file}
+	@${REINPLACE_CMD} -e "s,%%PREFIX%%,${PREFIX},g" ${WRKSRC}/midimountain/${file}
 .endfor
 .for dir in pixmaps languages
-	${PERL} -pi -e "s, ${dir}/, ${DATADIR}/${dir}/,g" ${WRKSRC}/midimountain/${dir}/Makefile.in
+	${REINPLACE_CMD} -e "s, ${dir}/, ${DATADIR}/${dir}/,g" ${WRKSRC}/midimountain/${dir}/Makefile.in
 .endfor
 
 .include <bsd.port.mk>
diff --git a/audio/muse/Makefile b/audio/muse/Makefile
index feebca38d557..e16ee6a1a00a 100644
--- a/audio/muse/Makefile
+++ b/audio/muse/Makefile
@@ -20,6 +20,7 @@ LIB_DEPENDS=	mp3lame.0:${PORTSDIR}/audio/lame \
 		vorbis.1:${PORTSDIR}/audio/libvorbis \
 		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
+USE_REINPLACE=	yes
 USE_GTK=	yes
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
@@ -29,11 +30,11 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 CONFIGURE_ARGS=	--disable-debug
 
 post-patch:
-	@${PERL} -pi -e 's|-O3|\$$CFLAGS|g ; \
+	@${REINPLACE_CMD} -e 's|-O3|\$$CFLAGS|g ; \
 		 s|\$$GTK_LIBS -lgthread|\$$GTK_LIBS \$$GLIB_LIBS|g ; \
 		 s|\$$GTK_FLAGS|\$$GTK_CFLAGS \$$GLIB_CFLAGS|g' \
 			${WRKSRC}/configure
-	@${PERL} -pi -e 's|-lpthread||g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-lpthread||g' ${WRKSRC}/Makefile.in
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/muse ${PREFIX}/bin
diff --git a/audio/nas/Makefile b/audio/nas/Makefile
index 733ef8aa1367..a70ed84e4d6d 100644
--- a/audio/nas/Makefile
+++ b/audio/nas/Makefile
@@ -13,6 +13,7 @@ EXTRACT_SUFX=	.src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 ALL_TARGET=	World
 # no need to "xmkmf -a" and create the Makefiles twice -- see above
@@ -25,7 +26,7 @@ INSTALLS_SHLIB=	yes
 
 post-patch:
 	@find ${WRKSRC} -name '*.[ch]' | xargs \
-		${PERL} -pi -e "s|<malloc.h>|<stdlib.h>|g"
+		${REINPLACE_CMD} -e "s|<malloc.h>|<stdlib.h>|g"
 
 post-install:
 	@${SED} -e 's:/usr/X11R6:${PREFIX}:g' ${PKGMESSAGE}
diff --git a/audio/osalp/Makefile b/audio/osalp/Makefile
index 0da6954726ab..48af51c54d8a 100644
--- a/audio/osalp/Makefile
+++ b/audio/osalp/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123
 LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib -lgnugetopt"
@@ -27,7 +28,7 @@ INSTALLS_SHLIB=	yes
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 post-patch:
-	@${PERL} -pi -e 's|/usr/local/lib/aflib|${PREFIX}/lib/aflib|g' \
+	@${REINPLACE_CMD} -e 's|/usr/local/lib/aflib|${PREFIX}/lib/aflib|g' \
 		${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/audio/pimp3/Makefile b/audio/pimp3/Makefile
index ee5a62ac2f56..bd7d4532b31a 100644
--- a/audio/pimp3/Makefile
+++ b/audio/pimp3/Makefile
@@ -17,11 +17,12 @@ RUN_DEPENDS=	mpg123:${PORTSDIR}/audio/mpg123 \
 
 WRKSRC=		${WRKDIR}/pimp3
 
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 USE_PYTHON=	yes
 
 post-patch:
-	@${PERL} -pi -ne "s!/usr/bin/python!${LOCALBASE}/bin/python!;" ${WRKSRC}/pimp3.py
+	@${REINPLACE_CMD} -e "s!/usr/bin/python!${LOCALBASE}/bin/python!" ${WRKSRC}/pimp3.py
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/*.py ${PREFIX}/bin/
diff --git a/audio/rawrec/Makefile b/audio/rawrec/Makefile
index 5875d3a872ed..2c2da8cdf6e7 100644
--- a/audio/rawrec/Makefile
+++ b/audio/rawrec/Makefile
@@ -21,6 +21,7 @@ LIB_DEPENDS=	gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ARGS=	CC="${CC}" \
 		CFLAGS="${CFLAGS} ${PTHREAD_CFLAGS} -I${LOCALBASE}/include" \
@@ -30,7 +31,7 @@ MAN1=	rawrec.1
 MLINKS=	rawrec.1 rawplay.1
 
 post-patch:
-	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<linux/soundcard.h>|<sys/soundcard.h>|g'
 
 do-install:
diff --git a/audio/sfront/Makefile b/audio/sfront/Makefile
index 7cf1c5702320..798a41319f82 100644
--- a/audio/sfront/Makefile
+++ b/audio/sfront/Makefile
@@ -14,12 +14,13 @@ DISTNAME=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_BISON=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}/src
 ALL_TARGET=	# empty
 
 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}/../bin/sfront ${PREFIX}/bin
diff --git a/audio/xmixer/Makefile b/audio/xmixer/Makefile
index ff399baf0824..51ede2523cde 100644
--- a/audio/xmixer/Makefile
+++ b/audio/xmixer/Makefile
@@ -14,6 +14,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
+USE_REINPLACE=	yes
 USE_GTK=	yes
 USE_AUTOCONF=	yes
 
@@ -21,6 +22,6 @@ MAN1=		xmixer.1
 MLINKS=		xmixer.1 xgmixer.1
 
 pre-patch:
-	@find ${WRKSRC} -type f | xargs  ${PERL} -pi -e 's|rxvt -e|xterm -e|g'
+	@find ${WRKSRC} -type f | xargs  ${REINPLACE_CMD} -e 's|rxvt -e|xterm -e|g'
 
 .include <bsd.port.mk>
diff --git a/audio/xmmix/Makefile b/audio/xmmix/Makefile
index b291e486af2a..f9a9fecbd6ad 100644
--- a/audio/xmmix/Makefile
+++ b/audio/xmmix/Makefile
@@ -13,12 +13,13 @@ MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 USE_MOTIF=	yes
 
 MAN1=		xmmix.1
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMmix.ad
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMmix.ad
 
 .include <bsd.port.mk>
diff --git a/audio/xmp/Makefile b/audio/xmp/Makefile
index 08654eca8cd8..cf50912084ab 100644
--- a/audio/xmp/Makefile
+++ b/audio/xmp/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_XLIB=	yes
 USE_GMAKE=	yes
@@ -36,6 +37,6 @@ MAN1=		xmp.1
 MLINKS=		xmp.1 xxmp.1
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/docs/xmp.1
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/docs/xmp.1
 
 .include <bsd.port.post.mk>