Changes 3.1.0:

- fixed obvious bug with wrong "Murphy" graphics (when digging etc.)
- fixed a lot of Emerald Mine and Supaplex game engine emulation bugs
- re-converted Emerald Mine and Supaplex levels to apply engine fixes
- changed default snap/drop keys from left/right Shift to Control keys
- added level loader for loading native Emerald Mine levels
- added level loader for loading native Supaplex packed levels
- added group elements for multiple matches and random element creation
- added elements that can be digged or left behind by custom elements
- added element "Sokoban field with player" missing for Sokoban levels
- added custom element features to allow building of teleporters
- added option to use step limit instead of time limit for level
- added pressing "space" key as valid action to select menu options
- added clipboard (cut and paste buttons) for custom and group elements
- added shortcut to dump brush (type ":DB" in editor) for use in forum
- added network multiplayer code for Windows (still only command line)
- replaced old tutorial level set with far better one by Niko Böhm
- "contributions" levels now separate package to make base set smaller
- too many bugfixes and changes to list them all here (see ChangeLog)

7 files changed, 34 insertions, 168 deletions

diff --git a/games/rocksndiamonds-sdl/Makefile b/games/rocksndiamonds-sdl/Makefile
index 269b52154c8..a46997adc8c 100644
--- a/games/rocksndiamonds-sdl/Makefile
+++ b/games/rocksndiamonds-sdl/Makefile
@@ -1,13 +1,12 @@
-# $NetBSD: Makefile,v 1.5 2004/10/03 00:14:46 tv Exp $
-#
+# $NetBSD: Makefile,v 1.6 2004/11/03 15:15:08 adam Exp $
 
 .include "../../audio/SDL_mixer/buildlink3.mk"
 .include "../../graphics/SDL_image/buildlink3.mk"
+.include "../../net/SDL_net/buildlink3.mk"
 
 .include "../rocksndiamonds/Makefile.common"
 
 PKGNAME=	${DISTNAME:S/-/-sdl-/}
-PKGREVISION=	2
 COMMENT=	Game like Boulder Dash, Emerald Mine, or Sokoban (SDL build)
 
 ALL_TARGET=	sdl
diff --git a/games/rocksndiamonds-sdl/distinfo b/games/rocksndiamonds-sdl/distinfo
index d32bb040ad9..1c18e79cf77 100644
--- a/games/rocksndiamonds-sdl/distinfo
+++ b/games/rocksndiamonds-sdl/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2003/12/15 14:48:10 adam Exp $
+$NetBSD: distinfo,v 1.7 2004/11/03 15:15:08 adam Exp $
 
-SHA1 (rocksndiamonds-3.0.8.tar.gz) = 2577ceaa179c7974b339316c6dac2ab9846ce654
-Size (rocksndiamonds-3.0.8.tar.gz) = 7179240 bytes
+SHA1 (rocksndiamonds-3.1.0.tar.gz) = a6e015cb0a513041da113f84fc1c3cba5fd59580
+Size (rocksndiamonds-3.1.0.tar.gz) = 3004476 bytes
 SHA1 (patch-aa) = 824bf9ef3ee1335a8a412d4cfd3bbf7ea13d3f46
-SHA1 (patch-ab) = 892d13a04cb67d3a90701ed428c00e6be0737d1b
+SHA1 (patch-ab) = 44f8c17ac22fa755e5363f2dfb3bd143c401112a
 SHA1 (patch-ag) = 8a80c7d96e508b66ec2ff998f65cbf1b4db45815
 SHA1 (patch-ah) = 584b406eef29b2849f7fc42181a7b9f29e6c9c69
-SHA1 (patch-ak) = 2d3f3c4b3018bd0be9b299e17eef64049ea85781
+SHA1 (patch-ak) = 9b7f80aade2ae4d542640c94fde4803f9c5441c8
diff --git a/games/rocksndiamonds/Makefile.common b/games/rocksndiamonds/Makefile.common
index 9b304d19d75..f9ae4e42b7d 100644
--- a/games/rocksndiamonds/Makefile.common
+++ b/games/rocksndiamonds/Makefile.common
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile.common,v 1.9 2004/03/07 00:39:43 snj Exp $
-#
+# $NetBSD: Makefile.common,v 1.10 2004/11/03 15:14:17 adam Exp $
 
-DISTNAME=	rocksndiamonds-3.0.8
+DISTNAME=	rocksndiamonds-3.1.0
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
@@ -10,8 +9,8 @@ HOMEPAGE=	http://www.artsoft.org/rocksndiamonds/
 
 USE_BUILDLINK3=		YES
 USE_GNU_TOOLS+=		make
-USE_X11=		YES
 USE_PKGINSTALL=		YES
+USE_X11=		YES
 
 PLIST_SRC=	${WRKDIR}/PLIST ../rocksndiamonds/PLIST
 PLIST_SUBST+=	SCORE_PATH=${SCORE_PATH}
@@ -28,11 +27,11 @@ RND_GROUP=	games
 MAKE_ENV+=	HAVE_JOYSTICK=1
 .endif
 
-SCORE_PATH=		/var/games/rocksndiamonds
+SCORE_PATH=	${VARBASE}/games/rocksndiamonds
 
 pre-configure:
 	@${SED} -e "s,@SCORE_PATH@,${SCORE_PATH},g" \
-	        ${WRKSRC}/Makefile > ${WRKSRC}/Makefile.fixed && \
+		${WRKSRC}/Makefile > ${WRKSRC}/Makefile.fixed && \
 	  ${MV} ${WRKSRC}/Makefile.fixed ${WRKSRC}/Makefile
 
 do-install:
@@ -57,9 +56,7 @@ do-install:
 	${CHOWN} -R ${RND_USER}:${RND_GROUP} ${SCORE_PATH}
 	# auto-generated PLIST
 	${RM} -f ${WRKDIR}/PLIST
-.for levdir in Boulderdash Classic_Games Contributions_1995-2000 \
-	Contributions_2001 Contributions_2002 Contributions_2003 Examples \
-	Tutorials
+.for levdir in Classic_Games Tutorials
 	cd ${PREFIX} && \
 	${FIND} share/rocksndiamonds/levels/${levdir} -type f -print >>${WRKDIR}/PLIST
 .endfor
diff --git a/games/rocksndiamonds/PLIST b/games/rocksndiamonds/PLIST
index 52736f5978f..347be45590a 100644
--- a/games/rocksndiamonds/PLIST
+++ b/games/rocksndiamonds/PLIST
@@ -1,94 +1,14 @@
-@comment $NetBSD: PLIST,v 1.5 2003/12/15 14:47:37 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2004/11/03 15:14:17 adam Exp $
 bin/rocksndiamonds
 man/man1/rocksndiamonds.1
 @dirrm share/rocksndiamonds/sounds/snd_classic
 @dirrm share/rocksndiamonds/sounds
 @dirrm share/rocksndiamonds/music/mus_classic
 @dirrm share/rocksndiamonds/music
+@dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_niko_boehm/tapes
+@dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial_niko_boehm
 @dirrm share/rocksndiamonds/levels/Tutorials/rnd_tutorial
 @dirrm share/rocksndiamonds/levels/Tutorials
-@dirrm share/rocksndiamonds/levels/Examples/example_artwork/sounds
-@dirrm share/rocksndiamonds/levels/Examples/example_artwork/music
-@dirrm share/rocksndiamonds/levels/Examples/example_artwork/graphics
-@dirrm share/rocksndiamonds/levels/Examples/example_artwork
-@dirrm share/rocksndiamonds/levels/Examples/example_andreas_buschbeck/graphics
-@dirrm share/rocksndiamonds/levels/Examples/example_andreas_buschbeck
-@dirrm share/rocksndiamonds/levels/Examples
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_sebastian_simon/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_sebastian_simon
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_sam_bateman/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_sam_bateman
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_richard_valvona
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_randy_johannessen/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_randy_johannessen
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_rafael_gatti
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_paul_e_collins_iii/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_paul_e_collins_iii
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_krystian_abramowicz/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_krystian_abramowicz
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_jorge_jordan
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_gavin_davidson/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_gavin_davidson
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_emanuel_schmieg/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_emanuel_schmieg/sounds
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_emanuel_schmieg/graphics
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_emanuel_schmieg
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_efraim_yawitz
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf/sounds
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf/music
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf/graphics
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_edward_leuf
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_audrius_saikunas
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_andreas_buschbeck/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_andreas_buschbeck/sounds
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_andreas_buschbeck/graphics
-@dirrm share/rocksndiamonds/levels/Contributions_2003/rnd_andreas_buschbeck
-@dirrm share/rocksndiamonds/levels/Contributions_2003
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_yamyam_palace/graphics
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_yamyam_palace
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_sylvan_hancock
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_ruediger_schaefer
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_jerome_kunegis
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_gerrit_holl
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_equinox_tetrachloride_ii/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_equinox_tetrachloride_ii
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_equinox_tetrachloride/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_equinox_tetrachloride
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_david_hutchinson/graphics
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_david_hutchinson
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_conor_mancone/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_conor_mancone
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_alan_bond/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_alan_bond/graphics
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_alan_bond
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_abby_king/tapes
-@dirrm share/rocksndiamonds/levels/Contributions_2002/rnd_abby_king
-@dirrm share/rocksndiamonds/levels/Contributions_2002
-@dirrm share/rocksndiamonds/levels/Contributions_2001/rnd_paul_sutton
-@dirrm share/rocksndiamonds/levels/Contributions_2001/rnd_helge_hafting
-@dirrm share/rocksndiamonds/levels/Contributions_2001/rnd_glenn_alexander
-@dirrm share/rocksndiamonds/levels/Contributions_2001/rnd_emilio_hemken
-@dirrm share/rocksndiamonds/levels/Contributions_2001/rnd_dominik_seichter
-@dirrm share/rocksndiamonds/levels/Contributions_2001/rnd_ben_braithwaite_3
-@dirrm share/rocksndiamonds/levels/Contributions_2001/rnd_ben_braithwaite_2
-@dirrm share/rocksndiamonds/levels/Contributions_2001/rnd_barak_shacked
-@dirrm share/rocksndiamonds/levels/Contributions_2001/rnd_arno_luppold
-@dirrm share/rocksndiamonds/levels/Contributions_2001
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_warwick_allison
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_visa_hastrup
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_tobias_authmann
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_stephan_beyer
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_pavel_machek
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_martin_herrmann
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_kjell_kristiansson
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_kimball_robinson
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_jan_hubicka
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_holger_schemel
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_gerhard_haeusler
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_charles_briscoe-smith
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000/rnd_ben_braithwaite
-@dirrm share/rocksndiamonds/levels/Contributions_1995-2000
 @dirrm share/rocksndiamonds/levels/Classic_Games/classic_supaplex/music
 @dirrm share/rocksndiamonds/levels/Classic_Games/classic_supaplex
 @dirrm share/rocksndiamonds/levels/Classic_Games/classic_sokoban/tapes
@@ -96,10 +16,6 @@ man/man1/rocksndiamonds.1
 @dirrm share/rocksndiamonds/levels/Classic_Games/classic_emerald_mine
 @dirrm share/rocksndiamonds/levels/Classic_Games/classic_boulderdash
 @dirrm share/rocksndiamonds/levels/Classic_Games
-@dirrm share/rocksndiamonds/levels/Boulderdash/bd_xbd
-@dirrm share/rocksndiamonds/levels/Boulderdash/bd_boulderdash_2
-@dirrm share/rocksndiamonds/levels/Boulderdash/bd_boulderdash_16
-@dirrm share/rocksndiamonds/levels/Boulderdash
 @dirrm share/rocksndiamonds/levels
 @dirrm share/rocksndiamonds/graphics/gfx_classic
 @dirrm share/rocksndiamonds/graphics/gfx_animal_kingdom
@@ -107,56 +23,8 @@ man/man1/rocksndiamonds.1
 @dirrm share/rocksndiamonds
 @exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}
 @exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/bd_boulderdash_16
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/bd_boulderdash_2
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/bd_xbd
 @exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/classic_boulderdash
 @exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/classic_emerald_mine
 @exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/classic_sokoban
 @exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/classic_supaplex
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_ben_braithwaite
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_charles_briscoe-smith
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_gerhard_haeusler
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_holger_schemel
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_jan_hubicka
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_kimball_robinson
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_kjell_kristiansson
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_martin_herrmann
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_pavel_machek
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_stephan_beyer
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_tobias_authmann
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_visa_hastrup
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_warwick_allison
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_arno_luppold
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_barak_shacked
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_ben_braithwaite_2
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_ben_braithwaite_3
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_dominik_seichter
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_emilio_hemken
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_glenn_alexander
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_helge_hafting
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_paul_sutton
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_abby_king
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_alan_bond
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_conor_mancone
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_david_hutchinson
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_equinox_tetrachloride
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_equinox_tetrachloride_ii
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_gerrit_holl
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_jerome_kunegis
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_ruediger_schaefer
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_sylvan_hancock
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_yamyam_palace
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_andreas_buschbeck
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_edward_leuf
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_emanuel_schmieg
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_gavin_davidson
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_jorge_jordan
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_rafael_gatti
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_randy_johannessen
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_richard_valvona
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_sam_bateman
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/example_andreas_buschbeck
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/example_artwork
-@exec ${ROCK_INSTALL_DIR} ${SCORE_PATH}/scores/rnd_tutorial
 @unexec echo Delete ${SCORE_PATH}/ if you do not need your hiscores anymore.
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index 9457d083d07..fa354e41007 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,9 +1,11 @@
-$NetBSD: distinfo,v 1.15 2003/12/15 14:47:37 adam Exp $
+$NetBSD: distinfo,v 1.16 2004/11/03 15:14:17 adam Exp $
 
-SHA1 (rocksndiamonds-3.0.8.tar.gz) = 2577ceaa179c7974b339316c6dac2ab9846ce654
-Size (rocksndiamonds-3.0.8.tar.gz) = 7179240 bytes
+SHA1 (rocksndiamonds-3.1.0.tar.gz) = a6e015cb0a513041da113f84fc1c3cba5fd59580
+Size (rocksndiamonds-3.1.0.tar.gz) = 3004476 bytes
+SHA1 (rnd-contrib-1.0.0.tar.gz) = 9b55ae5865575ba76a90353b1b3883ef3950d792
+Size (rnd-contrib-1.0.0.tar.gz) = 3389242 bytes
 SHA1 (patch-aa) = 824bf9ef3ee1335a8a412d4cfd3bbf7ea13d3f46
-SHA1 (patch-ab) = 892d13a04cb67d3a90701ed428c00e6be0737d1b
+SHA1 (patch-ab) = 44f8c17ac22fa755e5363f2dfb3bd143c401112a
 SHA1 (patch-ag) = 8a80c7d96e508b66ec2ff998f65cbf1b4db45815
 SHA1 (patch-ah) = 584b406eef29b2849f7fc42181a7b9f29e6c9c69
-SHA1 (patch-ak) = 2d3f3c4b3018bd0be9b299e17eef64049ea85781
+SHA1 (patch-ak) = 9b7f80aade2ae4d542640c94fde4803f9c5441c8
diff --git a/games/rocksndiamonds/patches/patch-ab b/games/rocksndiamonds/patches/patch-ab
index 62a1dcdedce..81598ced889 100644
--- a/games/rocksndiamonds/patches/patch-ab
+++ b/games/rocksndiamonds/patches/patch-ab
@@ -1,28 +1,28 @@
-$NetBSD: patch-ab,v 1.6 2003/11/19 12:48:47 adam Exp $
+$NetBSD: patch-ab,v 1.7 2004/11/03 15:14:17 adam Exp $
 
---- src/Makefile.orig	2003-11-09 23:35:32.000000000 +0100
+--- src/Makefile.orig	2004-06-06 23:57:02.000000000 +0000
 +++ src/Makefile
 @@ -21,8 +21,9 @@ endif
  ifdef X11_PATH			# path to X11 specified by top level Makefile
  XINC_PATH = $(X11_PATH)/include
  XLIB_PATH = $(X11_PATH)/lib
 -X11_INCL = -I$(XINC_PATH)
--X11_LIBS = -L$(XLIB_PATH)
+-X11_LIBS = -L$(XLIB_PATH) -lX11
 +# flags for X11 paths will be supplied by pkgsrc
 +X11_INCL = # empty
-+X11_LIBS = # empty
++X11_LIBS = -lX11
  endif
  
  AR = ar
-@@ -128,8 +129,10 @@ ifdef BUILD_DIST				# distribution build
+@@ -134,8 +135,10 @@ ifdef BUILD_DIST				# distribution build
  OPTIONS = -O3 -Wall
  endif
  
--CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
--LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+-CFLAGS = $(OPTIONS) $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
+-LDFLAGS =           $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
 +# pkgsrc presets those variables, so use '+=' to append to them
 +# flags for debugging or optimisation may be supplied from the pkgsrc Makefile
-+CFLAGS += $(SYS_CFLAGS) $(CONFIG)
++CFLAGS += $(SYS_CFLAGS)  $(EXTRA_CFLAGS) $(CONFIG)
 +LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
  
  
diff --git a/games/rocksndiamonds/patches/patch-ak b/games/rocksndiamonds/patches/patch-ak
index 214e422f307..3f15d7491aa 100644
--- a/games/rocksndiamonds/patches/patch-ak
+++ b/games/rocksndiamonds/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.3 2003/12/15 14:47:37 adam Exp $
+$NetBSD: patch-ak,v 1.4 2004/11/03 15:14:18 adam Exp $
 
---- src/libgame/system.c.orig	2003-12-13 23:30:41.000000000 +0000
+--- src/libgame/system.c.orig	2004-04-27 23:14:34.000000000 +0000
 +++ src/libgame/system.c
-@@ -1162,10 +1162,14 @@ inline void InitJoysticks()
+@@ -1190,10 +1190,14 @@ inline void InitJoysticks()
    return;	/* joysticks generally deactivated by compile-time directive */
  #endif