6 files changed, 31 insertions, 33 deletions

diff --git a/deskutils/gnofin/Makefile b/deskutils/gnofin/Makefile
index 968b8ebdf541..c30a337e2f81 100644
--- a/deskutils/gnofin/Makefile
+++ b/deskutils/gnofin/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Light-weight GNOME based financial management program
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
@@ -24,14 +25,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gnofin.1
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
-		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|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}/plugins -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		-e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
+		-e 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|' \
+		-e 's|$$(top_builddir)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|$$(datadir)/gnome/|$$(datadir)/|g' \
+		-e ' s|$$(datadir)/locale|$$(prefix)/share/locale|g'
+	@{FIND} ${WRKSRC}/plugins -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
 
 .include <bsd.port.mk>
diff --git a/deskutils/ithought/Makefile b/deskutils/ithought/Makefile
index b4b3762ef224..e1cb3c82c142 100644
--- a/deskutils/ithought/Makefile
+++ b/deskutils/ithought/Makefile
@@ -14,18 +14,11 @@ MASTER_SITE_SUBDIR=	ithought
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	An extensible text management system
 
-LIB_DEPENDS=    xml2.5:${PORTSDIR}/textproc/libxml2
+LIB_DEPENDS=	xml2.5:${PORTSDIR}/textproc/libxml2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--datadir=${PREFIX}/libexec
 
 USE_GNOME=	gtk12
 
-post-patch:
-	@${PERL} -i.orig -p \
-		-e 's#`gnome-config --cflags gtk`#`${GTK_CONFIG} --cflags`#;' \
-		-e 's#`gnome-config --cflags gtk xml`#`${GTK_CONFIG} --cflags; xml-config --cflags`#;' \
-		-e 's#`gnome-config --libs gtk xml`#`${GTK_CONFIG} --libs; xml-config --libs`#;' \
-		${WRKSRC}/src/Makefile.in
-
 .include <bsd.port.mk>
diff --git a/finance/gnofin/Makefile b/finance/gnofin/Makefile
index 968b8ebdf541..c30a337e2f81 100644
--- a/finance/gnofin/Makefile
+++ b/finance/gnofin/Makefile
@@ -14,6 +14,7 @@ MASTER_SITE_SUBDIR=	${PORTNAME}
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Light-weight GNOME based financial management program
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GMAKE=	yes
 USE_GNOME=	yes
@@ -24,14 +25,14 @@ CONFIGURE_ENV=	CPPFLAGS="-I${LOCALBASE}/include" \
 MAN1=		gnofin.1
 
 pre-patch:
-	@${PERL} -pi -e 's|-lpthread|${PTHREAD_LIBS}|g ; \
-		 s|DATADIRNAME=lib|DATADIRNAME=share|g ; \
-		 s|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|g ; \
-		 s|\$$\(top_builddir\)/intl/libintl.a|-lintl|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}/plugins -name "Makefile.in" | xargs ${PERL} -pi -e \
-		's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
+	@${REINPLACE_CMD} -e 's|-lpthread|${PTHREAD_LIBS}|g' \
+		-e 's|DATADIRNAME=lib|DATADIRNAME=share|g' \
+		-e 's|USE_INCLUDED_LIBINTL=yes|#USE_INCLUDED_LIBINTL=yes|' \
+		-e 's|$$(top_builddir)/intl/libintl.a|-lintl|g' ${WRKSRC}/configure
+	@${FIND} ${WRKSRC} -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|$$(datadir)/gnome/|$$(datadir)/|g' \
+		-e ' s|$$(datadir)/locale|$$(prefix)/share/locale|g'
+	@{FIND} ${WRKSRC}/plugins -name "Makefile.in" | ${XARGS} ${REINPLACE_CMD} \
+		-e 's|_la_LDFLAGS =|_la_LDFLAGS = -avoid-version|g'
 
 .include <bsd.port.mk>
diff --git a/lang/cyclone/Makefile b/lang/cyclone/Makefile
index 2ee65c8db935..084ea5f33019 100644
--- a/lang/cyclone/Makefile
+++ b/lang/cyclone/Makefile
@@ -20,6 +20,7 @@ DISTFILES=	${PORTNAME}-${PORTVERSION}.tar.gz \
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A safe dialect of C from Cornell and AT&T Research
 
+USE_REINPLACE=	yes
 USE_GMAKE=	yes
 NO_PACKAGE=	'Neither CC nor CFLAGS safe.'
 WRKSRC=		${WRKDIR}/${PORTNAME}
@@ -36,7 +37,7 @@ pre-everything::
 
 post-patch:
 .ifndef(WITH_OPTIMIZED_CFLAGS)
-	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${PERL} -pi -e \
+	@${FIND} ${WRKSRC} -name Makefile | ${XARGS} ${REINPLACE_CMD} -e \
 		's/-O3/-O/'
 .endif
 
diff --git a/x11-wm/libepplet/Makefile b/x11-wm/libepplet/Makefile
index c20c9358fe6e..79037fc72dae 100644
--- a/x11-wm/libepplet/Makefile
+++ b/x11-wm/libepplet/Makefile
@@ -17,6 +17,7 @@ COMMENT=	Library for building enlightenment dock applications
 
 WRKSRC=		${WRKDIR}/Epplets-${PORTVERSION}
 
+USE_REINPLACE=	yes
 USE_X_PREFIX=	yes
 USE_GNOME=	imlib
 USE_LIBTOOL=	yes
@@ -26,6 +27,6 @@ CONFIGURE_ARGS=	--enable-fsstd
 INSTALLS_SHLIB=	yes
 
 pre-patch:
-	@${PERL} -pi -e 's|api epplets|api|g' ${WRKSRC}/Makefile.in
+	@${REINPLACE_CMD} -e 's|api epplets|api|g' ${WRKSRC}/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/x11/xcolorsel/Makefile b/x11/xcolorsel/Makefile
index 82352b13c137..65774de6825e 100644
--- a/x11/xcolorsel/Makefile
+++ b/x11/xcolorsel/Makefile
@@ -18,15 +18,16 @@ COMMENT=	X utility to translate rgb values into X color names
 LIB_DEPENDS=	Xaw3d.${XAWVER}:${PORTSDIR}/x11-toolkits/Xaw3d
 
 WRKSRC=		$(WRKDIR)/xcolorsel
+USE_REINPLACE=	yes
 USE_IMAKE=	yes
 USE_XPM=	yes
 MAN1=		xcolorsel.1
 
 post-patch:
-	${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad
-	${PERL} -pi -e "s|#include <malloc.h>||g; s|/Xaw/|/Xaw3d/|g;" \
-		${WRKSRC}/*.[ch]
-	${PERL} -pi -e "s|app2head|./app2head|g; \
-		s|XawClientLibs|-lXaw3d \\$$\(XMULIBONLY\) \\$$\(XTOOLLIB\) \\$$\(XPMLIB) \\$$\(XLIB\)|g" ${WRKSRC}/Imakefile
+	@${ECHO_CMD} "*.file: ${X11BASE}/lib/X11/rgb.txt" >> ${WRKSRC}/Xcolorsel.ad
+	@${REINPLACE_CMD} -e 's|#include <malloc.h>||g' \
+		-e 's|/Xaw/|/Xaw3d/|g' ${WRKSRC}/*.[ch]
+	@${REINPLACE_CMD} -e 's|app2head|./app2head|g' \
+		-e 's|XawClientLibs|-lXaw3d $$(XMULIBONLY) $$(XTOOLLIB) $$(XPMLIB) $$(XLIB)|g' ${WRKSRC}/Imakefile
 
 .include <bsd.port.mk>