Index: x11/xf86-input-keyboard/Makefile
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/x11/xf86-input-keyboard/Makefile,v
retrieving revision 1.11
diff -u -r1.11 Makefile
--- x11/xf86-input-keyboard/Makefile	14 Sep 2010 11:03:11 -0000	1.11
+++ x11/xf86-input-keyboard/Makefile	7 Mar 2012 13:24:39 -0000
@@ -1,7 +1,6 @@
 # $NetBSD: Makefile,v 1.11 2010/09/14 11:03:11 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
@@ -21,5 +20,7 @@
 .include "../../x11/modular-xorg-server/buildlink3.mk"
 .include "../../x11/kbproto/buildlink3.mk"
 .include "../../x11/xproto/buildlink3.mk"
+.include "../../x11/xineramaproto/buildlink3.mk"
+.include "../../devel/xorg-util-macros/buildlink3.mk"
 
 .include "../../mk/bsd.pkg.mk"
Index: x11/xf86-input-keyboard/distinfo
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/x11/xf86-input-keyboard/distinfo,v
retrieving revision 1.6
diff -u -r1.6 distinfo
--- x11/xf86-input-keyboard/distinfo	14 Mar 2009 11:12:32 -0000	1.6
+++ x11/xf86-input-keyboard/distinfo	7 Mar 2012 13:24:51 -0000
@@ -1,8 +1,8 @@
 $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 (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) = fd628df7e147a44ce1ec0cacd4462662050486c7
+SHA1 (patch-ab) = a56c37e8f5bc835871b3eb2a4d72224ac4fef031
 SHA1 (patch-ac) = c72e321e49200f467996399a0c43c020a9fe8c47
Index: x11/xf86-input-keyboard/patches/patch-aa
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/x11/xf86-input-keyboard/patches/patch-aa,v
retrieving revision 1.1
diff -u -r1.1 patch-aa
--- x11/xf86-input-keyboard/patches/patch-aa	5 Aug 2007 23:32:48 -0000	1.1
+++ x11/xf86-input-keyboard/patches/patch-aa	31 Dec 2011 08:53:04 -0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-aa,v 1.1 2007/08/05 23:32:48 joerg Exp $
+$NetBSD$
 
---- configure.ac.orig	2007-04-10 23:01:04.000000000 +0200
-+++ configure.ac
-@@ -69,7 +69,7 @@ int main () {
-                        [Name of the period field in struct kbd_repeat])
+--- configure.ac.orig	2011-12-31 17:49:13.000000000 +0900
++++ configure.ac	2011-12-31 17:50:39.000000000 +0900
+@@ -62,7 +62,7 @@
+     IS_LINUX="yes"
      ;;
  
 -  freebsd* | kfreebsd-gnu* | netbsd* | openbsd*)
Index: x11/xf86-input-keyboard/patches/patch-ab
===================================================================
RCS file: /e/cvsync/cvsync/pkgsrc/x11/xf86-input-keyboard/patches/patch-ab,v
retrieving revision 1.1
diff -u -r1.1 patch-ab
--- x11/xf86-input-keyboard/patches/patch-ab	5 Aug 2007 23:32:48 -0000	1.1
+++ x11/xf86-input-keyboard/patches/patch-ab	31 Dec 2011 08:53:38 -0000
@@ -1,9 +1,9 @@
-$NetBSD: patch-ab,v 1.1 2007/08/05 23:32:48 joerg Exp $
+$NetBSD$
 
---- configure.orig	2007-04-10 23:00:40.000000000 +0200
-+++ configure
-@@ -20668,7 +20668,7 @@ _ACEOF
- 
+--- configure.orig	2011-03-08 08:43:37.000000000 +0900
++++ configure	2011-12-31 17:51:45.000000000 +0900
+@@ -11209,7 +11209,7 @@
+     IS_LINUX="yes"
      ;;
  
 -  freebsd* | kfreebsd-gnu* | netbsd* | openbsd*)