[pkgsrc/trunk]: pkgsrc/x11/xf86-input-keyboard xf86-input-keyboard-1.3.2nb1.

[apb <apb%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/ce5f00d7856b
branches:  trunk
changeset: 555943:ce5f00d7856b
user:      apb <apb%pkgsrc.org@localhost>
date:      Sat Mar 14 11:12:32 2009 +0000

description:
xf86-input-keyboard-1.3.2nb1.
Apply the following patch from NetBSD xsrc/external/mit/xf86-input-keyboard;
thanks to joerg for providing a list of changes to apply.

2009-02-07 17:33  christos

        * src/bsd_kbd.c (1.4):

        Set the version for the keyboard too. From Patrick Welche

diffstat:

 x11/xf86-input-keyboard/Makefile         |   3 ++-
 x11/xf86-input-keyboard/distinfo         |   3 ++-
 x11/xf86-input-keyboard/patches/patch-ac |  27 +++++++++++++++++++++++++++
 3 files changed, 31 insertions(+), 2 deletions(-)

diffs (56 lines):

diff -r 9ec8ecaa780b -r ce5f00d7856b x11/xf86-input-keyboard/Makefile
--- a/x11/xf86-input-keyboard/Makefile  Sat Mar 14 11:09:37 2009 +0000
+++ b/x11/xf86-input-keyboard/Makefile  Sat Mar 14 11:12:32 2009 +0000
@@ -1,6 +1,7 @@
-# $NetBSD: Makefile,v 1.8 2009/02/25 15:52:45 wiz Exp $
+# $NetBSD: Makefile,v 1.9 2009/03/14 11:12:32 apb Exp $
 
 DISTNAME=      xf86-input-keyboard-1.3.2
+PKGREVISION=   1
 CATEGORIES=    x11
 MASTER_SITES=  ${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=  .tar.bz2
diff -r 9ec8ecaa780b -r ce5f00d7856b x11/xf86-input-keyboard/distinfo
--- a/x11/xf86-input-keyboard/distinfo  Sat Mar 14 11:09:37 2009 +0000
+++ b/x11/xf86-input-keyboard/distinfo  Sat Mar 14 11:12:32 2009 +0000
@@ -1,7 +1,8 @@
-$NetBSD: distinfo,v 1.5 2009/02/25 15:52:45 wiz Exp $
+$NetBSD: distinfo,v 1.6 2009/03/14 11:12:32 apb Exp $
 
 SHA1 (xf86-input-keyboard-1.3.2.tar.bz2) = 81d35fedef7b809b35297935330ddc8743005512
 RMD160 (xf86-input-keyboard-1.3.2.tar.bz2) = 21bb5f58115ae5ffdf87b15e0d8c1105724c6e38
 Size (xf86-input-keyboard-1.3.2.tar.bz2) = 269634 bytes
 SHA1 (patch-aa) = 78756a648ba8d2550eda9795e81fd45d8ab0835f
 SHA1 (patch-ab) = 3e6d25832b10d86588dd458d81356001bb93f860
+SHA1 (patch-ac) = c72e321e49200f467996399a0c43c020a9fe8c47
diff -r 9ec8ecaa780b -r ce5f00d7856b x11/xf86-input-keyboard/patches/patch-ac
--- /dev/null   Thu Jan 01 00:00:00 1970 +0000
+++ b/x11/xf86-input-keyboard/patches/patch-ac  Sat Mar 14 11:12:32 2009 +0000
@@ -0,0 +1,27 @@
+$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);