Module Name: src
Committed By: mrg
Date: Sat Aug 20 01:08:13 UTC 2016
Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386
src/distrib/sets/lists/xserver: md.amd64 md.i386
src/external/mit/xorg/server/drivers: Makefile
Log Message:
now they build, reenable mach64, mga, s3, s3virge and tdfx drivers on x86
when built with xorg-server 1.18
To generate a diff of this commit:
cvs rdiff -u -r1.30 -r1.31 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.26 -r1.27 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.92 -r1.93 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.109 -r1.110 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.79 -r1.80 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.30 src/distrib/sets/lists/xdebug/md.amd64:1.31
--- src/distrib/sets/lists/xdebug/md.amd64:1.30 Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xdebug/md.amd64 Sat Aug 20 01:08:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.30 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: md.amd64,v 1.31 2016/08/20 01:08:13 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg,compatx11file
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg,compatx11file
@@ -137,7 +137,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libxgi_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
@@ -148,13 +148,13 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/savage_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sil164_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sis_drv.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.26 src/distrib/sets/lists/xdebug/md.i386:1.27
--- src/distrib/sets/lists/xdebug/md.i386:1.26 Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xdebug/md.i386 Sat Aug 20 01:08:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.26 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: md.i386,v 1.27 2016/08/20 01:08:13 mrg Exp $
./usr/X11R7/lib/libI810XvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libIntelXvMC_g.a -unknown- debuglib,xorg
./usr/X11R7/lib/libchromeXvMCPro_g.a -unknown- debuglib,xorg
@@ -149,7 +149,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libxgi_drv.so.1.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mach64_drv.so.6.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mga_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/mouse_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/neomagic_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
@@ -159,13 +159,13 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.7.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1.debug -unknown- xorg,debug,obsolete
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3_drv.so.0.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/s3virge_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/savage_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sil164_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/sis_drv.so.0.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tdfx_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tfp410_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tga_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/trident_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.92 src/distrib/sets/lists/xserver/md.amd64:1.93
--- src/distrib/sets/lists/xserver/md.amd64:1.92 Fri Aug 19 22:37:04 2016
+++ src/distrib/sets/lists/xserver/md.amd64 Sat Aug 20 01:08:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.92 2016/08/19 22:37:04 mrg Exp $
+# $NetBSD: md.amd64,v 1.93 2016/08/20 01:08:13 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -91,10 +91,10 @@
./usr/X11R7/lib/modules/drivers/ivch_drv.so.2 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/mach64_drv.so.6 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/mga_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mach64_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mga_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so -unknown- xorg,xorg_server_ver=110
@@ -115,10 +115,10 @@
./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown- xorg,obsolete
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 -unknown- xorg,obsolete
-./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/s3_drv.so.0 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/s3virge_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/s3virge_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3virge_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3virge_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/savage_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/savage_drv.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/sil164_drv.so -unknown- xorg,xorg_server_ver=110
@@ -127,8 +127,8 @@
./usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/sis_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/sis_drv.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/tdfx_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/tdfx_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/tfp410_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/tfp410_drv.so.2 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/tga_drv.so -unknown- xorg
@@ -289,7 +289,7 @@
./usr/X11R7/man/cat4/intel.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/intel_old.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
@@ -299,12 +299,12 @@
./usr/X11R7/man/cat4/r128.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeon.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeonhd.0 -unknown- .cat,xorg,obsolete
-./usr/X11R7/man/cat4/s3.0 -unknown- .cat,xorg,xorg_server_ver=110
-./usr/X11R7/man/cat4/s3virge.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/s3.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/s3virge.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/savage.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/siliconmotion.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/sis.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/tdfx.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/tdfx.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/trident.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/vesa.0 -unknown- .cat,xorg
@@ -338,7 +338,7 @@
./usr/X11R7/man/html4/intel.html -unknown- html,xorg
./usr/X11R7/man/html4/intel_old.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
-./usr/X11R7/man/html4/mga.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/mga.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
@@ -348,12 +348,12 @@
./usr/X11R7/man/html4/r128.html -unknown- html,xorg
./usr/X11R7/man/html4/radeon.html -unknown- html,xorg
./usr/X11R7/man/html4/radeonhd.html -unknown- html,xorg,obsolete
-./usr/X11R7/man/html4/s3.html -unknown- html,xorg,xorg_server_ver=110
-./usr/X11R7/man/html4/s3virge.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/s3.html -unknown- html,xorg
+./usr/X11R7/man/html4/s3virge.html -unknown- html,xorg
./usr/X11R7/man/html4/savage.html -unknown- html,xorg
./usr/X11R7/man/html4/siliconmotion.html -unknown- html,xorg
./usr/X11R7/man/html4/sis.html -unknown- html,xorg
-./usr/X11R7/man/html4/tdfx.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/tdfx.html -unknown- html,xorg
./usr/X11R7/man/html4/trident.html -unknown- html,xorg
./usr/X11R7/man/html4/tseng.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/vesa.html -unknown- html,xorg
@@ -387,7 +387,7 @@
./usr/X11R7/man/man4/intel.4 -unknown- .man,xorg
./usr/X11R7/man/man4/intel_old.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/neomagic.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/nouveau.4 -unknown- .man,xorg
@@ -397,12 +397,12 @@
./usr/X11R7/man/man4/r128.4 -unknown- .man,xorg
./usr/X11R7/man/man4/radeon.4 -unknown- .man,xorg
./usr/X11R7/man/man4/radeonhd.4 -unknown- .man,xorg,obsolete
-./usr/X11R7/man/man4/s3.4 -unknown- .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/s3virge.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/s3.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/s3virge.4 -unknown- .man,xorg
./usr/X11R7/man/man4/savage.4 -unknown- .man,xorg
./usr/X11R7/man/man4/siliconmotion.4 -unknown- .man,xorg
./usr/X11R7/man/man4/sis.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/tdfx.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/tdfx.4 -unknown- .man,xorg
./usr/X11R7/man/man4/trident.4 -unknown- .man,xorg
./usr/X11R7/man/man4/tseng.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/vesa.4 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.109 src/distrib/sets/lists/xserver/md.i386:1.110
--- src/distrib/sets/lists/xserver/md.i386:1.109 Fri Aug 19 22:37:04 2016
+++ src/distrib/sets/lists/xserver/md.i386 Sat Aug 20 01:08:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.109 2016/08/19 22:37:04 mrg Exp $
+# $NetBSD: md.i386,v 1.110 2016/08/20 01:08:13 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -102,10 +102,10 @@
./usr/X11R7/lib/modules/drivers/ivch_drv.so.2 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/kbd_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/mach64_drv.so.6 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/mga_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/mach64_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mach64_drv.so.6 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mga_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/mga_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/neomagic_drv.so -unknown- xorg,xorg_server_ver=110
@@ -126,10 +126,10 @@
./usr/X11R7/lib/modules/drivers/radeon_drv_old.so.6 -unknown- xorg
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so -unknown- xorg,obsolete
./usr/X11R7/lib/modules/drivers/radeonhd_drv.so.1 -unknown- xorg,obsolete
-./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/s3_drv.so.0 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/s3virge_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/s3virge_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/s3_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3_drv.so.0 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3virge_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/s3virge_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/savage_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/savage_drv.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/sil164_drv.so -unknown- xorg,xorg_server_ver=110
@@ -138,8 +138,8 @@
./usr/X11R7/lib/modules/drivers/siliconmotion_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/sis_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/sis_drv.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/tdfx_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/tdfx_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tdfx_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/tfp410_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/tfp410_drv.so.2 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/tga_drv.so -unknown- xorg
@@ -301,7 +301,7 @@
./usr/X11R7/man/cat4/intel.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/intel_old.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/mga.0 -unknown- .cat
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/neomagic.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
@@ -311,12 +311,12 @@
./usr/X11R7/man/cat4/r128.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeon.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeonhd.0 -unknown- .cat,xorg,obsolete
-./usr/X11R7/man/cat4/s3.0 -unknown- .cat,xorg,xorg_server_ver=110
-./usr/X11R7/man/cat4/s3virge.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/s3.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/s3virge.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/savage.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/siliconmotion.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/sis.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/tdfx.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/tdfx.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/trident.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/vesa.0 -unknown- .cat,xorg
@@ -351,7 +351,7 @@
./usr/X11R7/man/html4/intel.html -unknown- html,xorg
./usr/X11R7/man/html4/intel_old.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
-./usr/X11R7/man/html4/mga.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/mga.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/neomagic.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
@@ -361,12 +361,12 @@
./usr/X11R7/man/html4/r128.html -unknown- html,xorg
./usr/X11R7/man/html4/radeon.html -unknown- html,xorg
./usr/X11R7/man/html4/radeonhd.html -unknown- html,xorg,obsolete
-./usr/X11R7/man/html4/s3.html -unknown- html,xorg,xorg_server_ver=110
-./usr/X11R7/man/html4/s3virge.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/s3.html -unknown- html,xorg
+./usr/X11R7/man/html4/s3virge.html -unknown- html,xorg
./usr/X11R7/man/html4/savage.html -unknown- html,xorg
./usr/X11R7/man/html4/siliconmotion.html -unknown- html,xorg
./usr/X11R7/man/html4/sis.html -unknown- html,xorg
-./usr/X11R7/man/html4/tdfx.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/tdfx.html -unknown- html,xorg
./usr/X11R7/man/html4/trident.html -unknown- html,xorg
./usr/X11R7/man/html4/tseng.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/vesa.html -unknown- html,xorg
@@ -401,7 +401,7 @@
./usr/X11R7/man/man4/intel.4 -unknown- .man,xorg
./usr/X11R7/man/man4/intel_old.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/neomagic.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/nouveau.4 -unknown- .man,xorg
@@ -411,12 +411,12 @@
./usr/X11R7/man/man4/r128.4 -unknown- .man,xorg
./usr/X11R7/man/man4/radeon.4 -unknown- .man,xorg
./usr/X11R7/man/man4/radeonhd.4 -unknown- .man,xorg,obsolete
-./usr/X11R7/man/man4/s3.4 -unknown- .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/s3virge.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/s3.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/s3virge.4 -unknown- .man,xorg
./usr/X11R7/man/man4/savage.4 -unknown- .man,xorg
./usr/X11R7/man/man4/siliconmotion.4 -unknown- .man,xorg
./usr/X11R7/man/man4/sis.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/tdfx.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/tdfx.4 -unknown- .man,xorg
./usr/X11R7/man/man4/trident.4 -unknown- .man,xorg
./usr/X11R7/man/man4/tseng.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/vesa.4 -unknown- .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.79 src/external/mit/xorg/server/drivers/Makefile:1.80
--- src/external/mit/xorg/server/drivers/Makefile:1.79 Fri Aug 19 19:10:54 2016
+++ src/external/mit/xorg/server/drivers/Makefile Sat Aug 20 01:08:13 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.79 2016/08/19 19:10:54 mrg Exp $
+# $NetBSD: Makefile,v 1.80 2016/08/20 01:08:13 mrg Exp $
# xf86-input drivers
@@ -28,15 +28,20 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-ati \
xf86-video-intel \
+ xf86-video-mach64 \
+ xf86-video-mga \
xf86-video-nv \
xf86-video-nouveau \
xf86-video-openchrome \
xf86-video-r128 \
xf86-video-radeon \
xf86-video-radeon-kms \
+ xf86-video-s3 \
+ xf86-video-s3virge \
xf86-video-savage \
xf86-video-siliconmotion \
xf86-video-sis \
+ xf86-video-tdfx \
xf86-video-tga \
xf86-video-trident \
xf86-video-vmware \
@@ -61,12 +66,7 @@ SUBDIR+= \
xf86-video-i128 \
xf86-video-i740 \
xf86-video-intel-old \
- xf86-video-mach64 \
- xf86-video-mga \
xf86-video-neomagic \
- xf86-video-s3 \
- xf86-video-s3virge \
- xf86-video-tdfx \
xf86-video-tseng \
xf86-video-xgi
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
