Module Name: src
Committed By: mrg
Date: Sat Jun 22 23:20:39 UTC 2024
Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.cats md.i386
src/distrib/sets/lists/xserver: md.alpha md.amd64 md.cats md.i386
src/external/mit/xorg/server/drivers: Makefile
Log Message:
also enable xf86-video-trident for xorg-server 21 builds, it builds fine.
To generate a diff of this commit:
cvs rdiff -u -r1.66 -r1.67 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xdebug/md.cats
cvs rdiff -u -r1.63 -r1.64 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.65 -r1.66 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.128 -r1.129 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.73 -r1.74 src/distrib/sets/lists/xserver/md.cats
cvs rdiff -u -r1.144 -r1.145 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.111 -r1.112 src/external/mit/xorg/server/drivers/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/xdebug/md.amd64
diff -u src/distrib/sets/lists/xdebug/md.amd64:1.66 src/distrib/sets/lists/xdebug/md.amd64:1.67
--- src/distrib/sets/lists/xdebug/md.amd64:1.66 Sat Jun 22 23:02:44 2024
+++ src/distrib/sets/lists/xdebug/md.amd64 Sat Jun 22 23:20:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.66 2024/06/22 23:02:44 mrg Exp $
+# $NetBSD: md.amd64,v 1.67 2024/06/22 23:20:38 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a xdebug-libI810XvMC-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libIntelXvMC_g.a xdebug-libIntelXvMC-debuglib xorg,debuglib,compatx11file
./usr/X11R7/lib/libchromeXvMCPro_g.a xdebug-libchromeXvMCPro-debuglib xorg,debuglib,compatx11file
@@ -168,7 +168,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug xdebug-obsolete obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-xf86-video-trident-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug xdebug-xf86-video-tseng-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vboxvideo_drv.so.1.debug xdebug-xf86-video-vboxvideo-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug xdebug-xf86-video-vesa-debug xorg,debug
Index: src/distrib/sets/lists/xdebug/md.cats
diff -u src/distrib/sets/lists/xdebug/md.cats:1.24 src/distrib/sets/lists/xdebug/md.cats:1.25
--- src/distrib/sets/lists/xdebug/md.cats:1.24 Sat Jun 22 23:02:44 2024
+++ src/distrib/sets/lists/xdebug/md.cats Sat Jun 22 23:20:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.24 2024/06/22 23:02:44 mrg Exp $
+# $NetBSD: md.cats,v 1.25 2024/06/22 23:20:38 mrg Exp $
./usr/X11R7/lib/modules/extensions/libcfb32_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/modules/extensions/libcfb_g.a xdebug-obsolete xorg,obsolete
./usr/X11R7/lib/modules/extensions/libdbe_g.a xdebug-obsolete xorg,obsolete
@@ -84,7 +84,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1.debug xdebug-xf86-video-siliconmotion-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug xdebug-xf86-video-tdfx-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug xdebug-obsolete obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-xf86-video-trident-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug xdebug-xf86-video-tseng-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug xdebug-xf86-video-vesa-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ws_drv.so.1.debug xdebug-xf86-input-ws-debug xorg,debug
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.63 src/distrib/sets/lists/xdebug/md.i386:1.64
--- src/distrib/sets/lists/xdebug/md.i386:1.63 Sat Jun 22 23:02:44 2024
+++ src/distrib/sets/lists/xdebug/md.i386 Sat Jun 22 23:20:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.63 2024/06/22 23:02:44 mrg Exp $
+# $NetBSD: md.i386,v 1.64 2024/06/22 23:20:38 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a xdebug-libI810XvMC-debuglib xorg,debuglib
./usr/X11R7/lib/libIntelXvMC_g.a xdebug-libIntelXvMC-debuglib xorg,debuglib
./usr/X11R7/lib/libchromeXvMCPro_g.a xdebug-libchromeXvMCPro-debuglib xorg,debuglib
@@ -180,7 +180,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug xdebug-obsolete xorg,obsolete,xorg_server_ver=120
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug xdebug-obsolete obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-obsolete obsolete
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug xdebug-xf86-video-trident-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug xdebug-xf86-video-tseng-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vboxvideo_drv.so.1.debug xdebug-xf86-video-vboxvideo-debug xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug xdebug-xf86-video-vesa-debug xorg,debug
Index: src/distrib/sets/lists/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.65 src/distrib/sets/lists/xserver/md.alpha:1.66
--- src/distrib/sets/lists/xserver/md.alpha:1.65 Sat Jun 22 23:02:45 2024
+++ src/distrib/sets/lists/xserver/md.alpha Sat Jun 22 23:20:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.65 2024/06/22 23:02:45 mrg Exp $
+# $NetBSD: md.alpha,v 1.66 2024/06/22 23:20:38 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,8 +98,8 @@
./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-xf86-video-tga-drivers xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-xf86-video-tga-drivers xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-xf86-video-tga-drivers xorg,xorg_server_ver=120,obsolete
-./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg
+./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg
./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/tseng_drv.so xserver-xf86-video-tseng-drivers xorg
@@ -407,8 +407,7 @@
./usr/X11R7/man/man4/siliconmotion.4 xserver-xf86-video-siliconmotion-man .man,xorg
./usr/X11R7/man/man4/sis.4 xserver-xf86-video-sis-man .man,xorg
./usr/X11R7/man/man4/tdfx.4 xserver-xf86-video-tdfx-man .man,xorg
-./usr/X11R7/man/man4/trident.4 xserver-xf86-video-trident-man .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/trident.4 xserver-xf86-video-trident-man .man,xorg,xorg_server_ver=120,obsolete
+./usr/X11R7/man/man4/trident.4 xserver-xf86-video-trident-man .man,xorg
./usr/X11R7/man/man4/tseng.4 xserver-xf86-video-tseng-man .man,xorg
./usr/X11R7/man/man4/vga.4 xserver-obsolete obsolete
./usr/X11R7/man/man4/void.4 xserver-obsolete obsolete
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.128 src/distrib/sets/lists/xserver/md.amd64:1.129
--- src/distrib/sets/lists/xserver/md.amd64:1.128 Sat Jun 22 23:02:45 2024
+++ src/distrib/sets/lists/xserver/md.amd64 Sat Jun 22 23:20:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.128 2024/06/22 23:02:45 mrg Exp $
+# $NetBSD: md.amd64,v 1.129 2024/06/22 23:20:38 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
@@ -155,8 +155,8 @@
./usr/X11R7/lib/modules/drivers/tfp410_drv.so.2 xserver-obsolete xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-obsolete xorg,obsolete
./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-obsolete xorg,obsolete
-./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-obsolete xorg,obsolete
-./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg
+./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg
./usr/X11R7/lib/modules/drivers/tseng_drv.so xserver-xf86-video-tseng-drivers xorg
./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 xserver-xf86-video-tseng-drivers xorg
./usr/X11R7/lib/modules/drivers/vboxvideo_drv.so xserver-xf86-video-vboxvideo-drivers xorg
@@ -345,7 +345,7 @@
./usr/X11R7/man/cat4/siliconmotion.0 xserver-xf86-video-siliconmotion-catman .cat,xorg
./usr/X11R7/man/cat4/sis.0 xserver-xf86-video-sis-catman .cat,xorg
./usr/X11R7/man/cat4/tdfx.0 xserver-xf86-video-tdfx-catman .cat,xorg
-./usr/X11R7/man/cat4/trident.0 xserver-obsolete .cat,xorg,obsolete
+./usr/X11R7/man/cat4/trident.0 xserver-xf86-video-trident-catman .cat,xorg
./usr/X11R7/man/cat4/tseng.0 xserver-xf86-video-tseng-catman .cat,xorg
./usr/X11R7/man/cat4/vboxvideo.0 xserver-xf86-video-vboxvideo-catman .cat,xorg
./usr/X11R7/man/cat4/vesa.0 xserver-xf86-video-vesa-catman .cat,xorg
@@ -399,7 +399,7 @@
./usr/X11R7/man/html4/siliconmotion.html xserver-xf86-video-siliconmotion-htmlman html,xorg
./usr/X11R7/man/html4/sis.html xserver-xf86-video-sis-htmlman html,xorg
./usr/X11R7/man/html4/tdfx.html xserver-xf86-video-tdfx-htmlman html,xorg
-./usr/X11R7/man/html4/trident.html xserver-obsolete html,xorg,obsolete
+./usr/X11R7/man/html4/trident.html xserver-xf86-video-trident-htmlman html,xorg
./usr/X11R7/man/html4/tseng.html xserver-xf86-video-tseng-htmlman html,xorg
./usr/X11R7/man/html4/vboxvideo.html xserver-xf86-video-vboxvideo-htmlman html,xorg
./usr/X11R7/man/html4/vesa.html xserver-xf86-video-vesa-htmlman html,xorg
@@ -452,7 +452,7 @@
./usr/X11R7/man/man4/siliconmotion.4 xserver-xf86-video-siliconmotion-man .man,xorg
./usr/X11R7/man/man4/sis.4 xserver-xf86-video-sis-man .man,xorg
./usr/X11R7/man/man4/tdfx.4 xserver-xf86-video-tdfx-man .man,xorg
-./usr/X11R7/man/man4/trident.4 xserver-obsolete .man,xorg,obsolete
+./usr/X11R7/man/man4/trident.4 xserver-xf86-video-trident-man .man,xorg
./usr/X11R7/man/man4/tseng.4 xserver-xf86-video-tseng-man .man,xorg
./usr/X11R7/man/man4/vboxvideo.4 xserver-xf86-video-vboxvideo-man .man,xorg
./usr/X11R7/man/man4/vesa.4 xserver-xf86-video-vesa-man .man,xorg
Index: src/distrib/sets/lists/xserver/md.cats
diff -u src/distrib/sets/lists/xserver/md.cats:1.73 src/distrib/sets/lists/xserver/md.cats:1.74
--- src/distrib/sets/lists/xserver/md.cats:1.73 Sat Jun 22 23:02:45 2024
+++ src/distrib/sets/lists/xserver/md.cats Sat Jun 22 23:20:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.73 2024/06/22 23:02:45 mrg Exp $
+# $NetBSD: md.cats,v 1.74 2024/06/22 23:20:38 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
@@ -72,8 +72,8 @@
./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 xserver-xf86-video-tdfx-drivers xorg
./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-obsolete xorg,obsolete
./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-obsolete xorg,obsolete
-./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-obsolete xorg,obsolete
-./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg
+./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg
./usr/X11R7/lib/modules/drivers/tseng_drv.so xserver-xf86-video-tseng-drivers xorg
./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 xserver-xf86-video-tseng-drivers xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so xserver-xf86-video-vesa-drivers xorg
@@ -237,7 +237,7 @@
./usr/X11R7/man/cat4/savage.0 xserver-xf86-video-savage-catman .cat,xorg
./usr/X11R7/man/cat4/siliconmotion.0 xserver-xf86-video-siliconmotion-catman .cat,xorg
./usr/X11R7/man/cat4/tdfx.0 xserver-xf86-video-tdfx-catman .cat,xorg
-./usr/X11R7/man/cat4/trident.0 xserver-obsolete .cat,xorg,obsolete
+./usr/X11R7/man/cat4/trident.0 xserver-xf86-video-trident-catman .cat,xorg
./usr/X11R7/man/cat4/tseng.0 xserver-xf86-video-tseng-catman .cat,xorg
./usr/X11R7/man/cat4/vesa.0 xserver-xf86-video-vesa-catman .cat,xorg
./usr/X11R7/man/cat4/vga.0 xserver-obsolete obsolete
@@ -276,7 +276,7 @@
./usr/X11R7/man/html4/savage.html xserver-xf86-video-savage-htmlman html,xorg
./usr/X11R7/man/html4/siliconmotion.html xserver-xf86-video-siliconmotion-htmlman html,xorg
./usr/X11R7/man/html4/tdfx.html xserver-xf86-video-tdfx-htmlman html,xorg
-./usr/X11R7/man/html4/trident.html xserver-obsolete html,xorg,obsolete
+./usr/X11R7/man/html4/trident.html xserver-xf86-video-trident-htmlman html,xorg
./usr/X11R7/man/html4/tseng.html xserver-xf86-video-tseng-htmlman html,xorg
./usr/X11R7/man/html4/vesa.html xserver-xf86-video-vesa-htmlman html,xorg
./usr/X11R7/man/html4/vga.html xserver-obsolete obsolete
@@ -315,7 +315,7 @@
./usr/X11R7/man/man4/savage.4 xserver-xf86-video-savage-man .man,xorg
./usr/X11R7/man/man4/siliconmotion.4 xserver-xf86-video-siliconmotion-man .man,xorg
./usr/X11R7/man/man4/tdfx.4 xserver-xf86-video-tdfx-man .man,xorg
-./usr/X11R7/man/man4/trident.4 xserver-obsolete .man,xorg,obsolete
+./usr/X11R7/man/man4/trident.4 xserver-xf86-video-trident-man .man,xorg
./usr/X11R7/man/man4/tseng.4 xserver-xf86-video-tseng-man .man,xorg
./usr/X11R7/man/man4/vesa.4 xserver-xf86-video-vesa-man .man,xorg
./usr/X11R7/man/man4/vga.4 xserver-obsolete obsolete
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.144 src/distrib/sets/lists/xserver/md.i386:1.145
--- src/distrib/sets/lists/xserver/md.i386:1.144 Sat Jun 22 23:02:45 2024
+++ src/distrib/sets/lists/xserver/md.i386 Sat Jun 22 23:20:38 2024
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.144 2024/06/22 23:02:45 mrg Exp $
+# $NetBSD: md.i386,v 1.145 2024/06/22 23:20:38 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
@@ -166,8 +166,8 @@
./usr/X11R7/lib/modules/drivers/tfp410_drv.so.2 xserver-obsolete xorg,xorg_server_ver=120,obsolete
./usr/X11R7/lib/modules/drivers/tga_drv.so xserver-obsolete xorg,obsolete
./usr/X11R7/lib/modules/drivers/tga_drv.so.1 xserver-obsolete xorg,obsolete
-./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-obsolete xorg,obsolete
-./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-obsolete xorg,obsolete
+./usr/X11R7/lib/modules/drivers/trident_drv.so xserver-xf86-video-trident-drivers xorg
+./usr/X11R7/lib/modules/drivers/trident_drv.so.1 xserver-xf86-video-trident-drivers xorg
./usr/X11R7/lib/modules/drivers/tseng_drv.so xserver-xf86-video-tseng-drivers xorg
./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 xserver-xf86-video-tseng-drivers xorg
./usr/X11R7/lib/modules/drivers/vboxvideo_drv.so xserver-xf86-video-vboxvideo-drivers xorg
@@ -357,7 +357,7 @@
./usr/X11R7/man/cat4/siliconmotion.0 xserver-xf86-video-siliconmotion-catman .cat,xorg
./usr/X11R7/man/cat4/sis.0 xserver-xf86-video-sis-catman .cat,xorg
./usr/X11R7/man/cat4/tdfx.0 xserver-xf86-video-tdfx-catman .cat,xorg
-./usr/X11R7/man/cat4/trident.0 xserver-obsolete obsolete
+./usr/X11R7/man/cat4/trident.0 xserver-xf86-video-trident-catman .cat,xorg
./usr/X11R7/man/cat4/tseng.0 xserver-xf86-video-tseng-catman .cat,xorg
./usr/X11R7/man/cat4/vboxvideo.0 xserver-xf86-video-vboxvideo-catman .cat,xorg
./usr/X11R7/man/cat4/vesa.0 xserver-xf86-video-vesa-catman .cat,xorg
@@ -412,7 +412,7 @@
./usr/X11R7/man/html4/siliconmotion.html xserver-xf86-video-siliconmotion-htmlman html,xorg
./usr/X11R7/man/html4/sis.html xserver-xf86-video-sis-htmlman html,xorg
./usr/X11R7/man/html4/tdfx.html xserver-xf86-video-tdfx-htmlman html,xorg
-./usr/X11R7/man/html4/trident.html xserver-obsolete html,xorg,obsolete
+./usr/X11R7/man/html4/trident.html xserver-xf86-video-trident-htmlman html,xorg
./usr/X11R7/man/html4/tseng.html xserver-xf86-video-tseng-htmlman html,xorg
./usr/X11R7/man/html4/vboxvideo.html xserver-xf86-video-vboxvideo-htmlman html,xorg
./usr/X11R7/man/html4/vesa.html xserver-xf86-video-vesa-htmlman html,xorg
@@ -467,7 +467,7 @@
./usr/X11R7/man/man4/siliconmotion.4 xserver-xf86-video-siliconmotion-man .man,xorg
./usr/X11R7/man/man4/sis.4 xserver-xf86-video-sis-man .man,xorg
./usr/X11R7/man/man4/tdfx.4 xserver-xf86-video-tdfx-man .man,xorg
-./usr/X11R7/man/man4/trident.4 xserver-obsolete .man,xorg,obsolete
+./usr/X11R7/man/man4/trident.4 xserver-xf86-video-trident-man .man,xorg
./usr/X11R7/man/man4/tseng.4 xserver-xf86-video-tseng-man .man,xorg
./usr/X11R7/man/man4/vboxvideo.4 xserver-xf86-video-vboxvideo-man .man,xorg
./usr/X11R7/man/man4/vesa.4 xserver-xf86-video-vesa-man .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.111 src/external/mit/xorg/server/drivers/Makefile:1.112
--- src/external/mit/xorg/server/drivers/Makefile:1.111 Sat Jun 22 23:02:45 2024
+++ src/external/mit/xorg/server/drivers/Makefile Sat Jun 22 23:20:39 2024
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.111 2024/06/22 23:02:45 mrg Exp $
+# $NetBSD: Makefile,v 1.112 2024/06/22 23:20:39 mrg Exp $
.include <bsd.own.mk>
@@ -49,6 +49,7 @@ SUBDIR+= \
xf86-video-siliconmotion \
xf86-video-sis \
xf86-video-tdfx \
+ xf86-video-trident \
xf86-video-tseng \
xf86-video-vboxvideo \
xf86-video-vmware \
@@ -62,7 +63,6 @@ SUBDIR+= \
# needs porting for xorg-server 21.1.3
# xf86-video-s3
# xf86-video-tga
-# xf86-video-trident
# needs porting for xorg-server 1.18
# xf86-video-apm \
@@ -79,8 +79,8 @@ SUBDIR+= \
.if ${MACHINE} == "alpha"
SUBDIR+= \
- xf86-video-ast \
xf86-video-ark \
+ xf86-video-ast \
xf86-video-ati \
xf86-video-chips \
xf86-video-cirrus \
@@ -96,6 +96,7 @@ SUBDIR+= \
xf86-video-siliconmotion \
xf86-video-sis \
xf86-video-tdfx \
+ xf86-video-trident \
xf86-video-tseng \
xf86-video-wsfb
# xf86-video-imstt
@@ -105,8 +106,7 @@ SUBDIR+= \
xf86-video-apm \
xf86-video-glint \
xf86-video-s3 \
- xf86-video-tga \
- xf86-video-trident
+ xf86-video-tga
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "alpha"
@@ -143,6 +143,7 @@ SUBDIR+= \
xf86-video-savage \
xf86-video-siliconmotion \
xf86-video-tdfx \
+ xf86-video-trident \
xf86-video-tseng \
xf86-video-vesa \
xf86-video-wsfb
@@ -150,7 +151,6 @@ SUBDIR+= \
# needs porting for xorg-server 21.1.3
# xf86-video-s3
# xf86-video-tga
-# xf86-video-trident
# needs porting for xorg-server 1.18
# xf86-video-apm \
