CVS commit: src/distrib/sets/lists

[matthew green]

Module Name:    src
Committed By:   mrg
Date:           Thu Jul 14 23:55:54 UTC 2022

Modified Files:
        src/distrib/sets/lists/xbase: mi
        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 mi
        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:
fix sets after making cvt(1) for everyone

remove duplicate entries for Xorg and gtf


To generate a diff of this commit:
cvs rdiff -u -r1.168 -r1.169 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.18 -r1.19 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.58 -r1.59 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.13 -r1.14 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.12 -r1.13 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.17 -r1.18 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.33 -r1.34 src/distrib/sets/lists/xdebug/md.evbarm
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/xdebug/md.evbppc \
    src/distrib/sets/lists/xdebug/md.hppa
cvs rdiff -u -r1.11 -r1.12 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.54 -r1.55 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/md.ibmnws
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xdebug/md.iyonix \
    src/distrib/sets/lists/xdebug/md.pmax
cvs rdiff -u -r1.10 -r1.11 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.14 -r1.15 src/distrib/sets/lists/xdebug/md.sgimips
cvs rdiff -u -r1.19 -r1.20 src/distrib/sets/lists/xdebug/md.shark
cvs rdiff -u -r1.43 -r1.44 src/distrib/sets/lists/xdebug/mi
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.121 -r1.122 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xserver/md.amiga
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xserver/md.bebox
cvs rdiff -u -r1.67 -r1.68 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xserver/md.dreamcast
cvs rdiff -u -r1.27 -r1.28 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.18 -r1.19 src/distrib/sets/lists/xserver/md.evbmips
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xserver/md.evbppc
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xserver/md.hpcarm
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xserver/md.hpcmips
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xserver/md.hpcsh
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xserver/md.hppa
cvs rdiff -u -r1.137 -r1.138 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.12 -r1.13 src/distrib/sets/lists/xserver/md.ibmnws
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xserver/md.iyonix
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xserver/md.luna68k \
    src/distrib/sets/lists/xserver/md.vax
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xserver/md.mac68k \
    src/distrib/sets/lists/xserver/md.newsmips
cvs rdiff -u -r1.86 -r1.87 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.44 -r1.45 src/distrib/sets/lists/xserver/md.netwinder
cvs rdiff -u -r1.36 -r1.37 src/distrib/sets/lists/xserver/md.ofppc
cvs rdiff -u -r1.15 -r1.16 src/distrib/sets/lists/xserver/md.pmax
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xserver/md.prep
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.59 -r1.60 src/distrib/sets/lists/xserver/md.shark
cvs rdiff -u -r1.78 -r1.79 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.74 -r1.75 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/xbase/mi
diff -u src/distrib/sets/lists/xbase/mi:1.168 src/distrib/sets/lists/xbase/mi:1.169
--- src/distrib/sets/lists/xbase/mi:1.168	Thu Jul 14 06:53:40 2022
+++ src/distrib/sets/lists/xbase/mi	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.168 2022/07/14 06:53:40 mrg Exp $
+# $NetBSD: mi,v 1.169 2022/07/14 23:55:53 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -16,6 +16,7 @@
 ./usr/X11R7/bin/ccmakedep				xbase-ccmakedep-bin	xorg
 ./usr/X11R7/bin/cleanlinks				xbase-cleanlinks-bin	xorg
 ./usr/X11R7/bin/ctwm					xbase-ctwm-bin	xorg
+./usr/X11R7/bin/cvt					xbase-cvt-bin	xorg
 ./usr/X11R7/bin/cxpm					xbase-cxpm-bin	xorg
 ./usr/X11R7/bin/dga					xbase-xf86dga-bin	xorg
 ./usr/X11R7/bin/editres					xbase-editres-bin	xorg

Index: src/distrib/sets/lists/xdebug/md.alpha
diff -u src/distrib/sets/lists/xdebug/md.alpha:1.18 src/distrib/sets/lists/xdebug/md.alpha:1.19
--- src/distrib/sets/lists/xdebug/md.alpha:1.18	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.alpha	Thu Jul 14 23:55:53 2022
@@ -1,11 +1,7 @@
-# $NetBSD: md.alpha,v 1.18 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.alpha,v 1.19 2022/07/14 23:55: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
-./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/apm_drv.so.1.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug	xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
Index: src/distrib/sets/lists/xdebug/md.evbarm.armeb
diff -u src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.18 src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.19
--- src/distrib/sets/lists/xdebug/md.evbarm.armeb:1.18	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.evbarm.armeb	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm.armeb,v 1.18 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.evbarm.armeb,v 1.19 2022/07/14 23:55: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
@@ -20,7 +20,6 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
 ./usr/X11R7/lib/modules/libxf8_16bpp_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/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/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
Index: src/distrib/sets/lists/xdebug/md.ofppc
diff -u src/distrib/sets/lists/xdebug/md.ofppc:1.18 src/distrib/sets/lists/xdebug/md.ofppc:1.19
--- src/distrib/sets/lists/xdebug/md.ofppc:1.18	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.ofppc	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.18 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.ofppc,v 1.19 2022/07/14 23:55: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
@@ -15,11 +15,7 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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
-./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/dri/libmach64_dri.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libmga_dri.so.0.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/dri/libr128_dri.so.0.debug	xdebug-obsolete	xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.sparc
diff -u src/distrib/sets/lists/xdebug/md.sparc:1.18 src/distrib/sets/lists/xdebug/md.sparc:1.19
--- src/distrib/sets/lists/xdebug/md.sparc:1.18	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.sparc	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.18 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.sparc,v 1.19 2022/07/14 23:55: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
@@ -27,7 +27,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp_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/Xvfb.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/pcitweak.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.58 src/distrib/sets/lists/xdebug/md.amd64:1.59
--- src/distrib/sets/lists/xdebug/md.amd64:1.58	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.amd64	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.58 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.amd64,v 1.59 2022/07/14 23:55: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
@@ -23,12 +23,8 @@
 ./usr/X11R7/lib/modules/libvgahw_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxaa_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
 ./usr/libdata/debug/usr/X11R7/bin/Xvfb.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/bin/ioport.debug		xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/pcitweak.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.amiga
diff -u src/distrib/sets/lists/xdebug/md.amiga:1.13 src/distrib/sets/lists/xdebug/md.amiga:1.14
--- src/distrib/sets/lists/xdebug/md.amiga:1.13	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.amiga	Thu Jul 14 23:55:53 2022
@@ -1,6 +1,5 @@
-# $NetBSD: md.amiga,v 1.13 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.amiga,v 1.14 2022/07/14 23:55: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.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
Index: src/distrib/sets/lists/xdebug/md.dreamcast
diff -u src/distrib/sets/lists/xdebug/md.dreamcast:1.13 src/distrib/sets/lists/xdebug/md.dreamcast:1.14
--- src/distrib/sets/lists/xdebug/md.dreamcast:1.13	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.dreamcast	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.dreamcast,v 1.13 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.dreamcast,v 1.14 2022/07/14 23:55: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
@@ -13,11 +13,7 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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
-./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.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
Index: src/distrib/sets/lists/xdebug/md.hp300
diff -u src/distrib/sets/lists/xdebug/md.hp300:1.13 src/distrib/sets/lists/xdebug/md.hp300:1.14
--- src/distrib/sets/lists/xdebug/md.hp300:1.13	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.hp300	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hp300,v 1.13 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hp300,v 1.14 2022/07/14 23:55: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
@@ -18,7 +18,6 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete,xorg_server_ver=120
 ./usr/X11R7/lib/modules/libxf8_16bpp_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/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.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
Index: src/distrib/sets/lists/xdebug/md.vax
diff -u src/distrib/sets/lists/xdebug/md.vax:1.13 src/distrib/sets/lists/xdebug/md.vax:1.14
--- src/distrib/sets/lists/xdebug/md.vax:1.13	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.vax	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.vax,v 1.13 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.vax,v 1.14 2022/07/14 23:55: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
@@ -14,11 +14,7 @@
 ./usr/X11R7/lib/modules/libvgahw_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxaa_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
-./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.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

Index: src/distrib/sets/lists/xdebug/md.bebox
diff -u src/distrib/sets/lists/xdebug/md.bebox:1.12 src/distrib/sets/lists/xdebug/md.bebox:1.13
--- src/distrib/sets/lists/xdebug/md.bebox:1.12	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.bebox	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.12 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.bebox,v 1.13 2022/07/14 23:55: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
@@ -16,7 +16,6 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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/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-obsolete	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.evbmips
diff -u src/distrib/sets/lists/xdebug/md.evbmips:1.12 src/distrib/sets/lists/xdebug/md.evbmips:1.13
--- src/distrib/sets/lists/xdebug/md.evbmips:1.12	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.evbmips	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbmips,v 1.12 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.evbmips,v 1.13 2022/07/14 23:55: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
@@ -14,11 +14,7 @@
 ./usr/X11R7/lib/modules/libvgahw_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxaa_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
-./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.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
Index: src/distrib/sets/lists/xdebug/md.prep
diff -u src/distrib/sets/lists/xdebug/md.prep:1.12 src/distrib/sets/lists/xdebug/md.prep:1.13
--- src/distrib/sets/lists/xdebug/md.prep:1.12	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.prep	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.12 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.prep,v 1.13 2022/07/14 23:55: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
@@ -16,7 +16,6 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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/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-obsolete	obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug	xdebug-xf86-video-cirrus-debug	xorg,debug

Index: src/distrib/sets/lists/xdebug/md.cats
diff -u src/distrib/sets/lists/xdebug/md.cats:1.17 src/distrib/sets/lists/xdebug/md.cats:1.18
--- src/distrib/sets/lists/xdebug/md.cats:1.17	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.cats	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.17 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.cats,v 1.18 2022/07/14 23:55: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
@@ -27,11 +27,7 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_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
-./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/apm_drv.so.1.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/apm_drv.so.1.debug	xdebug-xf86-video-apm-debug		xorg,debug,xorg_server_ver=110
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ark_drv.so.0.debug	xdebug-obsolete		xorg,obsolete,xorg_server_ver=120
Index: src/distrib/sets/lists/xdebug/md.macppc
diff -u src/distrib/sets/lists/xdebug/md.macppc:1.17 src/distrib/sets/lists/xdebug/md.macppc:1.18
--- src/distrib/sets/lists/xdebug/md.macppc:1.17	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.macppc	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.17 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.macppc,v 1.18 2022/07/14 23:55: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
@@ -27,12 +27,8 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_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
 ./usr/libdata/debug/usr/X11R7/bin/Xvfb.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/bin/pcitweak.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/xf86cfg.debug		xdebug-obsolete	xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.sparc64
diff -u src/distrib/sets/lists/xdebug/md.sparc64:1.17 src/distrib/sets/lists/xdebug/md.sparc64:1.18
--- src/distrib/sets/lists/xdebug/md.sparc64:1.17	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.sparc64	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.17 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.sparc64,v 1.18 2022/07/14 23:55: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
@@ -26,12 +26,8 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_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
 ./usr/libdata/debug/usr/X11R7/bin/Xvfb.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/bin/pcitweak.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/xf86cfg.debug		xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.evbarm
diff -u src/distrib/sets/lists/xdebug/md.evbarm:1.33 src/distrib/sets/lists/xdebug/md.evbarm:1.34
--- src/distrib/sets/lists/xdebug/md.evbarm:1.33	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.evbarm	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.33 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.evbarm,v 1.34 2022/07/14 23:55: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
@@ -18,7 +18,6 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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/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/libdrm_amdgpu.so.1.2.debug	xdebug-libdrm_amdgpu-debug		xorg,debug,compatx11file
 ./usr/libdata/debug/usr/X11R7/lib/libdrm_nouveau.so.3.1.debug	xdebug-libdrm_nouveau-debug		xorg,debug,compatx11file

Index: src/distrib/sets/lists/xdebug/md.evbppc
diff -u src/distrib/sets/lists/xdebug/md.evbppc:1.2 src/distrib/sets/lists/xdebug/md.evbppc:1.3
--- src/distrib/sets/lists/xdebug/md.evbppc:1.2	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.evbppc	Thu Jul 14 23:55:53 2022
@@ -1,10 +1,6 @@
-# $NetBSD: md.evbppc,v 1.2 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.evbppc,v 1.3 2022/07/14 23:55: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.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
Index: src/distrib/sets/lists/xdebug/md.hppa
diff -u src/distrib/sets/lists/xdebug/md.hppa:1.2 src/distrib/sets/lists/xdebug/md.hppa:1.3
--- src/distrib/sets/lists/xdebug/md.hppa:1.2	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.hppa	Thu Jul 14 23:55:53 2022
@@ -1,6 +1,5 @@
-# $NetBSD: md.hppa,v 1.2 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hppa,v 1.3 2022/07/14 23:55: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.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

Index: src/distrib/sets/lists/xdebug/md.ews4800mips
diff -u src/distrib/sets/lists/xdebug/md.ews4800mips:1.11 src/distrib/sets/lists/xdebug/md.ews4800mips:1.12
--- src/distrib/sets/lists/xdebug/md.ews4800mips:1.11	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.ews4800mips	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ews4800mips,v 1.11 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.ews4800mips,v 1.12 2022/07/14 23:55: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
@@ -13,11 +13,7 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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
-./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.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
Index: src/distrib/sets/lists/xdebug/md.hpcarm
diff -u src/distrib/sets/lists/xdebug/md.hpcarm:1.11 src/distrib/sets/lists/xdebug/md.hpcarm:1.12
--- src/distrib/sets/lists/xdebug/md.hpcarm:1.11	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.hpcarm	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcarm,v 1.11 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hpcarm,v 1.12 2022/07/14 23:55: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
@@ -13,11 +13,7 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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
-./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.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
Index: src/distrib/sets/lists/xdebug/md.hpcmips
diff -u src/distrib/sets/lists/xdebug/md.hpcmips:1.11 src/distrib/sets/lists/xdebug/md.hpcmips:1.12
--- src/distrib/sets/lists/xdebug/md.hpcmips:1.11	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.hpcmips	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcmips,v 1.11 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hpcmips,v 1.12 2022/07/14 23:55: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
@@ -13,11 +13,7 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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
-./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.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
Index: src/distrib/sets/lists/xdebug/md.hpcsh
diff -u src/distrib/sets/lists/xdebug/md.hpcsh:1.11 src/distrib/sets/lists/xdebug/md.hpcsh:1.12
--- src/distrib/sets/lists/xdebug/md.hpcsh:1.11	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.hpcsh	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcsh,v 1.11 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hpcsh,v 1.12 2022/07/14 23:55: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
@@ -15,7 +15,6 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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/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.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
Index: src/distrib/sets/lists/xdebug/md.netwinder
diff -u src/distrib/sets/lists/xdebug/md.netwinder:1.11 src/distrib/sets/lists/xdebug/md.netwinder:1.12
--- src/distrib/sets/lists/xdebug/md.netwinder:1.11	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.netwinder	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.11 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.netwinder,v 1.12 2022/07/14 23:55: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
@@ -26,11 +26,7 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_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
-./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/bin/xorgconfig.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/mouse_drv.so.1.debug	xdebug-xf86-input-mouse-debug	xorg,debug
Index: src/distrib/sets/lists/xdebug/md.newsmips
diff -u src/distrib/sets/lists/xdebug/md.newsmips:1.11 src/distrib/sets/lists/xdebug/md.newsmips:1.12
--- src/distrib/sets/lists/xdebug/md.newsmips:1.11	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.newsmips	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.newsmips,v 1.11 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.newsmips,v 1.12 2022/07/14 23:55: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
@@ -13,11 +13,7 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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
-./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.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

Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.54 src/distrib/sets/lists/xdebug/md.i386:1.55
--- src/distrib/sets/lists/xdebug/md.i386:1.54	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.i386	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.54 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.i386,v 1.55 2022/07/14 23:55: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
@@ -36,11 +36,7 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_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
-./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/bin/ioport.debug		xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/xorgconfig.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/libI810XvMC.so.1.0.debug	xdebug-libI810XvMC-debug		xorg,debug

Index: src/distrib/sets/lists/xdebug/md.ibmnws
diff -u src/distrib/sets/lists/xdebug/md.ibmnws:1.8 src/distrib/sets/lists/xdebug/md.ibmnws:1.9
--- src/distrib/sets/lists/xdebug/md.ibmnws:1.8	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.ibmnws	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ibmnws,v 1.8 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.ibmnws,v 1.9 2022/07/14 23:55: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
@@ -16,7 +16,6 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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/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.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

Index: src/distrib/sets/lists/xdebug/md.iyonix
diff -u src/distrib/sets/lists/xdebug/md.iyonix:1.4 src/distrib/sets/lists/xdebug/md.iyonix:1.5
--- src/distrib/sets/lists/xdebug/md.iyonix:1.4	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.iyonix	Thu Jul 14 23:55:53 2022
@@ -1,6 +1,5 @@
-# $NetBSD: md.iyonix,v 1.4 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.iyonix,v 1.5 2022/07/14 23:55: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.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
Index: src/distrib/sets/lists/xdebug/md.pmax
diff -u src/distrib/sets/lists/xdebug/md.pmax:1.4 src/distrib/sets/lists/xdebug/md.pmax:1.5
--- src/distrib/sets/lists/xdebug/md.pmax:1.4	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.pmax	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.pmax,v 1.4 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.pmax,v 1.5 2022/07/14 23:55: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
@@ -14,11 +14,7 @@
 ./usr/X11R7/lib/modules/libvgahw_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxaa_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
-./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.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

Index: src/distrib/sets/lists/xdebug/md.luna68k
diff -u src/distrib/sets/lists/xdebug/md.luna68k:1.10 src/distrib/sets/lists/xdebug/md.luna68k:1.11
--- src/distrib/sets/lists/xdebug/md.luna68k:1.10	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.luna68k	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.luna68k,v 1.10 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.luna68k,v 1.11 2022/07/14 23:55: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
@@ -15,11 +15,7 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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
-./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.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
Index: src/distrib/sets/lists/xdebug/md.mac68k
diff -u src/distrib/sets/lists/xdebug/md.mac68k:1.10 src/distrib/sets/lists/xdebug/md.mac68k:1.11
--- src/distrib/sets/lists/xdebug/md.mac68k:1.10	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.mac68k	Thu Jul 14 23:55:53 2022
@@ -1,6 +1,5 @@
-# $NetBSD: md.mac68k,v 1.10 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.mac68k,v 1.11 2022/07/14 23:55: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.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
Index: src/distrib/sets/lists/xdebug/md.zaurus
diff -u src/distrib/sets/lists/xdebug/md.zaurus:1.10 src/distrib/sets/lists/xdebug/md.zaurus:1.11
--- src/distrib/sets/lists/xdebug/md.zaurus:1.10	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.zaurus	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.zaurus,v 1.10 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.zaurus,v 1.11 2022/07/14 23:55: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
@@ -15,11 +15,7 @@
 ./usr/X11R7/lib/modules/libxaa_g.a			xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_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
-./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.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

Index: src/distrib/sets/lists/xdebug/md.sgimips
diff -u src/distrib/sets/lists/xdebug/md.sgimips:1.14 src/distrib/sets/lists/xdebug/md.sgimips:1.15
--- src/distrib/sets/lists/xdebug/md.sgimips:1.14	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.sgimips	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.14 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.sgimips,v 1.15 2022/07/14 23:55: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
@@ -26,12 +26,8 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_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
 ./usr/libdata/debug/usr/X11R7/bin/Xvfb.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/bin/pcitweak.debug	xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/scanpci.debug		xdebug-obsolete	xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/bin/xf86cfg.debug		xdebug-obsolete	xorg,obsolete

Index: src/distrib/sets/lists/xdebug/md.shark
diff -u src/distrib/sets/lists/xdebug/md.shark:1.19 src/distrib/sets/lists/xdebug/md.shark:1.20
--- src/distrib/sets/lists/xdebug/md.shark:1.19	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xdebug/md.shark	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.19 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.shark,v 1.20 2022/07/14 23:55: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
@@ -27,11 +27,7 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp_g.a		xdebug-obsolete	xorg,obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_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
-./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/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

Index: src/distrib/sets/lists/xdebug/mi
diff -u src/distrib/sets/lists/xdebug/mi:1.43 src/distrib/sets/lists/xdebug/mi:1.44
--- src/distrib/sets/lists/xdebug/mi:1.43	Thu Jul 14 07:41:49 2022
+++ src/distrib/sets/lists/xdebug/mi	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.43 2022/07/14 07:41:49 mrg Exp $
+# $NetBSD: mi,v 1.44 2022/07/14 23:55:53 mrg Exp $
 ./etc/mtree/set.xdebug					comp-sys-root
 ./usr/X11R7/lib						base-x11-root	xorg,debuglib,compatx11dir
 ./usr/X11R7/lib/libEGL_g.a				xdebug-libEGL-debuglib	xorg,debuglib,compatx11file,xorg_glamor
@@ -115,6 +115,7 @@
 ./usr/libdata/debug/usr/X11R7/bin/bitmap.debug		xdebug-bitmap-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/bmtoa.debug		xdebug-bitmap-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/ctwm.debug		xdebug-ctwm-debug	xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug		xdebug-cvt-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/cxpm.debug		xdebug-cxpm-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/dga.debug		xdebug-xf86dga-debug	xorg,debug
 ./usr/libdata/debug/usr/X11R7/bin/editres.debug		xdebug-editres-debug	xorg,debug

Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.57 src/distrib/sets/lists/xserver/md.alpha:1.58
--- src/distrib/sets/lists/xserver/md.alpha:1.57	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.alpha	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.alpha,v 1.57 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.alpha,v 1.58 2022/07/14 23:55: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/bin/pcitweak				xserver-obsolete	obsolete
 ./usr/X11R7/bin/scanpci					xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.121 src/distrib/sets/lists/xserver/md.amd64:1.122
--- src/distrib/sets/lists/xserver/md.amd64:1.121	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.amd64	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.amd64,v 1.121 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.amd64,v 1.122 2022/07/14 23:55: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/bin/pcitweak				xserver-obsolete	obsolete
 ./usr/X11R7/bin/scanpci					xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.amiga
diff -u src/distrib/sets/lists/xserver/md.amiga:1.33 src/distrib/sets/lists/xserver/md.amiga:1.34
--- src/distrib/sets/lists/xserver/md.amiga:1.33	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.amiga	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.amiga,v 1.33 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.amiga,v 1.34 2022/07/14 23:55: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

Index: src/distrib/sets/lists/xserver/md.bebox
diff -u src/distrib/sets/lists/xserver/md.bebox:1.25 src/distrib/sets/lists/xserver/md.bebox:1.26
--- src/distrib/sets/lists/xserver/md.bebox:1.25	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.bebox	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.bebox,v 1.25 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.bebox,v 1.26 2022/07/14 23:55: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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg

Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.67 src/distrib/sets/lists/xserver/md.cats:1.68
--- src/distrib/sets/lists/xserver/md.cats:1.67	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.cats	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.cats,v 1.67 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.cats,v 1.68 2022/07/14 23:55: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/bin/pcitweak				xserver-obsolete	obsolete
 ./usr/X11R7/bin/scanpci					xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.dreamcast
diff -u src/distrib/sets/lists/xserver/md.dreamcast:1.32 src/distrib/sets/lists/xserver/md.dreamcast:1.33
--- src/distrib/sets/lists/xserver/md.dreamcast:1.32	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.dreamcast	Thu Jul 14 23:55:53 2022
@@ -1,9 +1,8 @@
-#	$NetBSD: md.dreamcast,v 1.32 2022/07/12 23:19:53 mrg Exp $
+#	$NetBSD: md.dreamcast,v 1.33 2022/07/14 23:55: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
 ./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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg

Index: src/distrib/sets/lists/xserver/md.evbarm
diff -u src/distrib/sets/lists/xserver/md.evbarm:1.27 src/distrib/sets/lists/xserver/md.evbarm:1.28
--- src/distrib/sets/lists/xserver/md.evbarm:1.27	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.evbarm	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.evbarm,v 1.27 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.evbarm,v 1.28 2022/07/14 23:55: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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
Index: src/distrib/sets/lists/xserver/md.ews4800mips
diff -u src/distrib/sets/lists/xserver/md.ews4800mips:1.27 src/distrib/sets/lists/xserver/md.ews4800mips:1.28
--- src/distrib/sets/lists/xserver/md.ews4800mips:1.27	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.ews4800mips	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.ews4800mips,v 1.27 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.ews4800mips,v 1.28 2022/07/14 23:55: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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg
Index: src/distrib/sets/lists/xserver/md.hp300
diff -u src/distrib/sets/lists/xserver/md.hp300:1.27 src/distrib/sets/lists/xserver/md.hp300:1.28
--- src/distrib/sets/lists/xserver/md.hp300:1.27	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.hp300	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.hp300,v 1.27 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hp300,v 1.28 2022/07/14 23:55: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
Index: src/distrib/sets/lists/xserver/md.zaurus
diff -u src/distrib/sets/lists/xserver/md.zaurus:1.27 src/distrib/sets/lists/xserver/md.zaurus:1.28
--- src/distrib/sets/lists/xserver/md.zaurus:1.27	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.zaurus	Thu Jul 14 23:55:53 2022
@@ -1,10 +1,9 @@
-# $NetBSD: md.zaurus,v 1.27 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.zaurus,v 1.28 2022/07/14 23:55: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
 ./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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg

Index: src/distrib/sets/lists/xserver/md.evbmips
diff -u src/distrib/sets/lists/xserver/md.evbmips:1.18 src/distrib/sets/lists/xserver/md.evbmips:1.19
--- src/distrib/sets/lists/xserver/md.evbmips:1.18	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.evbmips	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.evbmips,v 1.18 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.evbmips,v 1.19 2022/07/14 23:55: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

Index: src/distrib/sets/lists/xserver/md.evbppc
diff -u src/distrib/sets/lists/xserver/md.evbppc:1.6 src/distrib/sets/lists/xserver/md.evbppc:1.7
--- src/distrib/sets/lists/xserver/md.evbppc:1.6	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.evbppc	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-#	$NetBSD: md.evbppc,v 1.6 2022/07/12 23:19:53 mrg Exp $
+#	$NetBSD: md.evbppc,v 1.7 2022/07/14 23:55: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

Index: src/distrib/sets/lists/xserver/md.hpcarm
diff -u src/distrib/sets/lists/xserver/md.hpcarm:1.31 src/distrib/sets/lists/xserver/md.hpcarm:1.32
--- src/distrib/sets/lists/xserver/md.hpcarm:1.31	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.hpcarm	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcarm,v 1.31 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hpcarm,v 1.32 2022/07/14 23:55: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
@@ -11,7 +11,6 @@
 ./etc/X11/xorg.conf.ws020sh				xserver-xorg-server-etc	xorg
 ./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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg

Index: src/distrib/sets/lists/xserver/md.hpcmips
diff -u src/distrib/sets/lists/xserver/md.hpcmips:1.37 src/distrib/sets/lists/xserver/md.hpcmips:1.38
--- src/distrib/sets/lists/xserver/md.hpcmips:1.37	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.hpcmips	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcmips,v 1.37 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hpcmips,v 1.38 2022/07/14 23:55: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
@@ -7,7 +7,6 @@
 ./etc/X11/xorg.conf.800x600-us				xserver-xorg-server-etc	xorg
 ./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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg

Index: src/distrib/sets/lists/xserver/md.hpcsh
diff -u src/distrib/sets/lists/xserver/md.hpcsh:1.30 src/distrib/sets/lists/xserver/md.hpcsh:1.31
--- src/distrib/sets/lists/xserver/md.hpcsh:1.30	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.hpcsh	Thu Jul 14 23:55:53 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcsh,v 1.30 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hpcsh,v 1.31 2022/07/14 23:55: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
@@ -7,7 +7,6 @@
 ./etc/X11/xorg.conf.800x600-us				xserver-xorg-server-etc	xorg
 ./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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg

Index: src/distrib/sets/lists/xserver/md.hppa
diff -u src/distrib/sets/lists/xserver/md.hppa:1.5 src/distrib/sets/lists/xserver/md.hppa:1.6
--- src/distrib/sets/lists/xserver/md.hppa:1.5	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.hppa	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.hppa,v 1.5 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.hppa,v 1.6 2022/07/14 23:55: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

Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.137 src/distrib/sets/lists/xserver/md.i386:1.138
--- src/distrib/sets/lists/xserver/md.i386:1.137	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.i386	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.i386,v 1.137 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.i386,v 1.138 2022/07/14 23:55: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/bin/inb					xserver-obsolete	obsolete
 ./usr/X11R7/bin/inl					xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.ibmnws
diff -u src/distrib/sets/lists/xserver/md.ibmnws:1.12 src/distrib/sets/lists/xserver/md.ibmnws:1.13
--- src/distrib/sets/lists/xserver/md.ibmnws:1.12	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.ibmnws	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.ibmnws,v 1.12 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.ibmnws,v 1.13 2022/07/14 23:55: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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg

Index: src/distrib/sets/lists/xserver/md.iyonix
diff -u src/distrib/sets/lists/xserver/md.iyonix:1.4 src/distrib/sets/lists/xserver/md.iyonix:1.5
--- src/distrib/sets/lists/xserver/md.iyonix:1.4	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.iyonix	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.iyonix,v 1.4 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.iyonix,v 1.5 2022/07/14 23:55: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

Index: src/distrib/sets/lists/xserver/md.luna68k
diff -u src/distrib/sets/lists/xserver/md.luna68k:1.24 src/distrib/sets/lists/xserver/md.luna68k:1.25
--- src/distrib/sets/lists/xserver/md.luna68k:1.24	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.luna68k	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.luna68k,v 1.24 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.luna68k,v 1.25 2022/07/14 23:55: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
Index: src/distrib/sets/lists/xserver/md.vax
diff -u src/distrib/sets/lists/xserver/md.vax:1.24 src/distrib/sets/lists/xserver/md.vax:1.25
--- src/distrib/sets/lists/xserver/md.vax:1.24	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.vax	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.vax,v 1.24 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.vax,v 1.25 2022/07/14 23:55: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

Index: src/distrib/sets/lists/xserver/md.mac68k
diff -u src/distrib/sets/lists/xserver/md.mac68k:1.26 src/distrib/sets/lists/xserver/md.mac68k:1.27
--- src/distrib/sets/lists/xserver/md.mac68k:1.26	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.mac68k	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.mac68k,v 1.26 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.mac68k,v 1.27 2022/07/14 23:55: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
Index: src/distrib/sets/lists/xserver/md.newsmips
diff -u src/distrib/sets/lists/xserver/md.newsmips:1.26 src/distrib/sets/lists/xserver/md.newsmips:1.27
--- src/distrib/sets/lists/xserver/md.newsmips:1.26	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.newsmips	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.newsmips,v 1.26 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.newsmips,v 1.27 2022/07/14 23:55: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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg

Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.86 src/distrib/sets/lists/xserver/md.macppc:1.87
--- src/distrib/sets/lists/xserver/md.macppc:1.86	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.macppc	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.macppc,v 1.86 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.macppc,v 1.87 2022/07/14 23:55: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/bin/pcitweak				xserver-obsolete	obsolete
 ./usr/X11R7/bin/scanpci					xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.netwinder
diff -u src/distrib/sets/lists/xserver/md.netwinder:1.44 src/distrib/sets/lists/xserver/md.netwinder:1.45
--- src/distrib/sets/lists/xserver/md.netwinder:1.44	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.netwinder	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.netwinder,v 1.44 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.netwinder,v 1.45 2022/07/14 23:55: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/bin/pcitweak				xserver-obsolete	obsolete
 ./usr/X11R7/bin/scanpci					xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.ofppc
diff -u src/distrib/sets/lists/xserver/md.ofppc:1.36 src/distrib/sets/lists/xserver/md.ofppc:1.37
--- src/distrib/sets/lists/xserver/md.ofppc:1.36	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.ofppc	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.ofppc,v 1.36 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.ofppc,v 1.37 2022/07/14 23:55: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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.fonts			xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.pmax
diff -u src/distrib/sets/lists/xserver/md.pmax:1.15 src/distrib/sets/lists/xserver/md.pmax:1.16
--- src/distrib/sets/lists/xserver/md.pmax:1.15	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.pmax	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.pmax,v 1.15 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.pmax,v 1.16 2022/07/14 23:55: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

Index: src/distrib/sets/lists/xserver/md.prep
diff -u src/distrib/sets/lists/xserver/md.prep:1.28 src/distrib/sets/lists/xserver/md.prep:1.29
--- src/distrib/sets/lists/xserver/md.prep:1.28	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.prep	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.prep,v 1.28 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.prep,v 1.29 2022/07/14 23:55: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.DRI			xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/doc/README.modes			xserver-xorg-server-lib	xorg

Index: src/distrib/sets/lists/xserver/md.sgimips
diff -u src/distrib/sets/lists/xserver/md.sgimips:1.65 src/distrib/sets/lists/xserver/md.sgimips:1.66
--- src/distrib/sets/lists/xserver/md.sgimips:1.65	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.sgimips	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.sgimips,v 1.65 2022/07/12 23:19:53 mrg Exp $	x11
+# $NetBSD: md.sgimips,v 1.66 2022/07/14 23:55: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
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/xorgconfig				xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/Cards				xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.shark
diff -u src/distrib/sets/lists/xserver/md.shark:1.59 src/distrib/sets/lists/xserver/md.shark:1.60
--- src/distrib/sets/lists/xserver/md.shark:1.59	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.shark	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.shark,v 1.59 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.shark,v 1.60 2022/07/14 23:55: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/bin/xorgconfig				xserver-obsolete	obsolete
 ./usr/X11R7/lib/X11/Cards				xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.sparc
diff -u src/distrib/sets/lists/xserver/md.sparc:1.78 src/distrib/sets/lists/xserver/md.sparc:1.79
--- src/distrib/sets/lists/xserver/md.sparc:1.78	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.sparc	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.sparc,v 1.78 2022/07/12 23:19:53 mrg Exp $
+# $NetBSD: md.sparc,v 1.79 2022/07/14 23:55: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/bin/pcitweak				xserver-obsolete	obsolete
 ./usr/X11R7/bin/scanpci					xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.74 src/distrib/sets/lists/xserver/md.sparc64:1.75
--- src/distrib/sets/lists/xserver/md.sparc64:1.74	Tue Jul 12 23:19:53 2022
+++ src/distrib/sets/lists/xserver/md.sparc64	Thu Jul 14 23:55:53 2022
@@ -1,7 +1,6 @@
-# $NetBSD: md.sparc64,v 1.74 2022/07/12 23:19:53 mrg Exp $	x11
+# $NetBSD: md.sparc64,v 1.75 2022/07/14 23:55: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
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/pcitweak				xserver-obsolete	obsolete
 ./usr/X11R7/bin/scanpci					xserver-obsolete	obsolete