3 files changed, 6 insertions, 34 deletions
diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile
index 862f7c6699e..ecc29ce9309 100644
--- a/x11/xf86-input-keyboard/Makefile
+++ b/x11/xf86-input-keyboard/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.15 2013/05/16 05:51:53 richard Exp $
+# $NetBSD: Makefile,v 1.16 2013/11/01 01:22:48 wiz Exp $
 
-DISTNAME=	xf86-input-keyboard-1.6.2
+DISTNAME=	xf86-input-keyboard-1.8.0
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/x11/xf86-input-keyboard/distinfo b/x11/xf86-input-keyboard/distinfo
index 0b5641ddc3e..9aa3f4f2035 100644
--- a/x11/xf86-input-keyboard/distinfo
+++ b/x11/xf86-input-keyboard/distinfo
@@ -1,6 +1,5 @@
-$NetBSD: distinfo,v 1.8 2013/05/16 05:51:53 richard Exp $
+$NetBSD: distinfo,v 1.9 2013/11/01 01:22:48 wiz Exp $
 
-SHA1 (xf86-input-keyboard-1.6.2.tar.bz2) = 8a4f75076231b941011b7c129bd66afe8f261b9a
-RMD160 (xf86-input-keyboard-1.6.2.tar.bz2) = cf48f0d2fb4416ef56cbc3f4f3876d6c4de35181
-Size (xf86-input-keyboard-1.6.2.tar.bz2) = 322733 bytes
-SHA1 (patch-ac) = c72e321e49200f467996399a0c43c020a9fe8c47
+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
diff --git a/x11/xf86-input-keyboard/patches/patch-ac b/x11/xf86-input-keyboard/patches/patch-ac
deleted file mode 100644
index 7dada0e76b6..00000000000
--- a/x11/xf86-input-keyboard/patches/patch-ac
+++ /dev/null
@@ -1,27 +0,0 @@
-$NetBSD: patch-ac,v 1.1 2009/03/14 11:12:32 apb Exp $
-
-Changes from NetBSD xsrc/external/mit/xf86-input-keyboard/dist/\
-src/bsd_kbd.c
-
-----------------------------
-revision 1.4
-date: 2009/02/07 17:33:28;  author: christos;  state: Exp;  lines: +7 -0
-Set the version for the keyboard too. From Patrick Welche
-----------------------------
-
---- src/bsd_kbd.c.orig	2008-12-04 00:01:46.000000000 +0200
-+++ src/bsd_kbd.c
-@@ -454,6 +454,13 @@ OpenKeyboard(InputInfoPtr pInfo)
- #ifdef WSCONS_SUPPORT
-     if( prot == PROT_WSCONS) {
-        pKbd->consType = WSCONS;
-+#ifdef WSKBDIO_SETVERSION
-+       int version = WSKBDIO_EVENT_VERSION;
-+       if (ioctl(pInfo->fd, WSKBDIO_SETVERSION, &version) == -1) {
-+           xf86Msg(X_WARNING, "%s: cannot set version\n", pInfo->name);
-+           return FALSE;
-+       }
-+#endif 
-        /* Find out keyboard type */
-        if (ioctl(pInfo->fd, WSKBDIO_GTYPE, &(pKbd->wsKbdType)) == -1) {
-            xf86Msg(X_ERROR, "%s: cannot get keyboard type", pInfo->name);