[src/trunk]: src merge libX11 1.3.6 - delete XKeysymDB.

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

details:   https://anonhg.NetBSD.org/src/rev/01867a859b0e
branches:  trunk
changeset: 758943:01867a859b0e
user:      mrg <mrg%NetBSD.org@localhost>
date:      Mon Nov 22 00:12:14 2010 +0000

description:
merge libX11 1.3.6 - delete XKeysymDB.

diffstat:

 distrib/sets/lists/xbase/mi           |  4 ++--
 external/mit/xorg/lib/libX11/Makefile |  4 ++--
 2 files changed, 4 insertions(+), 4 deletions(-)

diffs (36 lines):

diff -r 9bc8c74889c8 -r 01867a859b0e distrib/sets/lists/xbase/mi
--- a/distrib/sets/lists/xbase/mi       Sun Nov 21 23:52:15 2010 +0000
+++ b/distrib/sets/lists/xbase/mi       Mon Nov 22 00:12:14 2010 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.97 2010/11/21 07:26:40 mrg Exp $
+# $NetBSD: mi,v 1.98 2010/11/22 00:12:14 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -259,7 +259,7 @@
 ./usr/X11R6/lib                                                base-x11-root   x11
 ./usr/X11R6/lib/X11                                    base-x11-root   x11
 ./usr/X11R6/lib/X11/XErrorDB                           -unknown-       x11
-./usr/X11R6/lib/X11/XKeysymDB                          -unknown-       x11
+./usr/X11R6/lib/X11/XKeysymDB                          -unknown-       obsolete
 ./usr/X11R6/lib/X11/Xcms.txt                           -unknown-       x11
 ./usr/X11R6/lib/X11/XftConfig                          xbase-obsolete  obsolete
 ./usr/X11R6/lib/X11/XftConfig-OBSOLETE                 xbase-obsolete  obsolete
diff -r 9bc8c74889c8 -r 01867a859b0e external/mit/xorg/lib/libX11/Makefile
--- a/external/mit/xorg/lib/libX11/Makefile     Sun Nov 21 23:52:15 2010 +0000
+++ b/external/mit/xorg/lib/libX11/Makefile     Mon Nov 22 00:12:14 2010 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.8 2010/06/01 05:26:51 mrg Exp $
+#      $NetBSD: Makefile,v 1.9 2010/11/22 00:12:14 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -83,7 +83,7 @@
 
 USETBL=                yes
 
-FILES=         XErrorDB XKeysymDB Xcms.txt
+FILES=         XErrorDB Xcms.txt
 FILESDIR=      ${X11LIBDIR}
 
 .PATH:         ${X11SRCDIR.X11}