Date: Sun, 22 Feb 2004 15:05:53 +0100 (CET) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Cc: voisine@yahoo.com Subject: ports/63222: [patch] Remove useless use of cat 5/5 Message-ID: <200402221405.i1ME5r2W028404@roadrunner.q.local> Resent-Message-ID: <200402221411.i1MEBJw6064326@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63222
>Category: ports
>Synopsis: [patch] Remove useless use of cat 5/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:11:09 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 5.2.1-RC2 i386
>Organization:
>Environment:
>Description:
These patches remove several useless uses of cat. All maintainers have
been CC'ed.
Together with the other four rounds of patches this should eliminate all
occurences of 'cat foo | sed s///'.
>How-To-Repeat:
>Fix:
--- cat_sed5.patch begins here ---
Index: audio/icecast/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/icecast/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- audio/icecast/Makefile 28 Mar 2003 08:25:46 -0000 1.26
+++ audio/icecast/Makefile 22 Feb 2004 13:43:21 -0000
@@ -40,6 +40,6 @@
.endfor
${MKDIR} ${PREFIX}/share/doc/icecast/
${INSTALL_DATA} ${WRKSRC}/doc/manual.html ${PREFIX}/share/doc/icecast/
- @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g'
+ @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
.include <bsd.port.mk>
Index: audio/teknap/Makefile
===================================================================
RCS file: /home/ncvs/ports/audio/teknap/Makefile,v
retrieving revision 1.15
diff -u -r1.15 Makefile
--- audio/teknap/Makefile 4 Feb 2004 05:18:40 -0000 1.15
+++ audio/teknap/Makefile 22 Feb 2004 13:43:21 -0000
@@ -68,7 +68,7 @@
${TAR} --directory ${PREFIX}/share/TekNap/help -xf -
${INSTALL_DATA} ${WRKSRC}/README ${PREFIX}/share/doc/TekNap
@${ECHO}
- @${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
+ @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${PKGMESSAGE}
@${ECHO}
.endif
Index: databases/postgresql72/Makefile
===================================================================
RCS file: /home/ncvs/ports/databases/postgresql72/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- databases/postgresql72/Makefile 4 Feb 2004 04:35:48 -0000 1.11
+++ databases/postgresql72/Makefile 22 Feb 2004 13:43:21 -0000
@@ -124,8 +124,8 @@
post-install:
@ ${MKDIR} ${PREFIX}/share/postgresql ;\
- ${CAT} ${FILESDIR}/post-install-notes ${PKGMESSAGE} |\
- ${SED} "s|/usr/local|${PREFIX}|g" |\
+ ${SED} "s|/usr/local|${PREFIX}|g" ${FILESDIR}/post-install-notes \
+ ${PKGMESSAGE} |\
tee ${PREFIX}/share/postgresql/post-install-notes
.if !defined(DEBUG_FLAGS)
.for file in ecpg pg_dump pg_id pg_passwd pg_restore psql
Index: devel/hs-uni/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/hs-uni/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- devel/hs-uni/Makefile 4 Feb 2004 05:19:35 -0000 1.6
+++ devel/hs-uni/Makefile 22 Feb 2004 13:43:21 -0000
@@ -78,7 +78,7 @@
@${INSTALL_SCRIPT} ${WRKSRC}/ghcihtk ${PREFIX}/bin
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g'
+ @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.post.mk>
Index: devel/swarm/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/swarm/Makefile,v
retrieving revision 1.26
diff -u -r1.26 Makefile
--- devel/swarm/Makefile 4 Feb 2004 05:19:53 -0000 1.26
+++ devel/swarm/Makefile 22 Feb 2004 13:43:21 -0000
@@ -62,6 +62,6 @@
post-patch:
post-install:
- ${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
+ @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${PKGMESSAGE}
.include <bsd.port.mk>
Index: emulators/vMac/Makefile
===================================================================
RCS file: /home/ncvs/ports/emulators/vMac/Makefile,v
retrieving revision 1.8
diff -u -r1.8 Makefile
--- emulators/vMac/Makefile 4 Feb 2004 05:20:08 -0000 1.8
+++ emulators/vMac/Makefile 22 Feb 2004 13:43:21 -0000
@@ -40,6 +40,6 @@
${PREFIX}/share/doc/vMac
${INSTALL_DATA} ${WRKSRC}/README.rom \
${PREFIX}/share/doc/vMac
- @${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}:
+ @${SED} -e "s:/usr/local:${PREFIX}:" ${PKGMESSAGE}
.include <bsd.port.mk>
Index: irc/trickyirc/Makefile
===================================================================
RCS file: /home/ncvs/ports/irc/trickyirc/Makefile,v
retrieving revision 1.10
diff -u -r1.10 Makefile
--- irc/trickyirc/Makefile 4 Feb 2004 05:21:16 -0000 1.10
+++ irc/trickyirc/Makefile 22 Feb 2004 13:43:21 -0000
@@ -27,6 +27,6 @@
${INSTALL_DATA} ${WRKSRC}/README \
${PREFIX}/share/doc/TrickyIRC
@${STRIP_CMD} ${PREFIX}/bin/trickyirc
- @${CAT} ${PKGMESSAGE} | ${SED} -e s:/usr/local:${PREFIX}:
+ @${SED} -e "s:/usr/local:${PREFIX}:" ${PKGMESSAGE}
.include <bsd.port.mk>
Index: lang/gnat-doc-html/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/gnat-doc-html/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- lang/gnat-doc-html/Makefile 19 Dec 2003 23:22:07 -0000 1.6
+++ lang/gnat-doc-html/Makefile 22 Feb 2004 13:43:21 -0000
@@ -74,7 +74,7 @@
post-install:
.if !defined(NOPORTDOCS)
- @${CAT} ${PKGMESSAGE} | ${SED} -e 's:/usr/local:${PREFIX}:'
+ @${SED} -e 's:/usr/local:${PREFIX}:' ${PKGMESSAGE}
.endif
.include <bsd.port.mk>
Index: mail/isoqlog/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/isoqlog/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- mail/isoqlog/Makefile 4 Feb 2004 05:07:21 -0000 1.5
+++ mail/isoqlog/Makefile 22 Feb 2004 13:43:21 -0000
@@ -21,6 +21,6 @@
USE_GMAKE= yes
post-install:
- @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g'
+ @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${PKGMESSAGE}
.include <bsd.port.mk>
Index: mail/silkymail/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/silkymail/Makefile,v
retrieving revision 1.2
diff -u -r1.2 Makefile
--- mail/silkymail/Makefile 5 Apr 2003 23:00:44 -0000 1.2
+++ mail/silkymail/Makefile 22 Feb 2004 13:43:21 -0000
@@ -46,8 +46,8 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%SILKYMAILDIR%%:${SILKYMAILDIR}:g;s:%%LOCALBASE%%:${LOCALBASE}:g;"
+ @${SED} -e "s:%%SILKYMAILDIR%%:${SILKYMAILDIR}:g" \
+ -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: math/vtk/Makefile
===================================================================
RCS file: /home/ncvs/ports/math/vtk/Makefile,v
retrieving revision 1.24
diff -u -r1.24 Makefile
--- math/vtk/Makefile 13 Feb 2004 03:53:48 -0000 1.24
+++ math/vtk/Makefile 22 Feb 2004 13:43:21 -0000
@@ -226,7 +226,7 @@
print-pkg-message:
@if ${TEST} -f ${PKGMESSAGE} ; then \
${ECHO_MSG} -e "-- V T K - N O T E ----------------------------------------------------\n\n" ; \
- ${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|' ; \
+ ${SED} -e 's|%%PREFIX%%|${PREFIX}|' ${PKGMESSAGE}; \
${ECHO_MSG} -e "\n\n-----------------------------------------------------------------------" ; \
fi
Index: net/kpopup/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/kpopup/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- net/kpopup/Makefile 4 Feb 2004 05:08:11 -0000 1.4
+++ net/kpopup/Makefile 22 Feb 2004 13:43:21 -0000
@@ -27,6 +27,6 @@
@${REINPLACE_CMD} -e 's,%%LOCALBASE%%,${LOCALBASE},' ${WRKSRC}/kpopup/misc.h
post-install:
- @${CAT} ${PKGMESSAGE} | ${SED} -e 's,%%PREFIX%%,${PREFIX},g'
+ @${SED} -e 's,%%PREFIX%%,${PREFIX},g' ${PKGMESSAGE}
.include <bsd.port.mk>
Index: textproc/gutenbook/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/gutenbook/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- textproc/gutenbook/Makefile 4 Feb 2004 05:09:12 -0000 1.9
+++ textproc/gutenbook/Makefile 22 Feb 2004 13:43:21 -0000
@@ -48,7 +48,7 @@
post-install:
.if !defined(NOPORTDOCS)
- @${CAT} ${PKGMESSAGE} | ${SED} 's#/usr/local#${PREFIX}#g'
+ @${SED} 's#/usr/local#${PREFIX}#g' ${PKGMESSAGE}
.endif
.include <bsd.port.mk>
Index: www/mod_jk/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/mod_jk/Makefile,v
retrieving revision 1.23
diff -u -r1.23 Makefile
--- www/mod_jk/Makefile 4 Feb 2004 05:09:30 -0000 1.23
+++ www/mod_jk/Makefile 22 Feb 2004 13:43:21 -0000
@@ -59,6 +59,6 @@
${INSTALL_DATA} ${FILESDIR}/workers.properties.sample ${APACHE_CONF}
post-install:
- ${CAT} ${PKGMESSAGE} | ${SED} "s|/usr/local|${PREFIX}|g"
+ @${SED} "s|/usr/local|${PREFIX}|g" ${PKGMESSAGE}
.include <bsd.port.post.mk>
Index: www/webreport/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/webreport/Makefile,v
retrieving revision 1.1
diff -u -r1.1 Makefile
--- www/webreport/Makefile 17 Feb 2004 14:34:13 -0000 1.1
+++ www/webreport/Makefile 22 Feb 2004 13:43:21 -0000
@@ -31,6 +31,6 @@
.endif
post-install:
- @${CAT} ${PKGMESSAGE} | ${SED} -e 's|%%PREFIX%%|${PREFIX}|g'
+ @${SED} -e 's|%%PREFIX%%|${PREFIX}|g' ${PKGMESSAGE}
.include <bsd.port.mk>
--- cat_sed5.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.i1ME5r2W028404>