From e294b09d37696e61d1349f3eca2c565f04e5d172 Mon Sep 17 00:00:00 2001
From: heinz <heinz@pkgsrc.org>
Date: Tue, 29 Oct 2002 19:07:53 +0000
Subject: Bump package revision to 1. New patch-ak fixes bug in Joystick
 support (tested on i386).

---
 games/rocksndiamonds/Makefile         |  4 ++--
 games/rocksndiamonds/distinfo         |  3 ++-
 games/rocksndiamonds/patches/patch-ak | 24 ++++++++++++++++++++++++
 3 files changed, 28 insertions(+), 3 deletions(-)
 create mode 100644 games/rocksndiamonds/patches/patch-ak

diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index eab8406ab18..e3c2316ff37 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,8 +1,8 @@
-# $NetBSD: Makefile,v 1.9 2002/10/23 13:24:53 heinz Exp $
+# $NetBSD: Makefile,v 1.10 2002/10/29 19:07:53 heinz Exp $
 #
 
 DISTNAME=		rocksndiamonds-2.1.1
-PKGREVISION=		# empty
+PKGREVISION=		1
 CATEGORIES=		games x11
 MASTER_SITES=		http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index e158fdb6c57..6d9491918b8 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.6 2002/10/19 20:06:45 heinz Exp $
+$NetBSD: distinfo,v 1.7 2002/10/29 19:07:53 heinz Exp $
 
 SHA1 (rocksndiamonds-2.1.1.tar.gz) = 3067ccd0af83de9ae2b98f0d8e4f60aca525733c
 Size (rocksndiamonds-2.1.1.tar.gz) = 2988537 bytes
@@ -6,3 +6,4 @@ SHA1 (patch-aa) = 5e85dc67f26a2f461f4281f539db44164b9ad34a
 SHA1 (patch-ab) = 152eff872f8295436b568550416bd779395f826b
 SHA1 (patch-ag) = 8a80c7d96e508b66ec2ff998f65cbf1b4db45815
 SHA1 (patch-ah) = 584b406eef29b2849f7fc42181a7b9f29e6c9c69
+SHA1 (patch-ak) = 61763f45178124adcf39c978c735608ee2caf0dd
diff --git a/games/rocksndiamonds/patches/patch-ak b/games/rocksndiamonds/patches/patch-ak
new file mode 100644
index 00000000000..4d55e67a341
--- /dev/null
+++ b/games/rocksndiamonds/patches/patch-ak
@@ -0,0 +1,24 @@
+$NetBSD: patch-ak,v 1.1 2002/10/29 19:07:54 heinz Exp $
+
+--- src/libgame/system.c.orig	Sat Aug 10 15:09:49 2002
++++ src/libgame/system.c
+@@ -874,10 +874,16 @@
+   return;	/* joysticks generally deactivated by compile-time directive */
+ #endif
+ 
++  /* pkgsrc: InitJoystick will be called more than once, so reset
++   * the state variable 'joystick' only if there's no joystick available
++   * (yet).
++   */
+   /* always start with reliable default values */
+-  joystick.status = JOYSTICK_NOT_AVAILABLE;
+-  for (i=0; i<MAX_PLAYERS; i++)
+-    joystick.fd[i] = -1;		/* joystick device closed */
++  if (joystick.status == JOYSTICK_NOT_AVAILABLE)
++  {
++    for (i=0; i<MAX_PLAYERS; i++)
++      joystick.fd[i] = -1;		/* joystick device closed */
++  }
+ 
+ #if defined(TARGET_SDL)
+   SDLInitJoysticks();
-- 
cgit v1.2.3