Module Name: src
Committed By: mrg
Date: Tue Jul 12 01:51:05 UTC 2022
Modified Files:
src/distrib/sets/lists/xdebug: md.alpha md.amd64 md.bebox md.cats
md.i386 md.prep
src/distrib/sets/lists/xserver: md.alpha md.amd64 md.bebox md.cats
md.i386 md.prep
Log Message:
updates for the merged cirrus driver (apline/laguna sub-drivers are gone.)
To generate a diff of this commit:
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xdebug/md.alpha
cvs rdiff -u -r1.56 -r1.57 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xdebug/md.bebox \
src/distrib/sets/lists/xdebug/md.prep
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/xdebug/md.cats
cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.55 -r1.56 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.119 -r1.120 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.23 -r1.24 src/distrib/sets/lists/xserver/md.bebox
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.135 -r1.136 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xserver/md.prep
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.16 src/distrib/sets/lists/xdebug/md.alpha:1.17
--- src/distrib/sets/lists/xdebug/md.alpha:1.16 Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xdebug/md.alpha Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.56 src/distrib/sets/lists/xdebug/md.amd64:1.57
--- src/distrib/sets/lists/xdebug/md.amd64:1.56 Mon Jul 11 19:35:42 2022
+++ src/distrib/sets/lists/xdebug/md.amd64 Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xdebug/md.bebox
diff -u src/distrib/sets/lists/xdebug/md.bebox:1.10 src/distrib/sets/lists/xdebug/md.bebox:1.11
--- src/distrib/sets/lists/xdebug/md.bebox:1.10 Sun Nov 3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.bebox Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xdebug/md.prep
diff -u src/distrib/sets/lists/xdebug/md.prep:1.10 src/distrib/sets/lists/xdebug/md.prep:1.11
--- src/distrib/sets/lists/xdebug/md.prep:1.10 Sun Nov 3 01:35:47 2019
+++ src/distrib/sets/lists/xdebug/md.prep Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xdebug/md.cats
diff -u src/distrib/sets/lists/xdebug/md.cats:1.15 src/distrib/sets/lists/xdebug/md.cats:1.16
--- src/distrib/sets/lists/xdebug/md.cats:1.15 Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xdebug/md.cats Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.52 src/distrib/sets/lists/xdebug/md.i386:1.53
--- src/distrib/sets/lists/xdebug/md.i386:1.52 Mon Jul 11 19:35:42 2022
+++ src/distrib/sets/lists/xdebug/md.i386 Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.55 src/distrib/sets/lists/xserver/md.alpha:1.56
--- src/distrib/sets/lists/xserver/md.alpha:1.55 Tue May 3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.alpha Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.119 src/distrib/sets/lists/xserver/md.amd64:1.120
--- src/distrib/sets/lists/xserver/md.amd64:1.119 Tue May 3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.amd64 Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xserver/md.bebox
diff -u src/distrib/sets/lists/xserver/md.bebox:1.23 src/distrib/sets/lists/xserver/md.bebox:1.24
--- src/distrib/sets/lists/xserver/md.bebox:1.23 Tue May 3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.bebox Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.65 src/distrib/sets/lists/xserver/md.cats:1.66
--- src/distrib/sets/lists/xserver/md.cats:1.65 Tue May 3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.cats Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.135 src/distrib/sets/lists/xserver/md.i386:1.136
--- src/distrib/sets/lists/xserver/md.i386:1.135 Tue May 3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.i386 Tue Jul 12 01:51:05 2022
@@ -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
Index: src/distrib/sets/lists/xserver/md.prep
diff -u src/distrib/sets/lists/xserver/md.prep:1.26 src/distrib/sets/lists/xserver/md.prep:1.27
--- src/distrib/sets/lists/xserver/md.prep:1.26 Tue May 3 12:53:51 2022
+++ src/distrib/sets/lists/xserver/md.prep Tue Jul 12 01:51:05 2022
@@ -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
