Update to rocksndiamonds 2.1.1.

Maybe someone can check how well this works with pkgsrc on MacOS X (see
below).

Summary of changes since rocksndiamonds-2.0.0
=============================================
        - lots of new contributed levels

Release Version 2.1.1 [13 AUG 2002]
-----------------------------------
	- sound bug (causing crashes) fixed (reported by Keith Peterston)
	- small NetBSD compilation bug fixed (thanks to Adam Ciarcinski)
	- default keys for "snap field" and "place bomb" fixed for Mac OS X

Release Version 2.1.0 [05 AUG 2002]
-----------------------------------
	- native Mac OS X port (finally!)
	- graphics, sounds and music now fully configurable
	- added support for TrueColor PCX graphics files
	- added support for 16 bit WAV sound files
	- enhanced sound system (especially regarding stereo and loop sounds)
	- new structured setup menu (with sub-menues for graphics and sounds)
	- added "quick save" and "quick load" functions with shortcut key
	- added single-step playing mode (automatic pause after each step)
	- behaviour of "Escape" key in level editor now more intuitive
	- changed default slipping behaviour of gems back to 2.0.0 style;
	  this is now an element property for gems in the level editor,
	  although existing converted levels use the new EM gems behaviour
	- bug fixed that prevented walking through tubes when gravity on
	- added Boulder Dash style "snap-pushing" (thanks to Achim Härtel)
	- fixed memory leak in image loading code
	- fixed some "solid" elements that were accidentally destructible
	- fixed some tape stuff
	- added custom graphics set "Animal Kingdom" by Flyboy

Release Version 2.0.1 [19 MAR 2002]
-----------------------------------
	- bug in explosion code fixed that broke level 24 of "Baby Ghost Mine"
	- several Supaplex emulation bugs fixed (thanks to Mihail Milushev):
	  + orange disk does not fall off from slippery elements
	  + infotrons kill electrons and snik snaks and trigger orange disks
	  + explosion chain reactions are now a bit slower than murphy
	- behaviour of robots adjusted to make them less aggressive
	  (needed for quite some Emerald Mine Club levels)
	- emeralds and diamonds now fall off normal, steel and growing walls,
	  as this is the correct behaviour in Emerald Mine; existing private
	  and contributed levels will still behave as before, unless saved
	  again (with or without modifications) from the level editor of the
	  current version of the game
	- icon for Windows executable added
	- bug when selecting default level series fixed
	- new IFF style file format for level and tape files
	- bug in storing amoeba content fixed
	- nasty tape bugs fixed (completely reworked tape stuff)
	- fullscreen mode now works with Windows (workaround for bug in SDL)
	- /dev/dsp support for NetBSD added (thanks to Krister Walfridsson)
	- file permissions when saving files and creating directories changed
	- some small sound bugs fixed

1 files changed, 19 insertions, 11 deletions

diff --git a/games/rocksndiamonds/patches/patch-ab b/games/rocksndiamonds/patches/patch-ab
index 5f4a7dd5896..0591dea4d0f 100644
--- a/games/rocksndiamonds/patches/patch-ab
+++ b/games/rocksndiamonds/patches/patch-ab
@@ -1,21 +1,29 @@
-$NetBSD: patch-ab,v 1.3 2001/07/05 22:07:59 kristerw Exp $
---- src/Makefile.orig	Wed May  2 23:13:44 2001
-+++ src/Makefile	Wed May  2 23:24:24 2001
-@@ -17,7 +17,7 @@
+$NetBSD: patch-ab,v 1.4 2002/10/19 20:06:46 heinz Exp $
+
+--- src/Makefile.orig	Tue Aug 13 01:52:36 2002
++++ src/Makefile
+@@ -16,8 +16,9 @@
+ 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_INCL = -I$(XINC_PATH)
 -X11_LIBS = -L$(XLIB_PATH)
-+X11_LIBS = -L$(XLIB_PATH) -Wl,-R$(XLIB_PATH)
++# flags for X11 paths will be supplied by pkgsrc
++X11_INCL = # empty
++X11_LIBS = # empty
  endif
  
  AR = ar
-@@ -100,7 +100,7 @@
- # OPTIONS = -O3
- # OPTIONS = -DSYSV -Ae				# may be needed for HP-UX
+@@ -117,8 +118,10 @@
+ OPTIONS = -O3 -Wall
+ endif
  
 -CFLAGS = $(OPTIONS) $(SYS_CFLAGS) $(CONFIG)
-+CFLAGS = $(SYS_CFLAGS) $(CONFIG)
- LDFLAGS = $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
+-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)
++LDFLAGS += $(SYS_LDFLAGS) $(EXTRA_LDFLAGS) -lm
  
  
+ SRCS =	main.c		\