@@ -1,4 +1,4 @@
-#	$NetBSD: NetBSD.dist,v 1.404 2009/06/10 02:20:13 mrg Exp $
+#	$NetBSD: NetBSD.dist,v 1.405 2009/06/11 05:40:56 mrg Exp $
 #	@(#)4.4BSD.dist	8.1 (Berkeley) 6/13/93
 
 # Do not customize this file as it may be overwritten on upgrades.
@@ -362,30 +362,27 @@
 ./usr/X11R7/lib/X11/xkb/compat
 ./usr/X11R7/lib/X11/xkb/compiled
 ./usr/X11R7/lib/X11/xkb/geometry
-./usr/X11R7/lib/X11/xkb/geometry/digital
-./usr/X11R7/lib/X11/xkb/geometry/ibm
-./usr/X11R7/lib/X11/xkb/geometry/sgi
+./usr/X11R7/lib/X11/xkb/geometry/digital_vndr
+./usr/X11R7/lib/X11/xkb/geometry/sgi_vndr
 ./usr/X11R7/lib/X11/xkb/keycodes
-./usr/X11R7/lib/X11/xkb/keycodes/digital
-./usr/X11R7/lib/X11/xkb/keycodes/sgi
+./usr/X11R7/lib/X11/xkb/keycodes/digital_vndr
+./usr/X11R7/lib/X11/xkb/keycodes/sgi_vndr
 ./usr/X11R7/lib/X11/xkb/keymap
-./usr/X11R7/lib/X11/xkb/keymap/digital
-./usr/X11R7/lib/X11/xkb/keymap/sgi
-./usr/X11R7/lib/X11/xkb/keymap/sun
+./usr/X11R7/lib/X11/xkb/keymap/digital_vndr
+./usr/X11R7/lib/X11/xkb/keymap/sgi_vndr
+./usr/X11R7/lib/X11/xkb/keymap/sun_vndr
 ./usr/X11R7/lib/X11/xkb/rules
 ./usr/X11R7/lib/X11/xkb/semantics
 ./usr/X11R7/lib/X11/xkb/symbols
-./usr/X11R7/lib/X11/xkb/symbols/digital
-./usr/X11R7/lib/X11/xkb/symbols/fujitsu
-./usr/X11R7/lib/X11/xkb/symbols/hp
-./usr/X11R7/lib/X11/xkb/symbols/macintosh
-./usr/X11R7/lib/X11/xkb/symbols/nec
-./usr/X11R7/lib/X11/xkb/symbols/pc
-./usr/X11R7/lib/X11/xkb/symbols/sgi
-./usr/X11R7/lib/X11/xkb/symbols/sharp
-./usr/X11R7/lib/X11/xkb/symbols/sony
-./usr/X11R7/lib/X11/xkb/symbols/sun
-./usr/X11R7/lib/X11/xkb/symbols/xfree68
+./usr/X11R7/lib/X11/xkb/symbols/digital_vndr
+./usr/X11R7/lib/X11/xkb/symbols/fujitsu_vndr
+./usr/X11R7/lib/X11/xkb/symbols/hp_vndr
+./usr/X11R7/lib/X11/xkb/symbols/macintosh_vndr
+./usr/X11R7/lib/X11/xkb/symbols/nec_vndr
+./usr/X11R7/lib/X11/xkb/symbols/sgi_vndr
+./usr/X11R7/lib/X11/xkb/symbols/sony_vndr
+./usr/X11R7/lib/X11/xkb/symbols/sun_vndr
+./usr/X11R7/lib/X11/xkb/symbols/xfree68_vndr
 ./usr/X11R7/lib/X11/xkb/torture
 ./usr/X11R7/lib/X11/xkb/types
 ./usr/X11R7/lib/modules