From aae9764e403b80666baf33d06bd0753b4d0a7290 Mon Sep 17 00:00:00 2001
From: mrg <mrg@NetBSD.org>
Date: Mon, 22 Nov 2010 00:12:14 +0000
Subject: [PATCH] merge libX11 1.3.6 - delete XKeysymDB.

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

diff --git a/distrib/sets/lists/xbase/mi b/distrib/sets/lists/xbase/mi
index 08fb69f1060d..a3bd6381e8fe 100644
--- a/distrib/sets/lists/xbase/mi
+++ b/distrib/sets/lists/xbase/mi
@@ -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 --git a/external/mit/xorg/lib/libX11/Makefile b/external/mit/xorg/lib/libX11/Makefile
index 959bc1353ccb..aa60111f6402 100644
--- a/external/mit/xorg/lib/libX11/Makefile
+++ b/external/mit/xorg/lib/libX11/Makefile
@@ -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 @@ MAN=		AllPlanes.3 BlackPixelOfScreen.3 DisplayOfCCC.3 \
 
 USETBL=		yes
 
-FILES=		XErrorDB XKeysymDB Xcms.txt
+FILES=		XErrorDB Xcms.txt
 FILESDIR=	${X11LIBDIR}
 
 .PATH:		${X11SRCDIR.X11}