Date: Sun, 22 Feb 2004 15:05:34 +0100 (CET) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: obraun@FreeBSD.org Subject: ports/63221: [patch] Remove useless use of cat 4/5 Message-ID: <200402221405.i1ME5YTR028373@roadrunner.q.local> Resent-Message-ID: <200402221411.i1MEB4wN064022@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63221 >Category: ports >Synopsis: [patch] Remove useless use of cat 4/5 >Confidential: no >Severity: non-critical >Priority: low >Responsible: freebsd-ports-bugs >State: open >Quarter: >Keywords: >Date-Required: >Class: change-request >Submitter-Id: current-users >Arrival-Date: Sun Feb 22 06:10:54 PST 2004 >Closed-Date: >Last-Modified: >Originator: Ulrich Spoerlein >Release: FreeBSD 5.2.1-RC2 i386 >Organization: >Environment: >Description: These patches are against some committers' ports and remove useless use of cat. >How-To-Repeat: >Fix: --- cat_sed4.patch begins here --- Index: databases/arcexplorer/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/arcexplorer/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- databases/arcexplorer/Makefile 7 Mar 2003 05:58:24 -0000 1.2 +++ databases/arcexplorer/Makefile 22 Feb 2004 13:43:12 -0000 @@ -38,7 +38,7 @@ post-install: @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' + @${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${PKGMESSAGE} @${ECHO_CMD} .include <bsd.port.post.mk> Index: databases/postgresql-devel/Makefile =================================================================== RCS file: /home/ncvs/ports/databases/postgresql-devel/Makefile,v retrieving revision 1.136 diff -u -r1.136 Makefile --- databases/postgresql-devel/Makefile 5 Feb 2004 12:41:25 -0000 1.136 +++ databases/postgresql-devel/Makefile 22 Feb 2004 13:43:12 -0000 @@ -213,8 +213,8 @@ ${GMAKE} -C ${WRKSRC}/contrib/pgcrypto install .endif @ ${MKDIR} ${PREFIX}/share/postgresql ;\ - ${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\ - ${SED} "s|/usr/local|${PREFIX}|g" |\ + ${SED} -e "s|/usr/local|${PREFIX}|g" \ + ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\ tee ${PREFIX}/share/postgresql/post-install-notes .if !defined(WITHOUT_SERVER) .for i in profile cshrc Index: graphics/mrsidviewer/Makefile =================================================================== RCS file: /home/ncvs/ports/graphics/mrsidviewer/Makefile,v retrieving revision 1.2 diff -u -r1.2 Makefile --- graphics/mrsidviewer/Makefile 7 Mar 2003 06:04:07 -0000 1.2 +++ graphics/mrsidviewer/Makefile 22 Feb 2004 13:43:12 -0000 @@ -31,7 +31,7 @@ post-install: @${ECHO_CMD} - @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' + @${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${PKGMESSAGE} @${ECHO_CMD} .include <bsd.port.post.mk> Index: lang/helium/Makefile =================================================================== RCS file: /home/ncvs/ports/lang/helium/Makefile,v retrieving revision 1.14 diff -u -r1.14 Makefile --- lang/helium/Makefile 4 Feb 2004 05:21:38 -0000 1.14 +++ lang/helium/Makefile 22 Feb 2004 13:43:12 -0000 @@ -53,7 +53,7 @@ do-install: @(cd ${WRKSRC}/heliumNT/src && ${GMAKE} install) - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' + @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE} .if defined(WITH_HINT) @${MKDIR} ${PREFIX}/share/java/helium @${INSTALL_DATA} ${DISTDIR}/Hint.jar ${PREFIX}/share/java/helium Index: www/mod_frontpage/Makefile =================================================================== RCS file: /home/ncvs/ports/www/mod_frontpage/Makefile,v retrieving revision 1.18 diff -u -r1.18 Makefile --- www/mod_frontpage/Makefile 22 Feb 2004 09:31:04 -0000 1.18 +++ www/mod_frontpage/Makefile 22 Feb 2004 13:43:12 -0000 @@ -70,10 +70,9 @@ post-install: .if (${PREFIX} != "/usr/local") - @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' + @${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${PKGMESSAGE} .else - @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' \ - | ${GREP} -v "ln" + @${SED} -e 's|%%PREFIX%%|${PREFIX}|' -e '/^ln/d' ${PKGMESSAGE} .endif .include <bsd.port.post.mk> Index: x11/kdebase3/Makefile =================================================================== RCS file: /home/ncvs/ports/x11/kdebase3/Makefile,v retrieving revision 1.131 diff -u -r1.131 Makefile --- x11/kdebase3/Makefile 11 Feb 2004 15:28:06 -0000 1.131 +++ x11/kdebase3/Makefile 22 Feb 2004 13:43:12 -0000 @@ -74,7 +74,7 @@ ${CHMOD} u+s ${PREFIX}/bin/kcheckpass ${CHGRP} kmem ${PREFIX}/bin/ksysguardd && \ ${CHMOD} g+s ${PREFIX}/bin/ksysguardd - @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g' \ - | ${SED} -e 's,%%X11BASE%%,${X11BASE},g' + @${SED} -e 's,%%PREFIX%%,${PREFIX},g' -e 's,%%X11BASE%%,${X11BASE},g' \ + ${PKGMESSAGE} .include <bsd.port.post.mk> --- cat_sed4.patch ends here --- >Release-Note: >Audit-Trail: >Unformatted:
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?200402221405.i1ME5YTR028373>