[src/trunk]: src Avoid splitting sed programs over multiple lines with

[apb <apb%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/b585d8a2e93b
branches:  trunk
changeset: 331799:b585d8a2e93b
user:      apb <apb%NetBSD.org@localhost>
date:      Sun Aug 24 18:27:16 2014 +0000

description:
Avoid splitting sed programs over multiple lines with
<backslash><newline><indentation>.  Use multiple -e options instead.

diffstat:

 external/mit/xorg/bin/rgb/Makefile        |  6 +++---
 external/mit/xorg/bin/sessreg/Makefile    |  8 ++++----
 external/mit/xorg/bin/xfs/Makefile        |  6 +++---
 external/mit/xorg/lib/libX11/Makefile     |  6 +++---
 external/mit/xorg/lib/libXcursor/Makefile |  8 ++++----
 sys/arch/alpha/stand/Makefile.bootxx      |  8 +++++---
 6 files changed, 22 insertions(+), 20 deletions(-)

diffs (126 lines):

diff -r ec9d9dedbe58 -r b585d8a2e93b external/mit/xorg/bin/rgb/Makefile
--- a/external/mit/xorg/bin/rgb/Makefile        Sun Aug 24 17:17:24 2014 +0000
+++ b/external/mit/xorg/bin/rgb/Makefile        Sun Aug 24 18:27:16 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2010/11/21 02:33:40 mrg Exp $
+#      $NetBSD: Makefile,v 1.4 2014/08/24 18:27:16 apb Exp $
 
 .include <bsd.own.mk>
 
@@ -7,8 +7,8 @@
 CPPFLAGS+=-DNDBM -DRGB_DB=\"${X11LIBDIR}/rgb\" -DUSE_RGB_TXT
 CPPFLAGS+=-I${X11SRCDIR.rgb}/include
 
-X11EXTRAMANDEFS+=      -e 's,__RGB_DB__,${X11LIBDIR}/rgb,g; \
-                           s,__RGB_DB_TYPE__,text,g'
+X11EXTRAMANDEFS+=      -e 's,__RGB_DB__,${X11LIBDIR}/rgb,g' \
+                       -e 's,__RGB_DB_TYPE__,text,g'
 
 FILES= rgb.txt
 FILESDIR=${X11LIBDIR}
diff -r ec9d9dedbe58 -r b585d8a2e93b external/mit/xorg/bin/sessreg/Makefile
--- a/external/mit/xorg/bin/sessreg/Makefile    Sun Aug 24 17:17:24 2014 +0000
+++ b/external/mit/xorg/bin/sessreg/Makefile    Sun Aug 24 18:27:16 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.5 2013/05/31 23:42:48 mrg Exp $
+#      $NetBSD: Makefile,v 1.6 2014/08/24 18:27:16 apb Exp $
 
 .include <bsd.own.mk>
 
@@ -8,9 +8,9 @@
 
 CPPFLAGS+=     -I${X11SRCDIR.${PROG}}/../include
 
-X11EXTRAMANDEFS+=      -e 's,__ttys_file__,/etc/ttys,g; \
-                       s,__utmp_file__,${XDMPIDDIR}/utmp,g; \
-                       s,__wtmp_file__,${XDMLOGDIR}/wtmp,g'
+X11EXTRAMANDEFS+=      -e 's,__ttys_file__,/etc/ttys,g' \
+                       -e 's,__utmp_file__,${XDMPIDDIR}/utmp,g' \
+                       -e 's,__wtmp_file__,${XDMLOGDIR}/wtmp,g'
 
 .include <bsd.x11.mk>
 .include <bsd.prog.mk>
diff -r ec9d9dedbe58 -r b585d8a2e93b external/mit/xorg/bin/xfs/Makefile
--- a/external/mit/xorg/bin/xfs/Makefile        Sun Aug 24 17:17:24 2014 +0000
+++ b/external/mit/xorg/bin/xfs/Makefile        Sun Aug 24 18:27:16 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.9 2013/05/31 01:50:25 mrg Exp $
+#      $NetBSD: Makefile,v 1.10 2014/08/24 18:27:16 apb Exp $
 
 .include <bsd.own.mk>
 
@@ -44,8 +44,8 @@
 # XXX
 CPPFLAGS.xfstrans.c+=  -Wno-error
 
-X11EXTRAMANDEFS+=      -e 's%__configfilepath__%${XFSCONFIGDIR}/config%g; \
-                       s%__configfiledesc__%the default file,%g'
+X11EXTRAMANDEFS+=      -e 's%__configfilepath__%${XFSCONFIGDIR}/config%g' \
+                       -e 's%__configfiledesc__%the default file,%g'
 
 
 .PATH: ${XFSDIR}/config
diff -r ec9d9dedbe58 -r b585d8a2e93b external/mit/xorg/lib/libX11/Makefile
--- a/external/mit/xorg/lib/libX11/Makefile     Sun Aug 24 17:17:24 2014 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile     Sun Aug 24 18:27:16 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.11 2011/02/23 07:53:29 mrg Exp $
+#      $NetBSD: Makefile,v 1.12 2014/08/24 18:27:16 apb Exp $
 
 .include <bsd.own.mk>
 
@@ -96,8 +96,8 @@
 
 XlibConf.h: XlibConf.h.in
        ${_MKTARGET_CREATE}
-       ${TOOL_SED} 's/#undef XTHREADS/#define XTHREADS 1/; \
-                   s/#undef XUSE_MTSAFE_API/#define XUSE_MTSAFE_API 1/ ' \
+       ${TOOL_SED} -e 's/#undef XTHREADS/#define XTHREADS 1/' \
+                   -e 's/#undef XUSE_MTSAFE_API/#define XUSE_MTSAFE_API 1/' \
                < ${.ALLSRC} > ${.TARGET}
 
 CLEANFILES+=   XlibConf.h
diff -r ec9d9dedbe58 -r b585d8a2e93b external/mit/xorg/lib/libXcursor/Makefile
--- a/external/mit/xorg/lib/libXcursor/Makefile Sun Aug 24 17:17:24 2014 +0000
+++ b/external/mit/xorg/lib/libXcursor/Makefile Sun Aug 24 18:27:16 2014 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.4 2008/10/14 23:37:19 cube Exp $
+#      $NetBSD: Makefile,v 1.5 2014/08/24 18:27:17 apb Exp $
 
 .include <bsd.own.mk>
 
@@ -13,9 +13,9 @@
 INCSDIR=${X11INCDIR}/X11/Xcursor
 
 MAN=   Xcursor.3
-X11EXTRAMANDEFS+=      -e 's%__XCURSORPATH__%~/.icons, \
-                          /usr/share/icons, /usr/share/pixmaps, \
-                          ${X11LIBDIR}/icons%g'
+X11EXTRAMANDEFS+=      -e 's%__XCURSORPATH__%~/.icons,' \
+                       -e '/usr/share/icons, /usr/share/pixmaps,' \
+                       -e '${X11LIBDIR}/icons%g'
 
 CPPFLAGS+=     ${X11FLAGS.THREADLIB}
 CPPFLAGS+=     -DICONDIR=\"${X11LIBDIR}/icons\"
diff -r ec9d9dedbe58 -r b585d8a2e93b sys/arch/alpha/stand/Makefile.bootxx
--- a/sys/arch/alpha/stand/Makefile.bootxx      Sun Aug 24 17:17:24 2014 +0000
+++ b/sys/arch/alpha/stand/Makefile.bootxx      Sun Aug 24 18:27:16 2014 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.bootxx,v 1.10 2012/07/20 15:23:02 matt Exp $
+# $NetBSD: Makefile.bootxx,v 1.11 2014/08/24 18:27:17 apb Exp $
 
 SRCS = start.S bootxx.c booted_dev.c blkdev.c prom.c prom_disp.S \
        putstr.c panic_putstr.c
@@ -39,8 +39,10 @@
 ${PROG}.sym: ${OBJS} ${LIBSA} ${LIBKERN}
        ${_MKTARGET_LINK}
        @${LD} -Ttext 0x20000000 -N --verbose 2>&1 \
-           | ${TOOL_SED} -n '/^==========/,/^===========/{/^========/d; \
-           s,^[[:blank:]]*\.eh_frame[[:blank:]]*:,  /DISCARD/ : ,;p;}' \
+           | ${TOOL_SED} -n -e '/^==========/,/^===========/{' \
+            -e '/^========/d' \
+            -e 's,^[[:blank:]]*\.eh_frame[[:blank:]]*:,  /DISCARD/ : ,' \
+            -e 'p' -e '}' \
            > ${PROG}.lds
        ${LD} -T ${PROG}.lds -Ttext ${BOOT_RELOC} -N -e start \
            -o ${PROG}.sym ${OBJS} ${LIBSA} ${LIBKERN} -Map ${PROG}.map