Date: Mon, 08 Apr 2002 15:53:52 +0900 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 Message-ID: <7melhqwuin.wl@waterblue.imgsrc.co.jp>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?7melhqwuin.wl>