Bug 39745

Summary: ${PERL} -> ${REINPLACE_CMD}
Product: Ports & Packages Reporter: sf <sf>
Component: Individual Port(s)Assignee: freebsd-ports (Nobody) <ports>
Status: Closed FIXED    
Severity: Affects Only Me    
Priority: Normal    
Version: Latest   
Hardware: Any   
OS: Any   
Attachments:
Description Flags
patch-Mosaic
none
patch-ashe
none
patch-comline
none
patch-harvest
none
patch-netraider
none
patch-peacock
none
patch-sqmgrlog none

Description sf 2002-06-23 22:20:01 UTC
	${PERL} -> ${REINPLACE_CMD}

Fix: --- Makefile.orig	Sat Jun 22 16:48:53 2002
+++ Makefile	Sun Jun 23 13:37:51 2002
@@ -42,6 +42,7 @@
 MAINTAINER=	ports@FreeBSD.org

 USE_OPENSSL=	YES
+USE_REINPLACE=	yes

 .include <bsd.port.pre.mk>

@@ -113,7 +114,7 @@
 	&& ./configure --with-apache=../${DISTNAME} --expert

 post-patch:
-	@${PERL} -pi -e 's|-print|-print0|;s|xargs|xargs -0|' \
+	@${REINPLACE_CMD} -e 's|-print|-print0|;s|xargs|xargs -0|' \
 		${WRKSRC}/Makefile.tmpl
 	@cd ${WRKSRC} \
 	&& find . -type f -name "*.orig" -print | xargs ${RM} -f
--- patch-apache13-modssl ends here ---

--- Makefile.orig	Tue Mar 27 05:16:21 2001
+++ Makefile	Sun Jun 23 13:40:13 2002
@@ -14,9 +14,10 @@

 USE_PERL5=	yes
 NO_BUILD=	yes
+USE_REINPLACE=	yes

 post-patch:
-	@find ${WRKSRC} -name '*.pl' | xargs ${PERL} -pi -e \
+	@find ${WRKSRC} -name '*.pl' | xargs ${REINPLACE_CMD} -e \
 		's|/usr/bin/perl|${PERL}|g ; \
 		 s|%%PREFIX%%|${PREFIX}|g'
--- patch-bkmrkconv ends here ---

--- Makefile.orig	Sat Apr  7 10:48:23 2001
+++ Makefile	Sun Jun 23 13:43:01 2002
@@ -15,6 +15,7 @@

 LOGFILE=	share/fhttpd/fhttpd.log
 PLIST_SUB+=	LOGFILE=${LOGFILE}
+USE_REINPLACE=	yes

 post-extract:
 	@${CP} ${FILESDIR}/fhttpd.sh ${WRKSRC}
@@ -24,9 +25,9 @@

 pre-install:
 	${RM} -rf ${WRKSRC}/http-root/pub/dummy_directory
-	${PERL} -pi -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" \
+	${REINPLACE_CMD} -e "s:%%LOGFILE%%:${PREFIX}/${LOGFILE}:g" \
 		${WRKSRC}/fhttpd.sh ${WRKSRC}/http-root/root-fhttpd.conf
-	${PERL} -pi -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/http-root/root-fhttpd.conf
+	${REINPLACE_CMD} -e "s:/usr/local:${PREFIX}:g" ${WRKSRC}/http-root/root-fhttpd.conf

 do-install:
 	${INSTALL_SCRIPT} ${WRKSRC}/fhttpd.sh ${PREFIX}/etc/rc.d
--- patch-fhttpd ends here ---

--- Makefile.orig	Mon Dec  3 01:27:24 2001
+++ Makefile	Sun Jun 23 13:45:38 2002
@@ -21,12 +21,13 @@

 MAINTAINER=	ports@FreeBSD.org

+USE_REINPLACE=	yes
 ALL_TARGET=	# yes, an empty target.
 JDIR=		${PREFIX}/etc/junkbuster
 MAN1=		junkbuster.1

 post-patch:
-	@${PERL} -pi -e 's:\r::' ${WRKSRC}/*
+	@${REINPLACE_CMD} -e 's:\r::' ${WRKSRC}/*

 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/junkbuster ${PREFIX}/sbin/junkbuster
--- patch-junkbuster ends here ---

--- Makefile.orig	Fri Jun 21 13:33:27 2002
+++ Makefile	Sun Jun 23 13:58:26 2002
@@ -19,6 +19,7 @@

 SITE_PERL=	${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}
 PERL_CONFIGURE=	yes
+USE_REINPLACE=	yes

 MASTER_SITE_BACKUP+=	http://www.template-toolkit.org/download/

@@ -74,7 +75,7 @@
 MAN3PREFIX=	${PREFIX}/lib/perl5/${PERL_VERSION}

 post-patch:
-	${PERL} -pi -e 's,${LOCALBASE}/tt2,${LOCALBASE}/share/tt2,g' \
+	${REINPLACE_CMD} -e 's,${LOCALBASE}/tt2,${LOCALBASE}/share/tt2,g' \
 		${CONFIGURE_WRKSRC}/${CONFIGURE_SCRIPT}

 .include <bsd.port.post.mk>
--- patch-p5-Template-Toolkit ends here ---

--- Makefile.orig	Fri Apr 12 10:10:09 2002
+++ Makefile	Sun Jun 23 14:01:53 2002
@@ -22,9 +22,10 @@
 USE_GMAKE=	yes
 MAKE_ENV=	LDFLAGS="${LDFLAGS}"
 ALL_TARGET=	# empty
+USE_REINPLACE=	yes

 post-patch:
-	@${PERL} -pi -e "s,-lpthread,${PTHREAD_LIBS},g ; \
+	@${REINPLACE_CMD} -e "s,-lpthread,${PTHREAD_LIBS},g ; \
 		s,%%LOCALBASE%%,${LOCALBASE},g ; \
 		s,%%PREFIX%%,${PREFIX},g ; \
 		s,^CC,#CC,g ; s,^CFLAGS,#CFLAGS,g" ${WRKSRC}/Makefile
--- patch-retawq ends here ---
Comment 1 Tilman Keskinoz freebsd_committer freebsd_triage 2002-11-03 18:01:31 UTC
State Changed
From-To: open->closed

All changes are now in the CVS, thanks