${PERL} -> ${REINPLACE_CMD}

PR:		40784
Submitted by:	corecode@corecode.ath.cx
Reviewed by:	flynn@energyhq.homeip.net

12 files changed, 34 insertions, 21 deletions

diff --git a/graphics/flip/Makefile b/graphics/flip/Makefile
index e87c335..e60ced4 100644
--- a/graphics/flip/Makefile
+++ b/graphics/flip/Makefile
@@ -17,17 +17,18 @@ LIB_DEPENDS=	tiff:${PORTSDIR}/graphics/tiff
 RUN_DEPENDS=	mpeg_encode:${PORTSDIR}/graphics/mpeg_encode
 
 USE_QT_VER=	2
+USE_REINPLACE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME:R}
 CFLAGS+=	-I${LOCALBASE}/include
 MAKE_ENV=	MOC="${MOC}" QTDIR="${X11BASE}"
 
 post-patch:
-	@${PERL} -pi -e "s,^CC,#CC,g ; s,^CXX,#CXX,g ; \
+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; s,^CXX,#CXX,g ; \
 		s,^CFLAGS,#CFLAGS,g ; s,^CXXFLAGS,#CXXFLAGS,g ; \
 		s,^MOC,#MOC,g ; s,lqt,lqt2,g ; \
 		s,/usr/X11R6,${X11BASE},g ; \
 		s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
-	@${PERL} -pi -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Config.cpp
+	@${REINPLACE_CMD} -e "s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Config.cpp
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/flip ${PREFIX}/bin
diff --git a/graphics/gd/Makefile b/graphics/gd/Makefile
index 3f7ba6a..9f2c6e2 100644
--- a/graphics/gd/Makefile
+++ b/graphics/gd/Makefile
@@ -29,6 +29,7 @@ BUILD_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 
 FREETYPE_CONFIG?=       ${LOCALBASE}/bin/freetype-config
 
+USE_REINPLACE=	yes
 MAKE_ENV=	FREETYPE_CONFIG="${FREETYPE_CONFIG}"
 INSTALLS_SHLIB=	yes
 
@@ -49,7 +50,7 @@ post-extract:
 		> ${WRKSRC}/gd_gif_in.c
 
 post-patch:
-	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/gdcache.h
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/gdcache.h
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/gd1/Makefile b/graphics/gd1/Makefile
index 3f7ba6a..9f2c6e2 100644
--- a/graphics/gd1/Makefile
+++ b/graphics/gd1/Makefile
@@ -29,6 +29,7 @@ BUILD_DEPENDS+=	bzip2:${PORTSDIR}/archivers/bzip2
 
 FREETYPE_CONFIG?=       ${LOCALBASE}/bin/freetype-config
 
+USE_REINPLACE=	yes
 MAKE_ENV=	FREETYPE_CONFIG="${FREETYPE_CONFIG}"
 INSTALLS_SHLIB=	yes
 
@@ -49,7 +50,7 @@ post-extract:
 		> ${WRKSRC}/gd_gif_in.c
 
 post-patch:
-	@${PERL} -pi -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/gdcache.h
+	@${REINPLACE_CMD} -e 's|<malloc.h>|<stdlib.h>|g' ${WRKSRC}/gdcache.h
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/gdchart/Makefile b/graphics/gdchart/Makefile
index 5d5173c..c9c5712 100644
--- a/graphics/gdchart/Makefile
+++ b/graphics/gdchart/Makefile
@@ -17,11 +17,12 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
+USE_REINPLACE=	yes
 MAKEFILE=	makefile
 WRKSRC=		${WRKDIR}/${DISTNAME}
 
 post-patch:
-	${PERL} -i -pe 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' ${WRKSRC}/*.[ch]
+	${REINPLACE_CMD} -e 's/^#ifdef HAVE_JPEG/#ifndef NO_JPEG/' ${WRKSRC}/*.[ch]
 
 do-install:
 	${INSTALL_DATA}	${WRKSRC}/libgdchart.a ${PREFIX}/lib
diff --git a/graphics/kisomandel/Makefile b/graphics/kisomandel/Makefile
index bf894a1..c63a0dd 100644
--- a/graphics/kisomandel/Makefile
+++ b/graphics/kisomandel/Makefile
@@ -16,15 +16,16 @@ MAINTAINER=	kde@freebsd.org
 LIB_DEPENDS=	png:${PORTSDIR}/graphics/png
 
 USE_BZIP2=	yes
+USE_REINPLACE=	yes
 USE_QT_VER=	2
 GNU_CONFIGURE=	yes
 WRKSRC=		${WRKDIR}/${PORTNAME}
 USE_GMAKE=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,-lqt,-lqt2,g" ${WRKSRC}/configure
-	@find ${WRKSRC} -name Makefile.in | xargs \
-		${PERL} -pi -e "s,-lqt,-lqt2,g"
-	@${PERL} -pi -e "s,malloc.h,stdlib.h,g" ${WRKSRC}/kisomandel/fractal.cpp
+	@${REINPLACE_CMD} -e "s,-lqt,-lqt2,g" ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name Makefile.in | ${XARGS} \
+		${REINPLACE_CMD} -e "s,-lqt,-lqt2,g"
+	@${REINPLACE_CMD} -e "s,malloc.h,stdlib.h,g" ${WRKSRC}/kisomandel/fractal.cpp
 
 .include <bsd.port.mk>
diff --git a/graphics/kuickshow-kde4/Makefile b/graphics/kuickshow-kde4/Makefile
index c9ee9e7..fe7c367 100644
--- a/graphics/kuickshow-kde4/Makefile
+++ b/graphics/kuickshow-kde4/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 
+USE_REINPLACE=	yes
 USE_IMLIB=	yes
 USE_KDELIBS_VER=	2
 USE_GMAKE=	yes
@@ -24,7 +25,7 @@ CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
 CONFIGURE_ARGS+=	--with-imlib-config=${X11BASE}/bin
 
 post-patch:
-	@${PERL} -pi -e 's,-O2,,g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,-O2,,g' ${WRKSRC}/configure
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/graphics/kuickshow/Makefile b/graphics/kuickshow/Makefile
index c9ee9e7..fe7c367 100644
--- a/graphics/kuickshow/Makefile
+++ b/graphics/kuickshow/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 GNU_CONFIGURE=	yes
 
+USE_REINPLACE=	yes
 USE_IMLIB=	yes
 USE_KDELIBS_VER=	2
 USE_GMAKE=	yes
@@ -24,7 +25,7 @@ CONFIGURE_ENV+=	KDEDIR="${LOCALBASE}"
 CONFIGURE_ARGS+=	--with-imlib-config=${X11BASE}/bin
 
 post-patch:
-	@${PERL} -pi -e 's,-O2,,g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,-O2,,g' ${WRKSRC}/configure
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/graphics/mpeg_encode/Makefile b/graphics/mpeg_encode/Makefile
index 2c580cf..65d97cc 100644
--- a/graphics/mpeg_encode/Makefile
+++ b/graphics/mpeg_encode/Makefile
@@ -15,11 +15,13 @@ MAINTAINER=	ports@FreeBSD.org
 
 MAN1=		mpeg_encode.1
 
+USE_REINPLACE=	yes
+
 WRKSRC=		${WRKDIR}/${PORTNAME}
 
 post-patch:
 	@(${GREP} -R -l "malloc.h" ${WRKSRC}/* | \
-	    ${XARGS} ${PERL} -pi -e "s/malloc.h/stdlib.h/")
+	    ${XARGS} ${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/")
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpeg_encode ${PREFIX}/bin
diff --git a/graphics/mpgtx/Makefile b/graphics/mpgtx/Makefile
index ce4c6ea..ba9c91a 100644
--- a/graphics/mpgtx/Makefile
+++ b/graphics/mpgtx/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 
+USE_REINPLACE=	yes
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS=	--prefix=${PREFIX}
 ALL_TARGET=	default
@@ -30,9 +31,9 @@ MLINKS=	mpgtx.1 mpgcat.1 \
 	mpgtx.1 mpgsplit.1
 
 pre-patch:
-	@${PERL} -pi -e 's|CFLAGS=|CFLAGS\+=|g ; \
-		 s|\$$cflags \$$optimization_cflags|\$$cflags|g ; \
-		 s|g\+\+|${CXX}|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|CFLAGS=|CFLAGS\+=|g ; \
+		 s|\$$cflags \$$optimization_cflags|$$cflags|g ; \
+		 s|g++|${CXX}|g' ${WRKSRC}/configure
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/mpgtx ${PREFIX}/bin
diff --git a/graphics/opendis/Makefile b/graphics/opendis/Makefile
index 6d3251e..b8a0310 100644
--- a/graphics/opendis/Makefile
+++ b/graphics/opendis/Makefile
@@ -15,11 +15,12 @@ MASTER_SITE_SUBDIR=	ods
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|-pedantic -W|-pedantic|g' ${WRKSRC}/configure
-	@${PERL} -pi -e 's| -g| \@CFLAGS\@|g' ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e 's|-pedantic -W|-pedantic|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's| -g| @CFLAGS@|g' ${WRKSRC}/src/Makefile.in
 
 post-install:
 .if !defined(NOPORTDOCS)
diff --git a/graphics/opendx/Makefile b/graphics/opendx/Makefile
index 38bbe99..4b2f80a 100644
--- a/graphics/opendx/Makefile
+++ b/graphics/opendx/Makefile
@@ -27,6 +27,7 @@ USE_GMAKE=	yes
 USE_MESA=	yes
 USE_MOTIF=	yes
 USE_XLIB=	yes
+USE_REINPLACE=	yes
 AUTOMAKE_ARGS=	-a -i
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	ARCH="" \
@@ -41,13 +42,13 @@ post-patch:
 	@${RM} -f ${WRKSRC}/include/stamp-h.in
 
 post-configure:
-	${PERL} -pi -e "s;flex ;flex -l ;g" ${WRKSRC}/src/uipp/dxuilib/Makefile
+	${REINPLACE_CMD} -e "s;flex ;flex -l ;g" ${WRKSRC}/src/uipp/dxuilib/Makefile
 
 post-install:
 	@${ECHO_MSG} "===>   Fixing path in the docs (/usr/lpp -> ${PREFIX})"
 .for dir in doc help html man
-	@find ${PREFIX}/dx/${dir} -type f | \
-	  xargs ${PERL} -pi -e "s;/usr/lpp;${PREFIX};g"
+	@${FIND} ${PREFIX}/dx/${dir} -type f | \
+	  ${XARGS} ${REINPLACE_CMD} -e "s;/usr/lpp;${PREFIX};g"
 .endfor
 
 .include <bsd.port.mk>
diff --git a/graphics/showimg/Makefile b/graphics/showimg/Makefile
index 2cedbe1..7ca7299 100644
--- a/graphics/showimg/Makefile
+++ b/graphics/showimg/Makefile
@@ -18,10 +18,11 @@ LIB_DEPENDS=	png:${PORTSDIR}/graphics/png \
 
 USE_QT_VER=	2
 USE_KDEBASE_VER=	2
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/showimg/Makefile.in
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g" ${WRKSRC}/showimg/Makefile.in
 
 .include <bsd.port.mk>