7 files changed, 20 insertions, 11 deletions

diff --git a/mail/althea/Makefile b/mail/althea/Makefile
index cdac7f963077..9831fe7cf5d0 100644
--- a/mail/althea/Makefile
+++ b/mail/althea/Makefile
@@ -14,13 +14,15 @@ EXTRACT_SUFX=	.tgz
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+REINPLACE_ARGS=	-i ""
 USE_GTK=	yes
 USE_OPENSSL=	yes
 MAKE_ENV=	MKDIR="${MKDIR}"
 MAKEFILE=	${FILESDIR}/Makefile.bsd
 
 post-patch:
-	@${PERL} -pi -e "s|/etc|${PREFIX}/etc|g" \
+	@${REINPLACE_CMD} -e "s|/etc|${PREFIX}/etc|g" \
 		${WRKSRC}/Documentation/help.html \
 		${WRKSRC}/load_config.cpp \
 		${WRKSRC}/load_config.h \
diff --git a/mail/glacier/Makefile b/mail/glacier/Makefile
index 324d0f79c1da..c8d048400c67 100644
--- a/mail/glacier/Makefile
+++ b/mail/glacier/Makefile
@@ -13,13 +13,14 @@ MASTER_SITES=	http://linuxberg.tele.net/files/gnome/network/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
 GNU_CONFIGURE=	yes
 
 pre-patch:
-	@find ${WRKSRC} -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|\$$\(datadir\)/gnome/|\$$\(datadir\)/|g'
+	@find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \
+		's|\$$(datadir)/gnome/|\$$(datadir)/|g'
 
 .include <bsd.port.mk>
diff --git a/mail/liamail/Makefile b/mail/liamail/Makefile
index 379b98fd4b27..6ef111b7b9cd 100644
--- a/mail/liamail/Makefile
+++ b/mail/liamail/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	gnugetopt:${PORTSDIR}/devel/libgnugetopt
 
+USE_REINPLACE=	yes
 USE_QT_VER=	2
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
@@ -24,7 +25,7 @@ CONFIGURE_ENV=	CPPFLAGS="${CXXFLAGS} -I${LOCALBASE}/include" \
 USE_GMAKE=	yes
 
 post-patch:
-	@${PERL} -pi -e "s/qt.so/qt2.so/g" ${WRKSRC}/configure
-	@${PERL} -pi -e "s/-lqt/-lqt2/g" ${WRKSRC}/src/Makefile.in
+	@${REINPLACE_CMD} -e "s/qt.so/qt2.so/g" ${WRKSRC}/configure
+	@${REINPLACE_CMD} -e "s/-lqt/-lqt2/g" ${WRKSRC}/src/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/mail/mreport/Makefile b/mail/mreport/Makefile
index edf00954fc63..1e51b056c77e 100644
--- a/mail/mreport/Makefile
+++ b/mail/mreport/Makefile
@@ -12,13 +12,14 @@ MASTER_SITES=	ftp://ftp.datrix.co.za/pub/mreport/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
 ALL_TARGET=	ALL
 MAN8=		mreport.8
 
 post-patch:
-	${PERL} -pi -e "s/^.TH mreport 1/.TH mreport 8/g; s/^.LO 1/.LO 8/g;" \
+	@${REINPLACE_CMD} -e "s/^.TH mreport 1/.TH mreport 8/g; s/^.LO 1/.LO 8/g;" \
 		${WRKSRC}/mreport.1
-	${PERL} -pi -e "s/^CC.+//g; s/-Wall -c -O2/${CFLAGS} -c/g;" \
+	@${REINPLACE_CMD} -E -e "s/^CC.+//g; s/-Wall -c -O2/${CFLAGS} -c/g;" \
 		${WRKSRC}/Makefile
 
 do-install:
diff --git a/mail/muttzilla/Makefile b/mail/muttzilla/Makefile
index d79441691337..e3c51b7640c6 100644
--- a/mail/muttzilla/Makefile
+++ b/mail/muttzilla/Makefile
@@ -13,8 +13,10 @@ MASTER_SITES=	http://www3.bc.sympatico.ca/brian_winters/mutt/
 
 MAINTAINER=	ports@FreeBSD.org
 
+USE_REINPLACE=	yes
+
 pre-configure:
-	@${PERL} -pi.orig \
+	@${REINPLACE_CMD} \
 		-e "s:/etc/muttzilla.conf:${PREFIX}/etc/muttzilla.conf:g"  \
 		${WRKSRC}/muttzilla.h ${WRKSRC}/mzmail.sh ${WRKSRC}/mzmail.py \
 		${WRKSRC}/mznews.sh ${WRKSRC}/mznews.py
diff --git a/mail/stuphead/Makefile b/mail/stuphead/Makefile
index b6452ad7588a..eaf16a8f92db 100644
--- a/mail/stuphead/Makefile
+++ b/mail/stuphead/Makefile
@@ -18,6 +18,7 @@ MAINTAINER=	ports@FreeBSD.org
 
 LIB_DEPENDS=	iconv.3:${PORTSDIR}/converters/libiconv
 
+USE_REINPLACE=	yes
 USE_BZIP2=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
@@ -54,9 +55,9 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/ispell-ru:${PORTSDIR}/russian/rus-ispell
 .endif
 
 pre-patch:
-	@${PERL} -pi -e 's#DATADIRNAME=lib#DATADIRNAME=share#g' \
+	@${REINPLACE_CMD} -e 's#DATADIRNAME=lib#DATADIRNAME=share#g' \
 		${WRKSRC}/configure
-	@${PERL} -pi -e 's#/usr/bin/gnome-config#$(PREFIX)/bin/gnome-config#g' \
+	@${REINPLACE_CMD} -e 's#/usr/bin/gnome-config#$(PREFIX)/bin/gnome-config#g' \
 		${WRKSRC}/configure
 
 do-install:
diff --git a/mail/xmailbox/Makefile b/mail/xmailbox/Makefile
index 68e0f59e404f..4867d91bfc56 100644
--- a/mail/xmailbox/Makefile
+++ b/mail/xmailbox/Makefile
@@ -13,12 +13,13 @@ MASTER_SITE_SUBDIR=	applications
 
 MAINTAINER=		ports@FreeBSD.org
 
+USE_REINPLACE=		yes
 USE_IMAKE=		yes
 USE_XPM=		yes
 MAN1=			xmailbox.1
 
 post-patch:
-	@${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMailbox.ad
+	@${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/XMailbox.ad
 
 post-install:
 	@${MKDIR} ${PREFIX}/share/xmailbox