[src/netbsd-6]: src Pull up following revision(s) (requested by joerg in tick...

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

details:   https://anonhg.NetBSD.org/src/rev/1b2ddb525230
branches:  netbsd-6
changeset: 773982:1b2ddb525230
user:      riz <riz%NetBSD.org@localhost>
date:      Fri Apr 06 17:02:09 2012 +0000

description:
Pull up following revision(s) (requested by joerg in ticket #147):
        tests/lib/libppath/Makefile: revision 1.4
        external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile: revision 1.11
        external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile: revision 1.12
        tests/lib/libppath/plist_to_c: revision 1.2
Use :Q for quoting. Execute shell script using the host shell.
Use :Q for quoting. Execute shell script using the host shell.
Use toolchain awk to make them buildable on Solaris 10.

diffstat:

 external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile |  12 +++++-----
 tests/lib/libppath/Makefile                                     |   4 +-
 tests/lib/libppath/plist_to_c                                   |   2 +-
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (55 lines):

diff -r 25776c2c8ac2 -r 1b2ddb525230 external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile
--- a/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile   Tue Apr 03 17:32:12 2012 +0000
+++ b/external/mit/xorg/server/xorg-server/hw/xfree86/loader/Makefile   Fri Apr 06 17:02:09 2012 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.10 2011/08/02 09:11:38 mrg Exp $
+#      $NetBSD: Makefile,v 1.10.4.1 2012/04/06 17:02:09 riz Exp $
 
 .include "../../../Makefile.serverlib"
 .include "../../../Makefile.servermod"
@@ -48,10 +48,10 @@
 #COPTS.sdksyms.c=              -Wno-error
 COPTS.loadmod.c=               -Wno-error
 
+sdksyms.c: sdksyms.sh
+       CPP=${CPP:Q} AWK=${TOOL_AWK:Q} ${HOST_SH} $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
+sdksyms.d: sdksyms.c
+CLEANFILES+=   sdksyms.c
+
 .include <bsd.x11.mk>
 .include <bsd.lib.mk>
-
-sdksyms.c: sdksyms.sh
-       CPP='$(CPP)' AWK='$(AWK)' $(LOADERDIR)/sdksyms.sh $(X11SRCDIR.xorg-server) ${CFLAGS} ${CPPFLAGS}
-sdksyms.d: sdksyms.c
-CLEANFILES+=   sdksyms.c
diff -r 25776c2c8ac2 -r 1b2ddb525230 tests/lib/libppath/Makefile
--- a/tests/lib/libppath/Makefile       Tue Apr 03 17:32:12 2012 +0000
+++ b/tests/lib/libppath/Makefile       Fri Apr 06 17:02:09 2012 +0000
@@ -1,4 +1,4 @@
-# $Id: Makefile,v 1.3 2012/01/20 15:06:47 tsutsui Exp $
+# $Id: Makefile,v 1.3.2.1 2012/04/06 17:02:09 riz Exp $
 
 .include <bsd.own.mk>
 
@@ -16,7 +16,7 @@
        echo "extern const char " ${.TARGET:S,.h$,,} "[];" > ${.TARGET}
 
 .plist.c:
-       ${HOST_SH} ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} < ${.IMPSRC} > ${.TARGET}
+       AWK=${TOOL_AWK:Q} ${HOST_SH} ${.CURDIR}/plist_to_c ${.TARGET:S,.c$,,} < ${.IMPSRC} > ${.TARGET}
 
 CLEANFILES+=personnel.c personnel.h
 
diff -r 25776c2c8ac2 -r 1b2ddb525230 tests/lib/libppath/plist_to_c
--- a/tests/lib/libppath/plist_to_c     Tue Apr 03 17:32:12 2012 +0000
+++ b/tests/lib/libppath/plist_to_c     Fri Apr 06 17:02:09 2012 +0000
@@ -12,7 +12,7 @@
 fi
 
 sed 's/\(["\]\)/\\\1/g' | \
-awk -v sym=$1 '
+${AWK:-awk} -v sym=$1 '
 BEGIN  { printf "const char " sym "[] = \""; }
        { printf $0 "\\n"; }
 END    { print "\";"; }'