From owner-freebsd-ports Sat Jun 22 2:40:34 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 2832037B401 for ; Sat, 22 Jun 2002 02:40:02 -0700 (PDT) Received: (from gnats@localhost) by freefall.freebsd.org (8.11.6/8.11.6) id g5M9e2599387; Sat, 22 Jun 2002 02:40:02 -0700 (PDT) (envelope-from gnats) Received: from unsane.de (pD950F864.dip.t-dialin.net [217.80.248.100]) by hub.freebsd.org (Postfix) with ESMTP id 425E837B404 for ; Sat, 22 Jun 2002 02:32:43 -0700 (PDT) Received: from localhost (localhost.unsane.de [127.0.0.1]) by unsane.de (Postfix) with ESMTP id C90282B5 for ; Sat, 22 Jun 2002 11:32:37 +0200 (CEST) Received: by unsane.de (Postfix, from userid 1001) id 9080A210; Sat, 22 Jun 2002 11:32:36 +0200 (CEST) Message-Id: <20020622093236.9080A210@unsane.de> Date: Sat, 22 Jun 2002 11:32:36 +0200 (CEST) From: Oliver Braun To: FreeBSD-gnats-submit@FreeBSD.org X-Send-Pr-Version: 3.113 Subject: ports/39652: Update ports@ maintained ports in category mail: ${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: 39652 >Category: ports >Synopsis: Update ports@ maintained ports in category mail: ${PERL} -> ${REINPLACE_CMD} >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports >State: open >Quarter: >Keywords: >Date-Required: >Class: maintainer-update >Submitter-Id: current-users >Arrival-Date: Sat Jun 22 02:40:01 PDT 2002 >Closed-Date: >Last-Modified: >Originator: Oliver Braun >Release: FreeBSD 4.6-STABLE i386 >Organization: >Environment: System: FreeBSD galore.unsane.de 4.6-STABLE FreeBSD 4.6-STABLE #0: Sun Jun 16 12:43:32 CEST 2002 root@galore.unsane.de:/usr/obj/usr/src/sys/GALORE_OB i386 >Description: Replace ${PERL} with ${REINPLACE_CMD} in mail/althea mail/glacier mail/liamail mail/mreport mail/muttzilla mail/stuphead mail/xmailbox Regards, Olli >How-To-Repeat: >Fix: Index: althea/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/althea/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- althea/Makefile 2001/12/08 21:09:06 1.6 +++ althea/Makefile 2002/06/22 09:28:33 @@ -14,13 +14,15 @@ 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 \ Index: glacier/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/glacier/Makefile,v retrieving revision 1.9 diff -u -r1.9 Makefile --- glacier/Makefile 2001/02/05 15:10:37 1.9 +++ glacier/Makefile 2002/06/22 09:28:36 @@ -13,13 +13,14 @@ 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 Index: liamail/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/liamail/Makefile,v retrieving revision 1.1 diff -u -r1.1 Makefile --- liamail/Makefile 2002/03/05 16:56:28 1.1 +++ liamail/Makefile 2002/06/22 09:28:36 @@ -16,6 +16,7 @@ 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 @@ 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 Index: mreport/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/mreport/Makefile,v retrieving revision 1.6 diff -u -r1.6 Makefile --- mreport/Makefile 2001/06/17 04:44:37 1.6 +++ mreport/Makefile 2002/06/22 09:28:37 @@ -12,13 +12,14 @@ 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: Index: muttzilla/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/muttzilla/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- muttzilla/Makefile 2002/05/08 20:52:14 1.12 +++ muttzilla/Makefile 2002/06/22 09:28:38 @@ -13,8 +13,10 @@ 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 Index: stuphead/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/stuphead/Makefile,v retrieving revision 1.12 diff -u -r1.12 Makefile --- stuphead/Makefile 2002/06/08 04:43:49 1.12 +++ stuphead/Makefile 2002/06/22 09:28:41 @@ -18,6 +18,7 @@ LIB_DEPENDS= iconv.3:${PORTSDIR}/converters/libiconv +USE_REINPLACE= yes USE_BZIP2= yes USE_X_PREFIX= yes USE_GMAKE= yes @@ -54,9 +55,9 @@ .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: Index: xmailbox/Makefile =================================================================== RCS file: /home/ncvs/ports/mail/xmailbox/Makefile,v retrieving revision 1.11 diff -u -r1.11 Makefile --- xmailbox/Makefile 2001/02/05 15:11:26 1.11 +++ xmailbox/Makefile 2002/06/22 09:28:42 @@ -13,12 +13,13 @@ 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 >Release-Note: >Audit-Trail: >Unformatted: To Unsubscribe: send mail to majordomo@FreeBSD.org with "unsubscribe freebsd-ports" in the body of the message