7 files changed, 47 insertions, 49 deletions

diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 1501c1d8839c..fe90e35b0d6f 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -6,18 +6,19 @@
 #
 
 PORTNAME=	rocksndiamonds
-PORTVERSION=	1.4.0
-PORTREVISION=	1
+PORTVERSION=	2.0.0
 CATEGORIES=	games
-MASTER_SITES=	http://www.artsoft.org/rocksndiamonds/RELEASES/ \
-		${MASTER_SITE_XCONTRIB}
-MASTER_SITE_SUBDIR=	games
-
-PATCH_SITES=	http://www.artsoft.org/RELEASES/
-PATCHFILES=	rocksndiamonds-1.4.0pl1.diff
+MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \
+		http://homepages.compuserve.de/rocksndiamonds/
 
 MAINTAINER=	mwest@uct.ac.za
 
+.if defined(WITH_SDL)
+LIB_DEPENDS=	SDL_image.10:${PORTSDIR}/graphics/sdl_image \
+		SDL_mixer.2:${PORTSDIR}/audio/sdl_mixer
+MAKE_ARGS+=	sdl
+.endif
+
 USE_XLIB=	yes
 USE_GMAKE=	yes
 MAKE_ENV+=	RO_GAME_DIR=${GAME_DIR} RW_GAME_DIR=${GAME_DIR}/scores \
@@ -29,6 +30,11 @@ MAKE_ENV+=	JOYSTICK="-DNO_JOYSTICK"
 GAME_DIR=${PREFIX}/share/rocksndiamonds
 DOC_DIR=${PREFIX}/share/doc/rocksndiamonds
 
+.if defined(WITH_SDL)
+pre-patch:
+	@${PERL} -pi.orig -e 's:sdl-config:sdl11-config:g' ${WRKSRC}/src/Makefile
+.endif
+
 do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${PREFIX}/bin
 	@${MKDIR} ${GAME_DIR}
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index c82fbf6662eb..1f69cbd9fbdb 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,2 +1 @@
-MD5 (rocksndiamonds-1.4.0.tar.gz) = 48f94ba1421ff1865199d560aca70abb
-MD5 (rocksndiamonds-1.4.0pl1.diff) = 9ba906a29b5deaff19080b00cca3f18c
+MD5 (rocksndiamonds-2.0.0.tar.gz) = 58e70641241e5b036ea052b7bcba384f
diff --git a/games/rocksndiamonds/files/patch-ab b/games/rocksndiamonds/files/patch-ab
index 67ec27fa9ed6..6aed2dd65642 100644
--- a/games/rocksndiamonds/files/patch-ab
+++ b/games/rocksndiamonds/files/patch-ab
@@ -1,11 +1,11 @@
---- src/Makefile.orig	Sun Oct 24 18:51:53 1999
-+++ src/Makefile	Wed Jan  5 22:11:35 2000
-@@ -61,7 +61,7 @@
- # OPTIONS = -DDEBUG -g -Wall			# only for debugging purposes
+--- src/Makefile.orig	Mon Jan  1 20:02:21 2001
++++ src/Makefile	Tue Jan 30 09:14:35 2001
+@@ -96,7 +96,7 @@
+ # OPTIONS = $(DEBUG) -O3 -Wall			# only for debugging purposes
+ # OPTIONS = $(DEBUG) -Wall -ansi -pedantic	# only for debugging purposes
  # OPTIONS = -O3 -Wall -ansi -pedantic
- # OPTIONS = -O3 -Wall
--OPTIONS = -O3
-+OPTIONS ?= -O3
- 
- # SYSTEM = -DSYSV -Ae		# may be needed for HP-UX
+-OPTIONS = -O3 -Wall
++OPTIONS ?= -O3 -Wall
+ # OPTIONS = -O3
+ # OPTIONS = -DSYSV -Ae				# may be needed for HP-UX
  
diff --git a/games/rocksndiamonds/files/patch-ad b/games/rocksndiamonds/files/patch-ad
index 5af75e3fa957..8670ea37470a 100644
--- a/games/rocksndiamonds/files/patch-ad
+++ b/games/rocksndiamonds/files/patch-ad
@@ -1,11 +1,11 @@
---- src/sound.h.orig	Sun Jun 20 18:05:54 1999
-+++ src/sound.h	Sun Jun 20 18:06:06 1999
-@@ -26,7 +26,7 @@
- extern void ioctl(long, long, void *);
- #endif
+--- src/libgame/sound.h.orig	Sat Dec 16 23:07:58 2000
++++ src/libgame/sound.h	Tue Jan 30 09:48:31 2001
+@@ -24,7 +24,7 @@
  
--#ifdef __FreeBSD__
-+#if defined(__FreeBSD__) && !defined(NO_SOUNDS)
+ #if defined(PLATFORM_LINUX)
+ #include <linux/soundcard.h>
+-#elif defined(PLATFORM_FREEBSD)
++#elif defined(PLATFORM_FREEBSD) && !defined(NO_SOUNDS)
  #include <machine/soundcard.h>
- #endif
- 
+ #elif defined(PLATFORM_HPUX)
+ #include <sys/audio.h>
diff --git a/games/rocksndiamonds/files/patch-ae b/games/rocksndiamonds/files/patch-ae
index e7d36093c5d9..a9e99a79934b 100644
--- a/games/rocksndiamonds/files/patch-ae
+++ b/games/rocksndiamonds/files/patch-ae
@@ -1,13 +1,13 @@
---- src/tools.c.orig	Sun Jun 20 18:09:07 1999
-+++ src/tools.c	Sun Jun 20 18:09:42 1999
+--- src/tools.c.orig	Tue Dec  5 02:14:16 2000
++++ src/tools.c	Tue Jan 30 09:50:28 2001
 @@ -13,10 +13,6 @@
  
  #include <stdarg.h>
  
--#ifdef __FreeBSD__
+-#if defined(PLATFORM_FREEBSD)
 -#include <machine/joystick.h>
 -#endif
 -
+ #include "libgame/libgame.h"
+ 
  #include "tools.h"
- #include "game.h"
- #include "events.h"
diff --git a/games/rocksndiamonds/files/patch-ag b/games/rocksndiamonds/files/patch-ag
index ae7fc6e8d324..6eb87d2e9c8f 100644
--- a/games/rocksndiamonds/files/patch-ag
+++ b/games/rocksndiamonds/files/patch-ag
@@ -1,18 +1,18 @@
---- src/joystick.c.orig	Sun Jun 20 18:15:41 1999
-+++ src/joystick.c	Sun Jun 20 18:16:24 1999
+--- src/joystick.c.orig	Tue Dec  5 02:11:08 2000
++++ src/joystick.c	Tue Jan 30 09:52:41 2001
 @@ -11,10 +11,6 @@
- *  joystick.c                                              *
+ * joystick.c                                               *
  ***********************************************************/
  
--#ifdef __FreeBSD__
+-#if defined(PLATFORM_FREEBSD)
 -#include <machine/joystick.h>
 -#endif
 -
- #include "joystick.h"
- #include "misc.h"
+ #include "libgame/libgame.h"
  
-@@ -67,7 +63,7 @@
- #ifndef MSDOS
+ #include "joystick.h"
+@@ -319,7 +315,7 @@
+ #if defined(PLATFORM_UNIX)
  int Joystick(int player_nr)
  {
 -#ifdef __FreeBSD__
@@ -20,7 +20,7 @@
    struct joystick joy_ctrl;
  #else
    struct joystick_control
-@@ -103,7 +99,7 @@
+@@ -355,7 +351,7 @@
    js_x  = joy_ctrl.x;
    js_y  = joy_ctrl.y;
  
diff --git a/games/rocksndiamonds/pkg-plist b/games/rocksndiamonds/pkg-plist
index 7ef12c04024e..de5368b3c946 100644
--- a/games/rocksndiamonds/pkg-plist
+++ b/games/rocksndiamonds/pkg-plist
@@ -1114,7 +1114,6 @@ share/rocksndiamonds/levels/Boulderdash/bd_xbd/031.level
 share/rocksndiamonds/levels/Boulderdash/bd_xbd/037.level
 share/rocksndiamonds/levels/Boulderdash/bd_xbd/030.level
 share/rocksndiamonds/levels/Boulderdash/levelinfo.conf
-share/rocksndiamonds/sounds/alchemy.wav
 share/rocksndiamonds/sounds/amoebe.wav
 share/rocksndiamonds/sounds/antigrav.wav
 share/rocksndiamonds/sounds/autsch.wav
@@ -1125,8 +1124,6 @@ share/rocksndiamonds/sounds/boom.wav
 share/rocksndiamonds/sounds/booom.wav
 share/rocksndiamonds/sounds/bug.wav
 share/rocksndiamonds/sounds/buing.wav
-share/rocksndiamonds/sounds/chase.wav
-share/rocksndiamonds/sounds/czardasz.wav
 share/rocksndiamonds/sounds/deng.wav
 share/rocksndiamonds/sounds/empty.wav
 share/rocksndiamonds/sounds/exit.wav
@@ -1149,7 +1146,6 @@ share/rocksndiamonds/sounds/krach.wav
 share/rocksndiamonds/sounds/lachen.wav
 share/rocksndiamonds/sounds/laser.wav
 share/rocksndiamonds/sounds/miep.wav
-share/rocksndiamonds/sounds/network.wav
 share/rocksndiamonds/sounds/njam.wav
 share/rocksndiamonds/sounds/oeffnen.wav
 share/rocksndiamonds/sounds/pling.wav
@@ -1168,9 +1164,6 @@ share/rocksndiamonds/sounds/schwirr.wav
 share/rocksndiamonds/sounds/sirr.wav
 share/rocksndiamonds/sounds/slurp.wav
 share/rocksndiamonds/sounds/sproing.wav
-share/rocksndiamonds/sounds/twilight.wav
-share/rocksndiamonds/sounds/tyger.wav
-share/rocksndiamonds/sounds/voyager.wav
 share/rocksndiamonds/sounds/warnton.wav
 share/rocksndiamonds/sounds/whoosh.wav
 share/rocksndiamonds/sounds/zisch.wav