Module Name: src
Committed By: mrg
Date: Mon Nov 22 00:12:14 UTC 2010
Modified Files:
src/distrib/sets/lists/xbase: mi
src/external/mit/xorg/lib/libX11: Makefile
Log Message:
merge libX11 1.3.6 - delete XKeysymDB.
To generate a diff of this commit:
cvs rdiff -u -r1.97 -r1.98 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.8 -r1.9 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.97 src/distrib/sets/lists/xbase/mi:1.98
--- src/distrib/sets/lists/xbase/mi:1.97 Sun Nov 21 07:26:40 2010
+++ src/distrib/sets/lists/xbase/mi Mon Nov 22 00:12:14 2010
@@ -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
Index: src/external/mit/xorg/lib/libX11/Makefile
diff -u src/external/mit/xorg/lib/libX11/Makefile:1.8 src/external/mit/xorg/lib/libX11/Makefile:1.9
--- src/external/mit/xorg/lib/libX11/Makefile:1.8 Tue Jun 1 05:26:51 2010
+++ src/external/mit/xorg/lib/libX11/Makefile Mon Nov 22 00:12:14 2010
@@ -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}
