Module Name:    src
Committed By:   mrg
Date:           Fri Jul 15 00:16:04 UTC 2022

Modified Files:
        src/distrib/sets/lists/xbase: 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:
also move cvt manual parts into the xbase set.


To generate a diff of this commit:
cvs rdiff -u -r1.169 -r1.170 src/distrib/sets/lists/xbase/mi
cvs rdiff -u -r1.58 -r1.59 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.122 -r1.123 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xserver/md.amiga
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xserver/md.bebox
cvs rdiff -u -r1.68 -r1.69 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xserver/md.dreamcast
cvs rdiff -u -r1.28 -r1.29 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.19 -r1.20 src/distrib/sets/lists/xserver/md.evbmips
cvs rdiff -u -r1.7 -r1.8 src/distrib/sets/lists/xserver/md.evbppc
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xserver/md.hpcarm
cvs rdiff -u -r1.38 -r1.39 src/distrib/sets/lists/xserver/md.hpcmips
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xserver/md.hpcsh
cvs rdiff -u -r1.6 -r1.7 src/distrib/sets/lists/xserver/md.hppa
cvs rdiff -u -r1.138 -r1.139 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xserver/md.ibmnws
cvs rdiff -u -r1.5 -r1.6 src/distrib/sets/lists/xserver/md.iyonix
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xserver/md.luna68k \
    src/distrib/sets/lists/xserver/md.vax
cvs rdiff -u -r1.27 -r1.28 src/distrib/sets/lists/xserver/md.mac68k \
    src/distrib/sets/lists/xserver/md.newsmips
cvs rdiff -u -r1.87 -r1.88 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.45 -r1.46 src/distrib/sets/lists/xserver/md.netwinder
cvs rdiff -u -r1.37 -r1.38 src/distrib/sets/lists/xserver/md.ofppc
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xserver/md.pmax
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xserver/md.prep
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.60 -r1.61 src/distrib/sets/lists/xserver/md.shark
cvs rdiff -u -r1.79 -r1.80 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.75 -r1.76 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.169 src/distrib/sets/lists/xbase/mi:1.170
--- src/distrib/sets/lists/xbase/mi:1.169	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xbase/mi	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.169 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: mi,v 1.170 2022/07/15 00:16:04 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -1284,6 +1284,7 @@
 ./usr/X11R7/man/cat1/ccmakedep.0			xbase-ccmakedep-catman	.cat,xorg
 ./usr/X11R7/man/cat1/cleanlinks.0			xbase-cleanlinks-catman	.cat,xorg
 ./usr/X11R7/man/cat1/ctwm.0				xbase-ctwm-catman	.cat,xorg
+./usr/X11R7/man/cat1/cvt.0				xbase-cvt-catman	.cat,xorg
 ./usr/X11R7/man/cat1/cxpm.0				xbase-cxpm-catman	.cat,xorg
 ./usr/X11R7/man/cat1/dga.0				xbase-xf86dga-catman	.cat,xorg
 ./usr/X11R7/man/cat1/editres.0				xbase-editres-catman	.cat,xorg
@@ -1434,6 +1435,7 @@
 ./usr/X11R7/man/html1/ccmakedep.html			xbase-ccmakedep-htmlman	html,xorg
 ./usr/X11R7/man/html1/cleanlinks.html			xbase-cleanlinks-htmlman	html,xorg
 ./usr/X11R7/man/html1/ctwm.html				xbase-ctwm-htmlman	html,xorg
+./usr/X11R7/man/html1/cvt.html				xbase-cvt-htmlman	html,xorg
 ./usr/X11R7/man/html1/cxpm.html				xbase-cxpm-htmlman	html,xorg
 ./usr/X11R7/man/html1/dga.html				xbase-xf86dga-htmlman	html,xorg
 ./usr/X11R7/man/html1/editres.html			xbase-editres-htmlman	html,xorg
@@ -1584,6 +1586,7 @@
 ./usr/X11R7/man/man1/ccmakedep.1			xbase-ccmakedep-man	.man,xorg
 ./usr/X11R7/man/man1/cleanlinks.1			xbase-cleanlinks-man	.man,xorg
 ./usr/X11R7/man/man1/ctwm.1				xbase-ctwm-man	.man,xorg
+./usr/X11R7/man/man1/cvt.1				xbase-cvt-man	.man,xorg
 ./usr/X11R7/man/man1/cxpm.1				xbase-cxpm-man	.man,xorg
 ./usr/X11R7/man/man1/dga.1				xbase-xf86dga-man	.man,xorg
 ./usr/X11R7/man/man1/editres.1				xbase-editres-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.58 src/distrib/sets/lists/xserver/md.alpha:1.59
--- src/distrib/sets/lists/xserver/md.alpha:1.58	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.alpha	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.58 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.alpha,v 1.59 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -228,7 +228,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/pcitweak.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/scanpci.0				xserver-obsolete	obsolete
@@ -288,7 +287,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/pcitweak.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html1/scanpci.html			xserver-obsolete	obsolete
@@ -348,7 +346,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/pcitweak.1				xserver-obsolete	obsolete
 ./usr/X11R7/man/man1/scanpci.1				xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.122 src/distrib/sets/lists/xserver/md.amd64:1.123
--- src/distrib/sets/lists/xserver/md.amd64:1.122	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.amd64	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.122 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.amd64,v 1.123 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -305,7 +305,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/pcitweak.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/scanpci.0				xserver-obsolete	obsolete
@@ -361,7 +360,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/pcitweak.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html1/scanpci.html			xserver-obsolete	obsolete
@@ -417,7 +415,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/pcitweak.1				xserver-obsolete	obsolete
 ./usr/X11R7/man/man1/scanpci.1				xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.amiga
diff -u src/distrib/sets/lists/xserver/md.amiga:1.34 src/distrib/sets/lists/xserver/md.amiga:1.35
--- src/distrib/sets/lists/xserver/md.amiga:1.34	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.amiga	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amiga,v 1.34 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.amiga,v 1.35 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -80,7 +80,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -90,7 +89,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -100,7 +98,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.bebox
diff -u src/distrib/sets/lists/xserver/md.bebox:1.26 src/distrib/sets/lists/xserver/md.bebox:1.27
--- src/distrib/sets/lists/xserver/md.bebox:1.26	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.bebox	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.26 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.bebox,v 1.27 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -98,7 +98,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/cirrus.0				xserver-xf86-video-cirrus-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
@@ -112,7 +111,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/cirrus.html			xserver-xf86-video-cirrus-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
@@ -126,7 +124,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/cirrus.4				xserver-xf86-video-cirrus-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.68 src/distrib/sets/lists/xserver/md.cats:1.69
--- src/distrib/sets/lists/xserver/md.cats:1.68	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.cats	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.68 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.cats,v 1.69 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -208,7 +208,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/pcitweak.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/scanpci.0				xserver-obsolete	obsolete
@@ -249,7 +248,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/pcitweak.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html1/scanpci.html			xserver-obsolete	obsolete
@@ -290,7 +288,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/pcitweak.1				xserver-obsolete	obsolete
 ./usr/X11R7/man/man1/scanpci.1				xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.dreamcast
diff -u src/distrib/sets/lists/xserver/md.dreamcast:1.33 src/distrib/sets/lists/xserver/md.dreamcast:1.34
--- src/distrib/sets/lists/xserver/md.dreamcast:1.33	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.dreamcast	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: md.dreamcast,v 1.33 2022/07/14 23:55:53 mrg Exp $
+#	$NetBSD: md.dreamcast,v 1.34 2022/07/15 00:16:04 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
@@ -84,7 +84,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -94,7 +93,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -104,7 +102,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.evbarm
diff -u src/distrib/sets/lists/xserver/md.evbarm:1.28 src/distrib/sets/lists/xserver/md.evbarm:1.29
--- src/distrib/sets/lists/xserver/md.evbarm:1.28	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.evbarm	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.28 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.evbarm,v 1.29 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -109,7 +109,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/ati.0				xserver-xf86-video-ati-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
@@ -122,7 +121,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/ati.html				xserver-xf86-video-ati-htmlman	html,xorg
 ./usr/X11R7/man/html4/evbarm/radeon.html		xserver-xf86-video-radeon-htmlman	html,xorg
@@ -138,7 +136,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/ati.4				xserver-xf86-video-ati-man	.man,xorg
 ./usr/X11R7/man/man4/evbarm/radeon.4			xserver-xf86-video-radeon-man	.man,xorg
Index: src/distrib/sets/lists/xserver/md.ews4800mips
diff -u src/distrib/sets/lists/xserver/md.ews4800mips:1.28 src/distrib/sets/lists/xserver/md.ews4800mips:1.29
--- src/distrib/sets/lists/xserver/md.ews4800mips:1.28	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.ews4800mips	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ews4800mips,v 1.28 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.ews4800mips,v 1.29 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -82,7 +82,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -92,7 +91,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -102,7 +100,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg
Index: src/distrib/sets/lists/xserver/md.hp300
diff -u src/distrib/sets/lists/xserver/md.hp300:1.28 src/distrib/sets/lists/xserver/md.hp300:1.29
--- src/distrib/sets/lists/xserver/md.hp300:1.28	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.hp300	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hp300,v 1.28 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.hp300,v 1.29 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -80,7 +80,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -90,7 +89,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -100,7 +98,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg
Index: src/distrib/sets/lists/xserver/md.zaurus
diff -u src/distrib/sets/lists/xserver/md.zaurus:1.28 src/distrib/sets/lists/xserver/md.zaurus:1.29
--- src/distrib/sets/lists/xserver/md.zaurus:1.28	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.zaurus	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.zaurus,v 1.28 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.zaurus,v 1.29 2022/07/15 00:16:04 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
@@ -87,7 +87,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -98,7 +97,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -109,7 +107,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.evbmips
diff -u src/distrib/sets/lists/xserver/md.evbmips:1.19 src/distrib/sets/lists/xserver/md.evbmips:1.20
--- src/distrib/sets/lists/xserver/md.evbmips:1.19	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.evbmips	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbmips,v 1.19 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.evbmips,v 1.20 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -81,7 +81,6 @@
 ./usr/X11R7/lib/modules/libxaa_pic.a			xserver-obsolete	xorg,picinstall,obsolete
 ./usr/X11R7/lib/xorg/protocol.txt			xserver-xorg-server-lib	xorg
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xorgconfig.0			xserver-obsolete	obsolete
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
@@ -94,7 +93,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/xorgconfig.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
@@ -107,7 +105,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/xorgconfig.1			xserver-obsolete	obsolete
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.evbppc
diff -u src/distrib/sets/lists/xserver/md.evbppc:1.7 src/distrib/sets/lists/xserver/md.evbppc:1.8
--- src/distrib/sets/lists/xserver/md.evbppc:1.7	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.evbppc	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: md.evbppc,v 1.7 2022/07/14 23:55:53 mrg Exp $
+#	$NetBSD: md.evbppc,v 1.8 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -41,7 +41,6 @@
 ./usr/X11R7/lib/modules/libxaa.so			-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/lib/modules/libxaa.so.0			-unknown-	xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -51,7 +50,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -61,7 +59,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.hpcarm
diff -u src/distrib/sets/lists/xserver/md.hpcarm:1.32 src/distrib/sets/lists/xserver/md.hpcarm:1.33
--- src/distrib/sets/lists/xserver/md.hpcarm:1.32	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.hpcarm	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcarm,v 1.32 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.hpcarm,v 1.33 2022/07/15 00:16:04 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
@@ -92,7 +92,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -102,7 +101,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -112,7 +110,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.hpcmips
diff -u src/distrib/sets/lists/xserver/md.hpcmips:1.38 src/distrib/sets/lists/xserver/md.hpcmips:1.39
--- src/distrib/sets/lists/xserver/md.hpcmips:1.38	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.hpcmips	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcmips,v 1.38 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.hpcmips,v 1.39 2022/07/15 00:16:04 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
@@ -88,7 +88,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -98,7 +97,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -108,7 +106,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.hpcsh
diff -u src/distrib/sets/lists/xserver/md.hpcsh:1.31 src/distrib/sets/lists/xserver/md.hpcsh:1.32
--- src/distrib/sets/lists/xserver/md.hpcsh:1.31	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.hpcsh	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcsh,v 1.31 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.hpcsh,v 1.32 2022/07/15 00:16:04 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
@@ -88,7 +88,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -98,7 +97,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -108,7 +106,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.hppa
diff -u src/distrib/sets/lists/xserver/md.hppa:1.6 src/distrib/sets/lists/xserver/md.hppa:1.7
--- src/distrib/sets/lists/xserver/md.hppa:1.6	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.hppa	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hppa,v 1.6 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.hppa,v 1.7 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -84,7 +84,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -94,7 +93,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -106,7 +104,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.138 src/distrib/sets/lists/xserver/md.i386:1.139
--- src/distrib/sets/lists/xserver/md.i386:1.138	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.i386	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.138 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.i386,v 1.139 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -316,7 +316,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/pcitweak.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/scanpci.0				xserver-obsolete	obsolete
@@ -373,7 +372,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/pcitweak.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html1/scanpci.html			xserver-obsolete	obsolete
@@ -430,7 +428,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/pcitweak.1				xserver-obsolete	obsolete
 ./usr/X11R7/man/man1/scanpci.1				xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.ibmnws
diff -u src/distrib/sets/lists/xserver/md.ibmnws:1.13 src/distrib/sets/lists/xserver/md.ibmnws:1.14
--- src/distrib/sets/lists/xserver/md.ibmnws:1.13	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.ibmnws	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ibmnws,v 1.13 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.ibmnws,v 1.14 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -88,7 +88,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -99,7 +98,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -110,7 +108,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.iyonix
diff -u src/distrib/sets/lists/xserver/md.iyonix:1.5 src/distrib/sets/lists/xserver/md.iyonix:1.6
--- src/distrib/sets/lists/xserver/md.iyonix:1.5	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.iyonix	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.iyonix,v 1.5 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.iyonix,v 1.6 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -49,7 +49,6 @@
 ./usr/X11R7/lib/modules/libvgahw.so.0			xserver-vgahw-modules	xorg
 ./usr/X11R7/lib/modules/libvgahw_pic.a			xserver-obsolete	xorg,picinstall,obsolete
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -60,7 +59,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.luna68k
diff -u src/distrib/sets/lists/xserver/md.luna68k:1.25 src/distrib/sets/lists/xserver/md.luna68k:1.26
--- src/distrib/sets/lists/xserver/md.luna68k:1.25	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.luna68k	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.luna68k,v 1.25 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.luna68k,v 1.26 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -80,7 +80,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -90,7 +89,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -100,7 +98,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg
Index: src/distrib/sets/lists/xserver/md.vax
diff -u src/distrib/sets/lists/xserver/md.vax:1.25 src/distrib/sets/lists/xserver/md.vax:1.26
--- src/distrib/sets/lists/xserver/md.vax:1.25	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.vax	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.vax,v 1.25 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.vax,v 1.26 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -76,7 +76,6 @@
 ./usr/X11R7/lib/modules/libxaa.so.0			xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/libxaa_pic.a			xserver-obsolete	xorg,picinstall,obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -86,7 +85,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -96,7 +94,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.mac68k
diff -u src/distrib/sets/lists/xserver/md.mac68k:1.27 src/distrib/sets/lists/xserver/md.mac68k:1.28
--- src/distrib/sets/lists/xserver/md.mac68k:1.27	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.mac68k	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.mac68k,v 1.27 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.mac68k,v 1.28 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -80,7 +80,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -90,7 +89,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -100,7 +98,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg
Index: src/distrib/sets/lists/xserver/md.newsmips
diff -u src/distrib/sets/lists/xserver/md.newsmips:1.27 src/distrib/sets/lists/xserver/md.newsmips:1.28
--- src/distrib/sets/lists/xserver/md.newsmips:1.27	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.newsmips	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.newsmips,v 1.27 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.newsmips,v 1.28 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -82,7 +82,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -92,7 +91,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -102,7 +100,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.87 src/distrib/sets/lists/xserver/md.macppc:1.88
--- src/distrib/sets/lists/xserver/md.macppc:1.87	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.macppc	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.87 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.macppc,v 1.88 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -178,7 +178,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/pcitweak.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/scanpci.0				xserver-obsolete	obsolete
@@ -201,7 +200,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/pcitweak.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html1/scanpci.html			xserver-obsolete	obsolete
@@ -224,7 +222,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/pcitweak.1				xserver-obsolete	obsolete
 ./usr/X11R7/man/man1/scanpci.1				xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.netwinder
diff -u src/distrib/sets/lists/xserver/md.netwinder:1.45 src/distrib/sets/lists/xserver/md.netwinder:1.46
--- src/distrib/sets/lists/xserver/md.netwinder:1.45	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.netwinder	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.45 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.netwinder,v 1.46 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -141,7 +141,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/pcitweak.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/scanpci.0				xserver-obsolete	obsolete
@@ -155,7 +154,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/pcitweak.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html1/scanpci.html			xserver-obsolete	obsolete
@@ -169,7 +167,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/pcitweak.1				xserver-obsolete	obsolete
 ./usr/X11R7/man/man1/scanpci.1				xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.ofppc
diff -u src/distrib/sets/lists/xserver/md.ofppc:1.37 src/distrib/sets/lists/xserver/md.ofppc:1.38
--- src/distrib/sets/lists/xserver/md.ofppc:1.37	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.ofppc	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.37 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.ofppc,v 1.38 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -120,7 +120,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/ati.0				xserver-xf86-video-ati-catman	.cat,xorg
 ./usr/X11R7/man/cat4/chips.0				xserver-xf86-video-chips-catman	.cat,xorg
@@ -137,7 +136,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/ati.html				xserver-xf86-video-ati-htmlman	html,xorg
 ./usr/X11R7/man/html4/chips.html			xserver-xf86-video-chips-htmlman	html,xorg
@@ -154,7 +152,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/ati.4				xserver-xf86-video-ati-man	.man,xorg
 ./usr/X11R7/man/man4/chips.4				xserver-xf86-video-chips-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.pmax
diff -u src/distrib/sets/lists/xserver/md.pmax:1.16 src/distrib/sets/lists/xserver/md.pmax:1.17
--- src/distrib/sets/lists/xserver/md.pmax:1.16	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.pmax	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.pmax,v 1.16 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.pmax,v 1.17 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -76,7 +76,6 @@
 ./usr/X11R7/lib/modules/libxaa.so.0			xserver-obsolete	xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/lib/modules/libxaa_pic.a			xserver-obsolete	xorg,picinstall,obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
 ./usr/X11R7/man/cat4/kbd.0				xserver-xf86-input-keyboard-catman	.cat,xorg
@@ -86,7 +85,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
 ./usr/X11R7/man/html4/kbd.html				xserver-xf86-input-keyboard-htmlman	html,xorg
@@ -96,7 +94,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg
 ./usr/X11R7/man/man4/kbd.4				xserver-xf86-input-keyboard-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.prep
diff -u src/distrib/sets/lists/xserver/md.prep:1.29 src/distrib/sets/lists/xserver/md.prep:1.30
--- src/distrib/sets/lists/xserver/md.prep:1.29	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.prep	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.29 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.prep,v 1.30 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -96,7 +96,6 @@
 ./usr/X11R7/lib/modules/libxf8_16bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_16bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat4/cirrus.0				xserver-xf86-video-cirrus-catman	.cat,xorg
 ./usr/X11R7/man/cat4/exa.0				xserver-xf86-video-exa-catman	.cat,xorg
@@ -109,7 +108,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html4/cirrus.html			xserver-xf86-video-cirrus-htmlman	html,xorg
 ./usr/X11R7/man/html4/exa.html				xserver-xf86-video-exa-htmlman	html,xorg
@@ -122,7 +120,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man4/cirrus.4				xserver-xf86-video-cirrus-man	.man,xorg
 ./usr/X11R7/man/man4/exa.4				xserver-xf86-video-exa-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.sgimips
diff -u src/distrib/sets/lists/xserver/md.sgimips:1.66 src/distrib/sets/lists/xserver/md.sgimips:1.67
--- src/distrib/sets/lists/xserver/md.sgimips:1.66	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.sgimips	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.66 2022/07/14 23:55:53 mrg Exp $	x11
+# $NetBSD: md.sgimips,v 1.67 2022/07/15 00:16:04 mrg Exp $	x11
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -157,7 +157,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xorgconfig.0			xserver-obsolete	obsolete
 ./usr/X11R7/man/cat4/crime.0				-unknown-	.cat,xorg,xorg_server_ver=110
@@ -173,7 +172,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/xorgconfig.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html4/cirrus.html			xserver-xf86-video-cirrus-htmlman	html,xorg
@@ -194,7 +192,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/xorgconfig.1			xserver-obsolete	obsolete
 ./usr/X11R7/man/man4/cirrus.4				xserver-xf86-video-cirrus-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.shark
diff -u src/distrib/sets/lists/xserver/md.shark:1.60 src/distrib/sets/lists/xserver/md.shark:1.61
--- src/distrib/sets/lists/xserver/md.shark:1.60	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.shark	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.60 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.shark,v 1.61 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -143,7 +143,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/xorgconfig.0			xserver-obsolete	obsolete
 ./usr/X11R7/man/cat4/chips.0				xserver-xf86-video-chips-catman	.cat,xorg
@@ -157,7 +156,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/xorgconfig.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html4/chips.html			xserver-xf86-video-chips-htmlman	html,xorg
@@ -171,7 +169,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/xorgconfig.1			xserver-obsolete	obsolete
 ./usr/X11R7/man/man4/chips.4				xserver-xf86-video-chips-man	.man,xorg

Index: src/distrib/sets/lists/xserver/md.sparc
diff -u src/distrib/sets/lists/xserver/md.sparc:1.79 src/distrib/sets/lists/xserver/md.sparc:1.80
--- src/distrib/sets/lists/xserver/md.sparc:1.79	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.sparc	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.79 2022/07/14 23:55:53 mrg Exp $
+# $NetBSD: md.sparc,v 1.80 2022/07/15 00:16:04 mrg Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -178,7 +178,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/pcitweak.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/scanpci.0				xserver-obsolete	obsolete
@@ -204,7 +203,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/pcitweak.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html1/scanpci.html			xserver-obsolete	obsolete
@@ -230,7 +228,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/pcitweak.1				xserver-obsolete	obsolete
 ./usr/X11R7/man/man1/scanpci.1				xserver-obsolete	obsolete

Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.75 src/distrib/sets/lists/xserver/md.sparc64:1.76
--- src/distrib/sets/lists/xserver/md.sparc64:1.75	Thu Jul 14 23:55:53 2022
+++ src/distrib/sets/lists/xserver/md.sparc64	Fri Jul 15 00:16:04 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.75 2022/07/14 23:55:53 mrg Exp $	x11
+# $NetBSD: md.sparc64,v 1.76 2022/07/15 00:16:04 mrg Exp $	x11
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/gtf					xserver-xorg-server-bin	xorg
@@ -176,7 +176,6 @@
 ./usr/X11R7/lib/modules/libxf8_32bpp.so.0		xserver-obsolete	obsolete
 ./usr/X11R7/lib/modules/libxf8_32bpp_pic.a		xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/Xorg.0				xserver-xorg-server-catman	.cat,xorg
-./usr/X11R7/man/cat1/cvt.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/gtf.0				xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat1/pcitweak.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat1/scanpci.0				xserver-obsolete	obsolete
@@ -201,7 +200,6 @@
 ./usr/X11R7/man/cat5/xorg.conf.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/cat5/xorg.conf.d.0			xserver-xorg-server-catman	.cat,xorg
 ./usr/X11R7/man/html1/Xorg.html				xserver-xorg-server-htmlman	html,xorg
-./usr/X11R7/man/html1/cvt.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/gtf.html				xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html1/pcitweak.html			xserver-obsolete	obsolete
 ./usr/X11R7/man/html1/scanpci.html			xserver-obsolete	obsolete
@@ -226,7 +224,6 @@
 ./usr/X11R7/man/html5/xorg.conf.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/html5/xorg.conf.d.html			xserver-xorg-server-htmlman	html,xorg
 ./usr/X11R7/man/man1/Xorg.1				xserver-xorg-server-man	.man,xorg
-./usr/X11R7/man/man1/cvt.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/gtf.1				xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/man/man1/pcitweak.1				xserver-obsolete	obsolete
 ./usr/X11R7/man/man1/scanpci.1				xserver-obsolete	obsolete

Reply via email to