[Midnightbsd-cvs] mports: x11-drivers/xf86-input-keyboard: Update to 1.3.2

[laffer1 at midnightbsd.org]

Log Message:
-----------
Update to 1.3.2

Modified Files:
--------------
    mports/x11-drivers/xf86-input-keyboard:
        Makefile (r1.1 -> r1.2)
        distinfo (r1.1 -> r1.2)

Added Files:
-----------
    mports/x11-drivers/xf86-input-keyboard/files:
        patch-at_scancode.c (r1.1)
        patch-bsd_kbd.c (r1.1)

-------------- next part --------------
Index: Makefile
===================================================================
RCS file: /home/cvs/mports/x11-drivers/xf86-input-keyboard/Makefile,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-drivers/xf86-input-keyboard/Makefile -L x11-drivers/xf86-input-keyboard/Makefile -u -r1.1 -r1.2
--- x11-drivers/xf86-input-keyboard/Makefile
+++ x11-drivers/xf86-input-keyboard/Makefile
@@ -1,13 +1,7 @@
-# New ports collection makefile for:	xf86-input-keyboard
-# Date Created:				17 Feb 2006
-# Whom:					Florent Thoumie <flz at FreeBSD.org>
-#
-# $FreeBSD: ports/x11-drivers/xf86-input-keyboard/Makefile,v 1.2 2007/09/13 19:44:48 flz Exp $
 # $MidnightBSD$
-#
 
 PORTNAME=	xf86-input-keyboard
-PORTVERSION=	1.2.2
+PORTVERSION=	1.3.2
 CATEGORIES=	x11-drivers
 
 MAINTAINER=	ports at MidnightBSD.org
Index: distinfo
===================================================================
RCS file: /home/cvs/mports/x11-drivers/xf86-input-keyboard/distinfo,v
retrieving revision 1.1
retrieving revision 1.2
diff -L x11-drivers/xf86-input-keyboard/distinfo -L x11-drivers/xf86-input-keyboard/distinfo -u -r1.1 -r1.2
--- x11-drivers/xf86-input-keyboard/distinfo
+++ x11-drivers/xf86-input-keyboard/distinfo
@@ -1,3 +1,3 @@
-MD5 (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = ab3122921f6359c54e250879288ffd47
-SHA256 (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = c25b35524eaf00928d97bd0d8bf9e489d92993b133461b5f4d8d9655d37ec072
-SIZE (xorg/driver/xf86-input-keyboard-1.2.2.tar.bz2) = 245665
+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
--- /dev/null
+++ x11-drivers/xf86-input-keyboard/files/patch-bsd_kbd.c
@@ -0,0 +1,33 @@
+--- 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) {
+ 
--- /dev/null
+++ x11-drivers/xf86-input-keyboard/files/patch-at_scancode.c
@@ -0,0 +1,31 @@
+--- src/at_scancode.c.orig	Sun Jul  3 09:01:35 2005
++++ src/at_scancode.c	Sat Oct  7 21:27:29 2006
+@@ -84,6 +84,10 @@
+        case KEY_Prefix0:
+           pKbd->scanPrefix = 0;
+           switch (*scanCode) {
++            case 0x1e:            *scanCode = KEY_AudioRaise;break;
++            case 0x1f:            *scanCode = KEY_AudioLower;break;
++            case 0x20:            *scanCode = KEY_Power;     break;
++            case 0x25:            *scanCode = KEY_Mute;      break;
+             case KEY_KP_7:        *scanCode = KEY_Home;      break;  /* curs home */
+             case KEY_KP_8:        *scanCode = KEY_Up;        break;  /* curs up */
+             case KEY_KP_9:        *scanCode = KEY_PgUp;      break;  /* curs pgup */
+@@ -103,6 +107,17 @@
+             case 0x5b:            *scanCode = KEY_LMeta;     break;
+             case 0x5c:            *scanCode = KEY_RMeta;     break;
+             case 0x5d:            *scanCode = KEY_Menu;      break;
++            case 0x5e:            *scanCode = KEY_L1;        break;  /* stop */
++            case 0x5f:            *scanCode = KEY_L2;        break;  /* again */
++            case 0x60:            *scanCode = KEY_L3;        break;  /* props */
++            case 0x61:            *scanCode = KEY_L4;        break;  /* undo */
++            case 0x62:            *scanCode = KEY_L5;        break;  /* front */
++            case 0x63:            *scanCode = KEY_L6;        break;  /* copy */
++            case 0x64:            *scanCode = KEY_L7;        break;  /* open */
++            case 0x65:            *scanCode = KEY_L8;        break;  /* paste */
++            case 0x66:            *scanCode = KEY_L9;        break;  /* find */
++            case 0x67:            *scanCode = KEY_L10;       break;  /* cut */
++            case 0x68:            *scanCode = KEY_Help;      break;
+             case KEY_F3:          *scanCode = KEY_F13;       break;
+             case KEY_F4:          *scanCode = KEY_F14;       break;
+             case KEY_F5:          *scanCode = KEY_F15;       break;