${PERL} -> ${REINPLACE_CMD}

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

11 files changed, 34 insertions, 19 deletions

diff --git a/www/Mosaic/Makefile b/www/Mosaic/Makefile
index 9a36fc6f003a..a8edb2dcfb9f 100644
--- a/www/Mosaic/Makefile
+++ b/www/Mosaic/Makefile
@@ -21,11 +21,12 @@ NO_PACKAGE=	${NO_CDROM}
 USE_MOTIF=	yes
 WRKSRC=		${WRKDIR}/Mosaic-src
 ALL_TARGET=	bsdi
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 
 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 	${WRKSRC}/libXmx/Xmx.h ${WRKSRC}/libdtm/dtm.c \
 	${WRKSRC}/libdtm/dtm.c ${WRKSRC}/libdtm/dtm.c \
 	${WRKSRC}/libdtm/dtm.c ${WRKSRC}/libdtm/dtminit.c \
diff --git a/www/apache13-ssl/Makefile b/www/apache13-ssl/Makefile
index fc4733e6bba2..057eacbeba35 100644
--- a/www/apache13-ssl/Makefile
+++ b/www/apache13-ssl/Makefile
@@ -47,6 +47,7 @@ APACHE_VERSION=		1.3.12
 APACHE_SSL_VERSION=	1.40
 
 USE_OPENSSL=	YES
+USE_PERL5=	YES
 
 .include <bsd.port.pre.mk>
 
diff --git a/www/ashe/Makefile b/www/ashe/Makefile
index fe1819a6efb8..6da7f19be1ae 100644
--- a/www/ashe/Makefile
+++ b/www/ashe/Makefile
@@ -18,13 +18,14 @@ NO_WRKSUBDIR=	yes
 CONFIGURE_WRKSRC=	${WRKDIR}/src
 INSTALL_WRKSRC=		${WRKDIR}/src
 
+USE_REINPLACE=	yes
 USE_MOTIF=	yes
 USE_IMAKE=	yes
 MAN1=		xhtml.1
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/XHTML.ad
-	@${PERL} -pi -e "s/malloc.h/stdlib.h/g" \
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/XHTML.ad
+	@${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/g" \
 		${WRKSRC}/libhtmlw-2.7b3/HTML-PSformat.c
 
 do-build:
diff --git a/www/comline/Makefile b/www/comline/Makefile
index 7a37b161ac41..d3635a5700da 100644
--- a/www/comline/Makefile
+++ b/www/comline/Makefile
@@ -17,10 +17,12 @@ DISTFILES=	w3c-libwww-4.0D.tar.gz \
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 WRKSRC=		${WRKDIR}/WWW
 
 post-patch:
-	@${PERL} -pi -e 's,strcasestr,strcasestr_,' \
+	@${REINPLACE_CMD} -e 's,strcasestr,strcasestr_,' \
 		${WRKSRC}/Library/Implementation/HTString.*
 
 do-build:
diff --git a/www/fhttpd/Makefile b/www/fhttpd/Makefile
index 4fba1f6ed05b..38fc769a93d3 100644
--- a/www/fhttpd/Makefile
+++ b/www/fhttpd/Makefile
@@ -13,6 +13,8 @@ MASTER_SITES=	http://www.fhttpd.org/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 LOGFILE=	share/fhttpd/fhttpd.log
 PLIST_SUB+=	LOGFILE=${LOGFILE}
 
@@ -24,9 +26,9 @@ pre-patch:
 
 pre-install:
 	${RM} -rf ${WRKSRC}/http-root/pub/dummy_directory
-	${PERL} -pi -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" \
+	${REINPLACE_CMD} -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" \
 		${WRKSRC}/fhttpd.sh ${WRKSRC}/http-root/root-fhttpd.conf
-	${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/http-root/root-fhttpd.conf
+	${REINPLACE_CMD} -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/http-root/root-fhttpd.conf
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/fhttpd.sh ${PREFIX}/etc/rc.d
diff --git a/www/harvest/Makefile b/www/harvest/Makefile
index 56a303be326b..4d157dcccc06 100644
--- a/www/harvest/Makefile
+++ b/www/harvest/Makefile
@@ -17,8 +17,10 @@ EXTRACT_SUFX=	-src.tar.gz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/src/configure ${WRKSRC}/src/broker/broker.h \
 		${WRKSRC}/src/gatherer/essence/main.c \
 		${WRKSRC}/src/gatherer/include/essence.h \
diff --git a/www/junkbuster/Makefile b/www/junkbuster/Makefile
index 9222c8f13855..292e0b7d422e 100644
--- a/www/junkbuster/Makefile
+++ b/www/junkbuster/Makefile
@@ -21,12 +21,14 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 ALL_TARGET=	# yes, an empty target.
 JDIR=		${PREFIX}/etc/junkbuster
 MAN1=		junkbuster.1
 
 post-patch:
-	@${PERL} -pi -e 's:\r::' ${WRKSRC}/*
+	@${REINPLACE_CMD} -e "s:`/usr/bin/printf '\r'`::" ${WRKSRC}/*
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/sbin/junkbuster
diff --git a/www/netraider/Makefile b/www/netraider/Makefile
index c177cb5f9042..6bcf81f7ce59 100644
--- a/www/netraider/Makefile
+++ b/www/netraider/Makefile
@@ -16,6 +16,7 @@ DISTNAME=	${PORTNAME}-source-${PORTVERSION}
 MAINTAINER=	kde@freebsd.org
 
 USE_QT_VER=	2
+USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 GNU_CONFIGURE=	yes
 USE_GMAKE=	yes
@@ -23,14 +24,14 @@ CFLAGS+=	-DBSD
 SUBST=		${WRKSRC}/konq-embed/src/Makefile.in
 
 pre-configure:
-	find ${WRKSRC} -name Makefile.am | xargs ${PERL} -pi -e \
+	${FIND} ${WRKSRC} -name Makefile.am | ${XARGS} ${REINPLACE_CMD} -e \
 		"s@-lqt@-lqt @g; s@ -lqt @ -lqt2@g"
 	${CP} ${WRKSRC}/konq-embed/src/konqueror ${WRKSRC}/konq-embed/src/konq-embedded
-	${CP} ${SUBST} ${SUBST}.bak && ${SED} \
-		-e 's,^bindir = $$(prefix),bindir= ${PREFIX}/bin,g' \
+	${REINPLACE_CMD} \
+		-e 's,^bindir = \$$(prefix),bindir= ${PREFIX}/bin,g' \
 		-e 's,bin_SCRIPTS = konqueror,bin_SCRIPTS= konq-embedded,g' \
 		-e 's,-lqt,-lqt ,g' \
 		-e 's, -lqt , -lqt2,g' \
-		${SUBST}.bak > ${SUBST}
+		${WRKSRC}/konq-embed/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/www/peacock/Makefile b/www/peacock/Makefile
index 1d844df66338..6fe8162d7b45 100644
--- a/www/peacock/Makefile
+++ b/www/peacock/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	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/www/retawq/Makefile b/www/retawq/Makefile
index 954264fc1092..be739c69271e 100644
--- a/www/retawq/Makefile
+++ b/www/retawq/Makefile
@@ -19,12 +19,13 @@ LIB_DEPENDS=	intl.4:${PORTSDIR}/devel/gettext
 
 CFLAGS+=	${PTHREAD_CFLAGS} -I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib -lintl
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	# empty
 
 post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g ; \
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g ; \
 		s,%%LOCALBASE%%,${LOCALBASE},g ; \
 		s,%%PREFIX%%,${PREFIX},g ; \
 		s,^CC,#CC,g ; s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile
diff --git a/www/sqmgrlog/Makefile b/www/sqmgrlog/Makefile
index fc57cfbd349e..1b33dc60b54b 100644
--- a/www/sqmgrlog/Makefile
+++ b/www/sqmgrlog/Makefile
@@ -12,12 +12,13 @@ MASTER_SITES=	http://web.onda.com.br/orso/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS+=	--enable-prefix=${PREFIX} --with-gcc
 
 post-patch:
-	@${PERL} -pi -e 's,LDFLAGS="-g",LDFLAGS="",' ${WRKSRC}/configure
-	@${PERL} -pi -e 's,/usr/local/etc/httpd/htdocs/,${PREFIX}/www/data/,; \
+	@${REINPLACE_CMD} -e 's,LDFLAGS="-g",LDFLAGS="",' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's,/usr/local/etc/httpd/htdocs/,${PREFIX}/www/data/,; \
 		s,mailx,mail,' ${WRKSRC}/sqmgrlog.conf ${WRKSRC}/log.c
 
 post-install: