Changes 3.2.6.0:

* fixed crash bug when scrolling with cursor keys in editor
* fixed X11 crash bug when scaling images with width/height less than 32
* fixed X11 crash bug when blitting masked title screens over background
* fixed growing steel wall to also leave behind steel wall
* fixed custom element change conditions where a player element is used
* fixed bug with player relocation while the player switches an element
* fixed problems with re-mapping players on playfield to input devices
* fixed wrong behaviour of player option "no centering when relocating"
* added condition "deadly when " for custom elements
* added possibility to reanimate player immediately after his death
* added "element used as action parameter" to element change actions
* added optional initial inventory for players (pre-collected elements)
* added change page actions "set player inventory" and "set CE artwork"
* added switch for EM style dynamite "[ ] explodes with chain reaction"
* moved "level settings" and "editor settings" to two tabbed screens
* added level setting to start a level with always the same random seed
* added CE action "set random seed" to re-initialize random seed in game

4 files changed, 21 insertions, 22 deletions

diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 614a836cfc8..a46fef2e02a 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2008/03/04 06:59:05 jlam Exp $
+# $NetBSD: Makefile,v 1.38 2009/01/12 19:22:18 adam Exp $
 
-DISTNAME=	rocksndiamonds-3.2.4
-PKGREVISION=	1
+DISTNAME=	rocksndiamonds-3.2.6.0
 CATEGORIES=	games x11
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/
 
@@ -54,8 +53,8 @@ MAKE_FLAGS+=	JOYSTICK=-DHAVE_JOYSTICK
 
 MAKE_FLAGS+=	CC=${CC:Q}
 MAKE_FLAGS+=	MAKE=${MAKE_PROGRAM:Q}
-MAKE_FLAGS+=	X11_PATH=${X11BASE:Q}
-MAKE_FLAGS+=	RO_GAME_DIR=${PREFIX:Q}/share/rocksndiamonds
+MAKE_FLAGS+=	X11_PATH=${X11BASE}
+MAKE_FLAGS+=	RO_GAME_DIR=${PREFIX}/share/rocksndiamonds
 MAKE_FLAGS+=	RW_GAME_DIR=${SCORE_PATH:Q}
 MAKE_FLAGS+=	X11_INCL=
 MAKE_FLAGS+=	X11_LIBS=-lX11
@@ -63,10 +62,10 @@ MAKE_FLAGS+=	X11_LIBS=-lX11
 .include "options.mk"
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${DESTDIR:Q}${PREFIX:Q}/bin/
+	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${DESTDIR}${PREFIX}/bin/
 	${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 \
-		${DESTDIR:Q}${PREFIX:Q}/${PKGMANDIR}/man6/rocksndiamonds.6
-	${INSTALL_DATA_DIR} ${DESTDIR:Q}${SHAREDIR:Q}
+		${DESTDIR}${PREFIX}/${PKGMANDIR}/man6/rocksndiamonds.6
+	${INSTALL_DATA_DIR} ${DESTDIR}${SHAREDIR}
 	# auto-generated PLIST
 	rm -f ${WRKDIR}/PLIST.F ${WRKDIR}/PLIST.D
 	set -e;								\
@@ -74,12 +73,12 @@ do-install:
 	for d in sounds graphics levels music; do 			\
 		find "$${d}" -type d -print | { while read subdir; do	\
 			${INSTALL_DATA_DIR} 				\
-				${DESTDIR:Q}${SHAREDIR:Q}/"$${subdir}";	\
+				${DESTDIR}${SHAREDIR}/"$${subdir}";	\
 			${ECHO} "@dirrm ${SHARESUBDIR}/$${subdir}";	\
 		done ; } | sort -r >> ${WRKDIR}/PLIST.D;		\
 		find "$${d}" -type f -print | while read f; do		\
 			${INSTALL_DATA} "$${f}"				\
-				${DESTDIR:Q}${SHAREDIR:Q}/"$${f}";	\
+				${DESTDIR}${SHAREDIR}/"$${f}";	\
 			${ECHO} ${SHARESUBDIR}/"$${f}" >> ${WRKDIR}/PLIST.F;\
 		done ;							\
 	done
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index 15a44fa443b..220e8d00d1d 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.22 2007/10/13 12:58:47 adam Exp $
+$NetBSD: distinfo,v 1.23 2009/01/12 19:22:18 adam Exp $
 
-SHA1 (rocksndiamonds-3.2.4.tar.gz) = 93abd489a3e027d2553886322cd93dee8b541f35
-RMD160 (rocksndiamonds-3.2.4.tar.gz) = a64116a6a17c4969bab1e79c5457b67ce0890a6b
-Size (rocksndiamonds-3.2.4.tar.gz) = 3427302 bytes
-SHA1 (patch-ab) = 4e432d128c3bf7d5d6c39b6b31ad7fae6b045b4d
+SHA1 (rocksndiamonds-3.2.6.0.tar.gz) = cebf6b856d20f7bacc7f20d2ce97c63bf3c9aec7
+RMD160 (rocksndiamonds-3.2.6.0.tar.gz) = 337ef991bfc9ab66f3b2622918c6c2589a274dac
+Size (rocksndiamonds-3.2.6.0.tar.gz) = 3471530 bytes
+SHA1 (patch-ab) = 0b364394ae03f31c9ed966039f2f2cd2e054bca1
 SHA1 (patch-ac) = 9cbf5ff897cae129455081c941d7ae355b525d1b
 SHA1 (patch-ag) = c9c500490948a03b6f5e2fa409f52112edbf7e92
 SHA1 (patch-ah) = 584b406eef29b2849f7fc42181a7b9f29e6c9c69
-SHA1 (patch-ak) = 8b92e0d014bc85abfd3de8f95ff81a0a02f1059f
+SHA1 (patch-ak) = ec80d7e32285a827afacfda4f17e686f2876fd14
diff --git a/games/rocksndiamonds/patches/patch-ab b/games/rocksndiamonds/patches/patch-ab
index 1c4c4ff0e0c..2c6e751deac 100644
--- a/games/rocksndiamonds/patches/patch-ab
+++ b/games/rocksndiamonds/patches/patch-ab
@@ -1,8 +1,8 @@
-$NetBSD: patch-ab,v 1.10 2007/10/13 12:58:48 adam Exp $
+$NetBSD: patch-ab,v 1.11 2009/01/12 19:22:18 adam Exp $
 
---- src/Makefile.orig	2007-09-13 23:32:36.000000000 +0200
+--- src/Makefile.orig	2008-11-03 21:22:19.000000000 +0100
 +++ src/Makefile
-@@ -142,8 +142,10 @@ ifdef BUILD_DIST				# distribution build
+@@ -160,8 +160,10 @@ ifdef BUILD_DIST			# distribution build
  OPTIONS = -O3 -Wall
  endif
  
diff --git a/games/rocksndiamonds/patches/patch-ak b/games/rocksndiamonds/patches/patch-ak
index 64417d0d553..af7bfbb0c61 100644
--- a/games/rocksndiamonds/patches/patch-ak
+++ b/games/rocksndiamonds/patches/patch-ak
@@ -1,8 +1,8 @@
-$NetBSD: patch-ak,v 1.7 2007/10/13 12:58:48 adam Exp $
+$NetBSD: patch-ak,v 1.8 2009/01/12 19:22:18 adam Exp $
 
---- src/libgame/system.c.orig	2007-09-03 21:27:29.000000000 +0200
+--- src/libgame/system.c.orig	2008-01-25 22:25:33.000000000 +0100
 +++ src/libgame/system.c
-@@ -1457,10 +1457,14 @@ void InitJoysticks()
+@@ -1494,10 +1494,14 @@ void InitJoysticks()
    return;	/* joysticks generally deactivated by compile-time directive */
  #endif