CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Tue Jul 12 23:19:53 UTC 2022

Modified Files:
        src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.amiga md.bebox
            md.cats md.dreamcast md.evbarm md.evbarm.armeb md.evbmips md.evbppc
            md.ews4800mips md.hp300 md.hpcarm md.hpcmips md.hpcsh md.hppa
            md.i386 md.ibmnws md.iyonix md.luna68k md.mac68k md.macppc
            md.netwinder md.newsmips md.ofppc md.pmax md.prep md.sgimips
            md.shark md.sparc md.sparc64 md.vax md.zaurus
        src/distrib/sets/lists/xserver: md.alpha md.amd64 md.amiga md.bebox
            md.cats md.dreamcast md.evbarm md.evbmips md.evbppc md.ews4800mips
            md.hp300 md.hpcarm md.hpcmips md.hpcsh md.hppa md.i386 md.ibmnws
            md.iyonix md.luna68k md.mac68k md.macppc md.netwinder md.newsmips
            md.ofppc md.pmax md.prep md.sgimips md.shark md.sparc md.sparc64
            md.vax md.zaurus

Log Message:
bump the krb_drv.so version (oops forgot to commit this yesterday.)

should fix most of the 46 builds broken currently..


To generate a diff of this commit:
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xdebug/md.alpha \
    src/distrib/sets/lists/xdebug/md.evbarm.armeb \
    src/distrib/sets/lists/xdebug/md.ofppc \
    src/distrib/sets/lists/xdebug/md.sparc
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xdebug/md.amiga \
    src/distrib/sets/lists/xdebug/md.dreamcast \
    src/distrib/sets/lists/xdebug/md.hp300 \
    src/distrib/sets/lists/xdebug/md.vax
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xdebug/md.bebox \
    src/distrib/sets/lists/xdebug/md.evbmips \
    src/distrib/sets/lists/xdebug/md.prep
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xdebug/md.cats \
    src/distrib/sets/lists/xdebug/md.macppc \
    src/distrib/sets/lists/xdebug/md.sparc64
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r1.1 -r1.2 src/distrib/sets/lists/xdebug/md.evbppc \
    src/distrib/sets/lists/xdebug/md.hppa
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xdebug/md.ews4800mips \
    src/distrib/sets/lists/xdebug/md.hpcarm \
    src/distrib/sets/lists/xdebug/md.hpcmips \
    src/distrib/sets/lists/xdebug/md.hpcsh \
    src/distrib/sets/lists/xdebug/md.netwinder \
    src/distrib/sets/lists/xdebug/md.newsmips
cvs rdiff -u -r1.53 -r1.54 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xdebug/md.ibmnws
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xdebug/md.iyonix \
    src/distrib/sets/lists/xdebug/md.pmax
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/md.luna68k \
    src/distrib/sets/lists/xdebug/md.mac68k \
    src/distrib/sets/lists/xdebug/md.zaurus
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xdebug/md.sgimips
cvs rdiff -u -r1.18 -r1.19 src/distrib/sets/lists/xdebug/md.shark
cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.120 -r1.121 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xserver/md.amiga
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xserver/md.bebox
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xserver/md.dreamcast
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xserver/md.evbarm \
    src/distrib/sets/lists/xserver/md.ews4800mips \
    src/distrib/sets/lists/xserver/md.hp300 \
    src/distrib/sets/lists/xserver/md.zaurus
cvs rdiff -u -r1.17 -r1.18 src/distrib/sets/lists/xserver/md.evbmips
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xserver/md.evbppc
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xserver/md.hpcarm
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xserver/md.hpcmips
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xserver/md.hpcsh
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xserver/md.hppa
cvs rdiff -u -r1.136 -r1.137 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.11 -r1.12 src/distrib/sets/lists/xserver/md.ibmnws
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xserver/md.iyonix
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xserver/md.luna68k \
    src/distrib/sets/lists/xserver/md.vax
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xserver/md.mac68k \
    src/distrib/sets/lists/xserver/md.newsmips
cvs rdiff -u -r1.85 -r1.86 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xserver/md.netwinder
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xserver/md.ofppc
cvs rdiff -u -r1.14 -r1.15 src/distrib/sets/lists/xserver/md.pmax
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xserver/md.prep
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/xserver/md.shark
cvs rdiff -u -r1.77 -r1.78 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/xserver/md.sparc64

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/xdebug/md.alpha
diff -u src/distrib/sets/lists/xdebug/md.alpha:1.17 src/distrib/sets/lists/xdebug/md.alpha:1.18
--- src/distrib/sets/lists/xdebug/md.alpha:1.17	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xdebug/md.alpha	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.17 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.alpha,v 1.18 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug	xdebug-xorg-server-debug	xorg,debug
@@ -21,7 +21,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug	xdebug-xf86-video-i128-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug	xdebug-xf86-video-i740-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug	xdebug-xf86-video-mach64-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.2.debug	xdebug-xf86-video-mga-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.evbarm.armeb
diff -u src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.17 src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.18
--- src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.17	Mon Jul 11 19:35:42 2022
+++ src/distrib/sets/lists/xdebug/md.evbarm.armeb	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm.armeb,v 1.17 2022/07/11 19:35:42 mrg Exp $
+# $NetBSD: md.evbarm.armeb,v 1.18 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/libvdpau_g.a				xdebug-libvdpau-debuglib	xorg,debuglib
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	xorg,debuglib,xorg_server_ver=110
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
@@ -25,8 +25,8 @@
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.1.debug	xdebug-libdrm_nouveau-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/libvdpau.so.1.0.debug		xdebug-libvdpau-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/nouveau_dri.so.0.debug	xdebug-xf86-video-nouveau-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.ofppc
diff -u src/distrib/sets/lists/xdebug/md.ofppc:1.17 src/distrib/sets/lists/xdebug/md.ofppc:1.18
--- src/distrib/sets/lists/xdebug/md.ofppc:1.17	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xdebug/md.ofppc	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.17 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.ofppc,v 1.18 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -39,10 +39,10 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	xdebug-obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug	xdebug-xf86-video-ati-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug		xdebug-xf86-video-chips-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmach64_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.sparc
diff -u src/distrib/sets/lists/xdebug/md.sparc:1.17 src/distrib/sets/lists/xdebug/md.sparc:1.18
--- src/distrib/sets/lists/xdebug/md.sparc:1.17	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xdebug/md.sparc	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.17 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.sparc,v 1.18 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -52,11 +52,11 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	xdebug-obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug	xdebug-xf86-video-ati-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libag10e_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libglint_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmach64_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.57 src/distrib/sets/lists/xdebug/md.amd64:1.58
--- src/distrib/sets/lists/xdebug/md.amd64:1.57	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xdebug/md.amd64	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.57 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.amd64,v 1.58 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a				xdebug-libI810XvMC-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libIntelXvMC_g.a			xdebug-libIntelXvMC-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			xdebug-libchromeXvMCPro-debuglib	xorg,debuglib,compatx11file
@@ -103,7 +103,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug	xdebug-xf86-video-intel-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libapm_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libark_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libast_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
@@ -119,7 +119,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libi740_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libintel_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libivch_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmach64_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.amiga
diff -u src/distrib/sets/lists/xdebug/md.amiga:1.12 src/distrib/sets/lists/xdebug/md.amiga:1.13
--- src/distrib/sets/lists/xdebug/md.amiga:1.12	Mon Nov  4 00:33:29 2019
+++ src/distrib/sets/lists/xdebug/md.amiga	Tue Jul 12 23:19:53 2022
@@ -1,8 +1,8 @@
-# $NetBSD: md.amiga,v 1.12 2019/11/04 00:33:29 rin Exp $
+# $NetBSD: md.amiga,v 1.13 2022/07/12 23:19:53 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.dreamcast
diff -u src/distrib/sets/lists/xdebug/md.dreamcast:1.12 src/distrib/sets/lists/xdebug/md.dreamcast:1.13
--- src/distrib/sets/lists/xdebug/md.dreamcast:1.12	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.dreamcast	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.dreamcast,v 1.12 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.dreamcast,v 1.13 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -18,7 +18,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.hp300
diff -u src/distrib/sets/lists/xdebug/md.hp300:1.12 src/distrib/sets/lists/xdebug/md.hp300:1.13
--- src/distrib/sets/lists/xdebug/md.hp300:1.12	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.hp300	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hp300,v 1.12 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.hp300,v 1.13 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		-unknown-	xorg,debuglib,xorg_server_ver=110
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
@@ -20,7 +20,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.vax
diff -u src/distrib/sets/lists/xdebug/md.vax:1.12 src/distrib/sets/lists/xdebug/md.vax:1.13
--- src/distrib/sets/lists/xdebug/md.vax:1.12	Mon Dec 30 05:37:19 2019
+++ src/distrib/sets/lists/xdebug/md.vax	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.vax,v 1.12 2019/12/30 05:37:19 uki Exp $
+# $NetBSD: md.vax,v 1.13 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -19,8 +19,8 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.bebox
diff -u src/distrib/sets/lists/xdebug/md.bebox:1.11 src/distrib/sets/lists/xdebug/md.bebox:1.12
--- src/distrib/sets/lists/xdebug/md.bebox:1.11	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xdebug/md.bebox	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.11 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.bebox,v 1.12 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -20,7 +20,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug	xdebug-obsolete	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.2.debug	xdebug-xf86-video-mga-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	xdebug-xf86-video-s3-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.evbmips
diff -u src/distrib/sets/lists/xdebug/md.evbmips:1.11 src/distrib/sets/lists/xdebug/md.evbmips:1.12
--- src/distrib/sets/lists/xdebug/md.evbmips:1.11	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.evbmips	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbmips,v 1.11 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.evbmips,v 1.12 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -19,8 +19,8 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libsiliconmotion_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libsis_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.prep
diff -u src/distrib/sets/lists/xdebug/md.prep:1.11 src/distrib/sets/lists/xdebug/md.prep:1.12
--- src/distrib/sets/lists/xdebug/md.prep:1.11	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xdebug/md.prep	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.11 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.prep,v 1.12 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -20,7 +20,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug	xdebug-obsolete	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.2.debug	xdebug-xf86-video-mga-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	xdebug-xf86-video-s3-debug	xorg,debug

Index: src/distrib/sets/lists/xdebug/md.cats
diff -u src/distrib/sets/lists/xdebug/md.cats:1.16 src/distrib/sets/lists/xdebug/md.cats:1.17
--- src/distrib/sets/lists/xdebug/md.cats:1.16	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xdebug/md.cats	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.16 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.cats,v 1.17 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -47,7 +47,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug	xdebug-xf86-video-i128-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug	xdebug-xf86-video-i740-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libapm_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libark_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libast_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
@@ -59,7 +59,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libglint_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libi128_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libi740_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libneomagic_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.macppc
diff -u src/distrib/sets/lists/xdebug/md.macppc:1.16 src/distrib/sets/lists/xdebug/md.macppc:1.17
--- src/distrib/sets/lists/xdebug/md.macppc:1.16	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xdebug/md.macppc	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.16 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.macppc,v 1.17 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -57,10 +57,10 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug	xdebug-xf86-video-ati-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug	xdebug-xf86-video-chips-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmach64_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.sparc64
diff -u src/distrib/sets/lists/xdebug/md.sparc64:1.16 src/distrib/sets/lists/xdebug/md.sparc64:1.17
--- src/distrib/sets/lists/xdebug/md.sparc64:1.16	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xdebug/md.sparc64	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.16 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.sparc64,v 1.17 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -55,11 +55,11 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	xdebug-obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug	xdebug-xf86-video-ati-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libag10e_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libglint_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmach64_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.evbarm
diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.32 src/distrib/sets/lists/xdebug/md.evbarm:1.33
--- src/distrib/sets/lists/xdebug/md.evbarm:1.32	Mon Jul 11 19:35:42 2022
+++ src/distrib/sets/lists/xdebug/md.evbarm	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.32 2022/07/11 19:35:42 mrg Exp $
+# $NetBSD: md.evbarm,v 1.33 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/libdrm_amdgpu_g.a			xdebug-libdrm_amdgpu-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libdrm_nouveau_g.a			xdebug-libdrm_nouveau-debuglib	xorg,debuglib,compatx11file
 ./usr/X11R7/lib/libvdpau_g.a				xdebug-libvdpau-debuglib	xorg,debuglib,compatx11file
@@ -32,9 +32,9 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeonsi_dri.so.0.debug	xdebug-xf86-video-radeon-debug		xorg,debug,llvmrt
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug	xdebug-obsolete		obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.19.debug	xdebug-xf86-video-ati-debug		xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.evbppc
diff -u src/distrib/sets/lists/xdebug/md.evbppc:1.1 src/distrib/sets/lists/xdebug/md.evbppc:1.2
--- src/distrib/sets/lists/xdebug/md.evbppc:1.1	Sun Mar  7 10:42:26 2021
+++ src/distrib/sets/lists/xdebug/md.evbppc	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.evbppc,v 1.1 2021/03/07 10:42:26 rin Exp $
+# $NetBSD: md.evbppc,v 1.2 2022/07/12 23:19:53 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.hppa
diff -u src/distrib/sets/lists/xdebug/md.hppa:1.1 src/distrib/sets/lists/xdebug/md.hppa:1.2
--- src/distrib/sets/lists/xdebug/md.hppa:1.1	Sat Oct 10 06:10:54 2020
+++ src/distrib/sets/lists/xdebug/md.hppa	Tue Jul 12 23:19:53 2022
@@ -1,8 +1,8 @@
-# $NetBSD: md.hppa,v 1.1 2020/10/10 06:10:54 rin Exp $
+# $NetBSD: md.hppa,v 1.2 2022/07/12 23:19:53 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.2.debug	xdebug-xf86-video-mga-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/r128_drv.so.6.debug	xdebug-xf86-video-r128-debug	xorg,debug

Index: src/distrib/sets/lists/xdebug/md.ews4800mips
diff -u src/distrib/sets/lists/xdebug/md.ews4800mips:1.10 src/distrib/sets/lists/xdebug/md.ews4800mips:1.11
--- src/distrib/sets/lists/xdebug/md.ews4800mips:1.10	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.ews4800mips	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ews4800mips,v 1.10 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.ews4800mips,v 1.11 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -18,7 +18,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.hpcarm
diff -u src/distrib/sets/lists/xdebug/md.hpcarm:1.10 src/distrib/sets/lists/xdebug/md.hpcarm:1.11
--- src/distrib/sets/lists/xdebug/md.hpcarm:1.10	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.hpcarm	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcarm,v 1.10 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.hpcarm,v 1.11 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -18,7 +18,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.hpcmips
diff -u src/distrib/sets/lists/xdebug/md.hpcmips:1.10 src/distrib/sets/lists/xdebug/md.hpcmips:1.11
--- src/distrib/sets/lists/xdebug/md.hpcmips:1.10	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.hpcmips	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcmips,v 1.10 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.hpcmips,v 1.11 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -18,7 +18,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.hpcsh
diff -u src/distrib/sets/lists/xdebug/md.hpcsh:1.10 src/distrib/sets/lists/xdebug/md.hpcsh:1.11
--- src/distrib/sets/lists/xdebug/md.hpcsh:1.10	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.hpcsh	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcsh,v 1.10 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.hpcsh,v 1.11 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -17,7 +17,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.netwinder
diff -u src/distrib/sets/lists/xdebug/md.netwinder:1.10 src/distrib/sets/lists/xdebug/md.netwinder:1.11
--- src/distrib/sets/lists/xdebug/md.netwinder:1.10	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.netwinder	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.10 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.netwinder,v 1.11 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -32,7 +32,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/xorgconfig.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.newsmips
diff -u src/distrib/sets/lists/xdebug/md.newsmips:1.10 src/distrib/sets/lists/xdebug/md.newsmips:1.11
--- src/distrib/sets/lists/xdebug/md.newsmips:1.10	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.newsmips	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.newsmips,v 1.10 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.newsmips,v 1.11 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -18,7 +18,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug

Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.53 src/distrib/sets/lists/xdebug/md.i386:1.54
--- src/distrib/sets/lists/xdebug/md.i386:1.53	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xdebug/md.i386	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.53 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.i386,v 1.54 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/libI810XvMC_g.a				xdebug-libI810XvMC-debuglib	xorg,debuglib
 ./usr/X11R7/lib/libIntelXvMC_g.a			xdebug-libIntelXvMC-debuglib	xorg,debuglib
 ./usr/X11R7/lib/libchromeXvMCPro_g.a			xdebug-libchromeXvMCPro-debuglib	xorg,debuglib
@@ -115,7 +115,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug	xdebug-xf86-video-intel-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug	-unknown-		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libapm_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libark_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libast_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
@@ -133,7 +133,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libi740_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libintel_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libivch_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmach64_drv.so.6.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmga_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.ibmnws
diff -u src/distrib/sets/lists/xdebug/md.ibmnws:1.7 src/distrib/sets/lists/xdebug/md.ibmnws:1.8
--- src/distrib/sets/lists/xdebug/md.ibmnws:1.7	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.ibmnws	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ibmnws,v 1.7 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.ibmnws,v 1.8 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -18,7 +18,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug	xdebug-xf86-video-s3-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug

Index: src/distrib/sets/lists/xdebug/md.iyonix
diff -u src/distrib/sets/lists/xdebug/md.iyonix:1.3 src/distrib/sets/lists/xdebug/md.iyonix:1.4
--- src/distrib/sets/lists/xdebug/md.iyonix:1.3	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.iyonix	Tue Jul 12 23:19:53 2022
@@ -1,8 +1,8 @@
-# $NetBSD: md.iyonix,v 1.3 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.iyonix,v 1.4 2022/07/12 23:19:53 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug					xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug					xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug					xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug		xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug		xdebug-xf86-video-nv-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug		xdebug-xf86-input-ws-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.pmax
diff -u src/distrib/sets/lists/xdebug/md.pmax:1.3 src/distrib/sets/lists/xdebug/md.pmax:1.4
--- src/distrib/sets/lists/xdebug/md.pmax:1.3	Mon Dec  6 17:51:59 2021
+++ src/distrib/sets/lists/xdebug/md.pmax	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.pmax,v 1.3 2021/12/06 17:51:59 abs Exp $
+# $NetBSD: md.pmax,v 1.4 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -19,8 +19,8 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.luna68k
diff -u src/distrib/sets/lists/xdebug/md.luna68k:1.9 src/distrib/sets/lists/xdebug/md.luna68k:1.10
--- src/distrib/sets/lists/xdebug/md.luna68k:1.9	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.luna68k	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.luna68k,v 1.9 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.luna68k,v 1.10 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -20,7 +20,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.mac68k
diff -u src/distrib/sets/lists/xdebug/md.mac68k:1.9 src/distrib/sets/lists/xdebug/md.mac68k:1.10
--- src/distrib/sets/lists/xdebug/md.mac68k:1.9	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.mac68k	Tue Jul 12 23:19:53 2022
@@ -1,8 +1,8 @@
-# $NetBSD: md.mac68k,v 1.9 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.mac68k,v 1.10 2022/07/12 23:19:53 mrg Exp $
 ./usr/libdata/debug/usr/X11R7/bin/Xorg.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.zaurus
diff -u src/distrib/sets/lists/xdebug/md.zaurus:1.9 src/distrib/sets/lists/xdebug/md.zaurus:1.10
--- src/distrib/sets/lists/xdebug/md.zaurus:1.9	Sun Nov  3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.zaurus	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.zaurus,v 1.9 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.zaurus,v 1.10 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri2_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdri_g.a		xdebug-obsolete	xorg,obsolete
@@ -20,7 +20,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/cvt.debug	xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug		xdebug-xorg-server-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/gtf.debug	xdebug-xorg-server-debug	xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug	xdebug-xf86-input-ws-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug	xdebug-xf86-video-wsfb-debug	xorg,debug

Index: src/distrib/sets/lists/xdebug/md.sgimips
diff -u src/distrib/sets/lists/xdebug/md.sgimips:1.13 src/distrib/sets/lists/xdebug/md.sgimips:1.14
--- src/distrib/sets/lists/xdebug/md.sgimips:1.13	Thu Aug 27 15:32:00 2020
+++ src/distrib/sets/lists/xdebug/md.sgimips	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.13 2020/08/27 15:32:00 riastradh Exp $
+# $NetBSD: md.sgimips,v 1.14 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -41,9 +41,9 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/crime_drv.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug	xdebug-xf86-video-glint-debug	xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug	xdebug-xf86-input-keyboard-debug		xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libcrime_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libnewport_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.shark
diff -u src/distrib/sets/lists/xdebug/md.shark:1.18 src/distrib/sets/lists/xdebug/md.shark:1.19
--- src/distrib/sets/lists/xdebug/md.shark:1.18	Tue Dec 31 05:01:49 2019
+++ src/distrib/sets/lists/xdebug/md.shark	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.18 2019/12/31 05:01:49 uki Exp $
+# $NetBSD: md.shark,v 1.19 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/lib/modules/extensions/libcfb32_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libcfb_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/extensions/libdbe_g.a		xdebug-obsolete	xorg,obsolete
@@ -35,10 +35,10 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug		xdebug-xf86-video-chips-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/igs_drv.so.0.debug		-unknown-	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/igs_drv.so.0.debug		xdebug-xf86-video-igs-debug	xorg,debug,xorg_server_ver=120
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.2.debug		xdebug-xf86-input-keyboard-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libigs_drv.so.0.debug	xdebug-obsolete	xorg,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.2.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug	xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.56 src/distrib/sets/lists/xserver/md.alpha:1.57
--- src/distrib/sets/lists/xserver/md.alpha:1.56	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xserver/md.alpha	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.56 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.alpha,v 1.57 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -67,7 +67,7 @@
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so.1		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so.6		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.120 src/distrib/sets/lists/xserver/md.amd64:1.121
--- src/distrib/sets/lists/xserver/md.amd64:1.120	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xserver/md.amd64	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.120 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.amd64,v 1.121 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -108,7 +108,7 @@
 ./usr/X11R7/lib/modules/drivers/ivch_drv.so.2		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ivch_drv.so.2		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so.6		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.amiga
diff -u src/distrib/sets/lists/xserver/md.amiga:1.32 src/distrib/sets/lists/xserver/md.amiga:1.33
--- src/distrib/sets/lists/xserver/md.amiga:1.32	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.amiga	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.amiga,v 1.32 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.amiga,v 1.33 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.bebox
diff -u src/distrib/sets/lists/xserver/md.bebox:1.24 src/distrib/sets/lists/xserver/md.bebox:1.25
--- src/distrib/sets/lists/xserver/md.bebox:1.24	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xserver/md.bebox	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.24 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.bebox,v 1.25 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -13,7 +13,7 @@
 ./usr/X11R7/lib/modules/drivers/cirrus_drv.so		xserver-xf86-video-cirrus-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1		xserver-xf86-video-cirrus-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so.2		xserver-xf86-video-mga-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.66 src/distrib/sets/lists/xserver/md.cats:1.67
--- src/distrib/sets/lists/xserver/md.cats:1.66	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xserver/md.cats	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.66 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.cats,v 1.67 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -49,7 +49,7 @@
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so.1		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so.2		xserver-xf86-video-mga-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.dreamcast
diff -u src/distrib/sets/lists/xserver/md.dreamcast:1.31 src/distrib/sets/lists/xserver/md.dreamcast:1.32
--- src/distrib/sets/lists/xserver/md.dreamcast:1.31	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.dreamcast	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: md.dreamcast,v 1.31 2022/05/03 12:53:51 uwe Exp $
+#	$NetBSD: md.dreamcast,v 1.32 2022/07/12 23:19:53 mrg Exp $
 ./etc/X11/xorg.conf.jpkbd				xserver-xorg-server-etc	xorg
 ./etc/X11/xorg.conf.uskbd				xserver-xorg-server-etc	xorg
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
@@ -9,7 +9,7 @@
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.evbarm
diff -u src/distrib/sets/lists/xserver/md.evbarm:1.26 src/distrib/sets/lists/xserver/md.evbarm:1.27
--- src/distrib/sets/lists/xserver/md.evbarm:1.26	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.evbarm	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.26 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.evbarm,v 1.27 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -24,7 +24,7 @@
 ./usr/X11R7/lib/modules/drivers/ati_drv.so.6		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/ati_drv.so.19		xserver-xf86-video-ati-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/modesetting_drv.so	xserver-modesetting-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/modesetting_drv.so.0	xserver-modesetting-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
Index: src/distrib/sets/lists/xserver/md.ews4800mips
diff -u src/distrib/sets/lists/xserver/md.ews4800mips:1.26 src/distrib/sets/lists/xserver/md.ews4800mips:1.27
--- src/distrib/sets/lists/xserver/md.ews4800mips:1.26	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.ews4800mips	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ews4800mips,v 1.26 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.ews4800mips,v 1.27 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -7,7 +7,7 @@
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg
Index: src/distrib/sets/lists/xserver/md.hp300
diff -u src/distrib/sets/lists/xserver/md.hp300:1.26 src/distrib/sets/lists/xserver/md.hp300:1.27
--- src/distrib/sets/lists/xserver/md.hp300:1.26	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.hp300	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.hp300,v 1.26 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.hp300,v 1.27 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg
Index: src/distrib/sets/lists/xserver/md.zaurus
diff -u src/distrib/sets/lists/xserver/md.zaurus:1.26 src/distrib/sets/lists/xserver/md.zaurus:1.27
--- src/distrib/sets/lists/xserver/md.zaurus:1.26	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.zaurus	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.zaurus,v 1.26 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.zaurus,v 1.27 2022/07/12 23:19:53 mrg Exp $
 ./etc/X11/xorg.conf.C3x00				xserver-xorg-server-etc	xorg
 ./etc/X11/xorg.conf.C7x0				xserver-xorg-server-etc	xorg
 ./etc/X11/xorg.conf.sample				xserver-obsolete	obsolete
@@ -10,7 +10,7 @@
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.evbmips
diff -u src/distrib/sets/lists/xserver/md.evbmips:1.17 src/distrib/sets/lists/xserver/md.evbmips:1.18
--- src/distrib/sets/lists/xserver/md.evbmips:1.17	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.evbmips	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.evbmips,v 1.17 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.evbmips,v 1.18 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/siliconmotion_drv.so	xserver-xf86-video-siliconmotion-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.evbppc
diff -u src/distrib/sets/lists/xserver/md.evbppc:1.5 src/distrib/sets/lists/xserver/md.evbppc:1.6
--- src/distrib/sets/lists/xserver/md.evbppc:1.5	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.evbppc	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-#	$NetBSD: md.evbppc,v 1.5 2022/05/03 12:53:51 uwe Exp $
+#	$NetBSD: md.evbppc,v 1.6 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.hpcarm
diff -u src/distrib/sets/lists/xserver/md.hpcarm:1.30 src/distrib/sets/lists/xserver/md.hpcarm:1.31
--- src/distrib/sets/lists/xserver/md.hpcarm:1.30	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.hpcarm	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcarm,v 1.30 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.hpcarm,v 1.31 2022/07/12 23:19:53 mrg Exp $
 ./etc/X11/xorg.conf.640x240-jp				xserver-xorg-server-etc	xorg
 ./etc/X11/xorg.conf.640x240-us				xserver-xorg-server-etc	xorg
 ./etc/X11/xorg.conf.640x480-jp				xserver-xorg-server-etc	xorg
@@ -17,7 +17,7 @@
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.hpcmips
diff -u src/distrib/sets/lists/xserver/md.hpcmips:1.36 src/distrib/sets/lists/xserver/md.hpcmips:1.37
--- src/distrib/sets/lists/xserver/md.hpcmips:1.36	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.hpcmips	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcmips,v 1.36 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.hpcmips,v 1.37 2022/07/12 23:19:53 mrg Exp $
 ./etc/X11/xorg.conf.640x240-jp				xserver-xorg-server-etc	xorg
 ./etc/X11/xorg.conf.640x240-us				xserver-xorg-server-etc	xorg
 ./etc/X11/xorg.conf.640x480-jp				xserver-xorg-server-etc	xorg
@@ -13,7 +13,7 @@
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.hpcsh
diff -u src/distrib/sets/lists/xserver/md.hpcsh:1.29 src/distrib/sets/lists/xserver/md.hpcsh:1.30
--- src/distrib/sets/lists/xserver/md.hpcsh:1.29	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.hpcsh	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcsh,v 1.29 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.hpcsh,v 1.30 2022/07/12 23:19:53 mrg Exp $
 ./etc/X11/xorg.conf.640x240-jp				xserver-xorg-server-etc	xorg
 ./etc/X11/xorg.conf.640x240-us				xserver-xorg-server-etc	xorg
 ./etc/X11/xorg.conf.640x480-jp				xserver-xorg-server-etc	xorg
@@ -13,7 +13,7 @@
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.hppa
diff -u src/distrib/sets/lists/xserver/md.hppa:1.4 src/distrib/sets/lists/xserver/md.hppa:1.5
--- src/distrib/sets/lists/xserver/md.hppa:1.4	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.hppa	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.hppa,v 1.4 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.hppa,v 1.5 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.136 src/distrib/sets/lists/xserver/md.i386:1.137
--- src/distrib/sets/lists/xserver/md.i386:1.136	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xserver/md.i386	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.136 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.i386,v 1.137 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -119,7 +119,7 @@
 ./usr/X11R7/lib/modules/drivers/ivch_drv.so.2		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/ivch_drv.so.2		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so.6		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.ibmnws
diff -u src/distrib/sets/lists/xserver/md.ibmnws:1.11 src/distrib/sets/lists/xserver/md.ibmnws:1.12
--- src/distrib/sets/lists/xserver/md.ibmnws:1.11	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.ibmnws	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ibmnws,v 1.11 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.ibmnws,v 1.12 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -7,7 +7,7 @@
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/s3_drv.so		xserver-xf86-video-s3-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.iyonix
diff -u src/distrib/sets/lists/xserver/md.iyonix:1.3 src/distrib/sets/lists/xserver/md.iyonix:1.4
--- src/distrib/sets/lists/xserver/md.iyonix:1.3	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.iyonix	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.iyonix,v 1.3 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.iyonix,v 1.4 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/nv_drv.so		xserver-xf86-video-nv-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.luna68k
diff -u src/distrib/sets/lists/xserver/md.luna68k:1.23 src/distrib/sets/lists/xserver/md.luna68k:1.24
--- src/distrib/sets/lists/xserver/md.luna68k:1.23	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.luna68k	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.luna68k,v 1.23 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.luna68k,v 1.24 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg
Index: src/distrib/sets/lists/xserver/md.vax
diff -u src/distrib/sets/lists/xserver/md.vax:1.23 src/distrib/sets/lists/xserver/md.vax:1.24
--- src/distrib/sets/lists/xserver/md.vax:1.23	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.vax	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.vax,v 1.23 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.vax,v 1.24 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.mac68k
diff -u src/distrib/sets/lists/xserver/md.mac68k:1.25 src/distrib/sets/lists/xserver/md.mac68k:1.26
--- src/distrib/sets/lists/xserver/md.mac68k:1.25	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.mac68k	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.mac68k,v 1.25 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.mac68k,v 1.26 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg
Index: src/distrib/sets/lists/xserver/md.newsmips
diff -u src/distrib/sets/lists/xserver/md.newsmips:1.25 src/distrib/sets/lists/xserver/md.newsmips:1.26
--- src/distrib/sets/lists/xserver/md.newsmips:1.25	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.newsmips	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.newsmips,v 1.25 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.newsmips,v 1.26 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -7,7 +7,7 @@
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.85 src/distrib/sets/lists/xserver/md.macppc:1.86
--- src/distrib/sets/lists/xserver/md.macppc:1.85	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.macppc	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.85 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.macppc,v 1.86 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -37,7 +37,7 @@
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/imstt_drv.so.1		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so.6		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.netwinder
diff -u src/distrib/sets/lists/xserver/md.netwinder:1.43 src/distrib/sets/lists/xserver/md.netwinder:1.44
--- src/distrib/sets/lists/xserver/md.netwinder:1.43	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.netwinder	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.43 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.netwinder,v 1.44 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -12,7 +12,7 @@
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/X11/doc/README.rapidaccess		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.ofppc
diff -u src/distrib/sets/lists/xserver/md.ofppc:1.35 src/distrib/sets/lists/xserver/md.ofppc:1.36
--- src/distrib/sets/lists/xserver/md.ofppc:1.35	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.ofppc	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.35 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.ofppc,v 1.36 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -29,7 +29,7 @@
 ./usr/X11R7/lib/modules/drivers/chips_drv.so		xserver-xf86-video-chips-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/chips_drv.so.1		xserver-xf86-video-chips-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so.6		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.pmax
diff -u src/distrib/sets/lists/xserver/md.pmax:1.14 src/distrib/sets/lists/xserver/md.pmax:1.15
--- src/distrib/sets/lists/xserver/md.pmax:1.14	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.pmax	Tue Jul 12 23:19:53 2022
@@ -1,11 +1,11 @@
-# $NetBSD: md.pmax,v 1.14 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.pmax,v 1.15 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/ws_drv.so		xserver-xf86-input-ws-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.prep
diff -u src/distrib/sets/lists/xserver/md.prep:1.27 src/distrib/sets/lists/xserver/md.prep:1.28
--- src/distrib/sets/lists/xserver/md.prep:1.27	Tue Jul 12 01:51:05 2022
+++ src/distrib/sets/lists/xserver/md.prep	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.27 2022/07/12 01:51:05 mrg Exp $
+# $NetBSD: md.prep,v 1.28 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -13,7 +13,7 @@
 ./usr/X11R7/lib/modules/drivers/cirrus_drv.so		xserver-xf86-video-cirrus-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1		xserver-xf86-video-cirrus-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so.2		xserver-xf86-video-mga-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.sgimips
diff -u src/distrib/sets/lists/xserver/md.sgimips:1.64 src/distrib/sets/lists/xserver/md.sgimips:1.65
--- src/distrib/sets/lists/xserver/md.sgimips:1.64	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.sgimips	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.64 2022/05/03 12:53:51 uwe Exp $	x11
+# $NetBSD: md.sgimips,v 1.65 2022/07/12 23:19:53 mrg Exp $	x11
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -20,7 +20,7 @@
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so.2		xserver-xf86-video-mga-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.shark
diff -u src/distrib/sets/lists/xserver/md.shark:1.58 src/distrib/sets/lists/xserver/md.shark:1.59
--- src/distrib/sets/lists/xserver/md.shark:1.58	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.shark	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.58 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.shark,v 1.59 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -14,7 +14,7 @@
 ./usr/X11R7/lib/modules/drivers/igs_drv.so		xserver-xf86-video-igs-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/igs_drv.so.0		xserver-xf86-video-igs-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mouse_drv.so.1		xserver-xf86-input-mouse-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/void_drv.so		xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.sparc
diff -u src/distrib/sets/lists/xserver/md.sparc:1.77 src/distrib/sets/lists/xserver/md.sparc:1.78
--- src/distrib/sets/lists/xserver/md.sparc:1.77	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.sparc	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.77 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.sparc,v 1.78 2022/07/12 23:19:53 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -33,7 +33,7 @@
 ./usr/X11R7/lib/modules/drivers/glint_drv.so		xserver-xf86-video-glint-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-xf86-video-glint-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so.6		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.73 src/distrib/sets/lists/xserver/md.sparc64:1.74
--- src/distrib/sets/lists/xserver/md.sparc64:1.73	Tue May  3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.sparc64	Tue Jul 12 23:19:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.73 2022/05/03 12:53:51 uwe Exp $	x11
+# $NetBSD: md.sparc64,v 1.74 2022/07/12 23:19:53 mrg Exp $	x11
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -35,7 +35,7 @@
 ./usr/X11R7/lib/modules/drivers/glint_drv.so		xserver-xf86-video-glint-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1		xserver-xf86-video-glint-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so		xserver-xf86-input-keyboard-drivers	xorg
-./usr/X11R7/lib/modules/drivers/kbd_drv.so.1		xserver-xf86-input-keyboard-drivers	xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.2		xserver-xf86-input-keyboard-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so.6		xserver-xf86-video-mach64-drivers	xorg
 ./usr/X11R7/lib/modules/drivers/mga_drv.so		xserver-xf86-video-mga-drivers	xorg