From owner-freebsd-ports  Sun Apr  7 23:56:34 2002
Delivered-To: freebsd-ports@freebsd.org
Received: from white.imgsrc.co.jp (ns.imgsrc.co.jp [210.226.20.2])
	by hub.freebsd.org (Postfix) with ESMTP id 5A17D37B47B
	for <ports@FreeBSD.org>; Sun,  7 Apr 2002 23:55:04 -0700 (PDT)
Received: from black.imgsrc.co.jp (black.imgsrc.co.jp [2001:218:422:2::130])
	by white.imgsrc.co.jp (Postfix) with ESMTP
	id 959E424D22; Mon,  8 Apr 2002 15:55:03 +0900 (JST)
Received: from waterblue.imgsrc.co.jp (waterblue.imgsrc.co.jp [2001:218:422:2::160])
	by black.imgsrc.co.jp (Postfix) with ESMTP
	id 643EF1E46F2; Mon,  8 Apr 2002 15:55:01 +0900 (JST)
Date: Mon, 08 Apr 2002 15:53:52 +0900
Message-ID: <7melhqwuin.wl@waterblue.imgsrc.co.jp>
From: Jun Kuriyama <kuriyama@imgsrc.co.jp>
To: taguchi@tohoku.iij.ad.jp
Cc: Ports Team <ports@FreeBSD.org>
Subject: Unbreak XFree86-Server for fresh 5-current
User-Agent: Wanderlust/2.9.7 (Unchained Melody) SEMI/1.14.3 (Ushinoya)
 FLIM/1.14.3 (=?ISO-8859-4?Q?Unebigory=F2mae?=) APEL/10.3 Emacs/21.1
 (i386--freebsd) MULE/5.0 (=?ISO-2022-JP?B?GyRCOC1MWhsoQg==?=)
MIME-Version: 1.0 (generated by SEMI 1.14.3 - "Ushinoya")
Content-Type: text/plain; charset=US-ASCII
Sender: owner-freebsd-ports@FreeBSD.ORG
Precedence: bulk
List-ID: <freebsd-ports.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20freebsd-ports>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20freebsd-ports>
X-Loop: FreeBSD.org


Recently, compatibility symlink for /usr/include/machine/joystick.h
was removed in 5-current.  This causes fresh installation of 5-current
has no <machine/joystick.h> anymore.

Is it OK to update a patch for bsd_jstk.c and add a patch for joycal.c
like this?


--- programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c.orig	Sun Jul 26 01:56:34 1998
+++ programs/Xserver/hw/xfree86/os-support/bsd/bsd_jstk.c	Mon Apr  8 14:32:01 2002
@@ -29,7 +29,7 @@
 #include <unistd.h>
 #include <string.h>
 #include <errno.h>
-#include <machine/joystick.h>
+#include <sys/joystick.h>
 #include <fcntl.h>
 
 #ifdef XFree86LOADER
@@ -56,6 +56,7 @@
   int   changed = 0;
   int   timeinmicros;
   struct joystick	js;
+  extern int errno;
   
 #ifdef DEBUG
   ErrorF("xf86JoystickOn: %s\n", name);
@@ -96,7 +97,6 @@
   if (*centerY < 0) {
     *centerY = js.y;
     xf86Msg(X_PROBED, "Joystick: CenterY set to %d\n", *centerY);
-    }
   }
 
   return status;
@@ -173,6 +173,7 @@
 }
 
 #ifdef XFree86LOADER
+#define MAGIC_DONE 1
 /*
  * Entry point for XFree86 Loader
  */

--- ./programs/Xserver/hw/xfree86/etc/joycal.c.orig	Sat Nov 22 09:00:18 1997
+++ ./programs/Xserver/hw/xfree86/etc/joycal.c	Mon Apr  8 15:08:17 2002
@@ -6,7 +6,7 @@
 #include <unistd.h>
 #include <string.h>
 #if defined (__FreeBSD__) || defined(__NetBSD__) || defined(__OpenBSD__)
-#include <machine/joystick.h>
+#include <sys/joystick.h>
 #define JS_RETURN sizeof(struct joystick)
 #define JS_DATA_TYPE joystick
 #define button_down(j) (j.b1 | j.b2)


-- 
Jun Kuriyama <kuriyama@imgsrc.co.jp> // IMG SRC, Inc.

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe freebsd-ports" in the body of the message