Fix behaviour of keyboard under sparc64, where keycodes were off by one

(i.e., when pressing 'd' on keyboard, server would get code for 'f').

Submitted by:	marius
Approved by:	portmgr (linimon), anholt (mentor)

6 files changed, 98 insertions, 2 deletions

diff --git a/x11-servers/xorg-server-snap/Makefile b/x11-servers/xorg-server-snap/Makefile
index e850ae787b36..1f27c688f7b3 100644
--- a/x11-servers/xorg-server-snap/Makefile
+++ b/x11-servers/xorg-server-snap/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	server
 PORTVERSION=	6.7.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
 		${MASTER_SITE_XORG}
diff --git a/x11-servers/xorg-server-snap/Makefile.inc b/x11-servers/xorg-server-snap/Makefile.inc
index 8c3886ff7997..2746d19b6127 100644
--- a/x11-servers/xorg-server-snap/Makefile.inc
+++ b/x11-servers/xorg-server-snap/Makefile.inc
@@ -48,6 +48,7 @@ SERVER_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefil
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86Events.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86fbman.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \
diff --git a/x11-servers/xorg-server-snap/files/patch-xf86Events.c b/x11-servers/xorg-server-snap/files/patch-xf86Events.c
new file mode 100644
index 000000000000..7fbd058bd222
--- /dev/null
+++ b/x11-servers/xorg-server-snap/files/patch-xf86Events.c
@@ -0,0 +1,47 @@
+--- programs/Xserver/hw/xfree86/common/xf86Events.c.orig	Sat Dec  6 14:24:24 2003
++++ programs/Xserver/hw/xfree86/common/xf86Events.c	Tue Aug 31 00:27:37 2004
+@@ -448,7 +448,7 @@
+ #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
+   static Bool first_time = TRUE;
+ #endif
+-#if defined(__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+   static int  kbdSun = -1;
+ #endif
+   /* Disable any keyboard processing while in suspend */
+@@ -464,7 +464,7 @@
+   }
+ #endif
+ 
+-#if defined (__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+   if (kbdSun == -1) {
+     if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
+ 	|| (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun")))
+@@ -474,7 +474,7 @@
+   }
+   if (kbdSun)
+     goto special;
+-#endif /* __sparc__ && __linux__ */
++#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
+ 
+ #ifdef __linux__
+   if (xf86Info.kbdCustomKeycodes) {
+@@ -676,7 +676,7 @@
+     }
+   }
+ #endif
+-#if defined (__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+ special:
+   if (kbdSun) {
+     switch (scanCode) {
+@@ -710,7 +710,7 @@
+      */
+     scanCode--;
+   }
+-#endif /* defined (__sparc__) && defined(__linux__) */
++#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
+ 
+ #ifdef XKB
+   if ((xf86Info.ddxSpecialKeys == SKWhenNeeded &&
diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index e850ae787b36..1f27c688f7b3 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	server
 PORTVERSION=	6.7.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	x11-servers
 MASTER_SITES=	http://freedesktop.org/~xorg/X11R6.7.0/src/ \
 		${MASTER_SITE_XORG}
diff --git a/x11-servers/xorg-server/Makefile.inc b/x11-servers/xorg-server/Makefile.inc
index 8c3886ff7997..2746d19b6127 100644
--- a/x11-servers/xorg-server/Makefile.inc
+++ b/x11-servers/xorg-server/Makefile.inc
@@ -48,6 +48,7 @@ SERVER_PATCHES=	${PORTSDIR}/x11-servers/xorg-server/files/patch-Xserver-Imakefil
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-man-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-os-Imakefile \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-savage-pci-id \
+		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86Events.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86fbman.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86sym.c \
 		${PORTSDIR}/x11-servers/xorg-server/files/patch-xf86drmCompat.c \
diff --git a/x11-servers/xorg-server/files/patch-xf86Events.c b/x11-servers/xorg-server/files/patch-xf86Events.c
new file mode 100644
index 000000000000..7fbd058bd222
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-xf86Events.c
@@ -0,0 +1,47 @@
+--- programs/Xserver/hw/xfree86/common/xf86Events.c.orig	Sat Dec  6 14:24:24 2003
++++ programs/Xserver/hw/xfree86/common/xf86Events.c	Tue Aug 31 00:27:37 2004
+@@ -448,7 +448,7 @@
+ #if defined(SYSCONS_SUPPORT) || defined(PCVT_SUPPORT) || defined(WSCONS_SUPPORT)
+   static Bool first_time = TRUE;
+ #endif
+-#if defined(__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+   static int  kbdSun = -1;
+ #endif
+   /* Disable any keyboard processing while in suspend */
+@@ -464,7 +464,7 @@
+   }
+ #endif
+ 
+-#if defined (__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+   if (kbdSun == -1) {
+     if ((xf86Info.xkbmodel && !strcmp(xf86Info.xkbmodel, "sun"))
+ 	|| (xf86Info.xkbrules && !strcmp(xf86Info.xkbrules, "sun")))
+@@ -474,7 +474,7 @@
+   }
+   if (kbdSun)
+     goto special;
+-#endif /* __sparc__ && __linux__ */
++#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
+ 
+ #ifdef __linux__
+   if (xf86Info.kbdCustomKeycodes) {
+@@ -676,7 +676,7 @@
+     }
+   }
+ #endif
+-#if defined (__sparc__) && defined(__linux__)
++#if defined(__sparc__) && (defined(__linux__) || defined(__FreeBSD__))
+ special:
+   if (kbdSun) {
+     switch (scanCode) {
+@@ -710,7 +710,7 @@
+      */
+     scanCode--;
+   }
+-#endif /* defined (__sparc__) && defined(__linux__) */
++#endif /* __sparc__ && (__linux__ || __FreeBSD__) */
+ 
+ #ifdef XKB
+   if ((xf86Info.ddxSpecialKeys == SKWhenNeeded &&