4 files changed, 4 insertions, 56 deletions

diff --git a/x11-drivers/xf86-input-keyboard/Makefile b/x11-drivers/xf86-input-keyboard/Makefile
index f42febe49885..a24488f4a6cc 100644
--- a/x11-drivers/xf86-input-keyboard/Makefile
+++ b/x11-drivers/xf86-input-keyboard/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.3.2
-PORTREVISION=	3
+PORTVERSION=	1.4.0
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	x11@FreeBSD.org
diff --git a/x11-drivers/xf86-input-keyboard/distinfo b/x11-drivers/xf86-input-keyboard/distinfo
index 87aab6634f0c..bc439114f1df 100644
--- a/x11-drivers/xf86-input-keyboard/distinfo
+++ b/x11-drivers/xf86-input-keyboard/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = d6fe929c4f6085d6dd67f197ae9c42f6
-SHA256 (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 33939ec65dbf56f49e1e7de854a1cf95446e40c533950431901567e67112aef2
-SIZE (xorg/driver/xf86-input-keyboard-1.3.2.tar.bz2) = 269634
+MD5 (xorg/driver/xf86-input-keyboard-1.4.0.tar.bz2) = fd17158ffeacecc8cc670604460cb98b
+SHA256 (xorg/driver/xf86-input-keyboard-1.4.0.tar.bz2) = 842d36cfca68ddab4f2c562c73bfd43ba76de2d490d60034f0c5dd524aa6d6a5
+SIZE (xorg/driver/xf86-input-keyboard-1.4.0.tar.bz2) = 287234
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c
deleted file mode 100644
index cc82bd4dde9a..000000000000
--- a/x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c
+++ /dev/null
@@ -1,33 +0,0 @@
---- src/bsd_kbd.c.orig	Mon Oct  3 18:46:14 2005
-+++ src/bsd_kbd.c	Fri Sep 29 23:26:17 2006
-@@ -74,6 +74,17 @@
-     KbdDevPtr pKbd = (KbdDevPtr) pInfo->private;
-     int real_leds = 0;
- 
-+#if defined (SYSCONS_SUPPORT)
-+    if (pKbd->sunKbd) {
-+  	if (leds & 0x08) real_leds |= XLED1;
-+  	if (leds & 0x04) real_leds |= XLED4;
-+  	if (leds & 0x02) real_leds |= XLED3;
-+  	if (leds & 0x01) real_leds |= XLED2;
-+        leds = real_leds;
-+        real_leds = 0;
-+    }
-+#endif
-+
- #ifdef LED_CAP
-     if (leds & XLED1)  real_leds |= LED_CAP;
- #endif
-@@ -82,8 +93,12 @@
- #endif
- #ifdef LED_SCR
-     if (leds & XLED3)  real_leds |= LED_SCR;
-+#ifdef LED_COMP
-+    if (leds & XLED4)  real_leds |= LED_COMP;
-+#else
-     if (leds & XLED4)  real_leds |= LED_SCR;
- #endif
-+#endif
- 
-     switch (pKbd->consType) {
- 
diff --git a/x11-drivers/xf86-input-keyboard/files/patch-kbd.c b/x11-drivers/xf86-input-keyboard/files/patch-kbd.c
deleted file mode 100644
index d43b9056148b..000000000000
--- a/x11-drivers/xf86-input-keyboard/files/patch-kbd.c
+++ /dev/null
@@ -1,18 +0,0 @@
---- src/kbd.c.orig	Wed Nov  9 22:31:23 2005
-+++ src/kbd.c	Sat Oct  7 21:09:40 2006
-@@ -635,7 +635,6 @@
- 	      return;
-   }
-   
--#ifndef __sparc64__
-   /*
-    * PC keyboards generate separate key codes for
-    * Alt+Print and Control+Pause but in the X keyboard model
-@@ -648,7 +647,6 @@
-     else if (scanCode == KEY_Break)
-       scanCode = KEY_Pause;
-   }
--#endif
- 
- sunKeyboards:
-   /*