Grab a patch for keyboard on sparc64 from Xorg CVS. This makes 'kbd' driver

work properly this time on FreeBSD/sparc64 so stop using workaround that
defaults to old 'keyboard' one and remove erroneous patch by me.

Pointed out by:	Matthias Muthmann (mmuthmann at gmx.net)
Tested by:	Matthias Muthmann (Ultra10/type5c), me (Ultra5/type5)
Obtained from:	Xorg CVS

4 files changed, 36 insertions, 31 deletions

diff --git a/x11-servers/xorg-server/Makefile b/x11-servers/xorg-server/Makefile
index c620ffda74a9..b035dd6742af 100644
--- a/x11-servers/xorg-server/Makefile
+++ b/x11-servers/xorg-server/Makefile
@@ -106,11 +106,6 @@ MAN4+=		sunbw2.4x \
 		sunffb.4x \
 		sunleo.4x \
 		suntcx.4x
-# WITH_SPARC_KBD is meant to be used to ease fixing 'kbd' driver under sparc64.
-# Do not define it if you want your keyboard to work.
-.if !defined(WITH_SPARC_KBD)
-SCRIPTS_ENV+=	OLD_KEYBOARD=YES
-.endif
 .else
 PLIST_SUB+=	SPARC64="@comment "
 PLIST_SUB+=	SPARC64_NA=""
diff --git a/x11-servers/xorg-server/files/patch-kbd.c b/x11-servers/xorg-server/files/patch-kbd.c
new file mode 100644
index 000000000000..92b84d149863
--- /dev/null
+++ b/x11-servers/xorg-server/files/patch-kbd.c
@@ -0,0 +1,36 @@
+Index: programs/Xserver/hw/xfree86/input/keyboard/kbd.c
+===================================================================
+RCS file: /cvs/xorg/xc/programs/Xserver/hw/xfree86/input/keyboard/kbd.c,v
+retrieving revision 1.15
+retrieving revision 1.16
+diff -u -r1.15 -r1.16
+--- programs/Xserver/hw/xfree86/input/keyboard/kbd.c	11 Jul 2005 02:38:00 -0000	1.15
++++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	13 Jul 2005 12:30:04 -0000	1.16
+@@ -553,6 +553,19 @@
+   if (xf86inSuspend)
+       return;
+ 
++  if (pKbd->sunKbd) {
++     /*
++      * XXX XXX XXX:
++      *
++      * I really don't know what's wrong here, but passing the real
++      * scanCode offsets by one from XKB's point of view.
++      *
++      * (ecd@skynet.be, 980405)
++      */
++      scanCode--;
++      goto sunKeyboards;
++  }
++
+   /*
+    * First do some special scancode remapping ...
+    */
+@@ -616,6 +629,7 @@
+   }
+ #endif
+ 
++sunKeyboards:
+   /*
+    * Now map the scancodes to real X-keycodes ...
+    */
diff --git a/x11-servers/xorg-server/files/patch-sparc64kbd b/x11-servers/xorg-server/files/patch-sparc64kbd
deleted file mode 100644
index d4854adf9cac..000000000000
--- a/x11-servers/xorg-server/files/patch-sparc64kbd
+++ /dev/null
@@ -1,22 +0,0 @@
---- programs/Xserver/hw/xfree86/input/keyboard/kbd.c.orig	Wed Feb 23 23:28:28 2005
-+++ programs/Xserver/hw/xfree86/input/keyboard/kbd.c	Thu Feb 24 00:12:20 2005
-@@ -571,6 +571,19 @@
-      }
-   }
- 
-+#if defined(__sparc__) && defined(__FreeBSD__)
-+  /*
-+   * Taken from xf86Events.c:
-+   * I really don't know what's wrong here, but passing the real
-+   * scanCode offsets by one from XKB's point of view.
-+   *
-+   * (ecd@skynet.be, 980405)
-+   */
-+  if (pKbd->sunKbd) {
-+    scanCode--;
-+  }
-+#endif
-+
- #ifndef TERMINATE_FALLBACK
- #define TERMINATE_FALLBACK 1
- #endif
diff --git a/x11-servers/xorg-server/scripts/configure b/x11-servers/xorg-server/scripts/configure
index 9d13bf718a84..84cf7bd2a731 100644
--- a/x11-servers/xorg-server/scripts/configure
+++ b/x11-servers/xorg-server/scripts/configure
@@ -29,10 +29,6 @@ echo "#define DriverManSuffix 4x"		>> $LOCALDEF
 echo "#define MiscManDir \$(MANSOURCEPATH)7"	>> $LOCALDEF
 echo "#define MiscManSuffix 7x"			>> $LOCALDEF
 
-if [ X$OLD_KEYBOARD = XYES ]; then
-	echo "#define UseDeprecatedKeyboardDriver YES"	>> $LOCALDEF
-fi
-
 if [ X$WITH_DEBUG != X ]; then
 	export CFLAGS="-g $CFLAGS"
 	echo "#define InstPgmFlags"		>> $LOCALDEF