Add joystick support for NetBSD

6 files changed, 82 insertions, 2 deletions

diff --git a/games/rocksndiamonds/DESCR b/games/rocksndiamonds/DESCR
index 3e2d0acab53..26c60071c5b 100644
--- a/games/rocksndiamonds/DESCR
+++ b/games/rocksndiamonds/DESCR
@@ -8,7 +8,7 @@ Included are many levels known from the games "Boulderdash",
 and a lot of new levels designed by other players.
 
 Some features:
-- joystick support for Linux, FreeBSD and DOS/Windows
+- joystick support for Linux, FreeBSD, NetBSD and DOS/Windows
 - network and local multiplayer support
 - soft scrolling with 50 frames/s
 - stereo sound effects and music
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 5c3f140ed0e..dd4a0de89cc 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.5 2001/07/05 22:07:58 kristerw Exp $
+# $NetBSD: Makefile,v 1.6 2002/02/02 11:59:09 jdolecek Exp $
 #
 
 DISTNAME=		rocksndiamonds-2.0.0
+PKGREVISION=		1
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
diff --git a/games/rocksndiamonds/patches/patch-ag b/games/rocksndiamonds/patches/patch-ag
new file mode 100644
index 00000000000..66002716c0d
--- /dev/null
+++ b/games/rocksndiamonds/patches/patch-ag
@@ -0,0 +1,31 @@
+$NetBSD: patch-ag,v 1.1 2002/02/02 11:59:09 jdolecek Exp $
+
+--- src/joystick.c.orig	Sat Feb  2 12:01:57 2002
++++ src/joystick.c	Sat Feb  2 12:11:43 2002
+@@ -11,7 +11,7 @@
+ * joystick.c                                               *
+ ***********************************************************/
+ 
+-#if defined(PLATFORM_FREEBSD)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <machine/joystick.h>
+ #endif
+ 
+@@ -319,7 +319,7 @@ void CheckJoystickData()
+ #if defined(PLATFORM_UNIX)
+ int Joystick(int player_nr)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+   struct joystick joy_ctrl;
+ #else
+   struct joystick_control
+@@ -355,7 +355,7 @@ int Joystick(int player_nr)
+   js_x  = joy_ctrl.x;
+   js_y  = joy_ctrl.y;
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+   js_b1 = joy_ctrl.b1;
+   js_b2 = joy_ctrl.b2;
+ #else
diff --git a/games/rocksndiamonds/patches/patch-ah b/games/rocksndiamonds/patches/patch-ah
new file mode 100644
index 00000000000..0f17a8925ec
--- /dev/null
+++ b/games/rocksndiamonds/patches/patch-ah
@@ -0,0 +1,13 @@
+$NetBSD: patch-ah,v 1.1 2002/02/02 11:59:09 jdolecek Exp $
+
+--- src/joystick.h.orig	Sat Feb  2 12:01:40 2002
++++ src/joystick.h	Sat Feb  2 12:40:04 2002
+@@ -20,7 +20,7 @@
+ #define JOYSTICK_OFF		0
+ #define	JOYSTICK_AVAILABLE	1
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <machine/joystick.h>
+ #define DEV_JOYSTICK_0		"/dev/joy0"
+ #define DEV_JOYSTICK_1		"/dev/joy1"
diff --git a/games/rocksndiamonds/patches/patch-ai b/games/rocksndiamonds/patches/patch-ai
new file mode 100644
index 00000000000..41103b0b998
--- /dev/null
+++ b/games/rocksndiamonds/patches/patch-ai
@@ -0,0 +1,13 @@
+$NetBSD: patch-ai,v 1.1 2002/02/02 11:59:09 jdolecek Exp $
+
+--- src/tools.c.orig	Sat Feb  2 12:05:13 2002
++++ src/tools.c	Sat Feb  2 12:16:01 2002
+@@ -13,7 +13,7 @@
+ 
+ #include <stdarg.h>
+ 
+-#if defined(PLATFORM_FREEBSD)
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+ #include <machine/joystick.h>
+ #endif
+ 
diff --git a/games/rocksndiamonds/patches/patch-aj b/games/rocksndiamonds/patches/patch-aj
new file mode 100644
index 00000000000..6ae2be0d7d4
--- /dev/null
+++ b/games/rocksndiamonds/patches/patch-aj
@@ -0,0 +1,22 @@
+$NetBSD: patch-aj,v 1.1 2002/02/02 11:59:10 jdolecek Exp $
+
+--- src/screens.c.orig	Sat Feb  2 12:51:14 2002
++++ src/screens.c	Sat Feb  2 12:52:14 2002
+@@ -2027,7 +2027,7 @@ void CustomizeKeyboard(int player_nr)
+ 
+ void CalibrateJoystick(int player_nr)
+ {
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+   struct joystick joy_ctrl;
+ #else
+   struct joystick_control
+@@ -2092,7 +2092,7 @@ void CalibrateJoystick(int player_nr)
+ 
+   BackToFront();
+ 
+-#ifdef __FreeBSD__
++#if defined(__FreeBSD__) || defined(__NetBSD__)
+   joy_ctrl.b1 = joy_ctrl.b2 = 0;
+ #else
+   joy_ctrl.buttons = 0;