aboutsummaryrefslogtreecommitdiffstats
path: root/x11
diff options
context:
space:
mode:
authorkuriyama <kuriyama@FreeBSD.org>2002-04-08 21:54:01 +0800
committerkuriyama <kuriyama@FreeBSD.org>2002-04-08 21:54:01 +0800
commita6a34532691b5249b90fede39238069f8d85dc94 (patch)
treee23bd0f8e81afa0292e812d06204c6e81a2de138 /x11
parent13e8f274eaf58e92104b2efba6947faf42689c73 (diff)
downloadfreebsd-ports-graphics-a6a34532691b5249b90fede39238069f8d85dc94.tar.gz
freebsd-ports-graphics-a6a34532691b5249b90fede39238069f8d85dc94.tar.zst
freebsd-ports-graphics-a6a34532691b5249b90fede39238069f8d85dc94.zip
Use <sys/joystick.h> instead of <machine/joystick.h>.
Reviewed by: will
Diffstat (limited to 'x11')
-rw-r--r--x11/XFree86-4-libraries/files/patch-211
-rw-r--r--x11/XFree86-4-libraries/files/patch-joycal.c11
2 files changed, 21 insertions, 1 deletions
diff --git a/x11/XFree86-4-libraries/files/patch-2 b/x11/XFree86-4-libraries/files/patch-2
index 98d660a8c11..ea789dd1b80 100644
--- a/x11/XFree86-4-libraries/files/patch-2
+++ b/x11/XFree86-4-libraries/files/patch-2
@@ -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;
diff --git a/x11/XFree86-4-libraries/files/patch-joycal.c b/x11/XFree86-4-libraries/files/patch-joycal.c
new file mode 100644
index 00000000000..377504cc8b8
--- /dev/null
+++ b/x11/XFree86-4-libraries/files/patch-joycal.c
@@ -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)