[src/netbsd-8]: src/external/mit/xorg/lib/xkeyboard-config Pull up following ...

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

details:   https://anonhg.NetBSD.org/src/rev/4e4dce72744d
branches:  netbsd-8
changeset: 319707:4e4dce72744d
user:      martin <martin%NetBSD.org@localhost>
date:      Thu Jun 07 17:53:44 2018 +0000

description:
Pull up following revision(s) (requested by youri in ticket #845):

        external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata: revision 1.4
        external/mit/xorg/lib/xkeyboard-config/rules/Makefile: revision 1.4

Generate xml files properly. Noted by youri.
XXX: pullup-8

diffstat:

 external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata |   8 +++++++-
 external/mit/xorg/lib/xkeyboard-config/rules/Makefile   |  16 ++++++++--------
 2 files changed, 15 insertions(+), 9 deletions(-)

diffs (49 lines):

diff -r 494a102ed112 -r 4e4dce72744d external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata
--- a/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata   Thu Jun 07 17:50:54 2018 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/Makefile.xkbdata   Thu Jun 07 17:53:44 2018 +0000
@@ -1,7 +1,13 @@
-#      $NetBSD: Makefile.xkbdata,v 1.3 2017/02/13 06:11:01 snj Exp $
+#      $NetBSD: Makefile.xkbdata,v 1.3.4.1 2018/06/07 17:53:44 martin Exp $
 
 XKBDISTDIR=    ${X11SRCDIR.xkeyboard-config}/${XKBNAME}
 
 .PATH:         ${XKBDISTDIR}
 
+.SUFFIXES: .in
+
+.in:
+       ${TOOL_SED} -e 's,<_,<,g' -e 's,</_,</,g' < ${.ALLSRC} > ${.TARGET}
+
+
 FILESDIR=      ${X11LIBDIR}/xkb/${XKBNAME}
diff -r 494a102ed112 -r 4e4dce72744d external/mit/xorg/lib/xkeyboard-config/rules/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/rules/Makefile     Thu Jun 07 17:50:54 2018 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/rules/Makefile     Thu Jun 07 17:53:44 2018 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.3 2010/05/29 07:58:24 ghen Exp $
+#      $NetBSD: Makefile,v 1.3.38.1 2018/06/07 17:53:44 martin Exp $
 #
 #      When upgrading, re-assemble the files base, base.lst, evdev and
 #      evdev.lst by running ./configure && make in the dist directory,
@@ -7,14 +7,14 @@
 .include <bsd.own.mk>
 
 XKBNAME=       rules
-FILES=         README base base.lst base.extras.xml.in base.xml.in \
-               evdev evdev.lst evdev.extras.xml.in evdev.xml.in \
-               xfree98 xkb.dtd
+GENFILES=      base.extras.xml base.xml evdev.extras.xml evdev.xml
+FILES=         README base base.lst evdev evdev.lst xfree98 xkb.dtd
+FILES+=                ${GENFILES}
+CLEAN+=                ${GENFILES}
 
-FILESNAME_base.xml.in=         base.xml
-FILESNAME_base.extras.xml.in=  base.extras.xml
-FILESNAME_evdev.xml.in=                evdev.xml
-FILESNAME_evdev.extras.xml.in= evdev.extras.xml
+.for i in ${GENFILES}
+FILESBUILD_${i}=       yes
+.endfor
 
 SYMLINKS=      base ${FILESDIR}/xorg \
                base.lst ${FILESDIR}/xorg.lst \