xsrc/42134: xkeyboard mapping broken again

[martin%NetBSD.org@localhost]

>Number:         42134
>Category:       xsrc
>Synopsis:       xkeyboard mapping broken again
>Confidential:   no
>Severity:       critical
>Priority:       high
>Responsible:    xsrc-manager
>State:          open
>Class:          sw-bug
>Submitter-Id:   net
>Arrival-Date:   Mon Sep 28 10:30:01 +0000 2009
>Originator:     Martin Husemann
>Release:        NetBSD 5.99.18
>Organization:
The NetBSD Foundation, Inc.
>Environment:
System: NetBSD nelly.aprisoft.de 5.99.18 NetBSD 5.99.18 (NELLY) #2: Sun Sep 27 
08:41:25 CEST 2009 
martin%emmas.aprisoft.de@localhost:/nelly/usr/src/sys/arch/sparc64/compile/NELLY
 sparc64
Architecture: sparc64
Machine: sparc64
>Description:

I updated base + X (and even removed /usr/X11R7/lib/X11/xkb beforehand)
to latest and greatest current. X keyboard mappings don't work any more:

(==) Log file: "/var/log/Xorg.0.log", Time: Mon Sep 28 12:21:58 2009
(==) Using config file: "/etc/xorg.conf"
Detected FFB1, Z-buffer, Double-buffered.
The XKEYBOARD keymap compiler (xkbcomp) reports:
> Error:            Can't find file "xfree86" for keycodes include
>                   Exiting
>                   Abandoning keycodes file "default"
Errors from xkbcomp are not fatal to the X server
(EE) Error compiling keymap (server-0)
(EE) XKB: Couldn't compile keymap
The XKEYBOARD keymap compiler (xkbcomp) reports:
> Error:            Can't find file "xfree86" for keycodes include
>                   Exiting
>                   Abandoning keycodes file "default"
Errors from xkbcomp are not fatal to the X server
(EE) Error compiling keymap (server-0)
(EE) XKB: Couldn't compile keymap


>How-To-Repeat:
s/a

>Fix:
n/a