4 files changed, 58 insertions, 2 deletions
diff --git a/x11/xf86-input-keyboard/distinfo b/x11/xf86-input-keyboard/distinfo
index 9aa3f4f2035..11d22eddbe6 100644
--- a/x11/xf86-input-keyboard/distinfo
+++ b/x11/xf86-input-keyboard/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.9 2013/11/01 01:22:48 wiz Exp $
+$NetBSD: distinfo,v 1.10 2015/04/06 13:28:22 tnn Exp $
 
 SHA1 (xf86-input-keyboard-1.8.0.tar.bz2) = 7728d733ef16d664a201868ecae5db3705cf8ef1
 RMD160 (xf86-input-keyboard-1.8.0.tar.bz2) = 19ce2bf7a0c7c245afce557990dc762d66575b3d
 Size (xf86-input-keyboard-1.8.0.tar.bz2) = 323838 bytes
+SHA1 (patch-src_sun__kbd.c) = d988239bc09a21cd634134a48d39e3026cda960d
diff --git a/x11/xf86-input-keyboard/patches/patch-src_sun__kbd.c b/x11/xf86-input-keyboard/patches/patch-src_sun__kbd.c
new file mode 100644
index 00000000000..1ded677f651
--- /dev/null
+++ b/x11/xf86-input-keyboard/patches/patch-src_sun__kbd.c
@@ -0,0 +1,29 @@
+$NetBSD: patch-src_sun__kbd.c,v 1.1 2015/04/06 13:28:22 tnn Exp $
+
+--- src/sun_kbd.c.orig	2013-03-27 00:56:38.000000000 +0000
++++ src/sun_kbd.c
+@@ -49,6 +49,12 @@
+ #include "config.h"
+ #endif
+ 
++#include <unistd.h> /* for ioctl */
++#include <sys/stropts.h>
++#include <sys/vuid_event.h>
++#include <sys/kbd.h>
++#include <sys/note.h>	/* needed before including older versions of hid.h */
++#include <sys/usb/clients/hid/hid.h>
+ #include <xorg-server.h>
+ #include "xf86.h"
+ #include "xf86Priv.h"
+@@ -56,11 +62,6 @@
+ #include "xf86OSKbd.h"
+ #include "sun_kbd.h"
+ 
+-#include <sys/stropts.h>
+-#include <sys/vuid_event.h>
+-#include <sys/kbd.h>
+-#include <sys/note.h>	/* needed before including older versions of hid.h */
+-#include <sys/usb/clients/hid/hid.h>
+ 
+ static int KbdOn(InputInfoPtr pInfo, int what);
+ static Bool OpenKeyboard(InputInfoPtr pInfo);
diff --git a/x11/xf86-input-mouse/distinfo b/x11/xf86-input-mouse/distinfo
index 121b3b721c3..8498fb11849 100644
--- a/x11/xf86-input-mouse/distinfo
+++ b/x11/xf86-input-mouse/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.16 2014/08/12 20:29:26 wiz Exp $
+$NetBSD: distinfo,v 1.17 2015/04/06 13:28:22 tnn Exp $
 
 SHA1 (xf86-input-mouse-1.9.1.tar.bz2) = edde3e0201ec18fbbbcf3c157f912dbae3b5a3cd
 RMD160 (xf86-input-mouse-1.9.1.tar.bz2) = 8d9807362b6be0b552e2fef605665dc30ce379ed
 Size (xf86-input-mouse-1.9.1.tar.bz2) = 348244 bytes
+SHA1 (patch-src_sun__mouse.c) = 2d8b285af1110c1dbad85ff356f916ca28ffa033
diff --git a/x11/xf86-input-mouse/patches/patch-src_sun__mouse.c b/x11/xf86-input-mouse/patches/patch-src_sun__mouse.c
new file mode 100644
index 00000000000..18f088a1133
--- /dev/null
+++ b/x11/xf86-input-mouse/patches/patch-src_sun__mouse.c
@@ -0,0 +1,25 @@
+$NetBSD: patch-src_sun__mouse.c,v 1.1 2015/04/06 13:28:22 tnn Exp $
+
+--- src/sun_mouse.c.orig	2014-08-12 06:36:34.000000000 +0000
++++ src/sun_mouse.c
+@@ -51,6 +51,10 @@
+ #include <xorg-config.h>
+ #endif
+ 
++#include <unistd.h> /* for ioctl(2) */
++#include <sys/stropts.h>
++#include <sys/vuid_event.h>
++#include <sys/msio.h>
+ #include "xorg-server.h"
+ #include "xf86.h"
+ #include "xf86_OSlib.h"
+@@ -58,9 +62,6 @@
+ #include "xisb.h"
+ #include "mipointer.h"
+ #include "xf86Crtc.h"
+-#include <sys/stropts.h>
+-#include <sys/vuid_event.h>
+-#include <sys/msio.h>
+ 
+ /* Wheel mouse support in VUID drivers in Solaris 9 updates & Solaris 10 */
+ #ifdef WHEEL_DEVID /* Defined in vuid_event.h if VUID wheel support present */