Updating from 5.0 to 5.1-STABLE caused X to break

[Dima Veselov <i%kab00m.ru@localhost>]

Hi!

I have a problem with my keyboard after updating NetBSD 5.1-RC3/amd64 box to 
5.1-STABLE.

The problem is: XKbLayout and Ctrl-Alt-* keys are not working anymore. DontZap 
is switched off, config wasn't changed.

Capslock is working as it should normally (have to switch groups), even Alt-Tab 
come through X into shell. :(

Not Caps, nor scroll leds are not working.

I have installed setxkbmap and tried something:
[kab00m@laura kab00m]$ setxkbmap       
Error loading new keyboard description
[kab00m@laura kab00m]$ setxkbmap -option terminate:ctrl_alt_bksp
Error loading new keyboard description

[kab00m@laura kab00m]$ setxkbmap -print
xkb_keymap {
        xkb_keycodes  { include "xfree86+aliases(qwerty)"       };
        xkb_types     { include "complete"      };
        xkb_compat    { include 
"complete+ledscroll(group_lock)+ledcaps(group_lock)"    };
        xkb_symbols   { include 
"pc/pc(pc105)+pc/us+pc/ru:2+group(rwin_switch)+group(caps_toggle)+group(rwin_switch)+group(caps_toggle)"};
        xkb_geometry  { include "pc(pc105)"     };
};

Log file following:

(**) Option "CoreKeyboard"
(**) Keyboard1: always reports core events
(**) Option "Protocol" "standard"
(**) Keyboard1: Protocol: standard
(**) Option "AutoRepeat" "250 30"
(**) Option "XkbRules" "xorg"
(**) Keyboard1: XkbRules: "xorg"
(**) Option "XkbModel" "pc105"
(**) Keyboard1: XkbModel: "pc105"
(**) Option "XkbLayout" "us,ru"
(**) Keyboard1: XkbLayout: "us,ru"
(**) Option "XkbOptions" "grp:caps_toggle,grp_led:scroll,grp:rwin_switch"
(**) Keyboard1: XkbOptions: "grp:caps_toggle,grp_led:scroll,grp:rwin_switch"
(**) Option "CustomKeycodes" "off"
(**) Keyboard1: CustomKeycodes disabled
(II) XINPUT: Adding extended input device "Keyboard1" (type: KEYBOARD)
(EE) Error loading keymap /usr/X11R7/lib/X11/xkbserver-0.xkm
(EE) Error loading keymap /usr/X11R7/lib/X11/xkbserver-0.xkm

In google i found some linux users having similar problems after updating 
(mostly on Gentoo or Ubuntu), but not any solution.

-- 
Sincerelly yours