[src/trunk]: src enable mga driver on sparc64 and xorg-server 1.18

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

details:   https://anonhg.NetBSD.org/src/rev/70a7c032a122
branches:  trunk
changeset: 817431:70a7c032a122
user:      mrg <mrg%NetBSD.org@localhost>
date:      Sat Aug 20 05:24:26 2016 +0000

description:
enable mga driver on sparc64 and xorg-server 1.18

diffstat:

 distrib/sets/lists/xdebug/md.sparc64      |   4 ++--
 distrib/sets/lists/xserver/md.sparc64     |  12 ++++++------
 external/mit/xorg/server/drivers/Makefile |   4 ++--
 3 files changed, 10 insertions(+), 10 deletions(-)

diffs (90 lines):

diff -r 3c64fb907f0b -r 70a7c032a122 distrib/sets/lists/xdebug/md.sparc64
--- a/distrib/sets/lists/xdebug/md.sparc64      Sat Aug 20 05:02:58 2016 +0000
+++ b/distrib/sets/lists/xdebug/md.sparc64      Sat Aug 20 05:24:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.6 2016/08/19 19:09:50 mrg Exp $
+# $NetBSD: md.sparc64,v 1.7 2016/08/20 05:24:26 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
@@ -70,7 +70,7 @@
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug obsolete                xorg,obsolete
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.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/r128_drv.so.6.debug  -unknown-               xorg,debug
 ./usr/libdata/debug/usr/X11R7/lib/modules/drivers/radeon_drv.so.6.debug        -unknown-               xorg,debug
diff -r 3c64fb907f0b -r 70a7c032a122 distrib/sets/lists/xserver/md.sparc64
--- a/distrib/sets/lists/xserver/md.sparc64     Sat Aug 20 05:02:58 2016 +0000
+++ b/distrib/sets/lists/xserver/md.sparc64     Sat Aug 20 05:24:26 2016 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.59 2016/08/19 22:37:04 mrg Exp $     x11
+# $NetBSD: md.sparc64,v 1.60 2016/08/20 05:24:26 mrg Exp $     x11
 ./usr/X11R7/bin/X                                      -unknown-       xorg
 ./usr/X11R7/bin/Xorg                                   -unknown-       xorg
 ./usr/X11R7/bin/cvt                                    -unknown-       xorg
@@ -35,8 +35,8 @@
 ./usr/X11R7/lib/modules/drivers/kbd_drv.so.1           -unknown-       xorg
 ./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,xorg_server_ver=110
-./usr/X11R7/lib/modules/drivers/mga_drv.so.1           -unknown-       xorg,xorg_server_ver=110
+./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/r128_drv.so            -unknown-       xorg
@@ -174,7 +174,7 @@
 ./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/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/r128.0                            -unknown-       .cat,xorg
 ./usr/X11R7/man/cat4/radeon.0                          -unknown-       .cat,xorg
@@ -196,7 +196,7 @@
 ./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/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/r128.html                                -unknown-       html,xorg
 ./usr/X11R7/man/html4/radeon.html                      -unknown-       html,xorg
@@ -218,7 +218,7 @@
 ./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/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/r128.4                            -unknown-       .man,xorg
 ./usr/X11R7/man/man4/radeon.4                          -unknown-       .man,xorg
diff -r 3c64fb907f0b -r 70a7c032a122 external/mit/xorg/server/drivers/Makefile
--- a/external/mit/xorg/server/drivers/Makefile Sat Aug 20 05:02:58 2016 +0000
+++ b/external/mit/xorg/server/drivers/Makefile Sat Aug 20 05:24:26 2016 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: Makefile,v 1.83 2016/08/20 05:02:58 mrg Exp $
+#      $NetBSD: Makefile,v 1.84 2016/08/20 05:24:26 mrg Exp $
 
 # xf86-input drivers
 
@@ -283,6 +283,7 @@
 SUBDIR+= \
        xf86-video-ati \
        xf86-video-mach64 \
+       xf86-video-mga \
        xf86-video-r128 \
        xf86-video-radeon \
        xf86-video-suncg6 \
@@ -291,7 +292,6 @@
 SUBDIR+= \
        xf86-video-ag10e \
        xf86-video-glint \
-       xf86-video-mga \
        xf86-video-sunffb \
        xf86-video-sunleo
 .endif # ${XORG_SERVER_SUBDIR} == "xorg-server.old"