Module Name: src
Committed By: abs
Date: Mon Dec 6 17:52:00 UTC 2021
Modified Files:
src/external/mit/xorg/server/drivers: Makefile
src/external/mit/xorg/server/drivers/xf86-input-keyboard: Makefile
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos:
Makefile
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos: Makefile
src/share/mk: bsd.own.mk bsd.x11.mk
Added Files:
src/distrib/sets/lists/xdebug: md.pmax
src/distrib/sets/lists/xserver: md.pmax
Log Message:
Add Xwsfb X server to pmax build
With the previous tweak to TURBOchannel framebuffers in sys/dev/tc this
should allows pmax to once again run X11.
TODO: Investigate pullup to -9
To generate a diff of this commit:
cvs rdiff -u -r0 -r1.3 src/distrib/sets/lists/xdebug/md.pmax
cvs rdiff -u -r0 -r1.13 src/distrib/sets/lists/xserver/md.pmax
cvs rdiff -u -r1.103 -r1.104 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.19 -r1.20 \
src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
cvs rdiff -u -r1.1.1.1 -r1.2 \
src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.49 -r1.50 \
src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
cvs rdiff -u -r1.1268 -r1.1269 src/share/mk/bsd.own.mk
cvs rdiff -u -r1.141 -r1.142 src/share/mk/bsd.x11.mk
Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.
Modified files:
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.103 src/external/mit/xorg/server/drivers/Makefile:1.104
--- src/external/mit/xorg/server/drivers/Makefile:1.103 Sat Aug 28 08:56:10 2021
+++ src/external/mit/xorg/server/drivers/Makefile Mon Dec 6 17:51:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.103 2021/08/28 08:56:10 maya Exp $
+# $NetBSD: Makefile,v 1.104 2021/12/06 17:51:59 abs Exp $
.include <bsd.own.mk>
@@ -337,10 +337,11 @@ SUBDIR+= \
.endif # ${MACHINE} == "sparc"
.endif # ${MACHINE} == "sparc" || ${MACHINE} == "sparc64"
-.if ${MACHINE} == "vax"
+.if ${MACHINE} == "pmax" || \
+ ${MACHINE} == "vax"
SUBDIR+= \
xf86-video-wsfb
-.endif # ${MACHINE} == "vax"
+.endif # ${MACHINE} == "pmax" || ${MACHINE} == "vax"
.if ${MACHINE} == "zaurus"
SUBDIR+= \
Index: src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.19 src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.20
--- src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile:1.19 Thu Jun 3 07:37:00 2021
+++ src/external/mit/xorg/server/drivers/xf86-input-keyboard/Makefile Mon Dec 6 17:51:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.19 2021/06/03 07:37:00 rin Exp $
+# $NetBSD: Makefile,v 1.20 2021/12/06 17:51:59 abs Exp $
DRIVER= xf86-input-keyboard
DRIVER_NAME= kbd_drv
@@ -17,6 +17,7 @@ CPPFLAGS+= -DPCVT_SUPPORT
${MACHINE} == "amiga" || \
${MACHINE} == "evbarm" || \
${MACHINE} == "mac68k" || \
+ ${MACHINE} == "pmax" || \
${MACHINE} == "sgimips" || \
${MACHINE} == "shark" || \
${MACHINE} == "sparc" || \
Index: src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile:1.1.1.1 src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile:1.2
--- src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile:1.1.1.1 Fri Jun 10 03:42:14 2016
+++ src/external/mit/xorg/server/xorg-server.old/hw/xfree86/xorgos/Makefile Mon Dec 6 17:52:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.1.1.1 2016/06/10 03:42:14 mrg Exp $
+# $NetBSD: Makefile,v 1.2 2021/12/06 17:52:00 abs Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -99,7 +99,8 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
.endfor
.endif
-.if ${MACHINE} == "vax"
+.if ${MACHINE} == "pmax" || \
+ ${MACHINE} == "vax"
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
Index: src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile
diff -u src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.49 src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.50
--- src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile:1.49 Sun Mar 7 10:42:27 2021
+++ src/external/mit/xorg/server/xorg-server/hw/xfree86/xorgos/Makefile Mon Dec 6 17:51:59 2021
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.49 2021/03/07 10:42:27 rin Exp $
+# $NetBSD: Makefile,v 1.50 2021/12/06 17:51:59 abs Exp $
.include "../../../Makefile.serverlib"
.include "../../../Makefile.servermod"
@@ -108,7 +108,8 @@ CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSES
.endfor
.endif
-.if ${MACHINE} == "vax"
+.if ${MACHINE} == "pmax" || \
+ ${MACHINE} == "vax"
SRCS.bsd+= ppc_video.c pm_noop.c agp_noop.c
.for _FN in ${SRCS.bsd}
CPPFLAGS.${_FN}= -DWSCONS_SUPPORT -DUSESTDRES -DHAVE_SYSV_IPC
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.1268 src/share/mk/bsd.own.mk:1.1269
--- src/share/mk/bsd.own.mk:1.1268 Sat Nov 13 10:13:42 2021
+++ src/share/mk/bsd.own.mk Mon Dec 6 17:52:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.1268 2021/11/13 10:13:42 skrll Exp $
+# $NetBSD: bsd.own.mk,v 1.1269 2021/12/06 17:52:00 abs Exp $
# This needs to be before bsd.init.mk
.if defined(BSD_MK_COMPAT_FILE)
@@ -1344,6 +1344,7 @@ MKSLJIT= yes
${MACHINE} == "macppc" || \
${MACHINE} == "netwinder" || \
${MACHINE} == "newsmips" || \
+ ${MACHINE} == "pmax" || \
${MACHINE} == "prep" || \
${MACHINE} == "ofppc" || \
${MACHINE} == "sgimips" || \
Index: src/share/mk/bsd.x11.mk
diff -u src/share/mk/bsd.x11.mk:1.141 src/share/mk/bsd.x11.mk:1.142
--- src/share/mk/bsd.x11.mk:1.141 Tue Aug 24 06:29:18 2021
+++ src/share/mk/bsd.x11.mk Mon Dec 6 17:52:00 2021
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.x11.mk,v 1.141 2021/08/24 06:29:18 mrg Exp $
+# $NetBSD: bsd.x11.mk,v 1.142 2021/12/06 17:52:00 abs Exp $
.include <bsd.init.mk>
@@ -82,7 +82,6 @@ X11FLAGS.OS_DEFINES= -DDDXOSINIT -DSERVE
-DDDXOSVERRORF -DDDXTIME -DUSB_HID
.if !(${MACHINE} == "acorn32" || \
- ${MACHINE} == "pmax" || \
${MACHINE} == "sun3" || \
${MACHINE} == "x68k" || \
${MACHINE} == "vax")
Added files:
Index: src/distrib/sets/lists/xdebug/md.pmax
diff -u /dev/null src/distrib/sets/lists/xdebug/md.pmax:1.3
--- /dev/null Mon Dec 6 17:52:00 2021
+++ src/distrib/sets/lists/xdebug/md.pmax Mon Dec 6 17:51:59 2021
@@ -0,0 +1,47 @@
+# $NetBSD: md.pmax,v 1.3 2021/12/06 17:51:59 abs Exp $
+./usr/X11R7/lib/modules/extensions/libdbe_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdri2_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdri_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libglx_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/librecord_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libexa_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libfb_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libi2c_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libvbe_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libvgahw_g.a xdebug-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libxaa_g.a xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/bin/Xorg.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/Xorg.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/cvt.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/bin/gtf.debug xdebug-xorg-server-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug xdebug-xf86-input-keyboard-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libkbd_drv.so.1.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libmouse_drv.so.1.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug xdebug-xf86-input-mouse-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug xdebug-xf86-input-ws-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/wsfb_drv.so.0.debug xdebug-xf86-video-wsfb-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri.so.0.debug xdebug-dri-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdri2.so.0.debug xdebug-dri2-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libextmod.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libextmod.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libglx.so.0.debug xdebug-glx-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/librecord.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/librecord.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
+./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libshadow.so.0.debug xdebug-shadow-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libexa.so.0.debug xdebug-exa-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libfb.so.0.debug xdebug-dixmods-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libi2c.so.0.debug xdebug-obsolete xorg,obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/libshadowfb.so.0.debug xdebug-shadowfb-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libvbe.so.0.debug xdebug-vbe-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libvgahw.so.0.debug xdebug-vgahw-debug xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/libxaa.so.0.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
Index: src/distrib/sets/lists/xserver/md.pmax
diff -u /dev/null src/distrib/sets/lists/xserver/md.pmax:1.13
--- /dev/null Mon Dec 6 17:52:00 2021
+++ src/distrib/sets/lists/xserver/md.pmax Mon Dec 6 17:51:59 2021
@@ -0,0 +1,106 @@
+# $NetBSD: md.pmax,v 1.13 2021/12/06 17:51:59 abs Exp $
+./usr/X11R7/bin/X xserver-xorg-server-bin xorg
+./usr/X11R7/bin/Xorg xserver-xorg-server-bin xorg
+./usr/X11R7/bin/cvt xserver-xorg-server-bin xorg
+./usr/X11R7/bin/gtf xserver-xorg-server-bin xorg
+./usr/X11R7/lib/X11/doc/README.modes xserver-xorg-server-lib xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so xserver-xf86-input-keyboard-drivers xorg
+./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 xserver-xf86-input-keyboard-drivers xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so xserver-xf86-input-mouse-drivers xorg
+./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 xserver-xf86-input-mouse-drivers xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so xserver-xf86-input-ws-drivers xorg
+./usr/X11R7/lib/modules/drivers/ws_drv.so.1 xserver-xf86-input-ws-drivers xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so xserver-xf86-video-wsfb-drivers xorg
+./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 xserver-xf86-video-wsfb-drivers xorg
+./usr/X11R7/lib/modules/extensions/libdbe.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libdbe.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libdbe.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/extensions/libdbe.so.0 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libdbe.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/extensions/libdbe_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libdri.a xserver-dri-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri.so xserver-dri-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri.so.0 xserver-dri-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri2.a xserver-dri2-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so xserver-dri2-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri2.so.0 xserver-dri2-modules xorg
+./usr/X11R7/lib/modules/extensions/libdri2_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libdri_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libextmod.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod.so.0 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/libextmod.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/extensions/libextmod_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libglx.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libglx.so xserver-glx-modules xorg
+./usr/X11R7/lib/modules/extensions/libglx.so.0 xserver-glx-modules xorg
+./usr/X11R7/lib/modules/extensions/libglx_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/librecord.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/librecord.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/librecord.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/extensions/librecord.so.0 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/extensions/librecord.so.0 xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/extensions/librecord_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/extensions/libshadow.so xserver-shadow-modules xorg
+./usr/X11R7/lib/modules/extensions/libshadow.so.0 xserver-shadow-modules xorg
+./usr/X11R7/lib/modules/extensions/libshadow_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libexa.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libexa.so xserver-exa-modules xorg
+./usr/X11R7/lib/modules/libexa.so.0 xserver-exa-modules xorg
+./usr/X11R7/lib/modules/libexa_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libfb.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libfb.so xserver-dixmods-modules xorg
+./usr/X11R7/lib/modules/libfb.so.0 xserver-dixmods-modules xorg
+./usr/X11R7/lib/modules/libfb_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libi2c.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libi2c.so xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libi2c.so.0 xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libi2c_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libshadowfb.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libshadowfb.so xserver-shadowfb-modules xorg
+./usr/X11R7/lib/modules/libshadowfb.so.0 xserver-shadowfb-modules xorg
+./usr/X11R7/lib/modules/libshadowfb_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libvbe.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libvbe.so xserver-vbe-modules xorg
+./usr/X11R7/lib/modules/libvbe.so.0 xserver-vbe-modules xorg
+./usr/X11R7/lib/modules/libvbe_pic.a xserver-obsolete xorg,picinstall,obsolete
+./usr/X11R7/lib/modules/libvgahw.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libvgahw.so xserver-vgahw-modules xorg
+./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/lib/modules/libxaa.a xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/libxaa.so -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/libxaa.so xserver-obsolete xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/lib/modules/libxaa.so.0 -unknown- xorg,xorg_server_ver=110
+./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
+./usr/X11R7/man/cat4/mousedrv.0 xserver-xf86-input-mouse-catman .cat,xorg
+./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/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
+./usr/X11R7/man/html4/mousedrv.html xserver-xf86-input-mouse-htmlman html,xorg
+./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/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
+./usr/X11R7/man/man4/mousedrv.4 xserver-xf86-input-mouse-man .man,xorg
+./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/share/aclocal/xorg-server.m4 xserver-xorg-server-share xorg
