Module Name:    src
Committed By:   mrg
Date:           Tue Apr 27 06:50:27 UTC 2021

Modified Files:
        src/distrib/sets/lists/xbase: mi shl.mi
        src/distrib/sets/lists/xdebug: shl.mi
        src/external/mit/xorg/lib/libX11: Makefile.libx11
        src/external/mit/xorg/lib/libX11/dynamic: shlib_version
        src/external/mit/xorg/share/nls: Makefile
Added Files:
        src/external/mit/xorg/share/nls/sr_RS.UTF-8: Makefile
Removed Files:
        src/external/mit/xorg/share/nls/sr_CS.UTF-8: Makefile

Log Message:
various updates for libX11.  bump the shlib major, install new nls.


To generate a diff of this commit:
cvs rdiff -u -r1.165 -r1.166 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.93 -r1.94 src/distrib/sets/lists/xbase/shl.mi
cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/xdebug/shl.mi
cvs rdiff -u -r1.21 -r1.22 src/external/mit/xorg/lib/libX11/Makefile.libx11
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mit/xorg/lib/libX11/dynamic/shlib_version
cvs rdiff -u -r1.5 -r1.6 src/external/mit/xorg/share/nls/Makefile
cvs rdiff -u -r1.1 -r0 src/external/mit/xorg/share/nls/sr_CS.UTF-8/Makefile
cvs rdiff -u -r0 -r1.1 src/external/mit/xorg/share/nls/sr_RS.UTF-8/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.165 src/distrib/sets/lists/xbase/mi:1.166
--- src/distrib/sets/lists/xbase/mi:1.165	Sat Jan  9 02:40:44 2021
+++ src/distrib/sets/lists/xbase/mi	Tue Apr 27 06:50:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.165 2021/01/09 02:40:44 uki Exp $
+# $NetBSD: mi,v 1.166 2021/04/27 06:50:27 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -284,7 +284,7 @@
 ./usr/X11R7/lib/X11/XErrorDB				xbase-x11-lib	xorg
 ./usr/X11R7/lib/X11/XKeysymDB				xbase-x11-lib	xorg
 ./usr/X11R7/lib/X11/Xcms.txt				xbase-x11-lib	xorg
-./usr/X11R7/lib/X11/app-defaults			base-x11-root	xorg
+./usr/X11R7/lib/X11/app-defaults			base-x11-root		xorg
 ./usr/X11R7/lib/X11/app-defaults/Beforelight		xbase-beforelight-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/Bitmap			xbase-bitmap-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/Bitmap-color		xbase-bitmap-bin	xorg
@@ -293,343 +293,347 @@
 ./usr/X11R7/lib/X11/app-defaults/Editres		xbase-editres-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/Editres-color		xbase-editres-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/SshAskpass		xbase-ssh-askpass-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/UXTerm			xbase-xterm-bin	xorg
+./usr/X11R7/lib/X11/app-defaults/UXTerm			xbase-xterm-bin		xorg
 ./usr/X11R7/lib/X11/app-defaults/Viewres		xbase-viewres-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/Viewres-color		xbase-viewres-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/XCalc			xbase-xcalc-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/XCalc-color		xbase-xcalc-bin	xorg
+./usr/X11R7/lib/X11/app-defaults/XCalc			xbase-xcalc-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/XCalc-color		xbase-xcalc-bin		xorg
 ./usr/X11R7/lib/X11/app-defaults/XClipboard		xbase-xclipboard-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/XClock			xbase-xclock-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/XClock-color		xbase-xclock-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/XConsole		xbase-xconsole-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/XFontSel		xbase-xfontsel-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/XLoad			xbase-xload-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/XLogo			xbase-xlogo-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/XLogo-color		xbase-xlogo-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/XMore			xbase-xmore-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/XSm			xbase-xsm-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/XTerm			xbase-xterm-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/XTerm-color		xbase-xterm-bin	xorg
+./usr/X11R7/lib/X11/app-defaults/XLoad			xbase-xload-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/XLogo			xbase-xlogo-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/XLogo-color		xbase-xlogo-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/XMore			xbase-xmore-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/XSm			xbase-xsm-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/XTerm			xbase-xterm-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/XTerm-color		xbase-xterm-bin		xorg
 ./usr/X11R7/lib/X11/app-defaults/Xditview		xbase-xditview-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/Xditview-chrtr		xbase-xditview-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/Xedit			xbase-xedit-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/Xedit-color		xbase-xedit-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/Xfd			xbase-xfd-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/Xgc			xbase-xgc-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/Xgc-color		xbase-xgc-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/Xmag			xbase-xmag-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/Xman			xbase-xman-bin	xorg
+./usr/X11R7/lib/X11/app-defaults/Xedit			xbase-xedit-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/Xedit-color		xbase-xedit-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/Xfd			xbase-xfd-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/Xgc			xbase-xgc-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/Xgc-color		xbase-xgc-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/Xmag			xbase-xmag-bin		xorg
+./usr/X11R7/lib/X11/app-defaults/Xman			xbase-xman-bin		xorg
 ./usr/X11R7/lib/X11/app-defaults/Xmessage		xbase-xmessage-bin	xorg
 ./usr/X11R7/lib/X11/app-defaults/Xmessage-color		xbase-xmessage-bin	xorg
-./usr/X11R7/lib/X11/app-defaults/Xmh			xbase-xmh-bin	xorg
+./usr/X11R7/lib/X11/app-defaults/Xmh			xbase-xmh-bin		xorg
 ./usr/X11R7/lib/X11/app-defaults/Xvidtune		xbase-xvidtune-bin	xorg
-./usr/X11R7/lib/X11/config				base-x11-root	xorg
-./usr/X11R7/lib/X11/doc					base-x11-root	xorg
-./usr/X11R7/lib/X11/etc					base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts				base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/100dpi			base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/75dpi				base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/CID				base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/Speedo			base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/TTF				base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/Type1				base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/cyrillic			base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/encodings			base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/encodings/large		base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/local				base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/misc				base-x11-root	xorg
-./usr/X11R7/lib/X11/fonts/util				base-x11-root	xorg
-./usr/X11R7/lib/X11/locale				base-x11-root	xorg
-./usr/X11R7/lib/X11/locale/C				base-x11-root	xorg
+./usr/X11R7/lib/X11/config				base-x11-root		xorg
+./usr/X11R7/lib/X11/doc					base-x11-root		xorg
+./usr/X11R7/lib/X11/etc					base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts				base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/100dpi			base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/75dpi				base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/CID				base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/Speedo			base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/TTF				base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/Type1				base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/cyrillic			base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/encodings			base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/encodings/large		base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/local				base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/misc				base-x11-root		xorg
+./usr/X11R7/lib/X11/fonts/util				base-x11-root		xorg
+./usr/X11R7/lib/X11/locale				base-x11-root		xorg
+./usr/X11R7/lib/X11/locale/C				base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/C/Compose			xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/C/XI18N_OBJS			xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/C/XLC_LOCALE			xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/am_ET.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/am_ET.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/am_ET.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/am_ET.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/am_ET.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/armscii-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/armscii-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/armscii-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/armscii-8/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/armscii-8/XLC_LOCALE		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/compose.dir			xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/el_GR.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/el_GR.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/el_GR.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/el_GR.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/el_GR.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/en_US.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/en_US.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/en_US.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/en_US.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/en_US.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/georgian-academy		base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/georgian-academy		base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/georgian-academy/Compose	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/georgian-academy/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/georgian-academy/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/georgian-ps			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/georgian-ps			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/georgian-ps/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/georgian-ps/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/georgian-ps/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/ibm-cp1133			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/ibm-cp1133			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/ibm-cp1133/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ibm-cp1133/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ibm-cp1133/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iscii-dev			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iscii-dev			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iscii-dev/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iscii-dev/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iscii-dev/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/isiri-3342			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/isiri-3342			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/isiri-3342/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/isiri-3342/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/isiri-3342/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-1			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-1			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-1/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-1/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-1/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-10			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-10			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-10/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-10/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-10/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-11			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-11			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-11/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-11/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-11/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-13			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-13			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-13/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-13/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-13/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-14			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-14			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-14/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-14/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-14/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-15			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-15			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-15/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-15/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-15/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-2			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-2			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-2/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-2/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-2/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-3			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-3			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-3/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-3/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-3/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-4			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-4			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-4/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-4/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-4/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-5			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-5			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-5/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-5/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-5/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-6			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-6			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-6/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-6/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-6/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-7			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-7			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-7/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-7/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-7/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-8/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-8/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-9			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-9			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-9/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-9/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-9/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/iso8859-9e			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/iso8859-9e			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/iso8859-9e/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-9e/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/iso8859-9e/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/ja				base-x11-root	xorg
-./usr/X11R7/lib/X11/locale/ja.JIS			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/ja				base-x11-root		xorg
+./usr/X11R7/lib/X11/locale/ja.JIS			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/ja.JIS/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ja.JIS/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ja.JIS/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/ja.S90			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/locale/ja.S90/Compose		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/locale/ja.S90/XI18N_OBJS		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/locale/ja.S90/XLC_LOCALE		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/locale/ja.SJIS			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/ja.S90			xbase-obsolete		obsolete
+./usr/X11R7/lib/X11/locale/ja.S90/Compose		xbase-obsolete		obsolete
+./usr/X11R7/lib/X11/locale/ja.S90/XI18N_OBJS		xbase-obsolete		obsolete
+./usr/X11R7/lib/X11/locale/ja.S90/XLC_LOCALE		xbase-obsolete		obsolete
+./usr/X11R7/lib/X11/locale/ja.SJIS			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/ja.SJIS/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ja.SJIS/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ja.SJIS/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/ja.U90			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/locale/ja.U90/Compose		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/locale/ja.U90/XI18N_OBJS		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/locale/ja.U90/XLC_LOCALE		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/locale/ja.U90			xbase-obsolete		obsolete
+./usr/X11R7/lib/X11/locale/ja.U90/Compose		xbase-obsolete		obsolete
+./usr/X11R7/lib/X11/locale/ja.U90/XI18N_OBJS		xbase-obsolete		obsolete
+./usr/X11R7/lib/X11/locale/ja.U90/XLC_LOCALE		xbase-obsolete		obsolete
 ./usr/X11R7/lib/X11/locale/ja/Compose			xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ja/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ja/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/ja_JP.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/ja_JP.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/ja_JP.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ja_JP.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ja_JP.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/km_KH.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/km_KH.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/km_KH.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/km_KH.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/km_KH.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/ko				base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/ko				base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/ko/Compose			xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ko/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ko/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/ko_KR.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/ko_KR.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/ko_KR.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ko_KR.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ko_KR.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/koi8-c			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/koi8-c			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/koi8-c/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/koi8-c/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/koi8-c/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/koi8-r			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/koi8-r			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/koi8-r/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/koi8-r/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/koi8-r/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/koi8-u			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/koi8-u			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/koi8-u/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/koi8-u/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/koi8-u/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/lib				base-x11-root	xorg
-./usr/X11R7/lib/X11/locale/lib/common			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/lib				base-x11-root		xorg
+./usr/X11R7/lib/X11/locale/lib/common			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/locale.alias			xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/locale.dir			xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/microsoft-cp1251		base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/microsoft-cp1251		base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/microsoft-cp1251/Compose	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/microsoft-cp1251/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/microsoft-cp1251/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/microsoft-cp1255		base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/microsoft-cp1255		base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/microsoft-cp1255/Compose	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/microsoft-cp1255/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/microsoft-cp1255/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/microsoft-cp1256		base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/microsoft-cp1256		base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/microsoft-cp1256/Compose	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/microsoft-cp1256/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/microsoft-cp1256/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/mulelao-1			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/mulelao-1			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/mulelao-1/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/mulelao-1/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/mulelao-1/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/nokhchi-1			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/nokhchi-1			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/nokhchi-1/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/nokhchi-1/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/nokhchi-1/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/pt_BR.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/pt_BR.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/pt_BR.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/pt_PT.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/pt_PT.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/pt_PT.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/pt_PT.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/pt_PT.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/ru_RU.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/ru_RU.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/ru_RU.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/sr_CS.UTF-8			base-x11-root	xorg
-./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/Compose		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/tatar-cyr			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/sr_CS.UTF-8			base-x11-root		obsolete
+./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/Compose		xbase-libX11-lib	obsolete
+./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/XI18N_OBJS	xbase-libX11-lib	obsolete
+./usr/X11R7/lib/X11/locale/sr_CS.UTF-8/XLC_LOCALE	xbase-libX11-lib	obsolete
+./usr/X11R7/lib/X11/locale/sr_RS.UTF-8			base-x11-root		xorg
+./usr/X11R7/lib/X11/locale/sr_RS.UTF-8/Compose		xbase-libX11-lib	xorg
+./usr/X11R7/lib/X11/locale/sr_RS.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
+./usr/X11R7/lib/X11/locale/sr_RS.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
+./usr/X11R7/lib/X11/locale/tatar-cyr			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/tatar-cyr/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/tatar-cyr/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/tatar-cyr/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/th_TH			base-x11-root	xorg
-./usr/X11R7/lib/X11/locale/th_TH.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/th_TH			base-x11-root		xorg
+./usr/X11R7/lib/X11/locale/th_TH.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/th_TH.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/th_TH.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/th_TH.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/th_TH/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/th_TH/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/th_TH/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/tscii-0			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/tscii-0			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/tscii-0/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/tscii-0/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/tscii-0/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/vi_VN.tcvn			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/vi_VN.tcvn			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/vi_VN.tcvn/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/vi_VN.tcvn/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/vi_VN.tcvn/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/vi_VN.viscii			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/vi_VN.viscii			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/vi_VN.viscii/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/vi_VN.viscii/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/vi_VN.viscii/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/zh_CN			base-x11-root	xorg
-./usr/X11R7/lib/X11/locale/zh_CN.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/zh_CN			base-x11-root		xorg
+./usr/X11R7/lib/X11/locale/zh_CN.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/zh_CN.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_CN.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_CN.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/zh_CN.gb18030		base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/zh_CN.gb18030		base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/zh_CN.gb18030/Compose	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_CN.gb18030/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_CN.gb18030/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/zh_CN.gbk			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/zh_CN.gbk			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/zh_CN.gbk/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_CN.gbk/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_CN.gbk/XLC_LOCALE		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_CN/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_CN/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_CN/XLC_LOCALE		xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/zh_HK.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/zh_HK.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/zh_HK.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_HK.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_HK.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/zh_HK.big5			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/zh_HK.big5			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/zh_HK.big5/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_HK.big5/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_HK.big5/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/zh_HK.big5hkscs		base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/zh_HK.big5hkscs		base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/zh_HK.big5hkscs/Compose	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_HK.big5hkscs/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_HK.big5hkscs/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/zh_TW			base-x11-root	xorg
-./usr/X11R7/lib/X11/locale/zh_TW.UTF-8			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/zh_TW			base-x11-root		xorg
+./usr/X11R7/lib/X11/locale/zh_TW.UTF-8			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/zh_TW.UTF-8/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_TW.UTF-8/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_TW.UTF-8/XLC_LOCALE	xbase-libX11-lib	xorg
-./usr/X11R7/lib/X11/locale/zh_TW.big5			base-x11-root	xorg
+./usr/X11R7/lib/X11/locale/zh_TW.big5			base-x11-root		xorg
 ./usr/X11R7/lib/X11/locale/zh_TW.big5/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_TW.big5/XI18N_OBJS	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_TW.big5/XLC_LOCALE	xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_TW/Compose		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_TW/XI18N_OBJS		xbase-libX11-lib	xorg
 ./usr/X11R7/lib/X11/locale/zh_TW/XLC_LOCALE		xbase-libX11-lib	share,xorg
-./usr/X11R7/lib/X11/rgb.txt				xbase-rgb-lib	xorg
-./usr/X11R7/lib/X11/x11perfcomp				base-x11-root	xorg
-./usr/X11R7/lib/X11/xedit				base-x11-root	xorg
-./usr/X11R7/lib/X11/xedit/lisp				base-x11-root	xorg
-./usr/X11R7/lib/X11/xedit/lisp/indent.lsp		xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/lisp.lsp			xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes		base-x11-root	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/c.lsp		xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/html.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/imake.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/lisp.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/make.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/man.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/patch.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/rpm.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/sgml.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/sh.lsp		xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/xconf.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/xlog.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/progmodes/xrdb.lsp	xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/syntax.lsp		xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xedit/lisp/xedit.lsp		xbase-xedit-lib	xorg
-./usr/X11R7/lib/X11/xkb					base-x11-root	xorg
+./usr/X11R7/lib/X11/rgb.txt				xbase-rgb-lib		xorg
+./usr/X11R7/lib/X11/x11perfcomp				base-x11-root		xorg
+./usr/X11R7/lib/X11/xedit				base-x11-root		xorg
+./usr/X11R7/lib/X11/xedit/lisp				base-x11-root		xorg
+./usr/X11R7/lib/X11/xedit/lisp/indent.lsp		xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/lisp.lsp			xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes		base-x11-root		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/c.lsp		xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/html.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/imake.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/lisp.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/make.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/man.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/patch.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/rpm.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/sgml.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/sh.lsp		xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/xconf.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/xlog.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/progmodes/xrdb.lsp	xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/syntax.lsp		xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xedit/lisp/xedit.lsp		xbase-xedit-lib		xorg
+./usr/X11R7/lib/X11/xkb					base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/README				xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/README.config			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/README.enhancing		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/compat				base-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/compat.dir			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/README.config			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/README.enhancing		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/compat				base-x11-root			xorg
+./usr/X11R7/lib/X11/xkb/compat.dir			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/compat/README			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/accessx			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/basic			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/caps			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/complete			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/compat/default			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/compat/default			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/compat/iso9995			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/japan			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/compat/keypad			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/compat/keypad			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/compat/ledcaps			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/ledcompose		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/lednum			xbase-xkeyboard-config-lib	xorg
@@ -637,25 +641,25 @@
 ./usr/X11R7/lib/X11/xkb/compat/level5			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/misc			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/mousekeys		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/compat/norepeat			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/compat/norepeat			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/compat/olpc			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/pc			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/pc98			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/xfree86			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/compat/xtest			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/compiled			base-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/geometry			base-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/geometry.dir			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/compiled			base-x11-root			xorg
+./usr/X11R7/lib/X11/xkb/geometry			base-x11-root			xorg
+./usr/X11R7/lib/X11/xkb/geometry.dir			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/README			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/amiga			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/ataritt		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/chicony		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/dell			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/geometry/digital		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/geometry/digital/lk		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/geometry/digital/pc		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/geometry/digital/unix		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/geometry/digital_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/geometry/digital		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/geometry/digital/lk		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/geometry/digital/pc		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/geometry/digital/unix		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/geometry/digital_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/geometry/digital_vndr/lk	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/digital_vndr/pc	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/digital_vndr/unix	xbase-xkeyboard-config-lib	xorg
@@ -663,8 +667,8 @@
 ./usr/X11R7/lib/X11/xkb/geometry/fujitsu		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/hhk			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/hp			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/geometry/ibm			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/geometry/ibm/thinkpad		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/geometry/ibm			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/geometry/ibm/thinkpad		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/geometry/keytronic		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/kinesis		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/macintosh		xbase-xkeyboard-config-lib	xorg
@@ -674,11 +678,11 @@
 ./usr/X11R7/lib/X11/xkb/geometry/northgate		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/pc			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sanwa			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/geometry/sgi			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/geometry/sgi/O2			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/geometry/sgi/indigo		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/geometry/sgi/indy		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/geometry/sgi			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/geometry/sgi/O2			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/geometry/sgi/indigo		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/geometry/sgi/indy		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/O2		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indigo	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr/indy		xbase-xkeyboard-config-lib	xorg
@@ -689,16 +693,16 @@
 ./usr/X11R7/lib/X11/xkb/geometry/thinkpad		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/typematrix		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/geometry/winbook		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/keycodes			base-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/keycodes.dir			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/keycodes			base-x11-root			xorg
+./usr/X11R7/lib/X11/xkb/keycodes.dir			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/keycodes/README			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/aliases		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/amiga			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/ataritt		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/keycodes/digital		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keycodes/digital/lk		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keycodes/digital/pc		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/keycodes/digital		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/digital/lk		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/digital/pc		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr/lk	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr/pc	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/empty			xbase-xkeyboard-config-lib	xorg
@@ -709,12 +713,12 @@
 ./usr/X11R7/lib/X11/xkb/keycodes/jolla			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/macintosh		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/olpc			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/keycodes/powerpcps2		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keycodes/sgi			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keycodes/sgi/indigo		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keycodes/sgi/indy		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keycodes/sgi/iris		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/keycodes/powerpcps2		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/sgi			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/sgi/indigo		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/sgi/indy		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/sgi/iris		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr/indigo	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr/indy		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr/iris		xbase-xkeyboard-config-lib	xorg
@@ -722,96 +726,96 @@
 ./usr/X11R7/lib/X11/xkb/keycodes/sun			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/xfree86		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/keycodes/xfree98		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/keymap				xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap.dir			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/README			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/amiga			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/ataritt			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/digital			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/digital/us		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/digital_vndr		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/digital_vndr/us		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/macintosh		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/be			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/bg			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/ca			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/ch			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/cz			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/cz_qwerty		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/de			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/de_CH		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/dk			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/dvorak		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/en_US		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/es			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/fi			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/fr			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/fr_CH		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/gb			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/hu			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/it			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/jp			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/no			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/pl			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/pt			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/ru			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/se			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/sk			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/sk_qwerty		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/th			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi/us			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/be		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/bg		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/ca		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/ch		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/cz		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/de		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/dk		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/dvorak		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/es		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/fi		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/fr		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/gb		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/hu		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/it		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/jp		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/no		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/pl		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/pt		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/ru		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/se		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/sk		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/th		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/us		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sony			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/de			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/es			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/fi			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/fr			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/no			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/pl			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/ru			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/se			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/uk			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun/us			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/all		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/de		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/es		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/fi		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/fr		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/no		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/pl		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/ru		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/se		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/uk		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/us		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/xfree86			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/keymap/xfree98			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/rules				base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/keymap				xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap.dir			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/README			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/amiga			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/ataritt			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/digital			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/digital/us		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/digital_vndr		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/digital_vndr/us		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/macintosh		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/be			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/bg			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/ca			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/ch			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/cz			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/cz_qwerty		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/de			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/de_CH		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/dk			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/dvorak		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/en_US		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/es			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/fi			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/fr			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/fr_CH		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/gb			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/hu			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/it			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/jp			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/no			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/pl			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/pt			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/ru			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/se			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/sk			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/sk_qwerty		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/th			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi/us			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/be		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/bg		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/ca		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/ch		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/cz		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/de		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/dk		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/dvorak		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/es		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/fi		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/fr		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/gb		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/hu		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/it		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/jp		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/no		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/pl		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/pt		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/ru		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/se		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/sk		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/th		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr/us		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sony			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/de			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/es			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/fi			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/fr			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/no			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/pl			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/ru			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/se			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/uk			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun/us			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/all		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/de		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/es		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/fi		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/fr		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/no		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/pl		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/ru		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/se		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/uk		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr/us		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/xfree86			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/keymap/xfree98			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/rules				base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/rules/README			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/rules/base			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/rules/base.extras.xml		xbase-xkeyboard-config-lib	xorg
@@ -821,34 +825,34 @@
 ./usr/X11R7/lib/X11/xkb/rules/evdev.extras.xml		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/rules/evdev.lst			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/rules/evdev.xml			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/rules/sgi			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/rules/sgi.lst			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/rules/sun			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/rules/sun.lst			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/rules/sgi			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/rules/sgi.lst			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/rules/sun			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/rules/sun.lst			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/rules/xfree98			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/rules/xfree98.lst		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/rules/xfree98.lst		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/rules/xkb.dtd			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/rules/xml2lst.pl		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/rules/xml2lst.pl		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/rules/xorg			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/rules/xorg-it.lst		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/rules/xorg-it.lst		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/rules/xorg.lst			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/rules/xorg.xml			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/semantics			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/semantics/basic			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/semantics/complete		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/semantics/default		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/semantics/xtest			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols				base-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/symbols.dir			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/README			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/ad			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/semantics			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/semantics/basic			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/semantics/complete		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/semantics/default		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/semantics/xtest			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols				base-x11-root			xorg
+./usr/X11R7/lib/X11/xkb/symbols.dir			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/README			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ad			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/af			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/al			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/altwin			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/am			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/apl			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/apple			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/ar			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/apple			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ar			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/ara			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/at			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/au			xbase-xkeyboard-config-lib	xorg
@@ -856,107 +860,107 @@
 ./usr/X11R7/lib/X11/xkb/symbols/ba			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/bd			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/be			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/ben			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ben			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/bg			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/bn			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/bn			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/br			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/brai			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/braille			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/bs			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/braille			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/bs			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/bt			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/bw			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/by			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ca			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/ca_enhanced		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ca_enhanced		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/capslock		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/cd			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ch			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/cm			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/cn			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/colemak			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/colemak			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/compose			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ctrl			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/cz			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/cz_qwerty		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/czsk			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/cz_qwerty		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/czsk			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/de			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/de_CH			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/dev			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/digital			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/digital/lk		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/digital/pc		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/digital/us		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/digital/vt		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/digital_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/de_CH			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/dev			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/digital			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/digital/lk		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/digital/pc		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/digital/us		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/digital/vt		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/digital_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/digital_vndr/lk		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/digital_vndr/pc		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/digital_vndr/us		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/digital_vndr/vt		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/dk			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/dvorak			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/dvorak			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/dz			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ee			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/eg			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/el			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/el			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/empty			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/en_US			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/en_US			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/epo			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/es			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/et			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/eu			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/eurosign		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/extras			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/extras/apl		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/extras/ir		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/extras/rs		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/extras/ru		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/extras/us		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/extras			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/extras/apl		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/extras/ir		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/extras/rs		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/extras/ru		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/extras/us		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/fi			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/fo			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/fr			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/fr_CH			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/fujitsu			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/fujitsu/jp		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/fujitsu/us		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/fr_CH			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/fujitsu			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/fujitsu/jp		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/fujitsu/us		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr/jp		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr/us		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/gb			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ge			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/ge_la			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/ge_ru			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ge_la			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ge_ru			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/gh			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/gn			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/gr			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/group			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/guj			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/gur			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/hp			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/hp/us			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/hp_vndr			base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/guj			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/gur			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/hp			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/hp/us			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/hp_vndr			base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/hp_vndr/us		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/hr			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/hr_US			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/hr_US			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/hu			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/hu_US			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/hu_qwerty		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/hu_US			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/hu_qwerty		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/id			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ie			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/il			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/il_phonetic		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/il_phonetic		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/in			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/inet			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/iq			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ir			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/is			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/iso9995-3		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/iso9995-3		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/it			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/iu			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/iu			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/jolla_vndr/sbj		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/jp			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/jv			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/kan			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/kan			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/ke			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/keypad			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/kg			xbase-xkeyboard-config-lib	xorg
@@ -970,35 +974,35 @@
 ./usr/X11R7/lib/X11/xkb/symbols/level3			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/level5			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/lk			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/lo			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/lock			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/lo			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/lock			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/lt			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/lt_a			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/lt_p			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/lt_std			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/lt_a			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/lt_p			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/lt_std			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/lv			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ma			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/macintosh		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/de		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/de_CH		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/dk		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/es		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/fi		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/fr		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/fr_CH		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/gb		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/it		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/nl		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/no		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/pt		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/se		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh/us		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/macintosh		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/de		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/de_CH		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/dk		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/es		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/fi		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/fr		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/fr_CH		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/gb		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/it		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/nl		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/no		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/pt		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/se		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh/us		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/apple	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/ch	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/de	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/dk	xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/es	xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/es	xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/fi	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/fr	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr/gb	xbase-xkeyboard-config-lib	xorg
@@ -1019,115 +1023,115 @@
 ./usr/X11R7/lib/X11/xkb/symbols/mm			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/mn			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/mt			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/mt_us			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/mt_us			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/mv			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/my			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/nbsp			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/nec			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/nec/jp			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/nec_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/nec			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/nec/jp			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/nec_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/nec_vndr/jp		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ng			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/nl			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/no			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr/rx-44	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr/rx-51	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/nokia_vndr/su-8w	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/np			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/ogham			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ogham			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/olpc			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/ori			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ori			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/parens			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/pc			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/pc/al			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/am			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ara			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/az			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ba			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/bd			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/be			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/bg			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/br			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/bt			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/by			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ca			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ch			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/colemak		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/cz			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/de			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/dk			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ee			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/es			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/fi			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/fo			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/fr			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/gb			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ge			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/gr			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/hr			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/hu			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ie			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/in			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ir			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/is			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/it			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/jp			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/kg			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/la			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/latam		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/latin		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/lk			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/lt			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/lv			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/mao			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/mkd			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/mm			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/mn			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/mt			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/nl			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/no			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/pc			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/pk			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/pl			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/pt			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ro			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ru			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/se			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/si			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/sk			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/srp			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/sy			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/th			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/tj			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/tr			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/ua			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/us			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/uz			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc/vn			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/pc104			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/al			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/am			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ara			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/az			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ba			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/bd			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/be			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/bg			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/br			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/bt			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/by			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ca			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ch			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/colemak		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/cz			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/de			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/dk			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ee			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/es			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/fi			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/fo			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/fr			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/gb			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ge			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/gr			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/hr			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/hu			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ie			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/in			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ir			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/is			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/it			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/jp			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/kg			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/la			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/latam		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/latin		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/lk			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/lt			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/lv			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/mao			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/mkd			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/mm			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/mn			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/mt			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/nl			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/no			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/pc			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/pk			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/pl			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/pt			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ro			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ru			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/se			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/si			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/sk			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/srp			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/sy			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/th			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/tj			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/tr			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/ua			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/us			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/uz			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc/vn			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pc104			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/ph			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/pk			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/pl			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/pl2			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/pl2			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/pt			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/ralt			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ralt			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/ro			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/ro2			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/ro2			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/rs			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ru			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/rupeesign		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sapmi			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sapmi			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/se			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/se_FI			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/se_NO			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/se_SE			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sgi			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sgi/jp			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/se_FI			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/se_NO			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/se_SE			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sgi			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sgi/jp			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr/jp		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sharp			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/sharp			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr/sl-c3x00	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr/ws003sh	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sharp_vndr/ws007sh	xbase-xkeyboard-config-lib	xorg
@@ -1136,25 +1140,25 @@
 ./usr/X11R7/lib/X11/xkb/symbols/shift			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/si			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sk			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sk_qwerty		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sk_qwerty		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sn			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sony			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sony/us			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sony_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/sony			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sony/us			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sony_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sony_vndr/us		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sr			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sr			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/srvr_ctrl		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sun			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sun/se			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sun/us			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sun/usb			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/sun_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/sun			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun/se			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun/us			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun/usb			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ara		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/be		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/br		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ca		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ch		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/cs		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/cs		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/cz		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/de		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/dk		xbase-xkeyboard-config-lib	xorg
@@ -1164,10 +1168,10 @@
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/fr		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/gb		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/gr		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/hu		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/hu		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/it		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/jp		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ko		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ko		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/kr		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/lt		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/lv		xbase-xkeyboard-config-lib	xorg
@@ -1180,64 +1184,64 @@
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/se		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/sk		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/solaris	xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/sw		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/sw		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/tr		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/tuv		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/tuv		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/tw		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/ua		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/us		xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/usb		xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/sun_vndr/usb		xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/sy			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/syr			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/syr_phonetic		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/tel			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/syr			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/syr_phonetic		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/tel			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/terminate		xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/tg			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/th			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/th_pat			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/th_tis			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/th_pat			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/th_tis			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/tj			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/tm			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/tml			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/tml			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/tr			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/tr_f			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/tr_f			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/trans			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/tw			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/typo			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/tz			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/ua			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/us			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/us_group2		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/us_group3		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/us_intl			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/us_group2		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/us_group3		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/us_intl			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/uz			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/vn			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/xfree68			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/xfree68/amiga		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/xfree68/ataritt		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr		base-x11-root	xorg
+./usr/X11R7/lib/X11/xkb/symbols/xfree68			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/xfree68/amiga		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/xfree68/ataritt		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr		base-x11-root			xorg
 ./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr/amiga	xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr/ataritt	xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/symbols/yu			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/symbols/yu			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/symbols/za			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/torture				obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/indicator		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/indicator1		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/indicator2		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/indicator3		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/mod_compat		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/mod_compat1		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/mod_compat2		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/mod_compat3		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/mod_compat4		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/sym_interp		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/sym_interp1		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/sym_interp2		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/sym_interp3		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/sym_interp4		xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/torture/types			xbase-obsolete	obsolete
-./usr/X11R7/lib/X11/xkb/types				base-x11-root	xorg
-./usr/X11R7/lib/X11/xkb/types.dir			xbase-obsolete	obsolete
+./usr/X11R7/lib/X11/xkb/torture				obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/indicator		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/indicator1		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/indicator2		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/indicator3		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/mod_compat		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/mod_compat1		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/mod_compat2		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/mod_compat3		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/mod_compat4		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/sym_interp		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/sym_interp1		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/sym_interp2		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/sym_interp3		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/sym_interp4		xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/torture/types			xbase-obsolete			obsolete
+./usr/X11R7/lib/X11/xkb/types				base-x11-root			xorg
+./usr/X11R7/lib/X11/xkb/types.dir			xbase-obsolete			obsolete
 ./usr/X11R7/lib/X11/xkb/types/README			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/types/basic			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/types/cancel			xbase-xkeyboard-config-lib	xorg
@@ -1251,7 +1255,7 @@
 ./usr/X11R7/lib/X11/xkb/types/nokia			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/types/numpad			xbase-xkeyboard-config-lib	xorg
 ./usr/X11R7/lib/X11/xkb/types/pc			xbase-xkeyboard-config-lib	xorg
-./usr/X11R7/lib/X11/xkb/xkbcomp				xbase-xkbcomp-bin	xorg
+./usr/X11R7/lib/X11/xkb/xkbcomp				xbase-xkbcomp-bin		xorg
 ./usr/X11R7/lib/X11/xman.help				xbase-xman-lib	xorg
 ./usr/X11R7/lib/modules					base-x11-root	xorg
 ./usr/X11R7/lib/modules/dri				base-x11-root	xorg

Index: src/distrib/sets/lists/xbase/shl.mi
diff -u src/distrib/sets/lists/xbase/shl.mi:1.93 src/distrib/sets/lists/xbase/shl.mi:1.94
--- src/distrib/sets/lists/xbase/shl.mi:1.93	Tue Apr 27 03:09:15 2021
+++ src/distrib/sets/lists/xbase/shl.mi	Tue Apr 27 06:50:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.93 2021/04/27 03:09:15 mrg Exp $
+# $NetBSD: shl.mi,v 1.94 2021/04/27 06:50:27 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -49,7 +49,7 @@
 ./usr/X11R7/lib/libX11-xcb.so.1.0		xbase-libX11-lib		xorg,compatx11file
 ./usr/X11R7/lib/libX11.so			xbase-libX11-lib		xorg,compatx11file
 ./usr/X11R7/lib/libX11.so.7			xbase-libX11-lib		xorg,compatx11file
-./usr/X11R7/lib/libX11.so.7.0			xbase-libX11-lib		xorg,compatx11file
+./usr/X11R7/lib/libX11.so.7.1			xbase-libX11-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXRes.so			xbase-libXres-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXRes.so.2			xbase-libXres-lib		xorg,compatx11file
 ./usr/X11R7/lib/libXRes.so.2.0			xbase-libXres-lib		xorg,compatx11file

Index: src/distrib/sets/lists/xdebug/shl.mi
diff -u src/distrib/sets/lists/xdebug/shl.mi:1.59 src/distrib/sets/lists/xdebug/shl.mi:1.60
--- src/distrib/sets/lists/xdebug/shl.mi:1.59	Tue Apr 27 03:09:16 2021
+++ src/distrib/sets/lists/xdebug/shl.mi	Tue Apr 27 06:50:27 2021
@@ -1,4 +1,4 @@
-# $NetBSD: shl.mi,v 1.59 2021/04/27 03:09:16 mrg Exp $
+# $NetBSD: shl.mi,v 1.60 2021/04/27 06:50:27 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/lib	base-sys-usr		xorg,debug,compatx11dir
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libximcp.so.2.0.debug	xorg,obsolete		xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/X11/locale/lib/common/libxlcDef.so.2.0.debug	xorg,obsolete		xorg,obsolete
@@ -21,7 +21,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/libOSMesa.so.7.0.debug	xdebug-obsolete		xorg,obsolete,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libSM.so.7.0.debug	xdebug-libSM-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libX11-xcb.so.1.0.debug	xdebug-libX11-debug		xorg,debug,compatx11file
-./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.0.debug	xdebug-libX11-debug		xorg,debug,compatx11file
+./usr/libdata/debug/usr/X11R7/lib/libX11.so.7.1.debug	xdebug-libX11-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXRes.so.2.0.debug	xdebug-libXres-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libXTrap.so.7.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/libXau.so.7.0.debug	xdebug-libXau-debug		xorg,debug,compatx11file

Index: src/external/mit/xorg/lib/libX11/Makefile.libx11
diff -u src/external/mit/xorg/lib/libX11/Makefile.libx11:1.21 src/external/mit/xorg/lib/libX11/Makefile.libx11:1.22
--- src/external/mit/xorg/lib/libX11/Makefile.libx11:1.21	Wed Sep 16 10:02:22 2020
+++ src/external/mit/xorg/lib/libX11/Makefile.libx11	Tue Apr 27 06:50:26 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile.libx11,v 1.21 2020/09/16 10:02:22 nia Exp $
+#	$NetBSD: Makefile.libx11,v 1.22 2021/04/27 06:50:26 mrg Exp $
 
 LIB=	X11
 .PATH:	${X11SRCDIR.${LIB}}/src
@@ -404,8 +404,8 @@ CPPFLAGS+=	-DHAVE_SYS_SELECT_H -DHAVE_SY
 CPPFLAGS+=	-DHAVE_UNISTD_H
 CPPFLAGS+=	-DHAVE_STRCASECMP -DHAVE_STRLCPY -DHAVE_STRTOL
 CPPFLAGS+=	-DHAVE_SYS_FILIO_H -DHAVE_SYS_IOCTL_H -DHAVE_SYS_SOCKET_H
-
 CPPFLAGS+=	-DHAVE_REALLOCARRAY -D_OPENBSD_SOURCE
+CPPFLAGS+=	-DHAVE_STRCASECMP -DHAVE_STRLCPY -DHAVE___BUILTIN_POPCOUNTL
 
 CPPFLAGS+=	-DUSE_XCB
 SRCS+=	\

Index: src/external/mit/xorg/lib/libX11/dynamic/shlib_version
diff -u src/external/mit/xorg/lib/libX11/dynamic/shlib_version:1.2 src/external/mit/xorg/lib/libX11/dynamic/shlib_version:1.3
--- src/external/mit/xorg/lib/libX11/dynamic/shlib_version:1.2	Sun Jan 11 03:10:11 2009
+++ src/external/mit/xorg/lib/libX11/dynamic/shlib_version	Tue Apr 27 06:50:26 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: shlib_version,v 1.2 2009/01/11 03:10:11 christos Exp $
+#	$NetBSD: shlib_version,v 1.3 2021/04/27 06:50:26 mrg Exp $
 #
 major=7
-minor=0
+minor=1

Index: src/external/mit/xorg/share/nls/Makefile
diff -u src/external/mit/xorg/share/nls/Makefile:1.5 src/external/mit/xorg/share/nls/Makefile:1.6
--- src/external/mit/xorg/share/nls/Makefile:1.5	Tue Oct  4 23:52:02 2016
+++ src/external/mit/xorg/share/nls/Makefile	Tue Apr 27 06:50:26 2021
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.5 2016/10/04 23:52:02 mrg Exp $
+#	$NetBSD: Makefile,v 1.6 2021/04/27 06:50:26 mrg Exp $
 
 .include <bsd.own.mk>
 
@@ -19,7 +19,7 @@ SUBDIR=	\
 	pt_BR.UTF-8 \
 	pt_PT.UTF-8 \
 	ru_RU.UTF-8 \
-	sr_CS.UTF-8 \
+	sr_RS.UTF-8 \
 	tatar-cyr th_TH th_TH.UTF-8 tscii-0 \
 	vi_VN.tcvn vi_VN.viscii \
 	zh_CN zh_CN.UTF-8 zh_CN.gb18030 zh_CN.gbk zh_HK.UTF-8 \
@@ -62,6 +62,6 @@ realall: ${FILES}
 build_subdirs:
 .for _dir in ${SUBDIR}
 	mkdir ${.CURDIR}/${_dir}
-	printf '#	$$NetBSD: Makefile,v 1.5 2016/10/04 23:52:02 mrg Exp $$\n\nNLS_SUBDIR=	${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
+	printf '#	$$NetBSD: Makefile,v 1.6 2021/04/27 06:50:26 mrg Exp $$\n\nNLS_SUBDIR=	${_dir}\n\n.include "../Makefile.nls"\n' > ${.CURDIR}/${_dir}/Makefile
 
 .endfor

Added files:

Index: src/external/mit/xorg/share/nls/sr_RS.UTF-8/Makefile
diff -u /dev/null src/external/mit/xorg/share/nls/sr_RS.UTF-8/Makefile:1.1
--- /dev/null	Tue Apr 27 06:50:27 2021
+++ src/external/mit/xorg/share/nls/sr_RS.UTF-8/Makefile	Tue Apr 27 06:50:26 2021
@@ -0,0 +1,5 @@
+#	$NetBSD: Makefile,v 1.1 2021/04/27 06:50:26 mrg Exp $
+
+NLS_SUBDIR=	sr_RS.UTF-8
+
+.include "../Makefile.nls"

Reply via email to