Module Name: src
Committed By: mbalmer
Date: Sat Nov 28 12:10:25 UTC 2009
Modified Files:
src/distrib/sets/lists/xserver: md.alpha md.amd64 md.i386 md.macppc
md.netwinder md.sgimips md.sparc64
src/external/mit/xorg/server/drivers: Makefile
src/share/mk: bsd.own.mk
Added Files:
src/external/mit/xorg/server/drivers/xf86-input-ws: Makefile
Log Message:
Link the xf86-input-ws X.Org input driver to the build and add it to the lists
that also have the wsmouse driver.
xf86-input-ws adds support for touchpanels in X11 that report absolute position
data through wscons(4), e.g. the extended ums(4) driver. xf86-input-ws was
written by Matthieu Herrb for OpenBSD.
Please remember to also update xsrc before the next system build.
To generate a diff of this commit:
cvs rdiff -u -r1.25 -r1.26 src/distrib/sets/lists/xserver/md.alpha
cvs rdiff -u -r1.54 -r1.55 src/distrib/sets/lists/xserver/md.amd64
cvs rdiff -u -r1.71 -r1.72 src/distrib/sets/lists/xserver/md.i386
cvs rdiff -u -r1.52 -r1.53 src/distrib/sets/lists/xserver/md.macppc
cvs rdiff -u -r1.20 -r1.21 src/distrib/sets/lists/xserver/md.netwinder
cvs rdiff -u -r1.35 -r1.36 src/distrib/sets/lists/xserver/md.sgimips
cvs rdiff -u -r1.40 -r1.41 src/distrib/sets/lists/xserver/md.sparc64
cvs rdiff -u -r1.33 -r1.34 src/external/mit/xorg/server/drivers/Makefile
cvs rdiff -u -r0 -r1.1 \
src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
cvs rdiff -u -r1.595 -r1.596 src/share/mk/bsd.own.mk
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/xserver/md.alpha
diff -u src/distrib/sets/lists/xserver/md.alpha:1.25 src/distrib/sets/lists/xserver/md.alpha:1.26
--- src/distrib/sets/lists/xserver/md.alpha:1.25 Sun Aug 30 21:27:35 2009
+++ src/distrib/sets/lists/xserver/md.alpha Sat Nov 28 12:10:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.alpha,v 1.25 2009/08/30 21:27:35 mrg Exp $
+# $NetBSD: md.alpha,v 1.26 2009/11/28 12:10:25 mbalmer Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XalphaNetBSD -unknown- x11
./usr/X11R6/bin/XdecNetBSD -unknown- x11
@@ -97,6 +97,8 @@
./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/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
./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libGLcore.a -unknown- obsolete
@@ -266,6 +268,7 @@
./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/ws.0 -unknown- .cat,xorg
./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
@@ -322,6 +325,7 @@
./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/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
@@ -378,5 +382,6 @@
./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/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.amd64
diff -u src/distrib/sets/lists/xserver/md.amd64:1.54 src/distrib/sets/lists/xserver/md.amd64:1.55
--- src/distrib/sets/lists/xserver/md.amd64:1.54 Sun Aug 30 21:27:35 2009
+++ src/distrib/sets/lists/xserver/md.amd64 Sat Nov 28 12:10:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.amd64,v 1.54 2009/08/30 21:27:35 mrg Exp $
+# $NetBSD: md.amd64,v 1.55 2009/11/28 12:10:25 mbalmer Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -476,6 +476,8 @@
./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/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
./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libGLcore.a -unknown- obsolete
@@ -631,6 +633,7 @@
./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/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
@@ -673,6 +676,7 @@
./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/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
@@ -715,5 +719,6 @@
./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/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.i386
diff -u src/distrib/sets/lists/xserver/md.i386:1.71 src/distrib/sets/lists/xserver/md.i386:1.72
--- src/distrib/sets/lists/xserver/md.i386:1.71 Sun Aug 30 21:27:35 2009
+++ src/distrib/sets/lists/xserver/md.i386 Sat Nov 28 12:10:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.i386,v 1.71 2009/08/30 21:27:35 mrg Exp $
+# $NetBSD: md.i386,v 1.72 2009/11/28 12:10:25 mbalmer Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -547,6 +547,8 @@
./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/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
./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libGLcore.a -unknown- obsolete
@@ -729,6 +731,7 @@
./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/wsfb.0 -unknown- .cat,xorg
./usr/X11R7/man/cat5/xorg.conf.0 -unknown- .cat,xorg
./usr/X11R7/man/html1/Xorg.html -unknown- html,xorg
@@ -771,6 +774,7 @@
./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/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
@@ -813,5 +817,6 @@
./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/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.macppc
diff -u src/distrib/sets/lists/xserver/md.macppc:1.52 src/distrib/sets/lists/xserver/md.macppc:1.53
--- src/distrib/sets/lists/xserver/md.macppc:1.52 Sun Aug 30 21:27:35 2009
+++ src/distrib/sets/lists/xserver/md.macppc Sat Nov 28 12:10:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.macppc,v 1.52 2009/08/30 21:27:35 mrg Exp $
+# $NetBSD: md.macppc,v 1.53 2009/11/28 12:10:25 mbalmer Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xmacppc -unknown- x11
@@ -355,6 +355,8 @@
./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/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
./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libGLcore.a -unknown- obsolete
@@ -514,6 +516,7 @@
./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/ws.0 -unknown- .cat,xorg
./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
@@ -535,6 +538,7 @@
./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/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
@@ -556,5 +560,6 @@
./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/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.netwinder
diff -u src/distrib/sets/lists/xserver/md.netwinder:1.20 src/distrib/sets/lists/xserver/md.netwinder:1.21
--- src/distrib/sets/lists/xserver/md.netwinder:1.20 Sun Aug 30 21:27:35 2009
+++ src/distrib/sets/lists/xserver/md.netwinder Sat Nov 28 12:10:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.netwinder,v 1.20 2009/08/30 21:27:35 mrg Exp $
+# $NetBSD: md.netwinder,v 1.21 2009/11/28 12:10:25 mbalmer Exp $
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/gtf -unknown- x11
@@ -267,6 +267,8 @@
./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/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
./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libGLcore.a -unknown- obsolete
@@ -417,6 +419,7 @@
./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/ws.0 -unknown- .cat,xorg
./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
@@ -429,6 +432,7 @@
./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/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
@@ -441,5 +445,6 @@
./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/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.sgimips
diff -u src/distrib/sets/lists/xserver/md.sgimips:1.35 src/distrib/sets/lists/xserver/md.sgimips:1.36
--- src/distrib/sets/lists/xserver/md.sgimips:1.35 Fri Oct 16 06:05:47 2009
+++ src/distrib/sets/lists/xserver/md.sgimips Sat Nov 28 12:10:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sgimips,v 1.35 2009/10/16 06:05:47 snj Exp $ x11
+# $NetBSD: md.sgimips,v 1.36 2009/11/28 12:10:25 mbalmer Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xprt -unknown- x11
@@ -416,6 +416,8 @@
./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/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
./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libGLcore.a -unknown- obsolete
@@ -566,6 +568,7 @@
./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/ws.0 -unknown- .cat,xorg
./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
@@ -578,6 +581,7 @@
./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/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
@@ -590,5 +594,6 @@
./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/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
Index: src/distrib/sets/lists/xserver/md.sparc64
diff -u src/distrib/sets/lists/xserver/md.sparc64:1.40 src/distrib/sets/lists/xserver/md.sparc64:1.41
--- src/distrib/sets/lists/xserver/md.sparc64:1.40 Sat Sep 5 22:38:45 2009
+++ src/distrib/sets/lists/xserver/md.sparc64 Sat Nov 28 12:10:25 2009
@@ -1,4 +1,4 @@
-# $NetBSD: md.sparc64,v 1.40 2009/09/05 22:38:45 macallan Exp $ x11
+# $NetBSD: md.sparc64,v 1.41 2009/11/28 12:10:25 mbalmer Exp $ x11
./usr/X11R6/bin/X -unknown- x11
./usr/X11R6/bin/XFree86 -unknown- x11
./usr/X11R6/bin/Xsun -unknown- x11
@@ -323,6 +323,8 @@
./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/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
./usr/X11R7/lib/modules/drivers/wsfb_drv.so.0 -unknown- xorg
./usr/X11R7/lib/modules/extensions/libGLcore.a -unknown- obsolete
@@ -478,6 +480,7 @@
./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/ws.0 -unknown- .cat,xorg
./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
@@ -500,6 +503,7 @@
./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/ws.html -unknown- html,xorg
./usr/X11R7/man/html4/wsfb.html -unknown- html,xorg
./usr/X11R7/man/html5/xorg.conf.html -unknown- html,xorg
./usr/X11R7/man/man1/Xorg.1 -unknown- .man,xorg
@@ -522,5 +526,6 @@
./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/ws.4 -unknown- .man,xorg
./usr/X11R7/man/man4/wsfb.4 -unknown- .man,xorg
./usr/X11R7/man/man5/xorg.conf.5 -unknown- .man,xorg
Index: src/external/mit/xorg/server/drivers/Makefile
diff -u src/external/mit/xorg/server/drivers/Makefile:1.33 src/external/mit/xorg/server/drivers/Makefile:1.34
--- src/external/mit/xorg/server/drivers/Makefile:1.33 Tue Nov 10 23:14:04 2009
+++ src/external/mit/xorg/server/drivers/Makefile Sat Nov 28 12:10:24 2009
@@ -1,9 +1,10 @@
-# $NetBSD: Makefile,v 1.33 2009/11/10 23:14:04 macallan Exp $
+# $NetBSD: Makefile,v 1.34 2009/11/28 12:10:24 mbalmer Exp $
SUBDIR= \
xf86-input-keyboard \
xf86-input-mouse \
- xf86-input-void
+ xf86-input-void \
+ xf86-input-ws
.if ${MACHINE_ARCH} == "i386" || \
${MACHINE_ARCH} == "x86_64"
Index: src/share/mk/bsd.own.mk
diff -u src/share/mk/bsd.own.mk:1.595 src/share/mk/bsd.own.mk:1.596
--- src/share/mk/bsd.own.mk:1.595 Tue Nov 10 21:41:31 2009
+++ src/share/mk/bsd.own.mk Sat Nov 28 12:10:24 2009
@@ -1,4 +1,4 @@
-# $NetBSD: bsd.own.mk,v 1.595 2009/11/10 21:41:31 macallan Exp $
+# $NetBSD: bsd.own.mk,v 1.596 2009/11/28 12:10:24 mbalmer Exp $
.if !defined(_BSD_OWN_MK_)
_BSD_OWN_MK_=1
@@ -910,7 +910,7 @@
.endfor
.for _i in \
- keyboard mouse vmmouse void
+ keyboard mouse vmmouse void ws
X11SRCDIR.xf86-input-${_i}?= ${X11SRCDIRMIT}/xf86-input-${_i}/dist
.endfor
Added files:
Index: src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile
diff -u /dev/null src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile:1.1
--- /dev/null Sat Nov 28 12:10:25 2009
+++ src/external/mit/xorg/server/drivers/xf86-input-ws/Makefile Sat Nov 28 12:10:24 2009
@@ -0,0 +1,15 @@
+# $NetBSD: Makefile,v 1.1 2009/11/28 12:10:24 mbalmer Exp $
+
+DRIVER= xf86-input-ws
+DRIVER_NAME= ws_drv
+
+SRCS= ws.c emumb.c
+MAN= ws.4
+
+CPPFLAGS+= -DHAVE_CONFIG_H \
+ -I${X11SRCDIR.${DRIVER}}/../include \
+ -I${X11SRCDIR.${DRIVER}}/include
+
+COPTS.ws.c= -Wno-error # XXX deprecated
+
+.include "../Makefile.xf86-driver"
