Module Name:    src
Committed By:   uwe
Date:           Tue May  3 12:53:52 UTC 2022

Modified Files:
        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
        src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc: Makefile
        src/external/mit/xorg/server/xorg-server/hw/xfree86/doc: Makefile

Log Message:
xorg-server: Add xorg.conf.d(5) MLINKS.


To generate a diff of this commit:
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.118 -r1.119 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.31 -r1.32 src/distrib/sets/lists/xserver/md.amiga
cvs rdiff -u -r1.22 -r1.23 src/distrib/sets/lists/xserver/md.bebox \
    src/distrib/sets/lists/xserver/md.luna68k \
    src/distrib/sets/lists/xserver/md.vax
cvs rdiff -u -r1.64 -r1.65 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xserver/md.dreamcast
cvs rdiff -u -r1.25 -r1.26 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.prep \
    src/distrib/sets/lists/xserver/md.zaurus
cvs rdiff -u -r1.16 -r1.17 src/distrib/sets/lists/xserver/md.evbmips
cvs rdiff -u -r1.4 -r1.5 src/distrib/sets/lists/xserver/md.evbppc
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xserver/md.hpcarm
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xserver/md.hpcmips
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xserver/md.hpcsh
cvs rdiff -u -r1.3 -r1.4 src/distrib/sets/lists/xserver/md.hppa
cvs rdiff -u -r1.134 -r1.135 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.10 -r1.11 src/distrib/sets/lists/xserver/md.ibmnws
cvs rdiff -u -r1.2 -r1.3 src/distrib/sets/lists/xserver/md.iyonix
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xserver/md.mac68k \
    src/distrib/sets/lists/xserver/md.newsmips
cvs rdiff -u -r1.84 -r1.85 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.42 -r1.43 src/distrib/sets/lists/xserver/md.netwinder
cvs rdiff -u -r1.34 -r1.35 src/distrib/sets/lists/xserver/md.ofppc
cvs rdiff -u -r1.13 -r1.14 src/distrib/sets/lists/xserver/md.pmax
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.57 -r1.58 src/distrib/sets/lists/xserver/md.shark
cvs rdiff -u -r1.76 -r1.77 src/distrib/sets/lists/xserver/md.sparc
cvs rdiff -u -r1.72 -r1.73 src/distrib/sets/lists/xserver/md.sparc64
cvs rdiff -u -r1.2 -r1.3 \
    src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile
cvs rdiff -u -r1.8 -r1.9 \
    src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile

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/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.54 src/distrib/sets/lists/xserver/md.alpha:1.55
--- src/distrib/sets/lists/xserver/md.alpha:1.54	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xserver/md.alpha	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.54 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.alpha,v 1.55 2022/05/03 12:53:51 uwe 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
@@ -287,6 +287,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -346,6 +347,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -405,4 +407,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.118 src/distrib/sets/lists/xserver/md.amd64:1.119
--- src/distrib/sets/lists/xserver/md.amd64:1.118	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xserver/md.amd64	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.118 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.amd64,v 1.119 2022/05/03 12:53:51 uwe 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
@@ -360,6 +360,7 @@
 ./usr/X11R7/man/cat4/xgi.0				xserver-obsolete	.cat,xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/man/cat4/xgi.0				xserver-xf86-video-xgi-catman	.cat,xorg,xorg_server_ver=110
 ./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
@@ -415,6 +416,7 @@
 ./usr/X11R7/man/html4/xgi.html				xserver-obsolete	html,xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/man/html4/xgi.html				xserver-xf86-video-xgi-htmlman	html,xorg,xorg_server_ver=110
 ./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
@@ -469,5 +471,6 @@
 ./usr/X11R7/man/man4/xgi.4				xserver-obsolete	.man,xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/man/man4/xgi.4				xserver-xf86-video-xgi-man	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg
 ./usr/X11R7/share/libdrm/amdgpu.ids			xserver-xf86-video-ati-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.amiga
diff -u src/distrib/sets/lists/xserver/md.amiga:1.31 src/distrib/sets/lists/xserver/md.amiga:1.32
--- src/distrib/sets/lists/xserver/md.amiga:1.31	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.amiga	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.amiga,v 1.31 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.amiga,v 1.32 2022/05/03 12:53:51 uwe 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
@@ -89,6 +89,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -98,6 +99,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -107,4 +109,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.bebox
diff -u src/distrib/sets/lists/xserver/md.bebox:1.22 src/distrib/sets/lists/xserver/md.bebox:1.23
--- src/distrib/sets/lists/xserver/md.bebox:1.22	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.bebox	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.bebox,v 1.22 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.bebox,v 1.23 2022/05/03 12:53:51 uwe 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
@@ -111,6 +111,7 @@
 ./usr/X11R7/man/cat4/vga.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./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
@@ -124,6 +125,7 @@
 ./usr/X11R7/man/html4/vga.html				xserver-obsolete	obsolete
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./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
@@ -137,4 +139,5 @@
 ./usr/X11R7/man/man4/vga.4				xserver-obsolete	obsolete
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg
Index: src/distrib/sets/lists/xserver/md.luna68k
diff -u src/distrib/sets/lists/xserver/md.luna68k:1.22 src/distrib/sets/lists/xserver/md.luna68k:1.23
--- src/distrib/sets/lists/xserver/md.luna68k:1.22	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.luna68k	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.luna68k,v 1.22 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.luna68k,v 1.23 2022/05/03 12:53:51 uwe 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
@@ -89,6 +89,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -98,6 +99,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -107,4 +109,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg
Index: src/distrib/sets/lists/xserver/md.vax
diff -u src/distrib/sets/lists/xserver/md.vax:1.22 src/distrib/sets/lists/xserver/md.vax:1.23
--- src/distrib/sets/lists/xserver/md.vax:1.22	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.vax	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.vax,v 1.22 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.vax,v 1.23 2022/05/03 12:53:51 uwe 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
@@ -85,6 +85,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -94,6 +95,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -103,4 +105,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.64 src/distrib/sets/lists/xserver/md.cats:1.65
--- src/distrib/sets/lists/xserver/md.cats:1.64	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xserver/md.cats	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.64 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.cats,v 1.65 2022/05/03 12:53:51 uwe 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
@@ -248,6 +248,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -288,6 +289,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -328,4 +330,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.dreamcast
diff -u src/distrib/sets/lists/xserver/md.dreamcast:1.30 src/distrib/sets/lists/xserver/md.dreamcast:1.31
--- src/distrib/sets/lists/xserver/md.dreamcast:1.30	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.dreamcast	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: md.dreamcast,v 1.30 2020/11/10 21:47:41 kamil Exp $
+#	$NetBSD: md.dreamcast,v 1.31 2022/05/03 12:53:51 uwe 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
@@ -93,6 +93,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -102,6 +103,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -111,4 +113,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.evbarm
diff -u src/distrib/sets/lists/xserver/md.evbarm:1.25 src/distrib/sets/lists/xserver/md.evbarm:1.26
--- src/distrib/sets/lists/xserver/md.evbarm:1.25	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xserver/md.evbarm	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbarm,v 1.25 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.evbarm,v 1.26 2022/05/03 12:53:51 uwe 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
@@ -121,6 +121,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -136,6 +137,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -151,5 +153,6 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg
 ./usr/X11R7/share/libdrm/amdgpu.ids			xserver-xf86-video-ati-drivers	xorg
Index: src/distrib/sets/lists/xserver/md.ews4800mips
diff -u src/distrib/sets/lists/xserver/md.ews4800mips:1.25 src/distrib/sets/lists/xserver/md.ews4800mips:1.26
--- src/distrib/sets/lists/xserver/md.ews4800mips:1.25	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.ews4800mips	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ews4800mips,v 1.25 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.ews4800mips,v 1.26 2022/05/03 12:53:51 uwe 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
@@ -91,6 +91,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -100,6 +101,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -109,4 +111,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg
Index: src/distrib/sets/lists/xserver/md.hp300
diff -u src/distrib/sets/lists/xserver/md.hp300:1.25 src/distrib/sets/lists/xserver/md.hp300:1.26
--- src/distrib/sets/lists/xserver/md.hp300:1.25	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.hp300	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hp300,v 1.25 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.hp300,v 1.26 2022/05/03 12:53:51 uwe 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
@@ -89,6 +89,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -98,6 +99,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -107,4 +109,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg
Index: src/distrib/sets/lists/xserver/md.prep
diff -u src/distrib/sets/lists/xserver/md.prep:1.25 src/distrib/sets/lists/xserver/md.prep:1.26
--- src/distrib/sets/lists/xserver/md.prep:1.25	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.prep	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.prep,v 1.25 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.prep,v 1.26 2022/05/03 12:53:51 uwe Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -108,6 +108,7 @@
 ./usr/X11R7/man/cat4/vga.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./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
@@ -120,6 +121,7 @@
 ./usr/X11R7/man/html4/vga.html				xserver-obsolete	obsolete
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./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
@@ -132,4 +134,5 @@
 ./usr/X11R7/man/man4/vga.4				xserver-obsolete	obsolete
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg
Index: src/distrib/sets/lists/xserver/md.zaurus
diff -u src/distrib/sets/lists/xserver/md.zaurus:1.25 src/distrib/sets/lists/xserver/md.zaurus:1.26
--- src/distrib/sets/lists/xserver/md.zaurus:1.25	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.zaurus	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.zaurus,v 1.25 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.zaurus,v 1.26 2022/05/03 12:53:51 uwe 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
@@ -97,6 +97,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -107,6 +108,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -117,4 +119,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.evbmips
diff -u src/distrib/sets/lists/xserver/md.evbmips:1.16 src/distrib/sets/lists/xserver/md.evbmips:1.17
--- src/distrib/sets/lists/xserver/md.evbmips:1.16	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.evbmips	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.evbmips,v 1.16 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.evbmips,v 1.17 2022/05/03 12:53:51 uwe 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
@@ -93,6 +93,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -105,6 +106,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -117,4 +119,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.evbppc
diff -u src/distrib/sets/lists/xserver/md.evbppc:1.4 src/distrib/sets/lists/xserver/md.evbppc:1.5
--- src/distrib/sets/lists/xserver/md.evbppc:1.4	Sun Mar  7 10:42:27 2021
+++ src/distrib/sets/lists/xserver/md.evbppc	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: md.evbppc,v 1.4 2021/03/07 10:42:27 rin Exp $
+#	$NetBSD: md.evbppc,v 1.5 2022/05/03 12:53:51 uwe Exp $
 ./usr/X11R7/bin/X					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/Xorg					xserver-xorg-server-bin	xorg
 ./usr/X11R7/bin/cvt					xserver-xorg-server-bin	xorg
@@ -50,6 +50,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -59,6 +60,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -68,4 +70,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.hpcarm
diff -u src/distrib/sets/lists/xserver/md.hpcarm:1.29 src/distrib/sets/lists/xserver/md.hpcarm:1.30
--- src/distrib/sets/lists/xserver/md.hpcarm:1.29	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.hpcarm	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcarm,v 1.29 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.hpcarm,v 1.30 2022/05/03 12:53:51 uwe 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
@@ -101,6 +101,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -110,6 +111,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -119,4 +121,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.hpcmips
diff -u src/distrib/sets/lists/xserver/md.hpcmips:1.35 src/distrib/sets/lists/xserver/md.hpcmips:1.36
--- src/distrib/sets/lists/xserver/md.hpcmips:1.35	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.hpcmips	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcmips,v 1.35 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.hpcmips,v 1.36 2022/05/03 12:53:51 uwe 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
@@ -97,6 +97,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -106,6 +107,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -115,4 +117,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.hpcsh
diff -u src/distrib/sets/lists/xserver/md.hpcsh:1.28 src/distrib/sets/lists/xserver/md.hpcsh:1.29
--- src/distrib/sets/lists/xserver/md.hpcsh:1.28	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.hpcsh	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hpcsh,v 1.28 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.hpcsh,v 1.29 2022/05/03 12:53:51 uwe 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
@@ -97,6 +97,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -106,6 +107,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -115,4 +117,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.hppa
diff -u src/distrib/sets/lists/xserver/md.hppa:1.3 src/distrib/sets/lists/xserver/md.hppa:1.4
--- src/distrib/sets/lists/xserver/md.hppa:1.3	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.hppa	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.hppa,v 1.3 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.hppa,v 1.4 2022/05/03 12:53:51 uwe 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
@@ -93,6 +93,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -104,6 +105,7 @@
 ./usr/X11R7/man/html4/r128.html				xserver-xf86-video-r128-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -115,4 +117,5 @@
 ./usr/X11R7/man/man4/r128.4				xserver-xf86-video-r128-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.134 src/distrib/sets/lists/xserver/md.i386:1.135
--- src/distrib/sets/lists/xserver/md.i386:1.134	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xserver/md.i386	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.134 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.i386,v 1.135 2022/05/03 12:53:51 uwe 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
@@ -372,6 +372,7 @@
 ./usr/X11R7/man/cat4/xgi.0				-unknown-	.cat,xorg,xorg_server_ver=110
 ./usr/X11R7/man/cat4/xgi.0				xserver-obsolete	.cat,xorg,xorg_server_ver=120,obsolete
 ./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
@@ -428,6 +429,7 @@
 ./usr/X11R7/man/html4/xgi.html				-unknown-	html,xorg,xorg_server_ver=110
 ./usr/X11R7/man/html4/xgi.html				xserver-obsolete	html,xorg,xorg_server_ver=120,obsolete
 ./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
@@ -484,5 +486,6 @@
 ./usr/X11R7/man/man4/xgi.4				-unknown-	.man,xorg,xorg_server_ver=110
 ./usr/X11R7/man/man4/xgi.4				xserver-obsolete	.man,xorg,xorg_server_ver=120,obsolete
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg
 ./usr/X11R7/share/libdrm/amdgpu.ids			xserver-xf86-video-ati-drivers	xorg

Index: src/distrib/sets/lists/xserver/md.ibmnws
diff -u src/distrib/sets/lists/xserver/md.ibmnws:1.10 src/distrib/sets/lists/xserver/md.ibmnws:1.11
--- src/distrib/sets/lists/xserver/md.ibmnws:1.10	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.ibmnws	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ibmnws,v 1.10 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.ibmnws,v 1.11 2022/05/03 12:53:51 uwe 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
@@ -98,6 +98,7 @@
 ./usr/X11R7/man/cat4/vga.0				xserver-obsolete	obsolete
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./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
@@ -108,6 +109,7 @@
 ./usr/X11R7/man/html4/vga.html				xserver-obsolete	obsolete
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./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
@@ -118,4 +120,5 @@
 ./usr/X11R7/man/man4/vga.4				xserver-obsolete	obsolete
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.iyonix
diff -u src/distrib/sets/lists/xserver/md.iyonix:1.2 src/distrib/sets/lists/xserver/md.iyonix:1.3
--- src/distrib/sets/lists/xserver/md.iyonix:1.2	Sat Oct 26 07:31:39 2019
+++ src/distrib/sets/lists/xserver/md.iyonix	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.iyonix,v 1.2 2019/10/26 07:31:39 uki Exp $
+# $NetBSD: md.iyonix,v 1.3 2022/05/03 12:53:51 uwe 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
@@ -59,6 +59,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -69,4 +70,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.mac68k
diff -u src/distrib/sets/lists/xserver/md.mac68k:1.24 src/distrib/sets/lists/xserver/md.mac68k:1.25
--- src/distrib/sets/lists/xserver/md.mac68k:1.24	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.mac68k	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.mac68k,v 1.24 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.mac68k,v 1.25 2022/05/03 12:53:51 uwe 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
@@ -89,6 +89,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -98,6 +99,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -107,4 +109,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg
Index: src/distrib/sets/lists/xserver/md.newsmips
diff -u src/distrib/sets/lists/xserver/md.newsmips:1.24 src/distrib/sets/lists/xserver/md.newsmips:1.25
--- src/distrib/sets/lists/xserver/md.newsmips:1.24	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.newsmips	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.newsmips,v 1.24 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.newsmips,v 1.25 2022/05/03 12:53:51 uwe 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
@@ -91,6 +91,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -100,6 +101,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -109,4 +111,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.84 src/distrib/sets/lists/xserver/md.macppc:1.85
--- src/distrib/sets/lists/xserver/md.macppc:1.84	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xserver/md.macppc	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.84 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.macppc,v 1.85 2022/05/03 12:53:51 uwe 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
@@ -200,6 +200,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -222,6 +223,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -244,4 +246,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.netwinder
diff -u src/distrib/sets/lists/xserver/md.netwinder:1.42 src/distrib/sets/lists/xserver/md.netwinder:1.43
--- src/distrib/sets/lists/xserver/md.netwinder:1.42	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.netwinder	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.42 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.netwinder,v 1.43 2022/05/03 12:53:51 uwe 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
@@ -154,6 +154,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -167,6 +168,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -180,4 +182,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.ofppc
diff -u src/distrib/sets/lists/xserver/md.ofppc:1.34 src/distrib/sets/lists/xserver/md.ofppc:1.35
--- src/distrib/sets/lists/xserver/md.ofppc:1.34	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xserver/md.ofppc	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.34 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.ofppc,v 1.35 2022/05/03 12:53:51 uwe 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
@@ -136,6 +136,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -152,6 +153,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -168,4 +170,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.pmax
diff -u src/distrib/sets/lists/xserver/md.pmax:1.13 src/distrib/sets/lists/xserver/md.pmax:1.14
--- src/distrib/sets/lists/xserver/md.pmax:1.13	Mon Dec  6 17:51:59 2021
+++ src/distrib/sets/lists/xserver/md.pmax	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.pmax,v 1.13 2021/12/06 17:51:59 abs Exp $
+# $NetBSD: md.pmax,v 1.14 2022/05/03 12:53:51 uwe 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
@@ -85,6 +85,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -94,6 +95,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -103,4 +105,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.sgimips
diff -u src/distrib/sets/lists/xserver/md.sgimips:1.63 src/distrib/sets/lists/xserver/md.sgimips:1.64
--- src/distrib/sets/lists/xserver/md.sgimips:1.63	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.sgimips	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.63 2020/11/10 21:47:41 kamil Exp $	x11
+# $NetBSD: md.sgimips,v 1.64 2022/05/03 12:53:51 uwe 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
@@ -172,6 +172,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -192,6 +193,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -212,4 +214,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.shark
diff -u src/distrib/sets/lists/xserver/md.shark:1.57 src/distrib/sets/lists/xserver/md.shark:1.58
--- src/distrib/sets/lists/xserver/md.shark:1.57	Tue Nov 10 21:47:41 2020
+++ src/distrib/sets/lists/xserver/md.shark	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.57 2020/11/10 21:47:41 kamil Exp $
+# $NetBSD: md.shark,v 1.58 2022/05/03 12:53:51 uwe 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
@@ -156,6 +156,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -169,6 +170,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -182,4 +184,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.sparc
diff -u src/distrib/sets/lists/xserver/md.sparc:1.76 src/distrib/sets/lists/xserver/md.sparc:1.77
--- src/distrib/sets/lists/xserver/md.sparc:1.76	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xserver/md.sparc	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.76 2022/02/25 17:42:59 mrg Exp $
+# $NetBSD: md.sparc,v 1.77 2022/05/03 12:53:51 uwe 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
@@ -203,6 +203,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -228,6 +229,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -253,4 +255,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.72 src/distrib/sets/lists/xserver/md.sparc64:1.73
--- src/distrib/sets/lists/xserver/md.sparc64:1.72	Fri Feb 25 17:42:59 2022
+++ src/distrib/sets/lists/xserver/md.sparc64	Tue May  3 12:53:51 2022
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.72 2022/02/25 17:42:59 mrg Exp $	x11
+# $NetBSD: md.sparc64,v 1.73 2022/05/03 12:53:51 uwe 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
@@ -200,6 +200,7 @@
 ./usr/X11R7/man/cat4/ws.0				xserver-xf86-input-ws-catman	.cat,xorg
 ./usr/X11R7/man/cat4/wsfb.0				xserver-xf86-video-wsfb-catman	.cat,xorg
 ./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
@@ -224,6 +225,7 @@
 ./usr/X11R7/man/html4/ws.html				xserver-xf86-input-ws-htmlman	html,xorg
 ./usr/X11R7/man/html4/wsfb.html				xserver-xf86-video-wsfb-htmlman	html,xorg
 ./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
@@ -248,4 +250,5 @@
 ./usr/X11R7/man/man4/ws.4				xserver-xf86-input-ws-man	.man,xorg
 ./usr/X11R7/man/man4/wsfb.4				xserver-xf86-video-wsfb-man	.man,xorg
 ./usr/X11R7/man/man5/xorg.conf.5			xserver-xorg-server-man	.man,xorg
+./usr/X11R7/man/man5/xorg.conf.d.5			xserver-xorg-server-man	.man,xorg
 ./usr/X11R7/share/aclocal/xorg-server.m4		xserver-xorg-server-share	xorg

Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile:1.2 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile:1.3
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile:1.2	Mon Mar 11 06:25:55 2019
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/doc/Makefile	Tue May  3 12:53:52 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.2 2019/03/11 06:25:55 mrg Exp $
+#	$NetBSD: Makefile,v 1.3 2022/05/03 12:53:52 uwe Exp $
 
 .include <bsd.own.mk>
 
@@ -9,8 +9,10 @@ FILES=	README.modes
 
 FILESDIR=	${X11USRLIBDIR}/X11/doc
 
-MAN=	Xorg.1 xorg.conf.5
-# xorg.conf.d.5?
+MAN += Xorg.1
+MAN += xorg.conf.5
+
+MLINKS += xorg.conf.5 xorg.conf.d.5
 
 X11EXTRAMANTRANSFORMS+= \
 	__xconfigdir__		xorg.conf.d \

Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.8 src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.9
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile:1.8	Mon Aug 10 09:23:37 2020
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/doc/Makefile	Tue May  3 12:53:52 2022
@@ -1,4 +1,4 @@
-#	$NetBSD: Makefile,v 1.8 2020/08/10 09:23:37 mrg Exp $
+#	$NetBSD: Makefile,v 1.9 2022/05/03 12:53:52 uwe Exp $
 
 .include <bsd.own.mk>
 
@@ -9,8 +9,10 @@ FILES=	README.modes
 
 FILESDIR=	${X11USRLIBDIR}/X11/doc
 
-MAN=	Xorg.1 xorg.conf.5
-# xorg.conf.d.5?
+MAN += Xorg.1
+MAN += xorg.conf.5
+
+MLINKS += xorg.conf.5 xorg.conf.d.5
 
 X11EXTRAMANTRANSFORMS_BOTH+= \
 	xconfigdir		xorg.conf.d \

Reply via email to