Re-import x11/openbsd-input-ws as x11/xf86-input-ws and update to 1.3.0.

From OpenBSD xenocara HEAD. No distfile, so manually tared up and dropped
in MASTER_SITE_LOCAL.

6 files changed, 85 insertions, 0 deletions

diff --git a/x11/xf86-input-ws/DESCR b/x11/xf86-input-ws/DESCR
new file mode 100644
index 00000000000..837ca787eea
--- /dev/null
+++ b/x11/xf86-input-ws/DESCR
@@ -0,0 +1 @@
+Matthieu Herrb's wscons pointing device driver for modular X.org.
diff --git a/x11/xf86-input-ws/MESSAGE b/x11/xf86-input-ws/MESSAGE
new file mode 100644
index 00000000000..dfa288146cc
--- /dev/null
+++ b/x11/xf86-input-ws/MESSAGE
@@ -0,0 +1,12 @@
+===========================================================================
+$NetBSD: MESSAGE,v 1.1 2015/10/10 20:02:52 tnn Exp $
+
+To use this driver, your xorg.conf file should have an entry like this:
+
+	Identifier  	"Mouse0"
+	Driver      	"ws"
+	Option		"Device"	"/dev/wsmouse"
+
+This should work with many wscons pointing devices, especially the zaurus.
+Please see the ws(4) manual page for more information.
+===========================================================================
diff --git a/x11/xf86-input-ws/Makefile b/x11/xf86-input-ws/Makefile
new file mode 100644
index 00000000000..ad89336904d
--- /dev/null
+++ b/x11/xf86-input-ws/Makefile
@@ -0,0 +1,22 @@
+# $NetBSD: Makefile,v 1.1 2015/10/10 20:02:52 tnn Exp $
+#
+
+DISTNAME=	xf86-input-ws-1.3.0.20151010
+CATEGORIES=	x11
+MASTER_SITES=	${MASTER_SITE_LOCAL}
+
+MAINTAINER=	pkgsrc-users@NetBSD.org
+HOMEPAGE=	http://xenocara.org/
+COMMENT=	OpenBSD's wscons input driver for modular X.org
+
+ONLY_FOR_PLATFORM=	NetBSD-*-* OpenBSD-*-*
+
+GNU_CONFIGURE=	yes
+USE_LIBTOOL=	yes
+USE_TOOLS+=	pkg-config
+
+.include "../../x11/modular-xorg-server/buildlink3.mk"
+.include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/inputproto/buildlink3.mk"
+
+.include "../../mk/bsd.pkg.mk"
diff --git a/x11/xf86-input-ws/PLIST b/x11/xf86-input-ws/PLIST
new file mode 100644
index 00000000000..30c74e40796
--- /dev/null
+++ b/x11/xf86-input-ws/PLIST
@@ -0,0 +1,4 @@
+@comment $NetBSD: PLIST,v 1.1 2015/10/10 20:02:52 tnn Exp $
+include/xorg/ws-properties.h
+lib/xorg/modules/input/ws_drv.la
+man/man4/ws.4
diff --git a/x11/xf86-input-ws/distinfo b/x11/xf86-input-ws/distinfo
new file mode 100644
index 00000000000..96c27e0ee1b
--- /dev/null
+++ b/x11/xf86-input-ws/distinfo
@@ -0,0 +1,6 @@
+$NetBSD: distinfo,v 1.1 2015/10/10 20:02:52 tnn Exp $
+
+SHA1 (xf86-input-ws-1.3.0.20151010.tar.gz) = c8951b6e2d0dd3f741948bb6e1ae28e0966bec90
+RMD160 (xf86-input-ws-1.3.0.20151010.tar.gz) = a3e66b571f791f3d1ddac6d9e477cdc28faa5952
+Size (xf86-input-ws-1.3.0.20151010.tar.gz) = 323648 bytes
+SHA1 (patch-src_ws.c) = 66cdc536a6a931d117f2e22111b1b95bf1d63b84
diff --git a/x11/xf86-input-ws/patches/patch-src_ws.c b/x11/xf86-input-ws/patches/patch-src_ws.c
new file mode 100644
index 00000000000..3ffcc5bec57
--- /dev/null
+++ b/x11/xf86-input-ws/patches/patch-src_ws.c
@@ -0,0 +1,40 @@
+$NetBSD: patch-src_ws.c,v 1.1 2015/10/10 20:02:52 tnn Exp $
+
+--- src/ws.c.orig	2015-08-29 08:48:29.000000000 +0000
++++ src/ws.c
+@@ -550,9 +550,11 @@ wsReadHwState(InputInfoPtr pInfo, wsHwSt
+ 		case WSCONS_EVENT_MOUSE_ABSOLUTE_W:
+ 			/* ignore those */
+ 			continue;
++#ifdef WSCONS_EVENT_SYNC
+ 		case WSCONS_EVENT_SYNC:
+ 			DBG(4, ErrorF("Sync\n"));
+ 			return TRUE;
++#endif
+ 		default:
+ 			xf86IDrvMsg(pInfo, X_WARNING,
+ 			    "bad wsmouse event type=%d\n", event->type);
+@@ -793,17 +795,23 @@ wsSetCalibProperty(DeviceIntPtr device, 
+ 		priv->coords.maxx = priv->max_x;
+ 		priv->coords.miny = priv->min_y;
+ 		priv->coords.maxy = priv->max_y;
++#ifdef __OpenBSD__
+ 		priv->coords.swapxy = priv->swap_axes;
++#endif
+ 
+ 		/* Update the kernel calibration table */
+ 		coords.minx = priv->min_x;
+ 		coords.maxx = priv->max_x;
+ 		coords.miny = priv->min_y;
+ 		coords.maxy = priv->max_y;
++#ifdef __OpenBSD__
+ 		coords.swapxy = priv->swap_axes;
++#endif
+ 		coords.samplelen = priv->raw;
++#ifdef __OpenBSD__
+ 		coords.resx = priv->coords.resx;
+ 		coords.resy = priv->coords.resy;
++#endif
+ 		if (ioctl(pInfo->fd, WSMOUSEIO_SCALIBCOORDS, &coords) != 0) {
+ 			xf86IDrvMsg(pInfo, X_ERROR, "SCALIBCOORDS failed %s\n",
+ 			    strerror(errno));