games/rocksndiamonds: Update to 4.4.0.0

- Switch to sdl2
- Pet portclippy and portfmt

ChangeLog:
https://www.artsoft.org/2024/12/24/rocksndiamonds-4-4-0-0-released/
This commit is contained in:
Nuno Teixeira 2025-01-01 16:13:48 +00:00
parent b4e3de5805
commit 2ff8da31cc
5 changed files with 68 additions and 96 deletions

View file

@ -1,18 +1,18 @@
PORTNAME= rocksndiamonds
DISTVERSION= 4.0.0.0
DISTVERSION= 4.4.0.0
CATEGORIES= games
MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/:game \
http://www.artsoft.org/RELEASES/rocksndiamonds/levels/:levels_artsoft \
SF/nemysisfreebsdp/${CATEGORIES}/${PORTNAME}/
# Please contact the MAINTAINER if a Level is missing
DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:game \
DISTFILES= ${PORTNAME}-${DISTVERSION}-linux${EXTRACT_SUFX}:game \
rnd_jue-3.3.0.0${EXTRACT_SUFX}:game \
${LEVELS_ARTSOFT:S/$/.zip/}:levels_artsoft \
${LEVELS_BD_FANS:S/$/.zip/} \
Tutorial_Alpha.zip \
${PORTNAME}_icons.zip
DIST_SUBDIR= ${PORTNAME}
EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \
EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}-linux${EXTRACT_SUFX} \
rnd_jue-3.3.0.0.tar.gz \
${PORTNAME}_icons.zip
@ -23,15 +23,24 @@ WWW= https://www.artsoft.org/rocksndiamonds/
LICENSE= GPLv2
LICENSE_FILE= ${WRKSRC}/COPYING
#LIB_DEPENDS= libsmpeg2.so:multimedia/smpeg2
EXTRACT_DEPENDS=${UNZIP_CMD}:archivers/unzip
EXTRACT_DEPENDS= ${UNZIP_CMD}:archivers/unzip
USES= gmake gnome iconv sdl
USE_SDL= image mixer net sdl
MAKE_ARGS= CC="${CC}" MAKE="${MAKE_CMD}" OPTIONS="${CFLAGS}" \
USE_SDL= image2 mixer2 net2 sdl2
MAKE_ARGS= BASE_PATH="${DATADIR}" \
CC="${CC}" \
MAKE="${MAKE_CMD}" \
OPTIONS="${CFLAGS}" \
RO_GAME_DIR="${DATADIR}" \
RW_GAME_DIR="/var/games/${PORTNAME}" \
X11_PATH="${LOCALBASE}"
ALL_TARGET= sdl
DESKTOP_ENTRIES= "Rocks'n'Diamonds" \
"" \
"${PORTNAME}" \
"${PORTNAME}" \
"Game;ArcadeGame;" \
""
SUB_FILES= pkg-message
@ -46,7 +55,7 @@ LEVELS_BD_FANS= Bug_Hunter Classic_Boulderdash Classic_Sokoban Classic_Supaplex
PORTDOCS= *
DOCSRCDIR1= ${WRKSRC}
DOC_FILES1= CREDITS ChangeLog README
DOC_FILES1= CREDITS ChangeLog
DOCSRCDIR2= ${WRKSRC}/docs/elements
DOCSDIR2= ${DOCSDIR}/docs/elements
@ -54,9 +63,6 @@ DOC_FILES2= *.txt
ICON_SIZES= 32x32 48x48 64x64 72x72 96x96
DESKTOP_ENTRIES="Rocks'n'Diamonds" "" "${PORTNAME}" \
"${PORTNAME}" "Game;ArcadeGame;" ""
OPTIONS_DEFINE= DOCS
post-extract-script:
@ -75,17 +81,13 @@ post-extract-script:
post-patch:
@${REINPLACE_CMD} \
-e 's|sdl-config|$${SDL_CONFIG}|g' ${WRKSRC}/src/Makefile
@${REINPLACE_CMD} \
-e 's|machine/soundcard.h|sys/soundcard.h|' \
${WRKSRC}/src/libgame/sound.c
-e 's|sdl2-config|$${SDL2_CONFIG}|g' ${WRKSRC}/src/Makefile
@${REINPLACE_CMD} \
-e 's|machine/joystick.h|sys/joystick.h|' \
${WRKSRC}/src/libgame/joystick.c
do-install:
${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/
${INSTALL_MAN} ${WRKSRC}/${PORTNAME}.1 ${STAGEDIR}${PREFIX}/share/man/man1/
.for dir in graphics levels music sounds
@(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR})

View file

@ -1,5 +1,6 @@
SHA256 (rocksndiamonds/rocksndiamonds-3.3.1.2.tar.gz) = c117c20026299c6c935bd531ef9b0dc767731f600881d12ceb80c831483755f3
SIZE (rocksndiamonds/rocksndiamonds-3.3.1.2.tar.gz) = 2614904
TIMESTAMP = 1735741873
SHA256 (rocksndiamonds/rocksndiamonds-4.4.0.0-linux.tar.gz) = 68a1c70ffbfeceac42b0e629d3a9ea0764d2865c02c04d49694d1a74ee13e02c
SIZE (rocksndiamonds/rocksndiamonds-4.4.0.0-linux.tar.gz) = 5314473
SHA256 (rocksndiamonds/rnd_jue-3.3.0.0.tar.gz) = 9594656bab084fea2ecf104e48c4dea3ccd8153f86a6ddbab04cdd0d5f6899a6
SIZE (rocksndiamonds/rnd_jue-3.3.0.0.tar.gz) = 35414851
SHA256 (rocksndiamonds/Sokoban-1.0.0.zip) = 63f9d36789edca22c0f9454202f9fd21fcee89111642459b5882314f13ebdc0e

View file

@ -1,18 +0,0 @@
--- src/game_em/sound.c.orig 2007-04-25 23:37:09.000000000 +0200
+++ src/game_em/sound.c 2012-12-12 02:10:57.000000000 +0100
@@ -10,15 +10,8 @@
#if defined(PLATFORM_LINUX) || defined(PLATFORM_BSD)
-#ifdef PLATFORM_LINUX
#include <sys/ioctl.h>
#include <sys/soundcard.h>
-#endif
-
-#ifdef PLATFORM_BSD
-#include <ioctl.h>
-#include <soundcard.h>
-#endif
static char audioname[] = "/dev/audio";

View file

@ -1,36 +0,0 @@
--- src/main.c.orig 2013-11-19 20:09:56 UTC
+++ src/main.c
@@ -42,12 +42,12 @@ int key_joystick_mapping = 0;
#if 1
#if NEW_SCROLL
-boolean redraw[2 + MAX_LEV_FIELDX + 2][2 + MAX_LEV_FIELDY + 2];
+extern boolean redraw[2 + MAX_LEV_FIELDX + 2][2 + MAX_LEV_FIELDY + 2];
#else
-boolean redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2];
+extern boolean redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2];
#endif
#else
-boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
+extern boolean redraw[MAX_BUF_XSIZE][MAX_BUF_YSIZE];
#endif
int redraw_x1 = 0, redraw_y1 = 0;
@@ -79,7 +79,7 @@ short ExplodeDelay[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int RunnerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int PlayerVisit[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
-int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
+extern int GfxFrame[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxRandom[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxElement[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
int GfxAction[MAX_LEV_FIELDX][MAX_LEV_FIELDY];
@@ -140,7 +140,7 @@ struct LevelInfo level, level_template;
struct PlayerInfo stored_player[MAX_PLAYERS], *local_player = NULL;
struct HiScore highscore[MAX_SCORE_ENTRIES];
struct TapeInfo tape;
-struct SetupInfo setup;
+extern struct SetupInfo setup;
struct GameInfo game;
struct GlobalInfo global;
struct BorderInfo border;

View file

@ -1,33 +1,41 @@
bin/rocksndiamonds
share/man/man1/rocksndiamonds.1.gz
share/icons/hicolor/32x32/apps/rocksndiamonds.png
share/icons/hicolor/48x48/apps/rocksndiamonds.png
share/icons/hicolor/64x64/apps/rocksndiamonds.png
share/icons/hicolor/72x72/apps/rocksndiamonds.png
share/icons/hicolor/96x96/apps/rocksndiamonds.png
share/pixmaps/rocksndiamonds.png
%%DATADIR%%/graphics/gfx_classic/RocksBusy.pcx
%%DATADIR%%/graphics/gfx_classic/RocksCE.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
%%DATADIR%%/graphics/gfx_classic/RocksHeroes.pcx
%%DATADIR%%/graphics/gfx_classic/RocksMore.pcx
%%DATADIR%%/graphics/gfx_classic/RocksSP.pcx
%%DATADIR%%/graphics/gfx_classic/RocksScreen.pcx
%%DATADIR%%/graphics/gfx_classic/RocksToons.pcx
%%DATADIR%%/graphics/gfx_classic/RocksBD.png
%%DATADIR%%/graphics/gfx_classic/RocksBD2.png
%%DATADIR%%/graphics/gfx_classic/RocksBusy.png
%%DATADIR%%/graphics/gfx_classic/RocksCE.png
%%DATADIR%%/graphics/gfx_classic/RocksCollect.png
%%DATADIR%%/graphics/gfx_classic/RocksDC.png
%%DATADIR%%/graphics/gfx_classic/RocksDC2.png
%%DATADIR%%/graphics/gfx_classic/RocksDF.png
%%DATADIR%%/graphics/gfx_classic/RocksDoor.png
%%DATADIR%%/graphics/gfx_classic/RocksDoor2.png
%%DATADIR%%/graphics/gfx_classic/RocksDoorMM.png
%%DATADIR%%/graphics/gfx_classic/RocksEMC.png
%%DATADIR%%/graphics/gfx_classic/RocksElements.png
%%DATADIR%%/graphics/gfx_classic/RocksFontBig.png
%%DATADIR%%/graphics/gfx_classic/RocksFontDC.png
%%DATADIR%%/graphics/gfx_classic/RocksFontEM.png
%%DATADIR%%/graphics/gfx_classic/RocksFontMedium.png
%%DATADIR%%/graphics/gfx_classic/RocksFontSmall.png
%%DATADIR%%/graphics/gfx_classic/RocksHeroes.png
%%DATADIR%%/graphics/gfx_classic/RocksMM.png
%%DATADIR%%/graphics/gfx_classic/RocksMore.png
%%DATADIR%%/graphics/gfx_classic/RocksSP.png
%%DATADIR%%/graphics/gfx_classic/RocksScreen.png
%%DATADIR%%/graphics/gfx_classic/RocksToons.png
%%DATADIR%%/graphics/gfx_classic/RocksTouch.png
%%DATADIR%%/graphics/gfx_classic/graphicsinfo.conf
%%DATADIR%%/graphics/gfx_classic/mouse.pcx
%%DATADIR%%/graphics/gfx_classic/rocks_icon.xbm
%%DATADIR%%/graphics/gfx_classic/rocks_icon_32x32.pcx
%%DATADIR%%/graphics/gfx_classic/rocks_iconmask.xbm
%%DATADIR%%/graphics/gfx_classic/icons/icon.png
%%DATADIR%%/graphics/gfx_classic/joystick/axis_x.png
%%DATADIR%%/graphics/gfx_classic/joystick/axis_y.png
%%DATADIR%%/graphics/gfx_classic/joystick/button.png
%%DATADIR%%/graphics/gfx_classic/joystick/controller.png
%%DATADIR%%/music/mus_classic/mod.apoplexy
%%DATADIR%%/music/mus_classic/mod.apoplexy.txt
%%DATADIR%%/music/mus_classic/mod.chiptune
@ -40,35 +48,50 @@ share/pixmaps/rocksndiamonds.png
%%DATADIR%%/sounds/snd_classic/autsch.wav
%%DATADIR%%/sounds/snd_classic/base.wav
%%DATADIR%%/sounds/snd_classic/blurb.wav
%%DATADIR%%/sounds/snd_classic/bong.wav
%%DATADIR%%/sounds/snd_classic/booom.wav
%%DATADIR%%/sounds/snd_classic/bug.wav
%%DATADIR%%/sounds/snd_classic/buing.wav
%%DATADIR%%/sounds/snd_classic/crash.wav
%%DATADIR%%/sounds/snd_classic/deng.wav
%%DATADIR%%/sounds/snd_classic/door.wav
%%DATADIR%%/sounds/snd_classic/empty.wav
%%DATADIR%%/sounds/snd_classic/exit.wav
%%DATADIR%%/sounds/snd_classic/fuel.wav
%%DATADIR%%/sounds/snd_classic/gate.wav
%%DATADIR%%/sounds/snd_classic/gong.wav
%%DATADIR%%/sounds/snd_classic/halloffame.wav
%%DATADIR%%/sounds/snd_classic/hammer.wav
%%DATADIR%%/sounds/snd_classic/holz.wav
%%DATADIR%%/sounds/snd_classic/hui.wav
%%DATADIR%%/sounds/snd_classic/infotron.wav
%%DATADIR%%/sounds/snd_classic/jingle.wav
%%DATADIR%%/sounds/snd_classic/kabumm.wav
%%DATADIR%%/sounds/snd_classic/kink.wav
%%DATADIR%%/sounds/snd_classic/klapper.wav
%%DATADIR%%/sounds/snd_classic/kling.wav
%%DATADIR%%/sounds/snd_classic/klopf.wav
%%DATADIR%%/sounds/snd_classic/klumpf.wav
%%DATADIR%%/sounds/snd_classic/knack.wav
%%DATADIR%%/sounds/snd_classic/knurk.wav
%%DATADIR%%/sounds/snd_classic/lachen.wav
%%DATADIR%%/sounds/snd_classic/laser.wav
%%DATADIR%%/sounds/snd_classic/miep.wav
%%DATADIR%%/sounds/snd_classic/njam.wav
%%DATADIR%%/sounds/snd_classic/oeffnen.wav
%%DATADIR%%/sounds/snd_classic/pling.wav
%%DATADIR%%/sounds/snd_classic/pong.wav
%%DATADIR%%/sounds/snd_classic/pusch.wav
%%DATADIR%%/sounds/snd_classic/quiek.wav
%%DATADIR%%/sounds/snd_classic/quirk.wav
%%DATADIR%%/sounds/snd_classic/rhythmloop.wav
%%DATADIR%%/sounds/snd_classic/roaaar.wav
%%DATADIR%%/sounds/snd_classic/roehr.wav
%%DATADIR%%/sounds/snd_classic/schlurf.wav
%%DATADIR%%/sounds/snd_classic/sirr.wav
%%DATADIR%%/sounds/snd_classic/slurp.wav
%%DATADIR%%/sounds/snd_classic/soundsinfo.conf
%%DATADIR%%/sounds/snd_classic/warnton.wav
%%DATADIR%%/sounds/snd_classic/whoosh.wav
%%DATADIR%%/sounds/snd_classic/zisch.wav
%%DATADIR%%/sounds/snd_classic/zonkdown.wav
%%DATADIR%%/sounds/snd_classic/zonkpush.wav