Module Name: src
Committed By: mrg
Date: Sat Aug 20 05:02:58 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
src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i128: Makefile
src/external/mit/xorg/server/drivers/xf86-video-i740: Makefile
src/external/mit/xorg/server/drivers/xf86-video-tseng: Makefile
Log Message:
reenable the cirrus, i128, i740, neomagic and tseng drivers now they
build with xorg-server 1.18.
To generate a diff of this commit:
cvs rdiff -u -r1.32 -r1.33 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.28 -r1.29 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.94 -r1.95 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.111 -r1.112 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.82 -r1.83 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r1.3 -r1.4 \
src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/Makefile
cvs rdiff -u -r1.2 -r1.3 \
src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
cvs rdiff -u -r1.4 -r1.5 \
src/external/mit/xorg/server/drivers/xf86-video-tseng/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.32 src/distrib/sets/lists/xdebug/md.amd64:1.33
--- src/distrib/sets/lists/xdebug/md.amd64:1.32 Sat Aug 20 03:57:25 2016
+++ src/distrib/sets/lists/xdebug/md.amd64 Sat Aug 20 05:02:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.32 2016/08/20 03:57:25 mrg Exp $
+# $NetBSD: md.amd64,v 1.33 2016/08/20 05:02:58 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
@@ -82,12 +82,12 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug -unknown- xorg
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
@@ -139,7 +139,7 @@
./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
./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/neomagic_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug
@@ -158,7 +158,7 @@
./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
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/tseng_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vesa_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmmouse_drv.so.13.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/vmware_drv.so.13.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.28 src/distrib/sets/lists/xdebug/md.i386:1.29
--- src/distrib/sets/lists/xdebug/md.i386:1.28 Sat Aug 20 03:57:25 2016
+++ src/distrib/sets/lists/xdebug/md.i386 Sat Aug 20 05:02:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.28 2016/08/20 03:57:25 mrg Exp $
+# $NetBSD: md.i386,v 1.29 2016/08/20 05:02:58 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
@@ -90,14 +90,14 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7017_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/elographics_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/geode_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/glint_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i128_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/i740_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/intel_drv_old.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ivch_drv.so.2.debug -unknown- xorg,debug,xorg_server_ver=110
@@ -151,7 +151,7 @@
./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
./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/neomagic_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nouveau_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/nv_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/openchrome_drv.so.0.debug -unknown- xorg,debug
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.94 src/distrib/sets/lists/xserver/md.amd64:1.95
--- src/distrib/sets/lists/xserver/md.amd64:1.94 Sat Aug 20 03:57:25 2016
+++ src/distrib/sets/lists/xserver/md.amd64 Sat Aug 20 05:02:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.94 2016/08/20 03:57:25 mrg Exp $
+# $NetBSD: md.amd64,v 1.95 2016/08/20 05:02:58 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -63,24 +63,24 @@
./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so -obsolete- obsolete
./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so.1 -obsolete- obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_laguna.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so -obsolete- obsolete
./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1 -obsolete- obsolete
./usr/X11R7/lib/modules/drivers/cyrix_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/cyrix_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/i128_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/i128_drv.so.1 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/i740_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/i740_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/i128_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i128_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i740_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i740_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/imstt_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/intel_drv.so -unknown- xorg
@@ -97,8 +97,8 @@
./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
-./usr/X11R7/lib/modules/drivers/neomagic_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/neomagic_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/neomagic_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/nouveau_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/nouveau_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- obsolete
@@ -135,8 +135,8 @@
./usr/X11R7/lib/modules/drivers/tga_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/trident_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/trident_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/tseng_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/tseng_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- obsolete
@@ -279,19 +279,19 @@
./usr/X11R7/man/cat4/apm.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/ati.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg,xorg_server_ver=110
-./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/cyrix.0 -unknown- obsolete
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg,xorg_server_ver=110
-./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg,xorg_server_ver=110
-./usr/X11R7/man/cat4/i740.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/i740.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/imstt.0 -unknown- obsolete
./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
./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/neomagic.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nsc.0 -unknown- obsolete
./usr/X11R7/man/cat4/nv.0 -unknown- .cat,xorg
@@ -306,7 +306,7 @@
./usr/X11R7/man/cat4/sis.0 -unknown- .cat,xorg
./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/tseng.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vesa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vga.0 -unknown- obsolete
./usr/X11R7/man/cat4/via.0 -unknown- obsolete
@@ -328,19 +328,19 @@
./usr/X11R7/man/html4/apm.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/ati.html -unknown- html,xorg
./usr/X11R7/man/html4/chips.html -unknown- html,xorg,xorg_server_ver=110
-./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg
./usr/X11R7/man/html4/cyrix.html -unknown- obsolete
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/glint.html -unknown- html,xorg,xorg_server_ver=110
-./usr/X11R7/man/html4/i128.html -unknown- html,xorg,xorg_server_ver=110
-./usr/X11R7/man/html4/i740.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/i128.html -unknown- html,xorg
+./usr/X11R7/man/html4/i740.html -unknown- html,xorg
./usr/X11R7/man/html4/imstt.html -unknown- obsolete
./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
./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/neomagic.html -unknown- html,xorg
./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
./usr/X11R7/man/html4/nsc.html -unknown- obsolete
./usr/X11R7/man/html4/nv.html -unknown- html,xorg
@@ -355,7 +355,7 @@
./usr/X11R7/man/html4/sis.html -unknown- html,xorg
./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/tseng.html -unknown- html,xorg
./usr/X11R7/man/html4/vesa.html -unknown- html,xorg
./usr/X11R7/man/html4/vga.html -unknown- obsolete
./usr/X11R7/man/html4/via.html -unknown- obsolete
@@ -377,19 +377,19 @@
./usr/X11R7/man/man4/apm.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/ati.4 -unknown- .man,xorg
./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/cirrus.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/cirrus.4 -unknown- .man,xorg
./usr/X11R7/man/man4/cyrix.4 -unknown- obsolete
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/glint.4 -unknown- .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/i128.4 -unknown- .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/i740.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/i128.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/i740.4 -unknown- .man,xorg
./usr/X11R7/man/man4/imstt.4 -unknown- obsolete
./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
./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/neomagic.4 -unknown- .man,xorg
./usr/X11R7/man/man4/nouveau.4 -unknown- .man,xorg
./usr/X11R7/man/man4/nsc.4 -unknown- obsolete
./usr/X11R7/man/man4/nv.4 -unknown- .man,xorg
@@ -404,7 +404,7 @@
./usr/X11R7/man/man4/sis.4 -unknown- .man,xorg
./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/tseng.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vesa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vga.4 -unknown- obsolete
./usr/X11R7/man/man4/via.4 -unknown- obsolete
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.111 src/distrib/sets/lists/xserver/md.i386:1.112
--- src/distrib/sets/lists/xserver/md.i386:1.111 Sat Aug 20 03:57:25 2016
+++ src/distrib/sets/lists/xserver/md.i386 Sat Aug 20 05:02:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.111 2016/08/20 03:57:25 mrg Exp $
+# $NetBSD: md.i386,v 1.112 2016/08/20 05:02:58 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -70,14 +70,14 @@
./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so.2 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/chips_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_alpine.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so -obsolete- obsolete
./usr/X11R7/lib/modules/drivers/cirrus_alpine_drv.so.1 -obsolete- obsolete
-./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_laguna.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/cirrus_laguna.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so -obsolete- obsolete
./usr/X11R7/lib/modules/drivers/cirrus_laguna_drv.so.1 -obsolete- obsolete
./usr/X11R7/lib/modules/drivers/cyrix_drv.so -unknown- obsolete
@@ -88,10 +88,10 @@
./usr/X11R7/lib/modules/drivers/geode_drv.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/glint_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/glint_drv.so.1 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/i128_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/i128_drv.so.1 -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/i740_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/i740_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/i128_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i128_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i740_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/i740_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/imstt_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/imstt_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/intel_drv.so -unknown- xorg
@@ -108,8 +108,8 @@
./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
-./usr/X11R7/lib/modules/drivers/neomagic_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/neomagic_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/neomagic_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/nouveau_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/nouveau_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/nsc_drv.so -unknown- obsolete
@@ -146,8 +146,8 @@
./usr/X11R7/lib/modules/drivers/tga_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/trident_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/trident_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/tseng_drv.so -unknown- xorg,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg,xorg_server_ver=110
+./usr/X11R7/lib/modules/drivers/tseng_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/vesa_drv.so.2 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- obsolete
@@ -290,20 +290,20 @@
./usr/X11R7/man/cat4/apm.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/ati.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg,xorg_server_ver=110
-./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/cirrus.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/cyrix.0 -unknown- obsolete
./usr/X11R7/man/cat4/elographics.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xor,xorg_server_ver=110g
-./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg,xorg_server_ver=110
-./usr/X11R7/man/cat4/i740.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/glint.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/i128.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/i740.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/imstt.0 -unknown- obsolete
./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
./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/neomagic.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nouveau.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/nsc.0 -unknown- obsolete
./usr/X11R7/man/cat4/nv.0 -unknown- .cat,xorg
@@ -318,7 +318,7 @@
./usr/X11R7/man/cat4/sis.0 -unknown- .cat,xorg
./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/tseng.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vesa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vga.0 -unknown- obsolete
./usr/X11R7/man/cat4/via.0 -unknown- obsolete
@@ -340,20 +340,20 @@
./usr/X11R7/man/html4/apm.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/ati.html -unknown- html,xorg
./usr/X11R7/man/html4/chips.html -unknown- html,xorg,xorg_server_ver=110
-./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/cirrus.html -unknown- html,xorg
./usr/X11R7/man/html4/cyrix.html -unknown- obsolete
./usr/X11R7/man/html4/elographics.html -unknown- html,xorg
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/glint.html -unknown- html,xorg,xorg_server_ver=110
-./usr/X11R7/man/html4/i128.html -unknown- html,xorg,xorg_server_ver=110
-./usr/X11R7/man/html4/i740.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/i128.html -unknown- html,xorg
+./usr/X11R7/man/html4/i740.html -unknown- html,xorg
./usr/X11R7/man/html4/imstt.html -unknown- obsolete
./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
./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/neomagic.html -unknown- html,xorg
./usr/X11R7/man/html4/nouveau.html -unknown- html,xorg
./usr/X11R7/man/html4/nsc.html -unknown- obsolete
./usr/X11R7/man/html4/nv.html -unknown- html,xorg
@@ -368,7 +368,7 @@
./usr/X11R7/man/html4/sis.html -unknown- html,xorg
./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/tseng.html -unknown- html,xorg
./usr/X11R7/man/html4/vesa.html -unknown- html,xorg
./usr/X11R7/man/html4/vga.html -unknown- obsolete
./usr/X11R7/man/html4/via.html -unknown- obsolete
@@ -390,20 +390,20 @@
./usr/X11R7/man/man4/apm.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/ati.4 -unknown- .man,xorg
./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/cirrus.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/cirrus.4 -unknown- .man,xorg
./usr/X11R7/man/man4/cyrix.4 -unknown- obsolete
./usr/X11R7/man/man4/elographics.4 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/glint.4 -unknown- .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/i128.4 -unknown- .man,xorg,xorg_server_ver=110
-./usr/X11R7/man/man4/i740.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/i128.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/i740.4 -unknown- .man,xorg
./usr/X11R7/man/man4/imstt.4 -unknown- obsolete
./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
./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/neomagic.4 -unknown- .man,xorg
./usr/X11R7/man/man4/nouveau.4 -unknown- .man,xorg
./usr/X11R7/man/man4/nsc.4 -unknown- obsolete
./usr/X11R7/man/man4/nv.4 -unknown- .man,xorg
@@ -418,7 +418,7 @@
./usr/X11R7/man/man4/sis.4 -unknown- .man,xorg
./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/tseng.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vesa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vga.4 -unknown- obsolete
./usr/X11R7/man/man4/via.4 -unknown- obsolete
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.82 src/external/mit/xorg/server/drivers/Makefile:1.83
--- src/external/mit/xorg/server/drivers/Makefile:1.82 Sat Aug 20 03:57:26 2016
+++ src/external/mit/xorg/server/drivers/Makefile Sat Aug 20 05:02:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.82 2016/08/20 03:57:26 mrg Exp $
+# $NetBSD: Makefile,v 1.83 2016/08/20 05:02:58 mrg Exp $
# xf86-input drivers
@@ -28,9 +28,15 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-ast \
xf86-video-ati \
+ xf86-video-cirrus \
+ xf86-video-cirrus_alpine \
+ xf86-video-cirrus_laguna \
+ xf86-video-i128 \
+ xf86-video-i740 \
xf86-video-intel \
xf86-video-mach64 \
xf86-video-mga \
+ xf86-video-neomagic \
xf86-video-nv \
xf86-video-nouveau \
xf86-video-openchrome \
@@ -45,6 +51,7 @@ SUBDIR+= \
xf86-video-tdfx \
xf86-video-tga \
xf86-video-trident \
+ xf86-video-tseng \
xf86-video-vmware \
xf86-video-vesa \
xf86-video-wsfb
@@ -59,15 +66,8 @@ SUBDIR+= \
xf86-video-apm \
xf86-video-ark \
xf86-video-chips \
- xf86-video-cirrus \
- xf86-video-cirrus_alpine \
- xf86-video-cirrus_laguna \
xf86-video-glint \
- xf86-video-i128 \
- xf86-video-i740 \
xf86-video-intel-old \
- xf86-video-neomagic \
- xf86-video-tseng \
xf86-video-xgi
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
Index: src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/Makefile:1.3 src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/Makefile:1.4
--- src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/Makefile:1.3 Mon Oct 27 20:29:10 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-cirrus_laguna/Makefile Sat Aug 20 05:02:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2008/10/27 20:29:10 veego Exp $
+# $NetBSD: Makefile,v 1.4 2016/08/20 05:02:58 mrg Exp $
# XXX move this under ../xf86-video-cirrus
@@ -7,6 +7,6 @@ DRIVER_NAME= cirrus_laguna
SRCS= lg_driver.c lg_hwcurs.c lg_i2c.c lg_xaa.c
-CPPFLAGS.lg_driver.c= -Wno-error # XXX
+#CPPFLAGS.lg_driver.c= -Wno-error # XXX
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.2 src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.3
--- src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile:1.2 Sun Aug 3 07:32:04 2008
+++ src/external/mit/xorg/server/drivers/xf86-video-i128/Makefile Sat Aug 20 05:02:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/08/03 07:32:04 rtr Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/20 05:02:58 mrg Exp $
DRIVER= xf86-video-i128
DRIVER_NAME= i128_drv
@@ -7,4 +7,6 @@ SRCS= i128accel.c i128dga.c i128exa.c i
SRCS+= i128IBMDAC.c i128init.c
MAN= i128.4
+COPTS+= -Wno-error=cpp
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile:1.4 Tue Aug 16 06:24:02 2016
+++ src/external/mit/xorg/server/drivers/xf86-video-i740/Makefile Sat Aug 20 05:02:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2016/08/16 06:24:02 mrg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/20 05:02:58 mrg Exp $
DRIVER= xf86-video-i740
DRIVER_NAME= i740_drv
@@ -7,4 +7,6 @@ SRCS= i740_accel.c i740_cursor.c i740_d
SRCS+= i740_i2c.c i740_io.c i740_video.c
MAN= i740.4
+COPTS+= -Wno-error=cpp
+
.include "../Makefile.xf86-driver"
Index: src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile
diff -u src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.4 src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.5
--- src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile:1.4 Thu Aug 11 23:15:41 2011
+++ src/external/mit/xorg/server/drivers/xf86-video-tseng/Makefile Sat Aug 20 05:02:58 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2011/08/11 23:15:41 joerg Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/20 05:02:58 mrg Exp $
DRIVER= xf86-video-tseng
DRIVER_NAME= tseng_drv
@@ -9,6 +9,8 @@ MAN= tseng.4
CPPFLAGS+= -I${X11SRCDIR.${DRIVER}}/../include
+COPTS+= -Wno-error=cpp
+
CWARNFLAGS.clang+= -Wno-pointer-sign
.include "../Makefile.xf86-driver"
