rocksndiamonds: update to 4.0.1.0

Rocks'n'Diamonds 4.0.1.0:
This new release mainly adds improved support for game controllers and joysticks. While old-style joysticks and game pads were supported since a long time ago in Rocks’n’Diamonds, modern game controllers like the Xbox game controller were not supported very well until now.

4 files changed, 19 insertions, 20 deletions

diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 757dc27a415..fc601406fb4 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.52 2017/09/09 07:10:34 adam Exp $
+# $NetBSD: Makefile,v 1.53 2017/10/13 16:08:35 adam Exp $
 
-DISTNAME=	rocksndiamonds-4.0.0.2
+DISTNAME=	rocksndiamonds-4.0.1.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index 64230b21d68..be7e91beb78 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.28 2017/09/09 07:10:34 adam Exp $
+$NetBSD: distinfo,v 1.29 2017/10/13 16:08:35 adam Exp $
 
-SHA1 (rocksndiamonds-4.0.0.2.tar.gz) = 9f19c740bf6fdc13a8559647ebd49131fdb469f8
-RMD160 (rocksndiamonds-4.0.0.2.tar.gz) = f865b343b07494644c16b21853b1c93b68ff9e58
-SHA512 (rocksndiamonds-4.0.0.2.tar.gz) = caab7693b37e1fa535c42e7b54eac618adeaffa31c93e70d0eeb1be438efe8a576cca8ddf37b0dec9dab8dceb85785b587eebffc26feae02de4cfd66a5386d3a
-Size (rocksndiamonds-4.0.0.2.tar.gz) = 3522458 bytes
+SHA1 (rocksndiamonds-4.0.1.0.tar.gz) = 1f529a0085a3729600d25d6ab02bae6020489100
+RMD160 (rocksndiamonds-4.0.1.0.tar.gz) = 26a9f21575d5292ee1f428fb31c51cb86ce0f27f
+SHA512 (rocksndiamonds-4.0.1.0.tar.gz) = 2648d3153e6c873d869f33df4c05c82aff24ff340ad16d3c4e384c0a460cb9311d1ad0e19776024e3ee0912164fd0b5c122593b98c192e5154be76a190e1400c
+Size (rocksndiamonds-4.0.1.0.tar.gz) = 3602271 bytes
 SHA1 (patch-src_Makefile) = 702af16aeb41f10d3ea995ad8c5c2a43f3ce9a0e
 SHA1 (patch-src_libgame_joystick.c) = 152bfcca101d5b66838d68532fbd76599297a6ef
-SHA1 (patch-src_libgame_joystick.h) = 05122ba22e0e46ba9cf12cecef710c1d591c096e
-SHA1 (patch-src_libgame_system.c) = 02fd27e60d02a61d0ad4e7f3e19825088374d696
+SHA1 (patch-src_libgame_joystick.h) = a6bae0443a6285b9e4179119f1101ba7bf8d6727
+SHA1 (patch-src_libgame_system.c) = 5ce2d385c5aac315be1c5624a297ae46d4085fdf
diff --git a/games/rocksndiamonds/patches/patch-src_libgame_joystick.h b/games/rocksndiamonds/patches/patch-src_libgame_joystick.h
index f06490c7235..f895f7f5b89 100644
--- a/games/rocksndiamonds/patches/patch-src_libgame_joystick.h
+++ b/games/rocksndiamonds/patches/patch-src_libgame_joystick.h
@@ -1,12 +1,12 @@
-$NetBSD: patch-src_libgame_joystick.h,v 1.1 2017/09/09 07:10:34 adam Exp $
+$NetBSD: patch-src_libgame_joystick.h,v 1.2 2017/10/13 16:08:35 adam Exp $
 
 Allow joystick on NetBSD.
 
---- src/libgame/joystick.h.orig	2015-10-20 21:58:08.000000000 +0000
+--- src/libgame/joystick.h.orig	2017-09-12 20:17:10.000000000 +0000
 +++ src/libgame/joystick.h
-@@ -19,7 +19,7 @@
- #define	JOYSTICK_ACTIVE		(1 << 1)
- #define JOYSTICK_ACTIVATED	(JOYSTICK_AVAILABLE | JOYSTICK_ACTIVE)
+@@ -23,7 +23,7 @@
+ 
+ #define MAX_JOYSTICK_NAME_LEN	40
  
 -#if defined(PLATFORM_FREEBSD)
 +#if defined(PLATFORM_FREEBSD) || (defined(PLATFORM_NETBSD) && defined(HAVE_JOYSTICK))
diff --git a/games/rocksndiamonds/patches/patch-src_libgame_system.c b/games/rocksndiamonds/patches/patch-src_libgame_system.c
index 44285d4fe3e..f9d42320a39 100644
--- a/games/rocksndiamonds/patches/patch-src_libgame_system.c
+++ b/games/rocksndiamonds/patches/patch-src_libgame_system.c
@@ -1,18 +1,17 @@
-$NetBSD: patch-src_libgame_system.c,v 1.1 2017/09/09 07:10:34 adam Exp $
+$NetBSD: patch-src_libgame_system.c,v 1.2 2017/10/13 16:08:35 adam Exp $
 
 InitJoystick will be called more than once, so reset the state
 variable 'joystick' only if there's no joystick available (yet).
 
---- src/libgame/system.c.orig	2017-03-15 20:15:06.000000000 +0000
+--- src/libgame/system.c.orig	2017-09-12 20:17:10.000000000 +0000
 +++ src/libgame/system.c
-@@ -1603,9 +1603,10 @@ void InitJoysticks()
- #endif
+@@ -1630,8 +1630,10 @@ void InitJoysticks()
  
    /* always start with reliable default values */
--  joystick.status = JOYSTICK_NOT_AVAILABLE;
+   joystick.status = JOYSTICK_NOT_AVAILABLE;
 +  if (joystick.status == JOYSTICK_NOT_AVAILABLE) {
    for (i = 0; i < MAX_PLAYERS; i++)
-     joystick.fd[i] = -1;		/* joystick device closed */
+     joystick.nr[i] = -1;		/* no joystick configured */
 +  }
  
    SDLInitJoysticks();