Module Name: src
Committed By: apb
Date: Sun Aug 24 18:27:17 UTC 2014
Modified Files:
src/external/mit/xorg/bin/rgb: Makefile
src/external/mit/xorg/bin/sessreg: Makefile
src/external/mit/xorg/bin/xfs: Makefile
src/external/mit/xorg/lib/libX11: Makefile
src/external/mit/xorg/lib/libXcursor: Makefile
src/sys/arch/alpha/stand: Makefile.bootxx
Log Message:
Avoid splitting sed programs over multiple lines with
<backslash><newline><indentation>. Use multiple -e options instead.
To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 src/external/mit/xorg/bin/rgb/Makefile
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/bin/sessreg/Makefile
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/bin/xfs/Makefile
cvs rdiff -u -r1.11 -r1.12 src/external/mit/xorg/lib/libX11/Makefile
cvs rdiff -u -r1.4 -r1.5 src/external/mit/xorg/lib/libXcursor/Makefile
cvs rdiff -u -r1.10 -r1.11 src/sys/arch/alpha/stand/Makefile.bootxx
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/bin/rgb/Makefile
diff -u src/external/mit/xorg/bin/rgb/Makefile:1.3 src/external/mit/xorg/bin/rgb/Makefile:1.4
--- src/external/mit/xorg/bin/rgb/Makefile:1.3 Sun Nov 21 02:33:40 2010
+++ src/external/mit/xorg/bin/rgb/Makefile Sun Aug 24 18:27:16 2014
@@ -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 @@ PROG= showrgb
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}
Index: src/external/mit/xorg/bin/sessreg/Makefile
diff -u src/external/mit/xorg/bin/sessreg/Makefile:1.5 src/external/mit/xorg/bin/sessreg/Makefile:1.6
--- src/external/mit/xorg/bin/sessreg/Makefile:1.5 Fri May 31 23:42:48 2013
+++ src/external/mit/xorg/bin/sessreg/Makefile Sun Aug 24 18:27:16 2014
@@ -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 @@ PROG= sessreg
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>
Index: src/external/mit/xorg/bin/xfs/Makefile
diff -u src/external/mit/xorg/bin/xfs/Makefile:1.9 src/external/mit/xorg/bin/xfs/Makefile:1.10
--- src/external/mit/xorg/bin/xfs/Makefile:1.9 Fri May 31 01:50:25 2013
+++ src/external/mit/xorg/bin/xfs/Makefile Sun Aug 24 18:27:16 2014
@@ -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 @@ CPPFLAGS.config.c= ${CONN_DEFINES}
# 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
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.11 src/external/mit/xorg/lib/libX11/Makefile:1.12
--- src/external/mit/xorg/lib/libX11/Makefile:1.11 Wed Feb 23 07:53:29 2011
+++ src/external/mit/xorg/lib/libX11/Makefile Sun Aug 24 18:27:16 2014
@@ -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 @@ FILESDIR= ${X11LIBDIR}
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
Index: src/external/mit/xorg/lib/libXcursor/Makefile
diff -u src/external/mit/xorg/lib/libXcursor/Makefile:1.4 src/external/mit/xorg/lib/libXcursor/Makefile:1.5
--- src/external/mit/xorg/lib/libXcursor/Makefile:1.4 Tue Oct 14 23:37:19 2008
+++ src/external/mit/xorg/lib/libXcursor/Makefile Sun Aug 24 18:27:17 2014
@@ -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 @@ INCS= Xcursor.h
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\"
Index: src/sys/arch/alpha/stand/Makefile.bootxx
diff -u src/sys/arch/alpha/stand/Makefile.bootxx:1.10 src/sys/arch/alpha/stand/Makefile.bootxx:1.11
--- src/sys/arch/alpha/stand/Makefile.bootxx:1.10 Fri Jul 20 15:23:02 2012
+++ src/sys/arch/alpha/stand/Makefile.bootxx Sun Aug 24 18:27:17 2014
@@ -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 @@ SAMISCMAKEFLAGS= SA_INCLUDE_NET=no SA_US
${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
