Use REINPLACE_CMD as well as USE_REINPLACE

7 files changed, 27 insertions, 19 deletions

diff --git a/devel/decompyle/Makefile b/devel/decompyle/Makefile
index 34b9bf2243dc..b1f06d2d079c 100644
--- a/devel/decompyle/Makefile
+++ b/devel/decompyle/Makefile
@@ -15,10 +15,11 @@ MAINTAINER=	perky@FreeBSD.org
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_REINPLACE=  yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,${LOCALBASE}/,,g}
 
 post-patch:
-	${PERL} -pi -e 's,/usr/bin/env python2,${PYTHON_CMD},' \
+	${REINPLACE_CMD} -e 's,/usr/bin/env python2,${PYTHON_CMD},' \
 		${WRKSRC}/scripts/decompyle
 
 .include <bsd.port.mk>
diff --git a/dns/py-adns/Makefile b/dns/py-adns/Makefile
index 795a7fcb628f..242602098e3c 100644
--- a/dns/py-adns/Makefile
+++ b/dns/py-adns/Makefile
@@ -18,11 +18,12 @@ LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_REINPLACE=	yes
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 
 post-patch:
-	@${PERL} -pi -e 's|^(include_dirs = ).*$$|\1\["${LOCALBASE}/include"\]|g; \
-		s|^(library_dirs = ).*$$|\1\["${LOCALBASE}/lib"\]|g' \
+	@${REINPLACE_CMD} -e 's|^\(include_dirs = \).*$$|\1\["${LOCALBASE}/include"\]|g' \
+		-e 's|^\(library_dirs = \).*$$|\1\["${LOCALBASE}/lib"\]|g' \
 		${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/graphics/py-gd/Makefile b/graphics/py-gd/Makefile
index 055717ac67bc..a57873efa5c5 100644
--- a/graphics/py-gd/Makefile
+++ b/graphics/py-gd/Makefile
@@ -16,6 +16,7 @@ MAINTAINER=	perky@FreeBSD.org
 LIB_DEPENDS=	gd.2:${PORTSDIR}/graphics/gd
 
 USE_PYTHON=	yes
+USE_REINPLACE=  yes
 PLIST_SUB=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} \
 		EXAMPLE_DIR=${EXAMPLE_DIR:S,^${PREFIX}/,,g}
 EXAMPLE_DIR=	${PREFIX}/share/examples/${PKGNAMEPREFIX}${PORTNAME}
@@ -25,10 +26,11 @@ USE_XPM=	yes
 .endif
 
 post-patch:
-	${PERL} -pi -e 's,^(gd.*)$$,\1 -I${LOCALBASE}/include/gd -L${LOCALBASE}/lib,g; s,-lttf,,g; s,/usr/X11R6,${X11BASE},g;' \
-		${WRKSRC}/Setup
+	${REINPLACE_CMD} -e 's,^\(gd.*\)$$,\1 -I${LOCALBASE}/include/gd\
+		-L${LOCALBASE}/lib,g' -e 's,-lttf,,g' \
+		-e 's,/usr/X11R6,${X11BASE},g' ${WRKSRC}/Setup
 .if defined(WITHOUT_X11)
-	${PERL} -pi -e 's,-lX11 -lXpm,,g' ${WRKSRC}/Setup
+	${REINPLACE_CMD} -e 's,-lX11 -lXpm,,g' ${WRKSRC}/Setup
 .endif
 
 pre-build:
diff --git a/graphics/py-paint/Makefile b/graphics/py-paint/Makefile
index 60d56b2cef1a..e707106e2bb0 100644
--- a/graphics/py-paint/Makefile
+++ b/graphics/py-paint/Makefile
@@ -20,11 +20,13 @@ LIB_DEPENDS=	png.5:${PORTSDIR}/graphics/png \
 USE_FREETYPE=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_REINPLACE=	yes
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S,^${LOCALBASE}/,,g} \
 		SHARE_SUBDIR=${SHARE_SUBDIR}
 SHARE_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 
-INC_DIRS=	["${LOCALBASE}/include/freetype1","${LOCALBASE}/include","${X11BASE}/include","${LOCALBASE}/include/freetype1/freetype"]
+INC_DIRS=	["${LOCALBASE}/include/freetype1","${LOCALBASE}/include", \
+		 "${X11BASE}/include","${LOCALBASE}/include/freetype1/freetype"]
 LIB_DIRS=	["${LOCALBASE}/lib","${X11BASE}/lib"]
 TMPSUFFIX=	.temp
 EXAMPLES=	test_bar.py test_paint.py testpie.py
@@ -32,8 +34,8 @@ EXAMPLES=	test_bar.py test_paint.py testpie.py
 .include <bsd.port.pre.mk>
 
 post-patch:
-	${PERL} -pi -e 's@^(.*libraries.*)$$@\1include_dirs=${INC_DIRS},library_dirs=${LIB_DIRS},@g' \
-		${WRKSRC}/setup.py
+	${REINPLACE_CMD} -e 's@^\(.*libraries.*\)$$@\1include_dirs=${INC_DIRS},\
+		library_dirs=${LIB_DIRS},@g' ${WRKSRC}/setup.py
 
 .if !defined(NOPORTDOCS)
 post-install:
diff --git a/lang/spl/Makefile b/lang/spl/Makefile
index 1e889d65892f..78e5772c34cb 100644
--- a/lang/spl/Makefile
+++ b/lang/spl/Makefile
@@ -14,22 +14,22 @@ MAINTAINER=	perky@FreeBSD.org
 
 USE_BISON=	yes
 USE_GMAKE=	yes
+USE_REINPLACE=	yes
 
 ALL_EXAMPLES=	Makefile fibonacci.spl fibonacci2.spl guess.spl hello.spl \
 		primes.spl reverse.spl shakesbeer.spl
 
 post-patch:
-	@${PERL} -pi -e 's,= gcc,?= gcc,; s,^CCFLAGS.*,CFLAGS += -Wall,; \
-		s,CCFLAGS,CFLAGS,g' \
-		${WRKSRC}/Makefile ${WRKSRC}/examples/Makefile
+	@for f in ${WRKSRC}/Makefile ${WRKSRC}/examples/Makefile; do \
+	 ${REINPLACE_CMD} -i "" -e 's,= gcc,?= gcc,' -e 's,^CCFLAGS.*,CFLAGS += -Wall,' \
+		-e 's,CCFLAGS,CFLAGS,g' -e 's,^SPLPATH =.*,SPLPATH =${PREFIX},g' \
+		-e 's, spl/, ${PREFIX}/,g' $$f; \
+	done
 
-do-install:
-	${TAR} -C ${WRKSRC}/spl -cf- . | ${TAR} -C ${PREFIX} -xpf-
+post-install:
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${EXAMPLESDIR}
 	cd ${WRKSRC}/examples && ${INSTALL_DATA} ${ALL_EXAMPLES} ${EXAMPLESDIR}
-	@${PERL} -pi -e 's,^SPLPATH =.*,SPLPATH =${PREFIX},g' \
-		${EXAMPLESDIR}/Makefile
 .endif
 
 .include <bsd.port.mk>
diff --git a/net/py-adns/Makefile b/net/py-adns/Makefile
index 795a7fcb628f..242602098e3c 100644
--- a/net/py-adns/Makefile
+++ b/net/py-adns/Makefile
@@ -18,11 +18,12 @@ LIB_DEPENDS=	adns.1:${PORTSDIR}/net/adns
 
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_REINPLACE=	yes
 PLIST_SUB+=	PYTHON_SITELIBDIR=${PYTHON_SITELIBDIR:S/^${LOCALBASE}\///g}
 
 post-patch:
-	@${PERL} -pi -e 's|^(include_dirs = ).*$$|\1\["${LOCALBASE}/include"\]|g; \
-		s|^(library_dirs = ).*$$|\1\["${LOCALBASE}/lib"\]|g' \
+	@${REINPLACE_CMD} -e 's|^\(include_dirs = \).*$$|\1\["${LOCALBASE}/include"\]|g' \
+		-e 's|^\(library_dirs = \).*$$|\1\["${LOCALBASE}/lib"\]|g' \
 		${WRKSRC}/setup.py
 
 .include <bsd.port.mk>
diff --git a/textproc/py-rxp/Makefile b/textproc/py-rxp/Makefile
index 79ae74dd9558..e3b0a12ccaf8 100644
--- a/textproc/py-rxp/Makefile
+++ b/textproc/py-rxp/Makefile
@@ -18,12 +18,13 @@ MAINTAINER=	perky@FreeBSD.org
 NO_WRKSUBDIR=	yes
 USE_PYTHON=	yes
 USE_PYDISTUTILS=	yes
+USE_REINPLACE=	yes
 
 EXAMPLESDIR=	${PREFIX}/share/examples/py-rxp
 DOCSDIR=	${PREFIX}/share/doc/py-rxp
 
 post-patch:
-	@${PERL} -pi -e 's/freebsd4/freebsd4","freebsd5/g' ${WRKSRC}/setup.py
+	@${REINPLACE_CMD} -e 's/freebsd4/freebsd4","freebsd5/g' ${WRKSRC}/setup.py
 
 .if !defined(NOPORTDOCS)
 post-install: