Module Name: src
Committed By: mrg
Date: Sun Nov 28 07:47:53 UTC 2010
Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/libX11: Makefile
Log Message:
re-install the phoenixed XKeysymDB, since keyboards don't work without it.
fixes PR #44137.
To generate a diff of this commit:
cvs rdiff -u -r1.102 -r1.103 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.9 -r1.10 src/external/mit/xorg/lib/libX11/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.102 src/distrib/sets/lists/xbase/mi:1.103
--- src/distrib/sets/lists/xbase/mi:1.102 Sun Nov 28 04:58:41 2010
+++ src/distrib/sets/lists/xbase/mi Sun Nov 28 07:47:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.102 2010/11/28 04:58:41 mrg Exp $
+# $NetBSD: mi,v 1.103 2010/11/28 07:47:53 mrg Exp $
#
# Note: don't delete entries from here - mark them as "obsolete" instead.
#
@@ -1523,7 +1523,7 @@
./usr/X11R7/lib base-x11-root xorg
./usr/X11R7/lib/X11 base-x11-root xorg
./usr/X11R7/lib/X11/XErrorDB -unknown- xorg
-./usr/X11R7/lib/X11/XKeysymDB -unknown- obsolete
+./usr/X11R7/lib/X11/XKeysymDB -unknown- xorg
./usr/X11R7/lib/X11/Xcms.txt -unknown- xorg
./usr/X11R7/lib/X11/app-defaults base-x11-root xorg
./usr/X11R7/lib/X11/app-defaults/Beforelight -unknown- xorg
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.9 src/external/mit/xorg/lib/libX11/Makefile:1.10
--- src/external/mit/xorg/lib/libX11/Makefile:1.9 Mon Nov 22 00:12:14 2010
+++ src/external/mit/xorg/lib/libX11/Makefile Sun Nov 28 07:47:53 2010
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/11/22 00:12:14 mrg Exp $
+# $NetBSD: Makefile,v 1.10 2010/11/28 07:47:53 mrg Exp $
.include <bsd.own.mk>
@@ -83,7 +83,7 @@
USETBL= yes
-FILES= XErrorDB Xcms.txt
+FILES= XErrorDB XKeysymDB Xcms.txt
FILESDIR= ${X11LIBDIR}
.PATH: ${X11SRCDIR.X11}
