aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat
-rw-r--r--games/rocksndiamonds/Makefile6
-rw-r--r--games/rocksndiamonds/distinfo6
-rw-r--r--games/rocksndiamonds/files/patch-src__game.c103
-rw-r--r--games/rocksndiamonds/files/patch-src__screens.c19
-rw-r--r--games/rocksndiamonds/pkg-plist26
5 files changed, 27 insertions, 133 deletions
diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile
index 6201bc54290d..7c5a1c4438ac 100644
--- a/games/rocksndiamonds/Makefile
+++ b/games/rocksndiamonds/Makefile
@@ -6,8 +6,7 @@
#
PORTNAME= rocksndiamonds
-PORTVERSION= 3.2.3
-PORTREVISION= 1
+PORTVERSION= 3.2.4
CATEGORIES= games
MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/ \
http://homepages.compuserve.de/rocksndiamonds/
@@ -28,6 +27,7 @@ USE_SDL= image mixer net sdl
ALL_TARGET= sdl
.else
USE_XLIB= yes
+USE_XORG= x11
ALL_TARGET= x11
.endif
@@ -45,7 +45,7 @@ do-install:
@${CHMOD} 777 ${DATADIR}/scores
.if !defined(NOPORTDOCS)
@${MKDIR} ${DOCSDIR}
-.for docfile in CHANGES CREDITS HARDWARE README TODO
+.for docfile in CHANGES ChangeLog CREDITS HARDWARE README TODO
${INSTALL_DATA} ${WRKSRC}/${docfile} ${DOCSDIR}
.endfor
@${MKDIR} ${DOCSDIR}/elements
diff --git a/games/rocksndiamonds/distinfo b/games/rocksndiamonds/distinfo
index 8ebe4ab33858..a9bc0707d31d 100644
--- a/games/rocksndiamonds/distinfo
+++ b/games/rocksndiamonds/distinfo
@@ -1,3 +1,3 @@
-MD5 (rocksndiamonds-3.2.3.tar.gz) = 9e206899bdb5cddebf504d47bd75d62b
-SHA256 (rocksndiamonds-3.2.3.tar.gz) = 1585d3a5ee73519c3213115fb7a8cde4c845511eef9e9cf986c228c811eba1f4
-SIZE (rocksndiamonds-3.2.3.tar.gz) = 3266249
+MD5 (rocksndiamonds-3.2.4.tar.gz) = 561bbebc7f59b3fa61bae9d7340ae49d
+SHA256 (rocksndiamonds-3.2.4.tar.gz) = 8973e9c8cea4395c0ba05e98329a573fbf691c00e866c8d53f573fa2d37410ac
+SIZE (rocksndiamonds-3.2.4.tar.gz) = 3427302
diff --git a/games/rocksndiamonds/files/patch-src__game.c b/games/rocksndiamonds/files/patch-src__game.c
deleted file mode 100644
index 64a81ea81f80..000000000000
--- a/games/rocksndiamonds/files/patch-src__game.c
+++ /dev/null
@@ -1,103 +0,0 @@
---- 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/files/patch-src__screens.c b/games/rocksndiamonds/files/patch-src__screens.c
deleted file mode 100644
index 1c14561f0b32..000000000000
--- a/games/rocksndiamonds/files/patch-src__screens.c
+++ /dev/null
@@ -1,19 +0,0 @@
---- src/screens.c.orig Thu Dec 28 11:16:25 2006
-+++ src/screens.c Tue Jan 16 02:53:33 2007
-@@ -550,11 +550,14 @@
-
- static boolean insideMenuPosRect(struct MenuPosInfo *rect, int x, int y)
- {
-+ int rect_x;
-+ int rect_y;
-+
- if (rect == NULL)
- return FALSE;
-
-- int rect_x = ALIGNED_XPOS(rect->x, rect->width, rect->align);
-- int rect_y = rect->y;
-+ rect_x = ALIGNED_XPOS(rect->x, rect->width, rect->align);
-+ rect_y = rect->y;
-
- return (x >= rect_x && x < rect_x + rect->width &&
- y >= rect_y && y < rect_y + rect->height);
diff --git a/games/rocksndiamonds/pkg-plist b/games/rocksndiamonds/pkg-plist
index cf6ba455b190..5eb44c9ca149 100644
--- a/games/rocksndiamonds/pkg-plist
+++ b/games/rocksndiamonds/pkg-plist
@@ -1,5 +1,6 @@
bin/rocksndiamonds
%%PORTDOCS%%%%DOCSDIR%%/CHANGES
+%%PORTDOCS%%%%DOCSDIR%%/ChangeLog
%%PORTDOCS%%%%DOCSDIR%%/CREDITS
%%PORTDOCS%%%%DOCSDIR%%/HARDWARE
%%PORTDOCS%%%%DOCSDIR%%/README
@@ -48,9 +49,13 @@ bin/rocksndiamonds
%%PORTDOCS%%%%DOCSDIR%%/elements/current_ce_value.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/custom.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/dark_yamyam.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/dc_gate_fake_gray.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/dc_gate_white.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/dc_gate_white_gray.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/dc_key_white.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/dc_landmine.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/dc_magic_wall.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
@@ -58,6 +63,8 @@ bin/rocksndiamonds
%%PORTDOCS%%%%DOCSDIR%%/elements/dynabomb_increase_size.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/dynamite.active.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/dynamite.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/em_exit_closed.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/em_exit_open.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_1.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_1_gray.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/em_gate_2.txt
@@ -70,6 +77,8 @@ 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/em_steel_exit_closed.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/em_steel_exit_open.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/emc_android.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/emc_dripper.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/emc_fake_acid.txt
@@ -103,6 +112,7 @@ bin/rocksndiamonds
%%PORTDOCS%%%%DOCSDIR%%/elements/expandable_wall_horizontal.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/expandable_wall_vertical.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/extra_time.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/frankie.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/game_of_life.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/gate_1.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/gate_1_gray.txt
@@ -120,7 +130,6 @@ 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
@@ -140,6 +149,8 @@ bin/rocksndiamonds
%%PORTDOCS%%%%DOCSDIR%%/elements/player_4.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/prev_ce.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/quicksand_empty.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/quicksand_fast_empty.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/quicksand_fast_full.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/quicksand_full.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/robot.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/robot_wheel.txt
@@ -149,8 +160,7 @@ bin/rocksndiamonds
%%PORTDOCS%%%%DOCSDIR%%/elements/self.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/shield_deadly.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/shield_normal.txt
-%%PORTDOCS%%%%DOCSDIR%%/elements/sign_exclamation.txt
-%%PORTDOCS%%%%DOCSDIR%%/elements/sign_stop.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/sign.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/sokoban_field_empty.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/sokoban_field_full.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/sokoban_field_player.txt
@@ -194,6 +204,9 @@ bin/rocksndiamonds
%%PORTDOCS%%%%DOCSDIR%%/elements/spaceship.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/speed_pill.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/spring.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/steel_char.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/steel_exit_closed.txt
+%%PORTDOCS%%%%DOCSDIR%%/elements/steel_exit_open.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/steelwall.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/steelwall_slippery.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/stoneblock.txt
@@ -223,11 +236,14 @@ bin/rocksndiamonds
%%PORTDOCS%%%%DOCSDIR%%/elements/wall_pearl.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/wall_slippery.txt
%%PORTDOCS%%%%DOCSDIR%%/elements/yamyam.txt
+%%DATADIR%%/graphics/gfx_classic/RocksBusy.pcx
%%DATADIR%%/graphics/gfx_classic/RocksDC.pcx
+%%DATADIR%%/graphics/gfx_classic/RocksDC2.pcx
%%DATADIR%%/graphics/gfx_classic/RocksDoor.pcx
%%DATADIR%%/graphics/gfx_classic/RocksEMC.pcx
%%DATADIR%%/graphics/gfx_classic/RocksElements.pcx
%%DATADIR%%/graphics/gfx_classic/RocksFontBig.pcx
+%%DATADIR%%/graphics/gfx_classic/RocksFontDC.pcx
%%DATADIR%%/graphics/gfx_classic/RocksFontEM.pcx
%%DATADIR%%/graphics/gfx_classic/RocksFontMedium.pcx
%%DATADIR%%/graphics/gfx_classic/RocksFontSmall.pcx
generated by cgit (git 2.34.1) at 2024-11-19 02:28:17 +0800