[src/trunk]: src/distrib/sets/lists/xserver - build mesa_dri and swrast on al...

[mrg <mrg%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/7d284f77c86b
branches:  trunk
changeset: 747018:7d284f77c86b
user:      mrg <mrg%NetBSD.org@localhost>
date:      Thu Aug 27 04:59:15 2009 +0000

description:
- build mesa_dri and swrast on all platforms
- kill imstt
- re-add int10 on macppc

diffstat:

 distrib/sets/lists/xserver/md.alpha   |  22 +++++++++-------------
 distrib/sets/lists/xserver/md.amd64   |   6 +-----
 distrib/sets/lists/xserver/md.i386    |   6 +-----
 distrib/sets/lists/xserver/md.macppc  |  14 +++++---------
 distrib/sets/lists/xserver/md.sparc   |   6 +-----
 distrib/sets/lists/xserver/md.sparc64 |   6 +-----
 distrib/sets/lists/xserver/mi         |   6 +++++-
 7 files changed, 23 insertions(+), 43 deletions(-)

diffs (254 lines):

diff -r d462feda4c43 -r 7d284f77c86b distrib/sets/lists/xserver/md.alpha
--- a/distrib/sets/lists/xserver/md.alpha       Thu Aug 27 04:36:40 2009 +0000
+++ b/distrib/sets/lists/xserver/md.alpha       Thu Aug 27 04:59:15 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.22 2009/08/23 09:05:45 mrg Exp $
+# $NetBSD: md.alpha,v 1.23 2009/08/27 04:59:15 mrg Exp $
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/XalphaNetBSD                           -unknown-       x11
 ./usr/X11R6/bin/XdecNetBSD                             -unknown-       x11
@@ -15,8 +15,6 @@
 ./usr/X11R7/lib/X11/doc/README.rapidaccess             -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mach64_dri.so              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mach64_dri.so.0            -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so                        -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so                        -unknown-       xorg
@@ -33,8 +31,6 @@
 ./usr/X11R7/lib/modules/dri/savage_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/sis_dri.so                 -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/sis_dri.so.0               -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so              -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/tdfx_dri.so                        -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/tdfx_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/trident_dri.so             -unknown-       xorg
@@ -61,8 +57,8 @@
 ./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-       xorg
-./usr/X11R7/lib/modules/drivers/imstt_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
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so.1           -unknown-       xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so          -unknown-       xorg
@@ -172,10 +168,10 @@
 ./usr/X11R7/lib/modules/libi2c.so                      -unknown-       xorg
 ./usr/X11R7/lib/modules/libi2c.so.0                    -unknown-       xorg
 ./usr/X11R7/lib/modules/libi2c_pic.a                   -unknown-       xorg
-./usr/X11R7/lib/modules/libint10.a                     -unknown-       xorg
-./usr/X11R7/lib/modules/libint10.so                    -unknown-       xorg
-./usr/X11R7/lib/modules/libint10.so.0                  -unknown-       xorg
-./usr/X11R7/lib/modules/libint10_pic.a                 -unknown-       xorg
+./usr/X11R7/lib/modules/libint10.a                     -unknown-       obsolete
+./usr/X11R7/lib/modules/libint10.so                    -unknown-       obsolete
+./usr/X11R7/lib/modules/libint10.so.0                  -unknown-       obsolete
+./usr/X11R7/lib/modules/libint10_pic.a                 -unknown-       obsolete
 ./usr/X11R7/lib/modules/libpcidata.a                   -unknown-       obsolete
 ./usr/X11R7/lib/modules/libpcidata.so                  -unknown-       obsolete
 ./usr/X11R7/lib/modules/libpcidata.so.0                        -unknown-       obsolete
@@ -308,7 +304,7 @@
 ./usr/X11R7/man/html4/glint.html                       -unknown-       html,xorg
 ./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-       html,xorg
+./usr/X11R7/man/html4/imstt.html                       -unknown-       obsolete
 ./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
@@ -363,7 +359,7 @@
 ./usr/X11R7/man/man4/glint.4                           -unknown-       .man,xorg
 ./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-       .man,xorg
+./usr/X11R7/man/man4/imstt.4                           -unknown-       obsolete
 ./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
diff -r d462feda4c43 -r 7d284f77c86b distrib/sets/lists/xserver/md.amd64
--- a/distrib/sets/lists/xserver/md.amd64       Thu Aug 27 04:36:40 2009 +0000
+++ b/distrib/sets/lists/xserver/md.amd64       Thu Aug 27 04:59:15 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.51 2009/08/23 09:05:45 mrg Exp $
+# $NetBSD: md.amd64,v 1.52 2009/08/27 04:59:15 mrg Exp $
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/XFree86                                        -unknown-       x11
 ./usr/X11R6/bin/gtf                                    -unknown-       x11
@@ -364,8 +364,6 @@
 ./usr/X11R7/lib/modules/dri/mach64_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so                        -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so                        -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r200_dri.so                        -unknown-       xorg
@@ -380,8 +378,6 @@
 ./usr/X11R7/lib/modules/dri/savage_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/sis_dri.so                 -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/sis_dri.so.0               -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so              -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/tdfx_dri.so                        -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/tdfx_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/trident_dri.so             -unknown-       xorg
diff -r d462feda4c43 -r 7d284f77c86b distrib/sets/lists/xserver/md.i386
--- a/distrib/sets/lists/xserver/md.i386        Thu Aug 27 04:36:40 2009 +0000
+++ b/distrib/sets/lists/xserver/md.i386        Thu Aug 27 04:59:15 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.68 2009/08/23 09:05:45 mrg Exp $
+# $NetBSD: md.i386,v 1.69 2009/08/27 04:59:15 mrg Exp $
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/XFree86                                        -unknown-       x11
 ./usr/X11R6/bin/gtf                                    -unknown-       x11
@@ -435,8 +435,6 @@
 ./usr/X11R7/lib/modules/dri/mach64_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so                        -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so                        -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r200_dri.so                        -unknown-       xorg
@@ -451,8 +449,6 @@
 ./usr/X11R7/lib/modules/dri/savage_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/sis_dri.so                 -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/sis_dri.so.0               -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so              -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/tdfx_dri.so                        -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/tdfx_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/trident_dri.so             -unknown-       xorg
diff -r d462feda4c43 -r 7d284f77c86b distrib/sets/lists/xserver/md.macppc
--- a/distrib/sets/lists/xserver/md.macppc      Thu Aug 27 04:36:40 2009 +0000
+++ b/distrib/sets/lists/xserver/md.macppc      Thu Aug 27 04:59:15 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.50 2009/08/23 09:05:45 mrg Exp $
+# $NetBSD: md.macppc,v 1.51 2009/08/27 04:59:15 mrg Exp $
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/XFree86                                        -unknown-       x11
 ./usr/X11R6/bin/Xmacppc                                        -unknown-       x11
@@ -321,8 +321,6 @@
 ./usr/X11R7/lib/modules/dri/mach64_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so                        -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so                        -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r200_dri.so                        -unknown-       xorg
@@ -331,16 +329,14 @@
 ./usr/X11R7/lib/modules/dri/r300_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/radeon_dri.so              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/radeon_dri.so.0            -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so              -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/tdfx_dri.so                        -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/tdfx_dri.so.0              -unknown-       xorg
 ./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
 ./usr/X11R7/lib/modules/drivers/chips_drv.so.1         -unknown-       xorg
-./usr/X11R7/lib/modules/drivers/imstt_drv.so           -unknown-       xorg
-./usr/X11R7/lib/modules/drivers/imstt_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
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so.1           -unknown-       xorg
 ./usr/X11R7/lib/modules/drivers/mach64_drv.so           -unknown-       xorg
@@ -531,7 +527,7 @@
 ./usr/X11R7/man/html4/ati.html                         -unknown-       html,xorg
 ./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-       html,xorg
+./usr/X11R7/man/html4/imstt.html                       -unknown-       obsolete
 ./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
@@ -552,7 +548,7 @@
 ./usr/X11R7/man/man4/ati.4                             -unknown-       .man,xorg
 ./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-       .man,xorg
+./usr/X11R7/man/man4/imstt.4                           -unknown-       obsolete
 ./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
diff -r d462feda4c43 -r 7d284f77c86b distrib/sets/lists/xserver/md.sparc
--- a/distrib/sets/lists/xserver/md.sparc       Thu Aug 27 04:36:40 2009 +0000
+++ b/distrib/sets/lists/xserver/md.sparc       Thu Aug 27 04:59:15 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.39 2009/08/26 22:38:22 macallan Exp $
+# $NetBSD: md.sparc,v 1.40 2009/08/27 04:59:15 mrg Exp $
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/XFree86                                        -unknown-       x11
 ./usr/X11R6/bin/Xsun                                   -unknown-       x11
@@ -290,8 +290,6 @@
 ./usr/X11R7/lib/modules/dri/mach64_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so                        -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so                        -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r200_dri.so                        -unknown-       xorg
@@ -300,8 +298,6 @@
 ./usr/X11R7/lib/modules/dri/r300_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/radeon_dri.so              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/radeon_dri.so.0            -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so              -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/drivers/ag10e_drv.so           -unknown-       xorg
 ./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0         -unknown-       xorg
 ./usr/X11R7/lib/modules/drivers/ati_drv.so             -unknown-       xorg
diff -r d462feda4c43 -r 7d284f77c86b distrib/sets/lists/xserver/md.sparc64
--- a/distrib/sets/lists/xserver/md.sparc64     Thu Aug 27 04:36:40 2009 +0000
+++ b/distrib/sets/lists/xserver/md.sparc64     Thu Aug 27 04:59:15 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.37 2009/08/23 09:05:45 mrg Exp $     x11
+# $NetBSD: md.sparc64,v 1.38 2009/08/27 04:59:15 mrg Exp $     x11
 ./usr/X11R6/bin/X                                      -unknown-       x11
 ./usr/X11R6/bin/XFree86                                        -unknown-       x11
 ./usr/X11R6/bin/Xsun                                   -unknown-       x11
@@ -289,8 +289,6 @@
 ./usr/X11R7/lib/modules/dri/mach64_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so                 -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/mga_dri.so.0               -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so                        -unknown-       xorg
-./usr/X11R7/lib/modules/dri/mesa_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so                        -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r128_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/r200_dri.so                        -unknown-       xorg
@@ -299,8 +297,6 @@
 ./usr/X11R7/lib/modules/dri/r300_dri.so.0              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/radeon_dri.so              -unknown-       xorg
 ./usr/X11R7/lib/modules/dri/radeon_dri.so.0            -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so              -unknown-       xorg
-./usr/X11R7/lib/modules/dri/swrast_dri.so.0            -unknown-       xorg
 ./usr/X11R7/lib/modules/drivers/ag10e_drv.so           -unknown-       xorg
 ./usr/X11R7/lib/modules/drivers/ag10e_drv.so.0         -unknown-       xorg
 ./usr/X11R7/lib/modules/drivers/ati_drv.so             -unknown-       xorg
diff -r d462feda4c43 -r 7d284f77c86b distrib/sets/lists/xserver/mi
--- a/distrib/sets/lists/xserver/mi     Thu Aug 27 04:36:40 2009 +0000
+++ b/distrib/sets/lists/xserver/mi     Thu Aug 27 04:59:15 2009 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: mi,v 1.29 2009/06/12 01:55:59 mrg Exp $
+# $NetBSD: mi,v 1.30 2009/08/27 04:59:15 mrg Exp $
 #
 # Note: don't delete entries from here - mark them as "obsolete" instead.
 #
@@ -54,6 +54,10 @@
 ./usr/X11R6/man/man1/xvidtune.1                                -unknown-       .man,x11
 ./usr/X11R7/bin/Xnest                                  -unknown-       xorg
 ./usr/X11R7/bin/Xvfb                                   -unknown-       xorg
+./usr/X11R7/lib/modules/dri/mesa_dri.so                        -unknown-       xorg
+./usr/X11R7/lib/modules/dri/mesa_dri.so.0              -unknown-       xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so              -unknown-       xorg
+./usr/X11R7/lib/modules/dri/swrast_dri.so.0            -unknown-       xorg
 ./usr/X11R7/man/cat1/Xmark.0                           -unknown-       .cat,xorg
 ./usr/X11R7/man/cat1/Xnest.0                           -unknown-       .cat,xorg
 ./usr/X11R7/man/cat1/Xserver.0                         -unknown-       .cat,xorg