18 files changed, 46 insertions, 25 deletions

diff --git a/net/amcl/Makefile b/net/amcl/Makefile
index 6ca23c0b26cc..3e5877aa6a94 100644
--- a/net/amcl/Makefile
+++ b/net/amcl/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
@@ -20,6 +21,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${PERL} -pi -e 's|CFLAGS -O -pipe -Wall|CFLAGS|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|CFLAGS -O -pipe -Wall|CFLAGS|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/angst/Makefile b/net/angst/Makefile
index 85994007f508..2d6a4542d619 100644
--- a/net/angst/Makefile
+++ b/net/angst/Makefile
@@ -18,10 +18,12 @@ BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
 
 LIBNET_CONFIG?=	${LOCALBASE}/bin/libnet-config
 
+USE_REINPLACE=	yes
+
 MAN8=	angst.8
 
 post-patch:
-	@${PERL} -pi -e "s,^CC,#CC,g ; \
+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
 		s,^CFLAGS,#CFLAGS,g ; \
 		s,libnet-config,${LIBNET_CONFIG},g" ${WRKSRC}/Makefile
 
diff --git a/net/cnet/Makefile b/net/cnet/Makefile
index 875ebab68903..dc679de924d9 100644
--- a/net/cnet/Makefile
+++ b/net/cnet/Makefile
@@ -15,6 +15,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	tk83.1:${PORTSDIR}/x11-toolkits/tk83
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_XPM=	yes
 USE_GMAKE=	yes
@@ -22,9 +23,9 @@ ALL_TARGET=	# empty
 MAN1=		cnet.1
 
 post-patch:
-	@${PERL} -pi -e 's|8.2|8.3|g ; \
+	@${REINPLACE_CMD} -e 's|8.2|8.3|g ; \
 		 s|82|83|g' ${WRKSRC}/src/Makefile.freebsd
-	@${PERL} -pi -e 's|%%CC%%|${CC}|g ; \
+	@${REINPLACE_CMD} -e 's|%%CC%%|${CC}|g ; \
 		 s|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/src/config.h
 
 do-install:
diff --git a/net/dlint/Makefile b/net/dlint/Makefile
index 9de4133041d6..34e7b55028b7 100644
--- a/net/dlint/Makefile
+++ b/net/dlint/Makefile
@@ -14,11 +14,12 @@ DISTNAME=	dlint${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 NO_BUILD=	yes
 MAN8=		dlint.8
 
 do-configure:
-	@${PERL} -pi.orig -e 's:/usr/local/bin:${PREFIX}/sbin:g' ${WRKSRC}/dlint
+	@${REINPLACE_CMD} -e 's:/usr/local/bin:${PREFIX}/sbin:g' ${WRKSRC}/dlint
 	@${SED} -e 's:DLINT 1:DLINT 8:g' ${WRKSRC}/dlint.1  >${WRKSRC}/dlint.8
 
 do-install:
diff --git a/net/fidelio/Makefile b/net/fidelio/Makefile
index 9a4726fdcdf7..0c52f215ef8d 100644
--- a/net/fidelio/Makefile
+++ b/net/fidelio/Makefile
@@ -19,6 +19,7 @@ LIB_DEPENDS=	intl.2:${PORTSDIR}/devel/gettext \
 
 XML_CONFIG?=	${LOCALBASE}/bin/xml2-config
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
@@ -32,14 +33,14 @@ CONFIGURE_ARGS=	--without-included-gettext
 CFLAGS+=	-DHAVE_STRCASESTR
 
 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'
-	@${PERL} -pi -e 's|-lxml|-lxml2|g' \
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} -e \
+		's|\$$(datadir)/gnome/|\$$(datadir)/|g ; \
+		 s|\$$(datadir)/locale|\$$(prefix)/share/locale|g'
+	@${REINPLACE_CMD} -e 's|-lxml|-lxml2|g' \
 		${WRKSRC}/configure
-	@${PERL} -pi -e 's|extern int strcasestr|//extern int strcasestr|' \
+	@${REINPLACE_CMD} -e 's|extern int strcasestr|//extern int strcasestr|' \
 		${WRKSRC}/src/trackers.c
 
 .include <bsd.port.mk>
diff --git a/net/forg/Makefile b/net/forg/Makefile
index 70636123656d..f7084ca01ac3 100644
--- a/net/forg/Makefile
+++ b/net/forg/Makefile
@@ -16,12 +16,13 @@ MAINTAINER=	ports@FreeBSD.org
 RUN_DEPENDS= 	${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter \
 		${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/pmw
 
+USE_REINPLACE=	yes
 USE_PYTHON=	yes
 NO_BUILD=	yes
 
 post-patch:
 .for file in forg.py mini-forg.py
-	@${PERL} -pi -e "s,/usr/bin/python,${PYTHON_CMD},g" ${WRKSRC}/${file}
+	@${REINPLACE_CMD} -e "s,/usr/bin/python,${PYTHON_CMD},g" ${WRKSRC}/${file}
 .endfor
 
 do-install:
diff --git a/net/fping/Makefile b/net/fping/Makefile
index 705be950c363..5a9825e7fe34 100644
--- a/net/fping/Makefile
+++ b/net/fping/Makefile
@@ -14,12 +14,13 @@ MASTER_SITES=	ftp://ftp.stanford.edu/dept/networking/pub/fping/  \
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS= --bindir="${PREFIX}/sbin"
 MAN8=		fping.8
 
 post-patch:
-	${PERL} -pi.fbsd -e 's/fping@/${MAINTAINER:S/@/\\@/g} or fping@/g' \
+	@${REINPLACE_CMD} -e 's/fping@/${MAINTAINER:S/@/\\@/g} or fping@/g' \
 	    ${WRKSRC}/fping.c
 
 post-install:
diff --git a/net/gnome-mud/Makefile b/net/gnome-mud/Makefile
index 6ca23c0b26cc..3e5877aa6a94 100644
--- a/net/gnome-mud/Makefile
+++ b/net/gnome-mud/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GTK=	yes
 GNU_CONFIGURE=	yes
@@ -20,6 +21,6 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 		LIBS="-L${LOCALBASE}/lib"
 
 post-patch:
-	@${PERL} -pi -e 's|CFLAGS -O -pipe -Wall|CFLAGS|g' ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e 's|CFLAGS -O -pipe -Wall|CFLAGS|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/gnosamba/Makefile b/net/gnosamba/Makefile
index 91674d3e01d2..ffec7c421a01 100644
--- a/net/gnosamba/Makefile
+++ b/net/gnosamba/Makefile
@@ -13,11 +13,12 @@ MASTER_SITES=	http://linuxberg.ii.net/files/gnome/network/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 post-patch:
-	@${PERL} -pi -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
+	@${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|g" ${WRKSRC}/src/*.c
 
 .include <bsd.port.mk>
diff --git a/net/gps/Makefile b/net/gps/Makefile
index ece2313172bc..0a08910782c5 100644
--- a/net/gps/Makefile
+++ b/net/gps/Makefile
@@ -15,12 +15,13 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
 
+USE_REINPLACE=	yes
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	LIBS="-L${LOCALBASE}/lib"
 USE_GMAKE=	yes
 
 post-patch:
-	@${PERL} -pi -e "s,-Wall -O3,${CFLAGS},g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s,-Wall -O3,${CFLAGS},g" ${WRKSRC}/configure
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/net/hagelslag/Makefile b/net/hagelslag/Makefile
index 0af2d752fecf..b132597d8f70 100644
--- a/net/hagelslag/Makefile
+++ b/net/hagelslag/Makefile
@@ -15,13 +15,14 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	makedepend:${PORTSDIR}/devel/makedepend
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 MAKEFILES=	Makefile gui/Makefile src/Makefile
 HS_DOCDIR=	${PREFIX}/share/doc/${PORTNAME}
 
 post-patch:
 .for mfile in ${MAKEFILES}
-	@ ${PERL} -pi -e 's#make -C#\$${MAKE} -C#' ${WRKSRC}/${mfile}
+	@ ${REINPLACE_CMD} -e 's#make -C#\$${MAKE} -C#' ${WRKSRC}/${mfile}
 .endfor
 
 post-install:
diff --git a/net/kdetelnet/Makefile b/net/kdetelnet/Makefile
index 797fb45d3a42..ec8eaaca94e3 100644
--- a/net/kdetelnet/Makefile
+++ b/net/kdetelnet/Makefile
@@ -17,12 +17,13 @@ MAINTAINER=	ports@FreeBSD.org
 
 BUILD_DEPENDS=	msgfmt:${PORTSDIR}/devel/gettext
 
+USE_REINPLACE=	yes
 USE_KDELIBS_VER=2
 USE_GMAKE=	yes
 GNU_CONFIGURE=	yes
 
 pre-patch:
-	@${PERL} -pi -e 's|-lqt|-l${QTNAME}|g ; \
+	@${REINPLACE_CMD} -e 's|-lqt|-l${QTNAME}|g ; \
 		 s|qt_libdir=NONE|qt_libdir=|g' ${WRKSRC}/configure
 
 .include <bsd.port.mk>
diff --git a/net/libfreenet/Makefile b/net/libfreenet/Makefile
index b27c46ec226f..5cf8acd22f92 100644
--- a/net/libfreenet/Makefile
+++ b/net/libfreenet/Makefile
@@ -13,6 +13,7 @@ MASTER_SITES=	http://thalassocracy.org/libfreenet/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_OPENSSL=	yes
 USE_GMAKE=	yes
 USE_LIBTOOL=	yes
@@ -20,6 +21,6 @@ CONFIGURE_ARGS=	--includedir=${PREFIX}/include/libfreenet
 INSTALLS_SHLIB=	yes
 
 post-patch:
-	@${PERL} -pi -e 's|-g -Wall|\@CFLAGS\@|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|-g -Wall|\@CFLAGS\@|g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/net/maradns/Makefile b/net/maradns/Makefile
index 7ca726bca563..20c2ef5a0796 100644
--- a/net/maradns/Makefile
+++ b/net/maradns/Makefile
@@ -14,6 +14,8 @@ MASTER_SITES=	http://www.maradns.org/download/ \
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_BZIP2=	yes
 MAKE_ENV=	FLAGS="${CFLAGS} ${PTHREAD_CFLAGS}"
 
@@ -22,9 +24,9 @@ MAN5=	mararc.5
 MAN8=	maradns.8 zoneserver.8
 
 post-patch:
-	@${FIND} ${WRKSRC} -type f | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -type f | ${XARGS} ${REINPLACE_CMD} -e \
 		's|/etc/mara|${PREFIX}/etc/mara|g'
-	@${FIND} ${WRKSRC} -name '*Makefile*' | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name '*Makefile*' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|make|\$$\{MAKE\}|g ; \
 		 s|^FLAGS =|#FLAGS =|g ; \
 		 s|-lpthread|${PTHREAD_LIBS}|g'
diff --git a/net/netscript/Makefile b/net/netscript/Makefile
index 81d4c4ac0b66..7a4db8f96a6e 100644
--- a/net/netscript/Makefile
+++ b/net/netscript/Makefile
@@ -17,6 +17,7 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 WANT_GTK=	yes
 
 .include <bsd.port.pre.mk>
@@ -29,7 +30,7 @@ ALL_TARGET=	bsd
 .endif
 
 post-patch:
-	@${PERL} -pi -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s,gtk-config,${GTK_CONFIG},g" ${WRKSRC}/Makefile
 
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/netscript ${PREFIX}/bin
diff --git a/net/oproute/Makefile b/net/oproute/Makefile
index 18f7900b1153..fb7444b2cf9b 100644
--- a/net/oproute/Makefile
+++ b/net/oproute/Makefile
@@ -14,7 +14,9 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Makefile
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/Makefile
 
 .include <bsd.port.mk>
diff --git a/net/py-libnet/Makefile b/net/py-libnet/Makefile
index 30e60095640e..754fe07aedac 100644
--- a/net/py-libnet/Makefile
+++ b/net/py-libnet/Makefile
@@ -19,12 +19,13 @@ MAINTAINER=	ports@FreeBSD.org
 BUILD_DEPENDS=	swig:${PORTSDIR}/devel/SWIG \
 		${LOCALBASE}/lib/libnet.a:${PORTSDIR}/net/libnet
 
+USE_REINPLACE=	yes
 USE_PYTHON=	yes
 USE_GMAKE=	yes
 WRKSRC=		${WRKDIR}/${DISTNAME}/src
 
 post-patch:
-	@${PERL} -pi -e "s,^CC,#CC,g ; \
+	@${REINPLACE_CMD} -e "s,^CC,#CC,g ; \
 		s,%%PYTHON_INCLUDEDIR%%,${PYTHON_INCLUDEDIR},g ; \
 		s,%%LOCALBASE%%,${LOCALBASE},g" ${WRKSRC}/Makefile
 
diff --git a/net/tn5250/Makefile b/net/tn5250/Makefile
index b0bc753d46d2..01c807cf6afd 100644
--- a/net/tn5250/Makefile
+++ b/net/tn5250/Makefile
@@ -13,6 +13,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_LIBTOOL=	yes
 CONFIGURE_TARGET=	--build=${ARCH}-portbld-freebsd${OSREL}
 CONFIGURE_ARGS=	--enable-os-dir=no
@@ -40,7 +41,7 @@ pre-everything::
 .endif
 
 post-patch:
-	@${FIND} ${WRKSRC}/src -name '*.[ch]' | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC}/src -name '*.[ch]' | ${XARGS} ${REINPLACE_CMD} -e \
 		's|<malloc.h>|<stdlib.h>|g'
 
 post-install: