summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authormrg <mrg@NetBSD.org>2010-05-22 21:12:19 +0000
committermrg <mrg@NetBSD.org>2010-05-22 21:12:19 +0000
commitb014fbb669dd040dbcb938c01ba60ee5d88fd2f4 (patch)
treebc0b26b9ab1386617d07f3e8f096d78d308eb3ea
parentc938c0405b48aad4998ce078e4fb0963a8f9b8d8 (diff)
don't build xf86-input-void; it is obsolete since xorg-server 1.4.
-rw-r--r--distrib/sets/lists/xcomp/md.amd644
-rw-r--r--distrib/sets/lists/xcomp/md.i3864
-rw-r--r--distrib/sets/lists/xcomp/md.sparc644
-rw-r--r--distrib/sets/lists/xserver/md.alpha12
-rw-r--r--distrib/sets/lists/xserver/md.amd6412
-rw-r--r--distrib/sets/lists/xserver/md.cats12
-rw-r--r--distrib/sets/lists/xserver/md.i38614
-rw-r--r--distrib/sets/lists/xserver/md.macppc12
-rw-r--r--distrib/sets/lists/xserver/md.netwinder12
-rw-r--r--distrib/sets/lists/xserver/md.sgimips12
-rw-r--r--distrib/sets/lists/xserver/md.shark12
-rw-r--r--distrib/sets/lists/xserver/md.sparc12
-rw-r--r--distrib/sets/lists/xserver/md.sparc6412
-rw-r--r--distrib/sets/lists/xserver/md.zaurus10
-rw-r--r--external/mit/xorg/server/drivers/Makefile3
15 files changed, 73 insertions, 74 deletions
diff --git a/distrib/sets/lists/xcomp/md.amd64 b/distrib/sets/lists/xcomp/md.amd64
index 427b4817967..4b821c4b358 100644
--- a/distrib/sets/lists/xcomp/md.amd64
+++ b/distrib/sets/lists/xcomp/md.amd64
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.21 2010/04/28 09:55:25 lukem Exp $
+# $NetBSD: md.amd64,v 1.22 2010/05/22 21:12:29 mrg Exp $
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11
@@ -148,7 +148,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvesa_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvmmouse_drv.so.12.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvmware_drv.so.10.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvoid_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvoid_drv.so.1.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug
diff --git a/distrib/sets/lists/xcomp/md.i386 b/distrib/sets/lists/xcomp/md.i386
index b87d325b480..77c3be38f57 100644
--- a/distrib/sets/lists/xcomp/md.i386
+++ b/distrib/sets/lists/xcomp/md.i386
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.27 2010/04/27 14:33:19 lukem Exp $
+# $NetBSD: md.i386,v 1.28 2010/05/22 21:12:29 mrg Exp $
./usr/X11R6/include/xf86Optrec.h -unknown- x11
./usr/X11R6/include/xf86Parser.h -unknown- x11
./usr/X11R6/man/cat3/XF86VidMode.0 -unknown- .cat,x11
@@ -145,7 +145,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvesa_drv.so.2.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvmmouse_drv.so.12.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvmware_drv.so.10.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvoid_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvoid_drv.so.1.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug
diff --git a/distrib/sets/lists/xcomp/md.sparc64 b/distrib/sets/lists/xcomp/md.sparc64
index 165321f9f0b..d03884a35d5 100644
--- a/distrib/sets/lists/xcomp/md.sparc64
+++ b/distrib/sets/lists/xcomp/md.sparc64
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.9 2010/04/30 05:20:34 lukem Exp $
+# $NetBSD: md.sparc64,v 1.10 2010/05/22 21:12:29 mrg Exp $
./usr/X11R6/include/X11/extensions/dpms.h -unknown- x11
./usr/X11R6/include/X11/extensions/dpmsstr.h -unknown- x11
./usr/X11R6/include/X11/extensions/xf86misc.h -unknown- x11
@@ -36,7 +36,7 @@
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libsuncg6_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libsunffb_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libsunleo_drv.so.1.debug -unknown- xorg,debug
-./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvoid_drv.so.1.debug -unknown- xorg,debug
+./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libvoid_drv.so.1.debug -unknown- obsolete
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libws_drv.so.1.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/drivers/libwsfb_drv.so.0.debug -unknown- xorg,debug
./usr/libdata/debug/usr/X11R7/lib/modules/extensions/libdbe.so.0.debug -unknown- xorg,debug
diff --git a/distrib/sets/lists/xserver/md.alpha b/distrib/sets/lists/xserver/md.alpha
index 060826889cc..abafa7561ba 100644
--- a/distrib/sets/lists/xserver/md.alpha
+++ b/distrib/sets/lists/xserver/md.alpha
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.26 2009/11/28 12:10:25 mbalmer Exp $
+# $NetBSD: md.alpha,v 1.27 2010/05/22 21:12:29 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XalphaNetBSD -unknown- x11
./usr/X11R6/bin/XdecNetBSD -unknown- x11
@@ -95,8 +95,8 @@
./usr/X11R7/lib/modules/drivers/tseng_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vga_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- obsolete
-./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -267,7 +267,7 @@
./usr/X11R7/man/cat4/trident.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/tseng.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vga.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -324,7 +324,7 @@
./usr/X11R7/man/html4/trident.html -unknown- html,xorg
./usr/X11R7/man/html4/tseng.html -unknown- html,xorg
./usr/X11R7/man/html4/vga.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -381,7 +381,7 @@
./usr/X11R7/man/man4/trident.4 -unknown- .man,xorg
./usr/X11R7/man/man4/tseng.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vga.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.amd64 b/distrib/sets/lists/xserver/md.amd64
index c6c4e517042..11553e3d81a 100644
--- a/distrib/sets/lists/xserver/md.amd64
+++ b/distrib/sets/lists/xserver/md.amd64
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.55 2009/11/28 12:10:25 mbalmer Exp $
+# $NetBSD: md.amd64,v 1.56 2010/05/22 21:12:29 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -474,8 +474,8 @@
./usr/X11R7/lib/modules/drivers/vmmouse_drv.so.12 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vmware_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/vmware_drv.so.10 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -632,7 +632,7 @@
./usr/X11R7/man/cat4/via.0 -unknown- obsolete
./usr/X11R7/man/cat4/vmmouse.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vmware.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -675,7 +675,7 @@
./usr/X11R7/man/html4/via.html -unknown- obsolete
./usr/X11R7/man/html4/vmmouse.html -unknown- html,xorg
./usr/X11R7/man/html4/vmware.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -718,7 +718,7 @@
./usr/X11R7/man/man4/via.4 -unknown- obsolete
./usr/X11R7/man/man4/vmmouse.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vmware.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.cats b/distrib/sets/lists/xserver/md.cats
index 4d7c2623732..0143feee380 100644
--- a/distrib/sets/lists/xserver/md.cats
+++ b/distrib/sets/lists/xserver/md.cats
@@ -1,4 +1,4 @@
-# $NetBSD: md.cats,v 1.37 2009/12/14 15:27:14 skrll Exp $
+# $NetBSD: md.cats,v 1.38 2010/05/22 21:12:30 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -419,8 +419,8 @@
./usr/X11R7/lib/modules/drivers/vga_drv.so.4 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/via_drv.so -unknown- obsolete
./usr/X11R7/lib/modules/drivers/via_drv.so.0 -unknown- obsolete
-./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -594,7 +594,7 @@
./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
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -632,7 +632,7 @@
./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
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -670,7 +670,7 @@
./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
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.i386 b/distrib/sets/lists/xserver/md.i386
index 691bb923d1c..2d6738430fe 100644
--- a/distrib/sets/lists/xserver/md.i386
+++ b/distrib/sets/lists/xserver/md.i386
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.73 2009/11/28 16:48:25 mbalmer Exp $
+# $NetBSD: md.i386,v 1.74 2010/05/22 21:12:30 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -547,8 +547,8 @@
./usr/X11R7/lib/modules/drivers/vmmouse_drv.so.12 -unknown- xorg
./usr/X11R7/lib/modules/drivers/vmware_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/vmware_drv.so.10 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -733,8 +733,8 @@
./usr/X11R7/man/cat4/via.0 -unknown- obsolete
./usr/X11R7/man/cat4/vmmouse.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/vmware.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
+./usr/X11R7/man/cat4/ws.0 -unknown- obsolete
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
@@ -777,7 +777,7 @@
./usr/X11R7/man/html4/via.html -unknown- obsolete
./usr/X11R7/man/html4/vmmouse.html -unknown- html,xorg
./usr/X11R7/man/html4/vmware.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -821,7 +821,7 @@
./usr/X11R7/man/man4/via.4 -unknown- obsolete
./usr/X11R7/man/man4/vmmouse.4 -unknown- .man,xorg
./usr/X11R7/man/man4/vmware.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.macppc b/distrib/sets/lists/xserver/md.macppc
index 70a6d4d5f4f..28ed2213e7d 100644
--- a/distrib/sets/lists/xserver/md.macppc
+++ b/distrib/sets/lists/xserver/md.macppc
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.53 2009/11/28 12:10:25 mbalmer Exp $
+# $NetBSD: md.macppc,v 1.54 2010/05/22 21:12:30 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xmacppc -unknown- x11
@@ -353,8 +353,8 @@
./usr/X11R7/lib/modules/drivers/radeon_drv.so.6 -unknown- xorg
./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/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -515,7 +515,7 @@
./usr/X11R7/man/cat4/r128.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/radeon.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/tdfx.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -537,7 +537,7 @@
./usr/X11R7/man/html4/r128.html -unknown- html,xorg
./usr/X11R7/man/html4/radeon.html -unknown- html,xorg
./usr/X11R7/man/html4/tdfx.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -559,7 +559,7 @@
./usr/X11R7/man/man4/r128.4 -unknown- .man,xorg
./usr/X11R7/man/man4/radeon.4 -unknown- .man,xorg
./usr/X11R7/man/man4/tdfx.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.netwinder b/distrib/sets/lists/xserver/md.netwinder
index 95f5d4fd08e..94cd0e04892 100644
--- a/distrib/sets/lists/xserver/md.netwinder
+++ b/distrib/sets/lists/xserver/md.netwinder
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.23 2010/01/14 13:47:42 wiz Exp $
+# $NetBSD: md.netwinder,v 1.24 2010/05/22 21:12:30 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -265,8 +265,8 @@
./usr/X11R7/lib/modules/drivers/kbd_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/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -418,7 +418,7 @@
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -431,7 +431,7 @@
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -444,7 +444,7 @@
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.sgimips b/distrib/sets/lists/xserver/md.sgimips
index 51644a3f096..cf0287e2365 100644
--- a/distrib/sets/lists/xserver/md.sgimips
+++ b/distrib/sets/lists/xserver/md.sgimips
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.36 2009/11/28 12:10:25 mbalmer Exp $ x11
+# $NetBSD: md.sgimips,v 1.37 2010/05/22 21:12:31 mrg Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xprt -unknown- x11
@@ -414,8 +414,8 @@
./usr/X11R7/lib/modules/drivers/mouse_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/newport_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/newport_drv.so.0 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -567,7 +567,7 @@
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/newport.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -580,7 +580,7 @@
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
./usr/X11R7/man/html4/newport.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -593,7 +593,7 @@
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
./usr/X11R7/man/man4/newport.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.shark b/distrib/sets/lists/xserver/md.shark
index a70262c531e..6f711a8e4b9 100644
--- a/distrib/sets/lists/xserver/md.shark
+++ b/distrib/sets/lists/xserver/md.shark
@@ -1,4 +1,4 @@
-# $NetBSD: md.shark,v 1.33 2009/12/05 06:45:06 snj Exp $
+# $NetBSD: md.shark,v 1.34 2010/05/22 21:12:31 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -258,8 +258,8 @@
./usr/X11R7/lib/modules/drivers/kbd_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/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -411,7 +411,7 @@
./usr/X11R7/man/cat4/igs.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -424,7 +424,7 @@
./usr/X11R7/man/html4/igs.html -unknown- html,xorg
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -437,7 +437,7 @@
./usr/X11R7/man/man4/igs.4 -unknown- .man,xorg
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.sparc b/distrib/sets/lists/xserver/md.sparc
index ffda05ba6aa..9b47f8091c5 100644
--- a/distrib/sets/lists/xserver/md.sparc
+++ b/distrib/sets/lists/xserver/md.sparc
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc,v 1.44 2010/02/11 04:09:10 macallan Exp $
+# $NetBSD: md.sparc,v 1.45 2010/05/22 21:12:31 mrg Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -328,8 +328,8 @@
./usr/X11R7/lib/modules/drivers/sunleo_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/suntcx_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/suntcx_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -488,7 +488,7 @@
./usr/X11R7/man/cat4/sunffb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/sunleo.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/suntcx.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -514,7 +514,7 @@
./usr/X11R7/man/html4/sunffb.html -unknown- html,xorg
./usr/X11R7/man/html4/sunleo.html -unknown- html,xorg
./usr/X11R7/man/html4/suntcx.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -540,7 +540,7 @@
./usr/X11R7/man/man4/sunffb.4 -unknown- .man,xorg
./usr/X11R7/man/man4/sunleo.4 -unknown- .man,xorg
./usr/X11R7/man/man4/suntcx.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.sparc64 b/distrib/sets/lists/xserver/md.sparc64
index 12c092de63d..73af1d82bb3 100644
--- a/distrib/sets/lists/xserver/md.sparc64
+++ b/distrib/sets/lists/xserver/md.sparc64
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.41 2009/11/28 12:10:25 mbalmer Exp $ x11
+# $NetBSD: md.sparc64,v 1.42 2010/05/22 21:12:31 mrg Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -321,8 +321,8 @@
./usr/X11R7/lib/modules/drivers/sunffb_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/sunleo_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/sunleo_drv.so.1 -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -479,7 +479,7 @@
./usr/X11R7/man/cat4/suncg6.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/sunffb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/sunleo.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -502,7 +502,7 @@
./usr/X11R7/man/html4/suncg6.html -unknown- html,xorg
./usr/X11R7/man/html4/sunffb.html -unknown- html,xorg
./usr/X11R7/man/html4/sunleo.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -525,7 +525,7 @@
./usr/X11R7/man/man4/suncg6.4 -unknown- .man,xorg
./usr/X11R7/man/man4/sunffb.4 -unknown- .man,xorg
./usr/X11R7/man/man4/sunleo.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/distrib/sets/lists/xserver/md.zaurus b/distrib/sets/lists/xserver/md.zaurus
index 63238978a78..fedaa00c270 100644
--- a/distrib/sets/lists/xserver/md.zaurus
+++ b/distrib/sets/lists/xserver/md.zaurus
@@ -8,8 +8,8 @@
./usr/X11R7/lib/modules/drivers/kbd_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/void_drv.so -unknown- xorg
-./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- xorg
+./usr/X11R7/lib/modules/drivers/void_drv.so -unknown- obsolete
+./usr/X11R7/lib/modules/drivers/void_drv.so.1 -unknown- obsolete
./usr/X11R7/lib/modules/drivers/ws_drv.so -unknown- xorg
./usr/X11R7/lib/modules/drivers/ws_drv.so.1 -unknown- xorg
./usr/X11R7/lib/modules/drivers/wsfb_drv.so -unknown- xorg
@@ -93,7 +93,7 @@
./usr/X11R7/man/cat4/exa.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/kbd.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/mousedrv.0 -unknown- .cat,xorg
-./usr/X11R7/man/cat4/void.0 -unknown- .cat,xorg
+./usr/X11R7/man/cat4/void.0 -unknown- obsolete
./usr/X11R7/man/cat4/ws.0 -unknown- .cat,xorg
./usr/X11R7/man/cat4/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
@@ -103,7 +103,7 @@
./usr/X11R7/man/html4/exa.html -unknown- html,xorg
./usr/X11R7/man/html4/kbd.html -unknown- html,xorg
./usr/X11R7/man/html4/mousedrv.html -unknown- html,xorg
-./usr/X11R7/man/html4/void.html -unknown- html,xorg
+./usr/X11R7/man/html4/void.html -unknown- obsolete
./usr/X11R7/man/html4/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
@@ -113,7 +113,7 @@
./usr/X11R7/man/man4/exa.4 -unknown- .man,xorg
./usr/X11R7/man/man4/kbd.4 -unknown- .man,xorg
./usr/X11R7/man/man4/mousedrv.4 -unknown- .man,xorg
-./usr/X11R7/man/man4/void.4 -unknown- .man,xorg
+./usr/X11R7/man/man4/void.4 -unknown- obsolete
./usr/X11R7/man/man4/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
diff --git a/external/mit/xorg/server/drivers/Makefile b/external/mit/xorg/server/drivers/Makefile
index d2c5f748a21..0d8ae2b8c5d 100644
--- a/external/mit/xorg/server/drivers/Makefile
+++ b/external/mit/xorg/server/drivers/Makefile
@@ -1,9 +1,8 @@
-# $NetBSD: Makefile,v 1.39 2010/02/11 04:07:17 macallan Exp $
+# $NetBSD: Makefile,v 1.40 2010/05/22 21:12:19 mrg Exp $
SUBDIR= \
xf86-input-keyboard \
xf86-input-mouse \
- xf86-input-void \
xf86-input-ws
.if ${MACHINE_ARCH} == "i386"