${PERL} -> ${REINPLACE_CMD}

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

16 files changed, 43 insertions, 27 deletions

diff --git a/databases/db4/Makefile b/databases/db4/Makefile
index d7cb99e1af02..06def6d1e7d4 100644
--- a/databases/db4/Makefile
+++ b/databases/db4/Makefile
@@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
 
 .include <bsd.port.mk>
diff --git a/databases/db41/Makefile b/databases/db41/Makefile
index d7cb99e1af02..06def6d1e7d4 100644
--- a/databases/db41/Makefile
+++ b/databases/db41/Makefile
@@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
 
 .include <bsd.port.mk>
diff --git a/databases/db42/Makefile b/databases/db42/Makefile
index d7cb99e1af02..06def6d1e7d4 100644
--- a/databases/db42/Makefile
+++ b/databases/db42/Makefile
@@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
 
 .include <bsd.port.mk>
diff --git a/databases/db43/Makefile b/databases/db43/Makefile
index d7cb99e1af02..06def6d1e7d4 100644
--- a/databases/db43/Makefile
+++ b/databases/db43/Makefile
@@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
 
 .include <bsd.port.mk>
diff --git a/databases/db44/Makefile b/databases/db44/Makefile
index d7cb99e1af02..06def6d1e7d4 100644
--- a/databases/db44/Makefile
+++ b/databases/db44/Makefile
@@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
 
 .include <bsd.port.mk>
diff --git a/databases/db45/Makefile b/databases/db45/Makefile
index d7cb99e1af02..06def6d1e7d4 100644
--- a/databases/db45/Makefile
+++ b/databases/db45/Makefile
@@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
 
 .include <bsd.port.mk>
diff --git a/databases/db46/Makefile b/databases/db46/Makefile
index d7cb99e1af02..06def6d1e7d4 100644
--- a/databases/db46/Makefile
+++ b/databases/db46/Makefile
@@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
 
 .include <bsd.port.mk>
diff --git a/databases/db47/Makefile b/databases/db47/Makefile
index d7cb99e1af02..06def6d1e7d4 100644
--- a/databases/db47/Makefile
+++ b/databases/db47/Makefile
@@ -24,6 +24,7 @@ WRKSRC=		${WRKDIR}/${DISTNAME}/build_unix
 
 INSTALLS_SHLIB=		yes
 HAS_CONFIGURE=		yes
+USE_REINPLACE=		yes
 CONFIGURE_SCRIPT=	../dist/configure
 CONFIGURE_ARGS=		--enable-compat185 \
 			--enable-dump185 --enable-cxx \
@@ -33,10 +34,10 @@ CONFIGURE_ARGS=		--enable-compat185 \
 			--target=${ARCH}-unknown-freebsd${OSREL}
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-patch:
 	@${CHMOD} 755 ${WRKSRC}/${CONFIGURE_SCRIPT}
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/../dist/configure
 
 .include <bsd.port.mk>
diff --git a/databases/dbtool/Makefile b/databases/dbtool/Makefile
index 00d59f3f674d..aaf1776352cb 100644
--- a/databases/dbtool/Makefile
+++ b/databases/dbtool/Makefile
@@ -29,6 +29,7 @@ CONFIGURE_ENV+=	LIBS="-L${LOCALBASE}/lib" \
 		CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include ${DB_INC}"
 
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 MAN1=	dbtool.1
 
@@ -42,8 +43,8 @@ post-extract:
 
 post-patch:
 .for file in dbtool.cc engine.cc engine.h
-	@${PERL} -pi -e "s,stdin,input,g" ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e "s,stdin,input,g" ${WRKSRC}/${file}
 .endfor
-	@${PERL} -pi -e "s,==,=,g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,==,=,g" ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/databases/dbview/Makefile b/databases/dbview/Makefile
index 31eeb8e6b98b..6bab341584e2 100644
--- a/databases/dbview/Makefile
+++ b/databases/dbview/Makefile
@@ -18,9 +18,10 @@ LIB_DEPENDS=		gnugetopt.1:${PORTSDIR}/devel/libgnugetopt
 
 MAN1=			dbview.1
 
+USE_REINPLACE=		yes
 
 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/db_dump.c
 
 do-install:
diff --git a/databases/freetds-devel/Makefile b/databases/freetds-devel/Makefile
index 717701b8fdc1..97d2390e8af2 100644
--- a/databases/freetds-devel/Makefile
+++ b/databases/freetds-devel/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=4.2
@@ -42,10 +43,10 @@ PLIST_SUB+=	ODBC="@comment "
 .endif
 
 post-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/freetds.conf|/freetds.conf.dist|g ; \
-		 s|glib-config|\$$\(GLIB_CONFIG\)|g ; \
-		 s|-lglib|`\$$\(GLIB_CONFIG\) --libs glib`|g ; \
+		 s|glib-config|$$(GLIB_CONFIG)|g ; \
+		 s|-lglib|`$$(GLIB_CONFIG) --libs glib`|g ; \
 		 s| common.h||g'
 
 post-install:
diff --git a/databases/freetds/Makefile b/databases/freetds/Makefile
index 717701b8fdc1..97d2390e8af2 100644
--- a/databases/freetds/Makefile
+++ b/databases/freetds/Makefile
@@ -18,6 +18,7 @@ LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
+USE_REINPLACE=	yes
 CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LDFLAGS="-L${LOCALBASE}/lib"
 CONFIGURE_ARGS=	--with-tdsver=4.2
@@ -42,10 +43,10 @@ PLIST_SUB+=	ODBC="@comment "
 .endif
 
 post-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/freetds.conf|/freetds.conf.dist|g ; \
-		 s|glib-config|\$$\(GLIB_CONFIG\)|g ; \
-		 s|-lglib|`\$$\(GLIB_CONFIG\) --libs glib`|g ; \
+		 s|glib-config|$$(GLIB_CONFIG)|g ; \
+		 s|-lglib|`$$(GLIB_CONFIG) --libs glib`|g ; \
 		 s| common.h||g'
 
 post-install:
diff --git a/databases/msql/Makefile b/databases/msql/Makefile
index 9cf2b86484aa..8a90be921dec 100644
--- a/databases/msql/Makefile
+++ b/databases/msql/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	databases
 MAINTAINER=	ports@FreeBSD.org
 
 INSTALLS_SHLIB= YES
+USE_PERL5=	YES
 
 # Not free for commercial use.
 NO_PACKAGE=	YES
diff --git a/databases/msql3/Makefile b/databases/msql3/Makefile
index 9cf2b86484aa..8a90be921dec 100644
--- a/databases/msql3/Makefile
+++ b/databases/msql3/Makefile
@@ -13,6 +13,7 @@ CATEGORIES=	databases
 MAINTAINER=	ports@FreeBSD.org
 
 INSTALLS_SHLIB= YES
+USE_PERL5=	YES
 
 # Not free for commercial use.
 NO_PACKAGE=	YES
diff --git a/databases/typhoon/Makefile b/databases/typhoon/Makefile
index 5ccf9f205470..94cc3132278a 100644
--- a/databases/typhoon/Makefile
+++ b/databases/typhoon/Makefile
@@ -15,6 +15,7 @@ EXTRACT_SUFX=	.tgz
 MAINTAINER=	ports@FreeBSD.org
 
 HAS_CONFIGURE=	yes
+USE_REINPLACE=	yes
 INSTALLS_SHLIB=	yes
 
 MAN1=	ddlp.1
@@ -25,7 +26,7 @@ MAN3=	d_close.3 d_crget.3 d_crread.3 d_crset.3 d_dbdpath.3 d_dbfpath.3 \
 	d_recread.3 d_recwrite.3 d_setfiles.3
 
 pre-patch:
-	@${PERL} -pi -e 's,<malloc.h>,<stdlib.h>,' \
+	@${REINPLACE_CMD} -e 's,<malloc.h>,<stdlib.h>,' \
 		${WRKSRC}/util/dbdview.c
 
 post-install:
diff --git a/databases/xmbase-grok/Makefile b/databases/xmbase-grok/Makefile
index a8dfc2b94c63..49c913d41171 100644
--- a/databases/xmbase-grok/Makefile
+++ b/databases/xmbase-grok/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_WRKSRC=	${WRKDIR}/${DISTNAME}/src
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_MOTIF=	yes
 MAKE_ENV=	MYCC="${CC}" DEBUG="${CFLAGS}" YO="" INCDIR="" \
@@ -26,7 +27,7 @@ MAN1=		grok.1
 DATADIR=	${PREFIX}/lib/X11/xmbase-grok
 
 pre-patch:
-	@${PERL} -pi -e 's|^GBIN =|#GBIN =|g ; \
+	@${REINPLACE_CMD} -e 's|^GBIN =|#GBIN =|g ; \
 		 s|^GLIB =|#GLIB =|g ; \
 		 s|^DEBUG =|#DEBUG =|g' ${BUILD_WRKSRC}/Makefile