[src/trunk]: src update for xkeyboard-config 2.21.

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

details:   https://anonhg.NetBSD.org/src/rev/e3c639975aac
branches:  trunk
changeset: 826344:e3c639975aac
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Aug 29 07:53:54 2017 +0000

description:
update for xkeyboard-config 2.21.
prepare for libdrm data files.

diffstat:

 distrib/sets/lists/xbase/mi                              |  6 ++++--
 etc/mtree/NetBSD.dist.Xorg                               |  3 ++-
 external/mit/xorg/lib/xkeyboard-config/geometry/Makefile |  4 ++--
 external/mit/xorg/lib/xkeyboard-config/symbols/Makefile  |  4 ++--
 4 files changed, 10 insertions(+), 7 deletions(-)

diffs (85 lines):

diff -r 208b63f8c760 -r e3c639975aac distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi       Tue Aug 29 07:12:13 2017 +0000
+++ b/distrib/sets/lists/xbase/mi       Tue Aug 29 07:53:54 2017 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.143 2017/02/13 06:11:01 snj Exp $
+# $NetBSD: mi,v 1.144 2017/08/29 07:53:54 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -674,6 +674,7 @@
 ./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indigo       -unknown-       xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indy         -unknown-       xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sony                  -unknown-       xorg
+./usr/X11R7/lib/X11/xkb/geometry/steelseries           -unknown-       xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sun                   -unknown-       xorg
 ./usr/X11R7/lib/X11/xkb/geometry/teck                  -unknown-       xorg
 ./usr/X11R7/lib/X11/xkb/geometry/thinkpad              -unknown-       xorg
@@ -848,7 +849,7 @@
 ./usr/X11R7/lib/X11/xkb/symbols/be                     -unknown-       xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ben                    -unknown-       obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/bg                     -unknown-       xorg
-./usr/X11R7/lib/X11/xkb/symbols/bn                     -unknown-       xorg
+./usr/X11R7/lib/X11/xkb/symbols/bn                     -unknown-       obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/br                     -unknown-       xorg
 ./usr/X11R7/lib/X11/xkb/symbols/brai                   -unknown-       xorg
 ./usr/X11R7/lib/X11/xkb/symbols/braille                        -unknown-       obsolete
@@ -1695,6 +1696,7 @@
 ./usr/X11R7/share/examples/ssh-askpass/SshAskpass-default.ad   -unknown-       xorg
 ./usr/X11R7/share/examples/ssh-askpass/SshAskpass-green.ad     -unknown-       xorg
 ./usr/X11R7/share/examples/ssh-askpass/SshAskpass-motif.ad     -unknown-       xorg
+./usr/X11R7/share/libdrm                               base-x11-root   xorg
 ./usr/X11R7/share/pciids                               base-x11-root   xorg
 ./usr/X11R7/share/xcb                                  base-x11-root   xorg
 ./usr/libdata/debug/usr/X11R7                          base-sys-usr    xorg
diff -r 208b63f8c760 -r e3c639975aac etc/mtree/NetBSD.dist.Xorg
--- a/etc/mtree/NetBSD.dist.Xorg        Tue Aug 29 07:12:13 2017 +0000
+++ b/etc/mtree/NetBSD.dist.Xorg        Tue Aug 29 07:53:54 2017 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: NetBSD.dist.Xorg,v 1.21 2017/02/13 04:23:19 snj Exp $
+#      $NetBSD: NetBSD.dist.Xorg,v 1.22 2017/08/29 07:53:54 mrg Exp $
 ./usr/X11R7
 ./usr/X11R7/bin
 ./usr/X11R7/include
@@ -172,6 +172,7 @@
 ./usr/X11R7/share/aclocal
 ./usr/X11R7/share/examples
 ./usr/X11R7/share/examples/ssh-askpass
+./usr/X11R7/share/libdrm
 ./usr/X11R7/share/pciids
 ./usr/X11R7/share/xcb
 ./usr/libdata/debug/usr/X11R7
diff -r 208b63f8c760 -r e3c639975aac external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile  Tue Aug 29 07:12:13 2017 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile  Tue Aug 29 07:53:54 2017 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.5 2017/02/13 06:11:01 snj Exp $
+#      $NetBSD: Makefile,v 1.6 2017/08/29 07:53:54 mrg Exp $
 
 .include <bsd.own.mk>
 
 XKBNAME=       geometry
 FILES=         README amiga ataritt chicony dell everex fujitsu hhk hp \
                keytronic kinesis macintosh microsoft nec nokia northgate \
-               pc sanwa sony sun teck thinkpad typematrix winbook
+               pc sanwa sony steelseries sun teck thinkpad typematrix winbook
 
 SUBDIR=                digital_vndr sgi_vndr
 
diff -r 208b63f8c760 -r e3c639975aac external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
--- a/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile   Tue Aug 29 07:12:13 2017 +0000
+++ b/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile   Tue Aug 29 07:53:54 2017 +0000
@@ -1,11 +1,11 @@
-#      $NetBSD: Makefile,v 1.12 2017/02/13 06:11:01 snj Exp $
+#      $NetBSD: Makefile,v 1.13 2017/08/29 07:53:54 mrg Exp $
 
 .include <bsd.own.mk>
 
 XKBNAME=       symbols
 
 FILES= af al altwin am apl ara at au az \
-       ba bd be bg bn br brai bt bw by \
+       ba bd be bg br brai bt bw by \
        ca capslock cd ch cm cn compose ctrl cz \
        de dk dz \
        ee empty epo es et eu eurosign \