Module Name: src
Committed By: mrg
Date: Sat Aug 20 23:56:20 UTC 2016
Modified Files:
src/distrib/sets/lists/xdebug: md.amd64 md.i386 md.macppc md.ofppc
md.shark
src/distrib/sets/lists/xserver: md.amd64 md.i386 md.macppc md.ofppc
md.shark
src/external/mit/xorg/server/drivers: Makefile
Log Message:
reenable chips driver everywhere now it builds with xorg-server 1.18
To generate a diff of this commit:
cvs rdiff -u -r1.33 -r1.34 src/distrib/sets/lists/xdebug/md.amd64
cvs rdiff -u -r1.29 -r1.30 src/distrib/sets/lists/xdebug/md.i386
cvs rdiff -u -r1.8 -r1.9 src/distrib/sets/lists/xdebug/md.macppc \
src/distrib/sets/lists/xdebug/md.ofppc
cvs rdiff -u -r1.9 -r1.10 src/distrib/sets/lists/xdebug/md.shark
cvs rdiff -u -r1.95 -r1.96 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.112 -r1.113 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.24 -r1.25 src/distrib/sets/lists/xserver/md.ofppc
cvs rdiff -u -r1.47 -r1.48 src/distrib/sets/lists/xserver/md.shark
cvs rdiff -u -r1.85 -r1.86 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.33 src/distrib/sets/lists/xdebug/md.amd64:1.34
--- src/distrib/sets/lists/xdebug/md.amd64:1.33 Sat Aug 20 05:02:58 2016
+++ src/distrib/sets/lists/xdebug/md.amd64 Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.33 2016/08/20 05:02:58 mrg Exp $
+# $NetBSD: md.amd64,v 1.34 2016/08/20 23:56:19 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
@@ -81,7 +81,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
./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/chips_drv.so.1.debug -unknown- xorg,debug
./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
Index: src/distrib/sets/lists/xdebug/md.i386
diff -u src/distrib/sets/lists/xdebug/md.i386:1.29 src/distrib/sets/lists/xdebug/md.i386:1.30
--- src/distrib/sets/lists/xdebug/md.i386:1.29 Sat Aug 20 05:02:58 2016
+++ src/distrib/sets/lists/xdebug/md.i386 Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.29 2016/08/20 05:02:58 mrg Exp $
+# $NetBSD: md.i386,v 1.30 2016/08/20 23:56:19 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
@@ -89,7 +89,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
./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/chips_drv.so.1.debug -unknown- xorg,debug
./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
Index: src/distrib/sets/lists/xdebug/md.macppc
diff -u src/distrib/sets/lists/xdebug/md.macppc:1.8 src/distrib/sets/lists/xdebug/md.macppc:1.9
--- src/distrib/sets/lists/xdebug/md.macppc:1.8 Sat Aug 20 06:51:00 2016
+++ src/distrib/sets/lists/xdebug/md.macppc Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.8 2016/08/20 06:51:00 mrg Exp $
+# $NetBSD: md.macppc,v 1.9 2016/08/20 23:56:19 mrg Exp $
./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete
@@ -54,7 +54,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- obsolete,debug
./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- xorg,debug
-./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/chips_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug obsolete xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.ofppc
diff -u src/distrib/sets/lists/xdebug/md.ofppc:1.8 src/distrib/sets/lists/xdebug/md.ofppc:1.9
--- src/distrib/sets/lists/xdebug/md.ofppc:1.8 Sat Aug 20 03:26:56 2016
+++ src/distrib/sets/lists/xdebug/md.ofppc Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.8 2016/08/20 03:26:56 mrg Exp $
+# $NetBSD: md.ofppc,v 1.9 2016/08/20 23:56:19 mrg Exp $
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete
./usr/X11R7/lib/modules/extensions/libdri2_g.a -unknown- debuglib,xorg,obsolete
./usr/X11R7/lib/modules/extensions/libdri_g.a -unknown- debuglib,xorg,obsolete
@@ -37,7 +37,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/dri/radeon_dri.so.0.debug -unknown- obsolete,xorg
./usr/libdata/debug/usr/X11R7/lib/modules/dri/tdfx_dri.so.0.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/ati_drv.so.6.debug -unknown- debug,xorg
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- debug,xorg,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libati_drv.so.6.debug obsolete xorg,obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug obsolete xorg,obsolete
Index: src/distrib/sets/lists/xdebug/md.shark
diff -u src/distrib/sets/lists/xdebug/md.shark:1.9 src/distrib/sets/lists/xdebug/md.shark:1.10
--- src/distrib/sets/lists/xdebug/md.shark:1.9 Fri Aug 19 22:37:03 2016
+++ src/distrib/sets/lists/xdebug/md.shark Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.9 2016/08/19 22:37:03 mrg Exp $
+# $NetBSD: md.shark,v 1.10 2016/08/20 23:56:19 mrg Exp $
./usr/X11R7/lib/modules/extensions/libcfb32_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libcfb_g.a -unknown- obsolete
./usr/X11R7/lib/modules/extensions/libdbe_g.a -unknown- debuglib,xorg,obsolete
@@ -32,7 +32,7 @@
./usr/libdata/debug/usr/X11R7/bin/cvt.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/bin/gtf.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- debug,xorg,xorg_server_ver=110
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/chips_drv.so.1.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/igs_drv.so.0.debug -unknown- debug,xorg,xorg_server_ver=110
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/kbd_drv.so.1.debug -unknown- debug,xorg
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libchips_drv.so.1.debug obsolete xorg,obsolete
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.95 src/distrib/sets/lists/xserver/md.amd64:1.96
--- src/distrib/sets/lists/xserver/md.amd64:1.95 Sat Aug 20 05:02:58 2016
+++ src/distrib/sets/lists/xserver/md.amd64 Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.95 2016/08/20 05:02:58 mrg Exp $
+# $NetBSD: md.amd64,v 1.96 2016/08/20 23:56:19 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -61,8 +61,8 @@
./usr/X11R7/lib/modules/drivers/ch7017_drv.so.2 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so -unknown- xorg,xorg_server_ver=110
./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/chips_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg
./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
@@ -278,7 +278,7 @@
./usr/X11R7/man/cat4/amdgpu.0 -unknown- .cat,xorg,xorg_server_ver=118
./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/chips.0 -unknown- .cat,xorg
./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
@@ -327,7 +327,7 @@
./usr/X11R7/man/html4/amdgpu.html -unknown- html,xorg,xorg_server_ver=118
./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/chips.html -unknown- html,xorg
./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
@@ -376,7 +376,7 @@
./usr/X11R7/man/man4/amdgpu.4 -unknown- .man,xorg,xorg_server_ver=118
./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/chips.4 -unknown- .man,xorg
./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
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.112 src/distrib/sets/lists/xserver/md.i386:1.113
--- src/distrib/sets/lists/xserver/md.i386:1.112 Sat Aug 20 05:02:58 2016
+++ src/distrib/sets/lists/xserver/md.i386 Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.112 2016/08/20 05:02:58 mrg Exp $
+# $NetBSD: md.i386,v 1.113 2016/08/20 23:56:19 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -68,8 +68,8 @@
./usr/X11R7/lib/modules/drivers/ch7017_drv.so.2 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/ch7xxx_drv.so -unknown- xorg,xorg_server_ver=110
./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/chips_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg
./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
@@ -289,7 +289,7 @@
./usr/X11R7/man/cat4/amdgpu.0 -unknown- .cat,xorg,xorg_server_ver=118
./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/chips.0 -unknown- .cat,xorg
./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
@@ -339,7 +339,7 @@
./usr/X11R7/man/html4/amdgpu.html -unknown- html,xorg,xorg_server_ver=118
./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/chips.html -unknown- html,xorg
./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
@@ -389,7 +389,7 @@
./usr/X11R7/man/man4/amdgpu.4 -unknown- .man,xorg,xorg_server_ver=118
./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/chips.4 -unknown- .man,xorg
./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
Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.71 src/distrib/sets/lists/xserver/md.macppc:1.72
--- src/distrib/sets/lists/xserver/md.macppc:1.71 Sat Aug 20 06:51:00 2016
+++ src/distrib/sets/lists/xserver/md.macppc Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.71 2016/08/20 06:51:00 mrg Exp $
+# $NetBSD: md.macppc,v 1.72 2016/08/20 23:56:19 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -29,8 +29,8 @@
./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
-./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/chips_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/chips_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/kbd_drv.so -unknown- xorg
@@ -174,7 +174,7 @@
./usr/X11R7/man/cat1/scanpci.0 -unknown- obsolete
./usr/X11R7/man/cat1/xorgconfig.0 -unknown- obsolete
./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/chips.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/imstt.0 -unknown- obsolete
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
@@ -195,7 +195,7 @@
./usr/X11R7/man/html1/scanpci.html -unknown- obsolete
./usr/X11R7/man/html1/xorgconfig.html -unknown- obsolete
./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/chips.html -unknown- html,xorg
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/imstt.html -unknown- obsolete
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
@@ -216,7 +216,7 @@
./usr/X11R7/man/man1/scanpci.1 -unknown- obsolete
./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete
./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/chips.4 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/imstt.4 -unknown- obsolete
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.ofppc
diff -u src/distrib/sets/lists/xserver/md.ofppc:1.24 src/distrib/sets/lists/xserver/md.ofppc:1.25
--- src/distrib/sets/lists/xserver/md.ofppc:1.24 Sat Aug 20 03:26:56 2016
+++ src/distrib/sets/lists/xserver/md.ofppc Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.ofppc,v 1.24 2016/08/20 03:26:56 mrg Exp $
+# $NetBSD: md.ofppc,v 1.25 2016/08/20 23:56:19 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -25,8 +25,8 @@
./usr/X11R7/lib/modules/dri/tdfx_dri.so.0 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ati_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ati_drv.so.6 -unknown- xorg
-./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/chips_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg
./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
@@ -115,7 +115,7 @@
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
./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/chips.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mga.0 -unknown- .cat,xorg
@@ -131,7 +131,7 @@
./usr/X11R7/man/html1/cvt.html -unknown- html,xorg
./usr/X11R7/man/html1/gtf.html -unknown- html,xorg
./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/chips.html -unknown- html,xorg
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mga.html -unknown- html,xorg
@@ -147,7 +147,7 @@
./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg
./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg
./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/chips.4 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mga.4 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.shark
diff -u src/distrib/sets/lists/xserver/md.shark:1.47 src/distrib/sets/lists/xserver/md.shark:1.48
--- src/distrib/sets/lists/xserver/md.shark:1.47 Fri Aug 19 22:37:04 2016
+++ src/distrib/sets/lists/xserver/md.shark Sat Aug 20 23:56:19 2016
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.47 2016/08/19 22:37:04 mrg Exp $
+# $NetBSD: md.shark,v 1.48 2016/08/20 23:56:19 mrg Exp $
./usr/X11R7/bin/X -unknown- xorg
./usr/X11R7/bin/Xorg -unknown- xorg
./usr/X11R7/bin/cvt -unknown- xorg
@@ -9,8 +9,8 @@
./usr/X11R7/lib/X11/doc/README.fonts -unknown- obsolete
./usr/X11R7/lib/X11/doc/README.modes -unknown- xorg
./usr/X11R7/lib/X11/doc/README.rapidaccess -unknown- obsolete
-./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/chips_drv.so -unknown- xorg
+./usr/X11R7/lib/modules/drivers/chips_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/igs_drv.so -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/igs_drv.so.0 -unknown- xorg,xorg_server_ver=110
./usr/X11R7/lib/modules/drivers/kbd_drv.so -unknown- xorg
@@ -139,7 +139,7 @@
./usr/X11R7/man/cat1/cvt.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/gtf.0 -unknown- .cat,xorg
./usr/X11R7/man/cat1/xorgconfig.0 -unknown- obsolete
-./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg,xorg_server_ver=110
+./usr/X11R7/man/cat4/chips.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/igs.0 -unknown- .cat,xorg,xorg_server_ver=110
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
@@ -152,7 +152,7 @@
./usr/X11R7/man/html1/cvt.html -unknown- html,xorg
./usr/X11R7/man/html1/gtf.html -unknown- html,xorg
./usr/X11R7/man/html1/xorgconfig.html -unknown- obsolete
-./usr/X11R7/man/html4/chips.html -unknown- html,xorg,xorg_server_ver=110
+./usr/X11R7/man/html4/chips.html -unknown- html,xorg
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/igs.html -unknown- html,xorg,xorg_server_ver=110
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
@@ -165,7 +165,7 @@
./usr/X11R7/man/man1/cvt.1 -unknown- .man,xorg
./usr/X11R7/man/man1/gtf.1 -unknown- .man,xorg
./usr/X11R7/man/man1/xorgconfig.1 -unknown- obsolete
-./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg,xorg_server_ver=110
+./usr/X11R7/man/man4/chips.4 -unknown- .man,xorg
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/igs.4 -unknown- .man,xorg,xorg_server_ver=110
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.85 src/external/mit/xorg/server/drivers/Makefile:1.86
--- src/external/mit/xorg/server/drivers/Makefile:1.85 Sat Aug 20 06:51:00 2016
+++ src/external/mit/xorg/server/drivers/Makefile Sat Aug 20 23:56:20 2016
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.85 2016/08/20 06:51:00 mrg Exp $
+# $NetBSD: Makefile,v 1.86 2016/08/20 23:56:20 mrg Exp $
# xf86-input drivers
@@ -28,6 +28,7 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-ast \
xf86-video-ati \
+ xf86-video-chips \
xf86-video-cirrus \
xf86-video-cirrus_alpine \
xf86-video-cirrus_laguna \
@@ -65,7 +66,6 @@ SUBDIR+= \
SUBDIR+= \
xf86-video-apm \
xf86-video-ark \
- xf86-video-chips \
xf86-video-glint \
xf86-video-intel-old \
xf86-video-xgi
@@ -210,6 +210,7 @@ SUBDIR+= \
.if ${MACHINE} == "macppc"
SUBDIR+= \
xf86-video-ati \
+ xf86-video-chips \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
@@ -218,10 +219,6 @@ SUBDIR+= \
xf86-video-tdfx \
xf86-video-wsfb
# xf86-video-imstt
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
- xf86-video-chips
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "macppc"
.if ${MACHINE} == "netwinder"
@@ -238,6 +235,7 @@ SUBDIR+= \
.if ${MACHINE} == "ofppc"
SUBDIR+= \
xf86-video-ati \
+ xf86-video-chips \
xf86-video-mach64 \
xf86-video-mga \
xf86-video-nv \
@@ -245,10 +243,6 @@ SUBDIR+= \
xf86-video-r128 \
xf86-video-tdfx \
xf86-video-wsfb
-.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
-SUBDIR+= \
- xf86-video-chips
-.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "ofppc"
.if ${MACHINE} == "prep"
@@ -272,11 +266,11 @@ SUBDIR+= \
.if ${MACHINE} == "shark"
SUBDIR+= \
+ xf86-video-chips \
xf86-video-wsfb
# needs porting for xorg-server 1.18
.if ${XORG_SERVER_SUBDIR} == "xorg-server.old"
SUBDIR+= \
- xf86-video-chips \
xf86-video-igs
.endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"
.endif # ${MACHINE} == "shark"
