Update to 1.6.1, provided by Francois Tigeot in PR 46416.

1.6.1:

Remove calls to xf86IsPc98
Return proper default for unknown values in pInfo->device_control
Man page fixes

1.6.0:

Various manual page fixes

1.5.99.901:

Adjust to input ABI 12
Require server 1.4 or later
Remove paranoia about event processing during suspend
Remove unused code and variables
bsd: Include fix
linux: warning fixes
Remove unused OpenBSD PCCONS code
Make key codes for Sun Japanese keyboard match xkb-config mappings
Fix default options for PC98
bsd: Fix print wscons type keyboard for Sun5
Do not print values of variables XkbRules etc. twice
Remove random History comment and OS_KBD_VERSION_CURRENT
Replace deprecated xfree/xcalloc with free & calloc
Remove unused PROT_XQUEUE and PROT_USB
Remove unused bell_pitch and bell_duration
lnx: Fix detect CustomKeycodes for __powerpc__
Do not print values of Protocol twice
Cleanup set the value of CustomKeycodes
Removed unnecessary code, since ABI_XINPUT_VERSION >= 2

1.5.0:

Various documentation and configuration fixes
Silence sed substitutions in make output
Various configure and pkg-config fixes
Missing #ifdef for PCCONS
Remove unused SCO driver files
upgrade to util-macros 1.8 for additional man page support
sun_kbd: Add mappings for Hangul and Hanja keys on Korean keyboard
Remove unused keyboardOptions
Various code cleanups
Sun's copyrights now belong to Oracle

1.4.0:

Require macros 1.3 for XORG_DEFAULT_OPTIONS
Don't use XKB_DFLT_RULES from the server
Remove now un-used autorepeat field

1.3.99.1:

Fix return type issues, remove unused variables, clear compiler warnings
Add note on hal-based configuration to man page
Add README with pointers to mailing list, bugzilla & git repos
Switch to new XKB API, remove all "noXkb" handling
Use XKB_DFLT_RULES from xorg-server.h for default xkb rules filename
Remove SpecialKey handling
Remove leftover ifdef XINPUT
Remove special support for Panix106 (SVR4 derivative)
Remove ModuleInfoRec
Remove autorepeat
nec/jp layout is just "jp" these days.
No more special sun keyboards anymore.
Fix xf86-input-keyboard build on Linux/sparc
Return BadValue if the server failed to init the keyboard. (#21278)
Assume Solaris is at least Solaris 8
Solaris keyboard fixes for HAL hotplugging support
Override HKTG & BSlash2 keycodes on Solaris
Sun bug 6852921: Recycling Xorg runs out of file descriptors in kbd driver
sun_kbd: re-open keyboard if needed in KbdOn
sun_kbd: Use HID ioctl variants to get/set direct mode on usbhid devices
sun_kbd: Check if streams module is already on the stack before pushing it

4 files changed, 21 insertions, 17 deletions

diff --git a/x11/xf86-input-keyboard/Makefile b/x11/xf86-input-keyboard/Makefile
index 51be245d3b6..e70b5eda701 100644
--- a/x11/xf86-input-keyboard/Makefile
+++ b/x11/xf86-input-keyboard/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2010/09/14 11:03:11 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2012/05/06 20:00:23 wiz Exp $
 
-DISTNAME=	xf86-input-keyboard-1.3.2
-PKGREVISION=	3
+DISTNAME=	xf86-input-keyboard-1.6.1
 CATEGORIES=	x11
 MASTER_SITES=	${MASTER_SITE_XORG:=driver/}
 EXTRACT_SUFX=	.tar.bz2
@@ -17,6 +16,7 @@ GNU_CONFIGURE=	YES
 USE_TOOLS+=	gmake pkg-config
 
 .include "../../x11/inputproto/buildlink3.mk"
+.include "../../x11/libxkbfile/buildlink3.mk"
 .include "../../x11/randrproto/buildlink3.mk"
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/kbproto/buildlink3.mk"
diff --git a/x11/xf86-input-keyboard/distinfo b/x11/xf86-input-keyboard/distinfo
index fa2a72d496f..e89e5bc011b 100644
--- a/x11/xf86-input-keyboard/distinfo
+++ b/x11/xf86-input-keyboard/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.6 2009/03/14 11:12:32 apb Exp $
+$NetBSD: distinfo,v 1.7 2012/05/06 20:00:23 wiz 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 (xf86-input-keyboard-1.6.1.tar.bz2) = ef30fecb9e846a5268ae339846401489a785e413
+RMD160 (xf86-input-keyboard-1.6.1.tar.bz2) = 72211dc8ec05ad93ee0fb9050b760ead7162458c
+Size (xf86-input-keyboard-1.6.1.tar.bz2) = 304166 bytes
+SHA1 (patch-aa) = 4acdabcf55d8f30fedeeca59a0a6410eb6f25b02
+SHA1 (patch-ab) = a7192b541d1ee1c4284963feee5766a271397449
 SHA1 (patch-ac) = c72e321e49200f467996399a0c43c020a9fe8c47
diff --git a/x11/xf86-input-keyboard/patches/patch-aa b/x11/xf86-input-keyboard/patches/patch-aa
index ffdc6a28664..ba70cfce644 100644
--- a/x11/xf86-input-keyboard/patches/patch-aa
+++ b/x11/xf86-input-keyboard/patches/patch-aa
@@ -1,9 +1,11 @@
-$NetBSD: patch-aa,v 1.1 2007/08/05 23:32:48 joerg Exp $
+$NetBSD: patch-aa,v 1.2 2012/05/06 20:00:24 wiz Exp $
 
---- configure.ac.orig	2007-04-10 23:01:04.000000000 +0200
+Recognize DragonFly BSD.
+
+--- configure.ac.orig	2012-01-04 00:45:20.000000000 +0000
 +++ configure.ac
-@@ -69,7 +69,7 @@ int main () {
-                        [Name of the period field in struct kbd_repeat])
+@@ -62,7 +62,7 @@ case $host_os in
+     IS_LINUX="yes"
      ;;
  
 -  freebsd* | kfreebsd-gnu* | netbsd* | openbsd*)
diff --git a/x11/xf86-input-keyboard/patches/patch-ab b/x11/xf86-input-keyboard/patches/patch-ab
index 037ffb0c813..af427b8a8c1 100644
--- a/x11/xf86-input-keyboard/patches/patch-ab
+++ b/x11/xf86-input-keyboard/patches/patch-ab
@@ -1,9 +1,11 @@
-$NetBSD: patch-ab,v 1.1 2007/08/05 23:32:48 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2012/05/06 20:00:24 wiz Exp $
 
---- configure.orig	2007-04-10 23:00:40.000000000 +0200
+Recognize DragonFly BSD.
+
+--- configure.orig	2012-01-04 00:46:04.000000000 +0000
 +++ configure
-@@ -20668,7 +20668,7 @@ _ACEOF
- 
+@@ -11895,7 +11895,7 @@ case $host_os in
+     IS_LINUX="yes"
      ;;
  
 -  freebsd* | kfreebsd-gnu* | netbsd* | openbsd*)