Date: Sun, 22 Feb 2004 15:05:07 +0100 (CET) From: Ulrich Spoerlein <q@uni.de> To: FreeBSD-gnats-submit@FreeBSD.org Subject: ports/63219: [patch] Remove useless use of cat 2/5 Message-ID: <200402221405.i1ME57J6028299@roadrunner.q.local> Resent-Message-ID: <200402221410.i1MEAYnI063610@freefall.freebsd.org>
next in thread | raw e-mail | index | archive | help
>Number: 63219
>Category: ports
>Synopsis: [patch] Remove useless use of cat 2/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:23 PST 2004
>Closed-Date:
>Last-Modified:
>Originator: Ulrich Spoerlein
>Release: FreeBSD 5.2.1-RC2 i386
>Organization:
>Environment:
>Description:
These patches are against thierry@pompo.net's ports and remove useless
use of cat. They also trim down some very long lines.
>How-To-Repeat:
>Fix:
--- cat_sed2.patch begins here ---
Index: deskutils/kronolith/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/kronolith/Makefile,v
retrieving revision 1.14
diff -u -r1.14 Makefile
--- deskutils/kronolith/Makefile 4 Feb 2004 05:19:15 -0000 1.14
+++ deskutils/kronolith/Makefile 22 Feb 2004 13:42:52 -0000
@@ -112,8 +112,9 @@
@${RM} ${CONFDIR}/conf.php.beforeKronolith
.endif
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%KRONOLITHDIR%%:${KRONOLITHDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%LOCALBASE%%:${LOCALBASE}:"
+ @${SED} -e "s:%%KRONOLITHDIR%%:${KRONOLITHDIR}:g" \
+ -e "s:%%PORTSDIR%%:${PORTSDIR}:g; s:%%CONFDIR%%:${CONFDIR}:g" \
+ -e "s:%%LOCALBASE%%:${LOCALBASE}:" ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: deskutils/mnemo/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/mnemo/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- deskutils/mnemo/Makefile 4 Feb 2004 05:19:17 -0000 1.4
+++ deskutils/mnemo/Makefile 22 Feb 2004 13:42:52 -0000
@@ -73,8 +73,9 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:"
+ @${SED} -e "s:%%MNEMODIR%%:${MNEMODIR}:g; s:%%PORTSDIR%%:${PORTSDIR}:g" \
+ -e "s:%%CONFDIR%%:${CONFDIR}:g; s:%%HORDEDIR%%:${HORDEDIR}:" \
+ ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: deskutils/nag/Makefile
===================================================================
RCS file: /home/ncvs/ports/deskutils/nag/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- deskutils/nag/Makefile 4 Feb 2004 05:19:17 -0000 1.7
+++ deskutils/nag/Makefile 22 Feb 2004 13:42:52 -0000
@@ -68,8 +68,9 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%NAGDIR%%:${NAGDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:"
+ @${SED} -e "s:%%NAGDIR%%:${NAGDIR}:g; s:%%PORTSDIR%%:${PORTSDIR}:g" \
+ -e "s:%%CONFDIR%%:${CONFDIR}:g; s:%%HORDEDIR%%:${HORDEDIR}:" \
+ ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: devel/chora/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/chora/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- devel/chora/Makefile 4 Feb 2004 05:19:24 -0000 1.9
+++ devel/chora/Makefile 22 Feb 2004 13:42:52 -0000
@@ -106,8 +106,8 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%CHORADIR%%:${CHORADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
+ @${SED} -e "s:%%CHORADIR%%:${CHORADIR}:g; s:%%PORTSDIR%%:${PORTSDIR}:g" \
+ -e "s:%%CONFDIR%%:${CONFDIR}:g" ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: devel/whups/Makefile
===================================================================
RCS file: /home/ncvs/ports/devel/whups/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- devel/whups/Makefile 18 Feb 2004 03:50:35 -0000 1.7
+++ devel/whups/Makefile 22 Feb 2004 13:42:52 -0000
@@ -65,8 +65,9 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%WHUPSDIR%%:${WHUPSDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%HORDEDIR%%:${HORDEDIR}:"
+ @${SED} -e "s:%%WHUPSDIR%%:${WHUPSDIR}:g; s:%%PORTSDIR%%:${PORTSDIR}:g" \
+ -e "s:%%CONFDIR%%:${CONFDIR}:g; s:%%HORDEDIR%%:${HORDEDIR}:" \
+ ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: finance/grisbi/Makefile
===================================================================
RCS file: /home/ncvs/ports/finance/grisbi/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- finance/grisbi/Makefile 4 Feb 2004 04:35:56 -0000 1.7
+++ finance/grisbi/Makefile 22 Feb 2004 13:42:52 -0000
@@ -33,7 +33,7 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:"
+ @${SED} -e "s:%%PREFIX%%:${PREFIX}:" ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: french/facturier/Makefile
===================================================================
RCS file: /home/ncvs/ports/french/facturier/Makefile,v
retrieving revision 1.7
diff -u -r1.7 Makefile
--- french/facturier/Makefile 22 Jan 2004 22:11:43 -0000 1.7
+++ french/facturier/Makefile 22 Feb 2004 13:42:52 -0000
@@ -106,11 +106,10 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:/usr/local/www/facturier:${FACT_REP}:" \
- -e "s:/usr/local/share/doc/facturier:${DOCSDIR}:" \
- -e "s:%%DBOWN%%:${DBOWN}:;s:%%DBPWD%%:${DBPWD}:" \
- -e "s:%%DBSERV%%:${DBSERV}:"
+ @${SED} -e "s:/usr/local/www/facturier:${FACT_REP}:" \
+ -e "s:/usr/local/share/doc/facturier:${DOCSDIR}:" \
+ -e "s:%%DBOWN%%:${DBOWN}:; s:%%DBPWD%%:${DBPWD}:" \
+ -e "s:%%DBSERV%%:${DBSERV}:" ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: lang/njs/Makefile
===================================================================
RCS file: /home/ncvs/ports/lang/njs/Makefile,v
retrieving revision 1.5
diff -u -r1.5 Makefile
--- lang/njs/Makefile 14 Oct 2003 07:13:40 -0000 1.5
+++ lang/njs/Makefile 22 Feb 2004 13:42:52 -0000
@@ -44,7 +44,7 @@
.endfor
.endif
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
+ @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: mail/imp3/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/imp3/Makefile,v
retrieving revision 1.30
diff -u -r1.30 Makefile
--- mail/imp3/Makefile 4 Feb 2004 05:07:20 -0000 1.30
+++ mail/imp3/Makefile 22 Feb 2004 13:42:52 -0000
@@ -323,8 +323,9 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%IMPDIR%%:${IMPDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%DOCSDIR%%:${DOCSDIR}:g"
+ @${SED} -e "s:%%IMPDIR%%:${IMPDIR}:g; s:%%PORTSDIR%%:${PORTSDIR}:g" \
+ -e "s:%%CONFDIR%%:${CONFDIR}:g; s:%%DOCSDIR%%:${DOCSDIR}:g" \
+ ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: mail/turba/Makefile
===================================================================
RCS file: /home/ncvs/ports/mail/turba/Makefile,v
retrieving revision 1.22
diff -u -r1.22 Makefile
--- mail/turba/Makefile 4 Feb 2004 05:07:25 -0000 1.22
+++ mail/turba/Makefile 22 Feb 2004 13:42:52 -0000
@@ -115,8 +115,8 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
+ @${SED} -e "s:%%TURBADIR%%:${TURBADIR}:g; s:%%PORTSDIR%%:${PORTSDIR}:g" \
+ -e "s:%%CONFDIR%%:${CONFDIR}:g" ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: misc/libmcal/Makefile
===================================================================
RCS file: /home/ncvs/ports/misc/libmcal/Makefile,v
retrieving revision 1.9
diff -u -r1.9 Makefile
--- misc/libmcal/Makefile 4 Feb 2004 05:07:42 -0000 1.9
+++ misc/libmcal/Makefile 22 Feb 2004 13:42:52 -0000
@@ -68,7 +68,7 @@
@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
.endif
@${ECHO}
- @${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%LOCALBASE%%:${LOCALBASE}:g"
+ @${SED} -e "s:%%LOCALBASE%%:${LOCALBASE}:g" ${PKGMESSAGE}
@${ECHO}
.include <bsd.port.mk>
Index: net/nic/Makefile
===================================================================
RCS file: /home/ncvs/ports/net/nic/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- net/nic/Makefile 4 Feb 2004 05:08:16 -0000 1.4
+++ net/nic/Makefile 22 Feb 2004 13:42:52 -0000
@@ -67,8 +67,8 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%NICDIR%%:${NICDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g"
+ @${SED} -e "s:%%NICDIR%%:${NICDIR}:g; s:%%CONFDIR%%:${CONFDIR}:g" \
+ ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: textproc/spellutils/Makefile
===================================================================
RCS file: /home/ncvs/ports/textproc/spellutils/Makefile,v
retrieving revision 1.6
diff -u -r1.6 Makefile
--- textproc/spellutils/Makefile 4 Feb 2004 04:36:26 -0000 1.6
+++ textproc/spellutils/Makefile 22 Feb 2004 13:42:52 -0000
@@ -41,7 +41,7 @@
@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
.endif
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | ${SED} -e "s:%%PREFIX%%:${PREFIX}:g"
+ @${SED} -e "s:%%PREFIX%%:${PREFIX}:g" ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
Index: www/horde2/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/horde2/Makefile,v
retrieving revision 1.35
diff -u -r1.35 Makefile
--- www/horde2/Makefile 4 Feb 2004 05:09:28 -0000 1.35
+++ www/horde2/Makefile 22 Feb 2004 13:42:52 -0000
@@ -182,8 +182,8 @@
post-install:
@${ECHO}
- @${CAT} ${PKGMESSAGE} | ${SED} -e \
- "s:%%HORDEDIR%%:${HORDEDIR}:g;s:%%APACHE_CONF%%:${APACHE_CONF}:g;s:%%HORDESBIN%%:${HORDESBIN}:g"
+ @${SED} -e "s:%%HORDEDIR%%:${HORDEDIR}:g; s:%%HORDESBIN%%:${HORDESBIN}:g" \
+ -e "s:%%APACHE_CONF%%:${APACHE_CONF}:g" ${PKGMESSAGE}
@${ECHO}
.include <bsd.port.mk>
Index: www/jonah/Makefile
===================================================================
RCS file: /home/ncvs/ports/www/jonah/Makefile,v
retrieving revision 1.4
diff -u -r1.4 Makefile
--- www/jonah/Makefile 4 Feb 2004 05:09:29 -0000 1.4
+++ www/jonah/Makefile 22 Feb 2004 13:42:52 -0000
@@ -106,8 +106,9 @@
post-install:
@${ECHO_MSG}
- @${CAT} ${PKGMESSAGE} | \
- ${SED} -e "s:%%JONAHDIR%%:${JONAHDIR}:g;s:%%PORTSDIR%%:${PORTSDIR}:g;s:%%CONFDIR%%:${CONFDIR}:g;s:%%PREFIX%%:${PREFIX}:"
+ @${SED} -e "s:%%JONAHDIR%%:${JONAHDIR}:g; s:%%PORTSDIR%%:${PORTSDIR}:g" \
+ -e "s:%%CONFDIR%%:${CONFDIR}:g; s:%%PREFIX%%:${PREFIX}:" \
+ ${PKGMESSAGE}
@${ECHO_MSG}
.include <bsd.port.mk>
--- cat_sed2.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.i1ME57J6028299>