4 files changed, 145 insertions, 7 deletions

diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index a743560c5bfd..5871a0139bc5 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	rocksndiamonds
-PORTVERSION=	3.1.2
+PORTVERSION=	3.2.0
 CATEGORIES=	games
 MASTER_SITES=	http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \
 		http://homepages.compuserve.de/rocksndiamonds/
@@ -35,7 +35,7 @@ post-patch:
 		's:sdl-config:$${SDL_CONFIG}:g' ${WRKSRC}/src/Makefile
 
 do-install:
-	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${PREFIX}/bin
+	${INSTALL_PROGRAM} ${WRKSRC}/rocksndiamonds ${TARGETDIR}/bin
 	${INSTALL_MAN} ${WRKSRC}/rocksndiamonds.1 ${MANPREFIX}/man/man1
 	@${MKDIR} ${DATADIR}
 	${TAR} -C ${WRKSRC} -cf - graphics levels music scores sounds | \
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index 8714c7fb3087..6440d13b54da 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,3 +1,3 @@
-MD5 (rocksndiamonds-3.1.2.tar.gz) = 489d1c1401ef1fe1bd218ba465b05594
-SHA256 (rocksndiamonds-3.1.2.tar.gz) = ab026cc34acf88bc600bdc6e6c68be7016bda1708354ba7eb0735b7e3318d456
-SIZE (rocksndiamonds-3.1.2.tar.gz) = 3120830
+MD5 (rocksndiamonds-3.2.0.tar.gz) = 0403e252fd978095e9546c0f10fa55ac
+SHA256 (rocksndiamonds-3.2.0.tar.gz) = e85175ecbfc91623ec1f6b62fe2b23d69b00cc57482c9c4ddab275de6af60f99
+SIZE (rocksndiamonds-3.2.0.tar.gz) = 3215788
diff --git a/games/rocksndiamonds/files/patch-src__game.c b/games/rocksndiamonds/files/patch-src__game.c
new file mode 100644
index 000000000000..64a81ea81f80
--- /dev/null
+++ b/games/rocksndiamonds/files/patch-src__game.c
@@ -0,0 +1,103 @@
+--- src/game.c.orig	Sun Jun 11 04:58:34 2006
++++ src/game.c	Sun Aug  6 21:04:47 2006
+@@ -7998,23 +7998,34 @@
+   int action_mode = change->action_mode;
+   int action_arg = change->action_arg;
+   int i;
++  int level_time_value;
++  int action_arg_element;
++  int action_arg_direction;
++  int action_arg_number_min;
++  int action_arg_number_max;
++  int action_arg_number_reset;
++  int action_arg_number;
++  int action_arg_number_old;
++  int action_arg_number_new;
++  int trigger_player_bits;
++  int action_arg_player_bits;
+ 
+   if (!change->has_action)
+     return;
+ 
+   /* ---------- determine action paramater values -------------------------- */
+ 
+-  int level_time_value =
++  level_time_value =
+     (level.time > 0 ? TimeLeft :
+      TimePlayed);
+ 
+-  int action_arg_element =
++  action_arg_element =
+     (action_arg == CA_ARG_PLAYER_TRIGGER  ? change->actual_trigger_player :
+      action_arg == CA_ARG_ELEMENT_TRIGGER ? change->actual_trigger_element :
+      action_arg == CA_ARG_ELEMENT_TARGET  ? change->target_element :
+      EL_EMPTY);
+ 
+-  int action_arg_direction =
++  action_arg_direction =
+     (action_arg >= CA_ARG_DIRECTION_LEFT &&
+      action_arg <= CA_ARG_DIRECTION_DOWN ? action_arg - CA_ARG_DIRECTION :
+      action_arg == CA_ARG_DIRECTION_TRIGGER ?
+@@ -8023,11 +8034,11 @@
+      MV_DIR_OPPOSITE(change->actual_trigger_side) :
+      MV_NONE);
+ 
+-  int action_arg_number_min =
++  action_arg_number_min =
+     (action_type == CA_SET_PLAYER_SPEED ? STEPSIZE_NOT_MOVING :
+      CA_ARG_MIN);
+ 
+-  int action_arg_number_max =
++  action_arg_number_max =
+     (action_type == CA_SET_PLAYER_SPEED ? STEPSIZE_EVEN_FASTER :
+      action_type == CA_SET_LEVEL_GEMS ? 999 :
+      action_type == CA_SET_LEVEL_TIME ? 9999 :
+@@ -8036,7 +8047,7 @@
+      action_type == CA_SET_CE_SCORE ? 9999 :
+      CA_ARG_MAX);
+ 
+-  int action_arg_number_reset =
++  action_arg_number_reset =
+     (action_type == CA_SET_PLAYER_SPEED ? level.initial_player_stepsize[0] :
+      action_type == CA_SET_LEVEL_GEMS ? level.gems_needed :
+      action_type == CA_SET_LEVEL_TIME ? level.time :
+@@ -8049,7 +8060,7 @@
+      action_type == CA_SET_CE_SCORE ? 0 :
+      0);
+ 
+-  int action_arg_number =
++  action_arg_number =
+     (action_arg <= CA_ARG_MAX ? action_arg :
+      action_arg >= CA_ARG_SPEED_NOT_MOVING &&
+      action_arg <= CA_ARG_SPEED_EVEN_FASTER ? (action_arg - CA_ARG_SPEED) :
+@@ -8075,7 +8086,7 @@
+      action_arg == CA_ARG_ELEMENT_NR_TRIGGER ? change->actual_trigger_element :
+      -1);
+ 
+-  int action_arg_number_old =
++  action_arg_number_old =
+     (action_type == CA_SET_LEVEL_GEMS ? local_player->gems_still_needed :
+      action_type == CA_SET_LEVEL_TIME ? TimeLeft :
+      action_type == CA_SET_LEVEL_SCORE ? local_player->score :
+@@ -8083,18 +8094,18 @@
+      action_type == CA_SET_CE_SCORE ? ei->collect_score :
+      0);
+ 
+-  int action_arg_number_new =
++  action_arg_number_new =
+     getModifiedActionNumber(action_arg_number_old,
+ 			    action_mode, action_arg_number,
+ 			    action_arg_number_min, action_arg_number_max);
+ 
+-  int trigger_player_bits =
++  trigger_player_bits =
+     (change->actual_trigger_player >= EL_PLAYER_1 &&
+      change->actual_trigger_player <= EL_PLAYER_4 ?
+      (1 << (change->actual_trigger_player - EL_PLAYER_1)) :
+      PLAYER_BITS_ANY);
+ 
+-  int action_arg_player_bits =
++  action_arg_player_bits =
+     (action_arg >= CA_ARG_PLAYER_1 &&
+      action_arg <= CA_ARG_PLAYER_4 ? action_arg - CA_ARG_PLAYER :
+      action_arg == CA_ARG_PLAYER_TRIGGER ? trigger_player_bits :
diff --git a/games/rocksndiamonds/pkg-plist b/games/rocksndiamonds/pkg-plist
index d02fda4bbe09..2850910e4407 100644
--- a/games/rocksndiamonds/pkg-plist
+++ b/games/rocksndiamonds/pkg-plist
@@ -14,6 +14,7 @@ bin/rocksndiamonds
 %%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_drop.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_dry.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_full.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_to_diamond.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/amoeba_wet.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/arrow_down.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/arrow_left.txt
@@ -23,6 +24,7 @@ bin/rocksndiamonds
 %%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_any.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_down.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_left.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_none.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_right.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/balloon_switch_up.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/bd_amoeba.txt
@@ -41,9 +43,13 @@ bin/rocksndiamonds
 %%PORTDOCS%%%%DOCSDIR%%/elements/conveyor_belt.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/conveyor_belt_switch.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/crystal.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/current_ce_score.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/current_ce_value.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/custom.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/dark_yamyam.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/diamond.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/door_white.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/door_white_gray.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/dragon.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/dx_supabomb.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/dynabomb_increase_number.txt
@@ -63,9 +69,29 @@ bin/rocksndiamonds
 %%PORTDOCS%%%%DOCSDIR%%/elements/em_key_2.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/em_key_3.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/em_key_4.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_android.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_dripper.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_fake_acid.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_fake_grass.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_5.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_5_gray.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_6.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_6_gray.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_7.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_7_gray.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_8.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_gate_8_gray.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_grass.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_key_5.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_key_6.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_key_7.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_key_8.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/emc_lenses.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_magic_ball.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_magic_ball_switch.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/emc_magnifier.txt
-%%PORTDOCS%%%%DOCSDIR%%/elements/emc_steelwall_1.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_plant.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/emc_spring_bumper.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/emerald.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/empty_space.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/envelope.txt
@@ -93,6 +119,7 @@ bin/rocksndiamonds
 %%PORTDOCS%%%%DOCSDIR%%/elements/key_2.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/key_3.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/key_4.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/key_white.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/lamp.active.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/lamp.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/landmine.txt
@@ -167,16 +194,20 @@ bin/rocksndiamonds
 %%PORTDOCS%%%%DOCSDIR%%/elements/steelwall_slippery.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/stoneblock.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/switchgate.txt
-%%PORTDOCS%%%%DOCSDIR%%/elements/switchgate_switch_up.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/switchgate_switch.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/time_orb_empty.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/time_orb_full.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/timegate_closed.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/timegate_open.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/timegate_switch.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/trap.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/trigger_ce_score.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/trigger_ce_value.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/trigger_element.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/trigger_player.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/tube.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/unknown.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/unused.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/wall.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/wall_bd_diamond.txt
 %%PORTDOCS%%%%DOCSDIR%%/elements/wall_crystal.txt
@@ -630,7 +661,9 @@ bin/rocksndiamonds
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_aaron_davidson/002.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_aaron_davidson/003.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_aaron_davidson/004.level
+%%DATADIR%%/levels/Tutorials/rnd_tutorial_aaron_davidson/004.level.orig
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_aaron_davidson/005.level
+%%DATADIR%%/levels/Tutorials/rnd_tutorial_aaron_davidson/005.level.orig
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_aaron_davidson/006.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_aaron_davidson/007.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_aaron_davidson/008.level
@@ -685,6 +718,7 @@ bin/rocksndiamonds
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/002.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/003.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/004.level
+%%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/004.level.orig
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/005.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/006.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/007.level
@@ -693,6 +727,7 @@ bin/rocksndiamonds
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/010.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/011.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/012.level
+%%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/012.level.orig
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/013.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/014.level
 %%DATADIR%%/levels/Tutorials/rnd_tutorial_niko_boehm/015.level