Date: Mon, 08 Apr 2002 21:23:29 +0900 From: Jun Kuriyama <kuriyama@imgsrc.co.jp> To: Will Andrews <will@csociety.org>, taguchi@tohoku.iij.ad.jp, Ports Team <ports@FreeBSD.org> Subject: Re: Unbreak XFree86-Server for fresh 5-current Message-ID: <7mr8lq8jlq.wl@waterblue.imgsrc.co.jp> In-Reply-To: <20020408121805.GE75343@squall.waterspout.com> References: <7melhqwuin.wl@waterblue.imgsrc.co.jp> <20020408120614.GD75343@squall.waterspout.com> <7msn668jxu.wl@waterblue.imgsrc.co.jp> <20020408121805.GE75343@squall.waterspout.com>
next in thread | previous in thread | raw e-mail | index | archive | help
At Mon, 8 Apr 2002 07:18:05 -0500,
Will Andrews wrote:
> Umm. Please provide patches against -current- patches, not
> full patches.
Sorry, here it is:
Index: files/patch-2
===================================================================
RCS file: /home/ncvs/ports/x11/XFree86-4-libraries/files/patch-2,v
retrieving revision 1.2
diff -u -r1.2 patch-2
--- files/patch-2 25 Mar 2001 23:04:43 -0000 1.2
+++ files/patch-2 8 Apr 2002 05:32:00 -0000
@@ -1,5 +1,14 @@
--- 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 Fri Jan 5 09:48:25 2001
++++ 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;
Index: files/patch-joycal.c
===================================================================
RCS file: files/patch-joycal.c
diff -N files/patch-joycal.c
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ files/patch-joycal.c 8 Apr 2002 06:07:33 -0000
@@ -0,0 +1,11 @@
+--- ./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?7mr8lq8jlq.wl>