[src/trunk]: src/distrib/sets/lists updates for the merged cirrus driver (apl...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/c83033778d13
branches:  trunk
changeset: 368446:c83033778d13
user:      mrg <mrg%NetBSD.org@localhost>
date:      Tue Jul 12 01:51:05 2022 +0000

description:
updates for the merged cirrus driver (apline/laguna sub-drivers are gone.)

diffstat:

 distrib/sets/lists/xdebug/md.alpha  |   6 +++---
 distrib/sets/lists/xdebug/md.amd64  |   6 +++---
 distrib/sets/lists/xdebug/md.bebox  |   4 ++--
 distrib/sets/lists/xdebug/md.cats   |   6 +++---
 distrib/sets/lists/xdebug/md.i386   |   6 +++---
 distrib/sets/lists/xdebug/md.prep   |   4 ++--
 distrib/sets/lists/xserver/md.alpha |  10 +++++-----
 distrib/sets/lists/xserver/md.amd64 |  18 +++++++++---------
 distrib/sets/lists/xserver/md.bebox |   6 +++---
 distrib/sets/lists/xserver/md.cats  |  18 +++++++++---------
 distrib/sets/lists/xserver/md.i386  |  18 +++++++++---------
 distrib/sets/lists/xserver/md.prep  |   6 +++---
 12 files changed, 54 insertions(+), 54 deletions(-)

diffs (288 lines):

diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xdebug/md.alpha
--- a/distrib/sets/lists/xdebug/md.alpha        Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xdebug/md.alpha        Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.16 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.alpha,v 1.17 2022/07/12 01:51:05 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
@@ -14,9 +14,9 @@
 ./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/cirrus_alpine.so.1.debug     xdebug-xf86-video-cirrus_alpine-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/cirrus_laguna.so.1.debug     xdebug-xf86-video-cirrus_laguna-debug   xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug     xdebug-obsolete obsolete
 ./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/i128_drv.so.1.debug  xdebug-xf86-video-i128-debug    xorg,debug
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xdebug/md.amd64
--- a/distrib/sets/lists/xdebug/md.amd64        Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xdebug/md.amd64        Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.56 2022/07/11 19:35:42 mrg Exp $
+# $NetBSD: md.amd64,v 1.57 2022/07/12 01:51:05 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
@@ -91,9 +91,9 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug        -unknown-               xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug        xdebug-obsolete         xorg,obsolete,xorg_server_ver=120
 ./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/cirrus_alpine.so.1.debug     xdebug-xf86-video-cirrus_alpine-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/cirrus_laguna.so.1.debug     xdebug-xf86-video-cirrus_laguna-debug           xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug     xdebug-obsolete obsolete
 ./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/i128_drv.so.1.debug  xdebug-xf86-video-i128-debug            xorg,debug
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xdebug/md.bebox
--- a/distrib/sets/lists/xdebug/md.bebox        Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xdebug/md.bebox        Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.10 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.bebox,v 1.11 2022/07/12 01:51:05 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/cirrus_alpine.so.1.debug     xdebug-xf86-video-cirrus_alpine-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/mga_drv.so.2.debug   xdebug-xf86-video-mga-debug     xorg,debug
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xdebug/md.cats
--- a/distrib/sets/lists/xdebug/md.cats Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xdebug/md.cats Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.15 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.cats,v 1.16 2022/07/12 01:51:05 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
@@ -40,9 +40,9 @@
 ./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/cirrus_alpine.so.1.debug     xdebug-xf86-video-cirrus_alpine-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/cirrus_laguna.so.1.debug     xdebug-xf86-video-cirrus_laguna-debug           xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug     xdebug-obsolete obsolete
 ./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/i128_drv.so.1.debug  xdebug-xf86-video-i128-debug            xorg,debug
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xdebug/md.i386
--- a/distrib/sets/lists/xdebug/md.i386 Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xdebug/md.i386 Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.52 2022/07/11 19:35:42 mrg Exp $
+# $NetBSD: md.i386,v 1.53 2022/07/12 01:51:05 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
@@ -101,9 +101,9 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug        -unknown-               xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug        xdebug-obsolete         xorg,obsolete,xorg_server_ver=120
 ./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/cirrus_alpine.so.1.debug     xdebug-xf86-video-cirrus_alpine-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/cirrus_laguna.so.1.debug     xdebug-xf86-video-cirrus_laguna-debug   xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug     xdebug-obsolete obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/elographics_drv.so.1.debug   xdegub-xf86-input-elographics-debug     xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/geode_drv.so.2.debug xdebug-xf86-video-geode-debug           xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug xdebug-obsolete         xorg,obsolete,xorg_server_ver=120
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xdebug/md.prep
--- a/distrib/sets/lists/xdebug/md.prep Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xdebug/md.prep Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.10 2019/11/03 01:35:47 uki Exp $
+# $NetBSD: md.prep,v 1.11 2022/07/12 01:51:05 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/cirrus_alpine.so.1.debug     xdebug-xf86-video-cirrus_alpine-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/mga_drv.so.2.debug   xdebug-xf86-video-mga-debug     xorg,debug
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xserver/md.alpha
--- a/distrib/sets/lists/xserver/md.alpha       Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xserver/md.alpha       Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.55 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.alpha,v 1.56 2022/07/12 01:51:05 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
@@ -50,12 +50,12 @@
 ./usr/X11R7/lib/modules/drivers/ati_drv.so.19          xserver-xf86-video-ati-drivers  xorg
 ./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/cirrus_alpine.so       xserver-xf86-video-cirrus_alpine-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-xf86-video-cirrus_alpine-drivers        xorg
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so       xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-obsolete        obsolete
 ./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/cirrus_laguna.so       xserver-xf86-video-cirrus_laguna-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1     xserver-xf86-video-cirrus_laguna-drivers        xorg
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so       xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1     xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/glint_drv.so           -unknown-       xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/drivers/glint_drv.so           xserver-obsolete        xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/drivers/glint_drv.so.1         -unknown-       xorg,xorg_server_ver=110
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xserver/md.amd64
--- a/distrib/sets/lists/xserver/md.amd64       Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xserver/md.amd64       Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.119 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.amd64,v 1.120 2022/07/12 01:51:05 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
@@ -75,16 +75,16 @@
 ./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2                xserver-obsolete        xorg,xorg_server_ver=120,obsolete
 ./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/cirrus_alpine.so       xserver-xf86-video-cirrus_alpine-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-xf86-video-cirrus_alpine-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so   xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so.1 xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so       xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so   xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so.1 xserver-obsolete        obsolete
 ./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/cirrus_laguna.so       xserver-xf86-video-cirrus_laguna-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1     xserver-xf86-video-cirrus_laguna-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so   xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1 xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so       xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1     xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so   xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1 xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so           xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so.1         xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/glint_drv.so           xserver-obsolete        xorg,xorg_server_ver=120,obsolete
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xserver/md.bebox
--- a/distrib/sets/lists/xserver/md.bebox       Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xserver/md.bebox       Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.23 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.bebox,v 1.24 2022/07/12 01:51:05 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
@@ -8,8 +8,8 @@
 ./usr/X11R7/lib/X11/doc/README.rapidaccess             xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               xserver-obsolete        obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so       xserver-xf86-video-cirrus_alpine-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-xf86-video-cirrus_alpine-drivers        xorg
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so       xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-obsolete        obsolete
 ./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
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xserver/md.cats
--- a/distrib/sets/lists/xserver/md.cats        Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xserver/md.cats        Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.65 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.cats,v 1.66 2022/07/12 01:51:05 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
@@ -26,16 +26,16 @@
 ./usr/X11R7/lib/modules/drivers/ati_drv.so.19          xserver-xf86-video-ati-drivers  xorg
 ./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/cirrus_alpine.so       xserver-xf86-video-cirrus_alpine-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-xf86-video-cirrus_alpine-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so   xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so.1 xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so       xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so   xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so.1 xserver-obsolete        obsolete
 ./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/cirrus_laguna.so       xserver-xf86-video-cirrus_laguna-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1     xserver-xf86-video-cirrus_laguna-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so   xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1 xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so       xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1     xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so   xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1 xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so           xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so.1         xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/glint_drv.so           -unknown-       xorg,xorg_server_ver=110
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xserver/md.i386
--- a/distrib/sets/lists/xserver/md.i386        Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xserver/md.i386        Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.135 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.i386,v 1.136 2022/07/12 01:51:05 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
@@ -82,16 +82,16 @@
 ./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2                xserver-obsolete        xorg,xorg_server_ver=120,obsolete
 ./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/cirrus_alpine.so       xserver-xf86-video-cirrus_alpine-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-xf86-video-cirrus_alpine-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so   xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so.1 xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so       xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so   xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so.1 xserver-obsolete        obsolete
 ./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/cirrus_laguna.so       xserver-xf86-video-cirrus_laguna-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1     xserver-xf86-video-cirrus_laguna-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so   xdebug-obsolete obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1 xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so       xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1     xdebug-obsolete obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so   xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1 xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so           xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/cyrix_drv.so.1         xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/drivers/elographics_drv.so     xserver-xf86-input-elographics-drivers  xorg
diff -r c4b5f207737a -r c83033778d13 distrib/sets/lists/xserver/md.prep
--- a/distrib/sets/lists/xserver/md.prep        Mon Jul 11 19:33:33 2022 +0000
+++ b/distrib/sets/lists/xserver/md.prep        Tue Jul 12 01:51:05 2022 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.26 2022/05/03 12:53:51 uwe Exp $
+# $NetBSD: md.prep,v 1.27 2022/07/12 01:51:05 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
@@ -8,8 +8,8 @@
 ./usr/X11R7/lib/X11/doc/README.rapidaccess             xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 xserver-obsolete        obsolete
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               xserver-obsolete        obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so       xserver-xf86-video-cirrus_alpine-drivers        xorg
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-xf86-video-cirrus_alpine-drivers        xorg
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so       xserver-obsolete        obsolete
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1     xserver-obsolete        obsolete
 ./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