Module Name:    src
Committed By:   mrg
Date:           Tue Aug 29 07:53:54 UTC 2017

Modified Files:
        src/distrib/sets/lists/xbase: mi
        src/etc/mtree: NetBSD.dist.Xorg
        src/external/mit/xorg/lib/xkeyboard-config/geometry: Makefile
        src/external/mit/xorg/lib/xkeyboard-config/symbols: Makefile

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


To generate a diff of this commit:
cvs rdiff -u -r1.143 -r1.144 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.21 -r1.22 src/etc/mtree/NetBSD.dist.Xorg
cvs rdiff -u -r1.5 -r1.6 \
    src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
cvs rdiff -u -r1.12 -r1.13 \
    src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: src/distrib/sets/lists/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.143 src/distrib/sets/lists/xbase/mi:1.144
--- src/distrib/sets/lists/xbase/mi:1.143	Mon Feb 13 06:11:01 2017
+++ src/distrib/sets/lists/xbase/mi	Tue Aug 29 07:53:54 2017
@@ -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

Index: src/etc/mtree/NetBSD.dist.Xorg
diff -u src/etc/mtree/NetBSD.dist.Xorg:1.21 src/etc/mtree/NetBSD.dist.Xorg:1.22
--- src/etc/mtree/NetBSD.dist.Xorg:1.21	Mon Feb 13 04:23:19 2017
+++ src/etc/mtree/NetBSD.dist.Xorg	Tue Aug 29 07:53:54 2017
@@ -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

Index: src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.5 src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.6
--- src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile:1.5	Mon Feb 13 06:11:01 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/geometry/Makefile	Tue Aug 29 07:53:54 2017
@@ -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
 

Index: src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile
diff -u src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.12 src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.13
--- src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile:1.12	Mon Feb 13 06:11:01 2017
+++ src/external/mit/xorg/lib/xkeyboard-config/symbols/Makefile	Tue Aug 29 07:53:54 2017
@@ -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 \

Reply via email to