From owner-freebsd-ports Sun Jun 23 14:20:35 2002 Delivered-To: freebsd-ports@hub.freebsd.org Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21]) by hub.freebsd.org (Postfix) with ESMTP id AB33C37B40C for ; Sun, 23 Jun 2002 14:20:01 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5NLK1Z25964; Sun, 23 Jun 2002 14:20:01 -0700 (PDT) (envelope-from gnats) Received: from innovations.dsinw.com (ns.dsinw.com [207.149.40.194]) by hub.freebsd.org (Postfix) with ESMTP id 6F44437B401 for ; Sun, 23 Jun 2002 14:14:33 -0700 (PDT) Received: from ivymike.satan.kom (02-074.021.popsite.net [192.216.196.74]) by innovations.dsinw.com (8.11.6/8.11.6) with ESMTP id g5NLCj622573 for ; Sun, 23 Jun 2002 14:12:45 -0700 Message-Id: <20020623141518.E2906-100000@ivymike.satan.kom> Date: Sun, 23 Jun 2002 14:15:58 -0700 (PDT) From: Scott Flatman To: freebsd-gnats-submit@FreeBSD.org Subject: ports/39745: ports/www ${PERL} -> ${REINPLACE_CMD} Sender: owner-freebsd-ports@FreeBSD.ORG Precedence: bulk List-ID: List-Archive: (Web Archive) List-Help: (List Instructions) List-Subscribe: List-Unsubscribe: X-Loop: FreeBSD.org >Number: 39745 >Category: ports >Synopsis: ${PERL} -> ${REINPLACE_CMD} >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: update >Submitter-Id: current-users >Arrival-Date: Sun Jun 23 14:20:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Scott Flatman >Release: >Organization: >Environment: >Description: ${PERL} -> ${REINPLACE_CMD} >How-To-Repeat: >Fix: --- patch-Mosaic begins here --- --- Makefile.orig Sat Jan 26 03:31:22 2002 +++ Makefile Sun Jun 23 13:34:56 2002 @@ -23,9 +23,10 @@ ALL_TARGET= bsdi USE_X_PREFIX= yes USE_XPM= yes +USE_REINPLACE= yes pre-patch: - @${PERL} -pi -e 's,,,' \ + @${REINPLACE_CMD} -e 's,,,' \ ${WRKSRC}/libXmx/Xmx.h ${WRKSRC}/libdtm/dtm.c \ ${WRKSRC}/libdtm/dtm.c ${WRKSRC}/libdtm/dtm.c \ ${WRKSRC}/libdtm/dtm.c ${WRKSRC}/libdtm/dtminit.c \ --- patch-Mosaic ends here --- --- patch-apache13-modssl begins here --- --- 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 @@ -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 --- --- patch-ashe begins here --- --- Makefile.orig Wed Jan 2 16:52:48 2002 +++ Makefile Sun Jun 23 13:39:15 2002 @@ -18,13 +18,14 @@ CONFIGURE_WRKSRC= ${WRKDIR}/src INSTALL_WRKSRC= ${WRKDIR}/src +USE_REINPLACE= yes USE_MOTIF= yes USE_IMAKE= yes MAN1= xhtml.1 post-patch: - @${PERL} -pi -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/XHTML.ad - @${PERL} -pi -e "s/malloc.h/stdlib.h/g" \ + @${REINPLACE_CMD} -e "s|%%PREFIX%%|${PREFIX}|g" ${WRKSRC}/src/XHTML.ad + @${REINPLACE_CMD} -e "s/malloc.h/stdlib.h/g" \ ${WRKSRC}/libhtmlw-2.7b3/HTML-PSformat.c do-build: --- patch-ashe ends here --- --- patch-bkmrkconv begins 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 --- --- patch-comline begins here --- --- Makefile.orig Mon Mar 25 12:24:43 2002 +++ Makefile Sun Jun 23 13:41:55 2002 @@ -18,9 +18,10 @@ MAINTAINER= ports@FreeBSD.org WRKSRC= ${WRKDIR}/WWW +USE_REINPLACE= yes post-patch: - @${PERL} -pi -e 's,strcasestr,strcasestr_,' \ + @${REINPLACE_CMD} -e 's,strcasestr,strcasestr_,' \ ${WRKSRC}/Library/Implementation/HTString.* do-build: --- patch-comline ends here --- --- patch-fhttpd begins 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 --- --- patch-harvest begins here --- --- Makefile.orig Sat Mar 30 19:10:17 2002 +++ Makefile Sun Jun 23 13:44:27 2002 @@ -17,8 +17,10 @@ MAINTAINER= ports@FreeBSD.org +USE_REINPLACE= yes + pre-patch: - @${PERL} -pi -e 's,,,' \ + @${REINPLACE_CMD} -e 's,,,' \ ${WRKSRC}/src/configure ${WRKSRC}/src/broker/broker.h \ ${WRKSRC}/src/gatherer/essence/main.c \ ${WRKSRC}/src/gatherer/include/essence.h \ --- patch-harvest ends here --- --- patch-junkbuster begins 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 --- --- patch-netraider begins here --- --- Makefile.orig Fri Nov 23 11:07:34 2001 +++ Makefile Sun Jun 23 13:50:47 2002 @@ -21,9 +21,10 @@ USE_GMAKE= yes CFLAGS+= -DBSD SUBST= ${WRKSRC}/konq-embed/src/Makefile.in +USE_REINPLACE= yes pre-configure: - find ${WRKSRC} -name Makefile.am | xargs ${PERL} -pi -e \ + find ${WRKSRC} -name Makefile.am | xargs ${REINPLACE_CMD} -e \ "s@-lqt@-lqt @g; s@ -lqt @ -lqt2@g" ${CP} ${WRKSRC}/konq-embed/src/konqueror ${WRKSRC}/konq-embed/src/konq-embedded ${CP} ${SUBST} ${SUBST}.bak && ${SED} \ --- patch-netraider ends here --- --- patch-p5-Template-Toolkit begins 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 --- patch-p5-Template-Toolkit ends here --- --- patch-peacock begins here --- --- Makefile.orig Sat Dec 22 04:12:14 2001 +++ Makefile Sun Jun 23 14:00:09 2002 @@ -13,6 +13,7 @@ MAINTAINER= ports@FreeBSD.org +USE_REINPLACE= yes USE_GMAKE= yes USE_X_PREFIX= yes USE_GNOME= yes @@ -21,9 +22,9 @@ LIBS="-L${LOCALBASE}/lib" 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 \ + @find ${WRKSRC} -name "Makefile.in" | xargs ${REINPLACE_CMD} -e \ 's|\$\(datadir\)/gnome/|\$\(datadir\)/|g ; \ s|\$\(datadir\)/locale|\$\(prefix\)/share/locale|g' --- patch-peacock ends here --- --- patch-retawq begins 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 --- --- patch-sqmgrlog begins here --- --- Makefile.orig Fri Aug 31 17:45:16 2001 +++ Makefile Sun Jun 23 14:02:48 2002 @@ -12,12 +12,13 @@ MAINTAINER= ports@FreeBSD.org +USE_REINPLACE= yes GNU_CONFIGURE= yes CONFIGURE_ARGS+= --enable-prefix=${PREFIX} --with-gcc post-patch: - @${PERL} -pi -e 's,LDFLAGS="-g",LDFLAGS="",' ${WRKSRC}/configure - @${PERL} -pi -e 's,/usr/local/etc/httpd/htdocs/,${PREFIX}/www/data/,; \ + @${REINPLACE_CMD} -e 's,LDFLAGS="-g",LDFLAGS="",' ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's,/usr/local/etc/httpd/htdocs/,${PREFIX}/www/data/,; \ s,mailx,mail,' ${WRKSRC}/sqmgrlog.conf ${WRKSRC}/log.c post-install: --- patch-sqmgrlog ends here --- >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message