diff --git a/games/rnd_jue/Makefile b/games/rnd_jue/Makefile index 8ae347a010f5..780f63635871 100644 --- a/games/rnd_jue/Makefile +++ b/games/rnd_jue/Makefile @@ -1,91 +1,88 @@ PORTNAME= rnd_jue -PORTVERSION= 3.3.0.0 -PORTREVISION= 6 +DISTVERSION= 3.3.0.0 +PORTREVISION= 7 CATEGORIES= games MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/:game \ SF/nemysisfreebsdp/${CATEGORIES}/rocksndiamonds/ DISTFILES= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:game \ rocksndiamonds-3.3.1.0${EXTRACT_SUFX}:game \ ${LEVELS_BD_FANS:S/$/.zip/} \ Tutorial_Alpha.zip \ ${PORTNAME}_icons.tar.gz DIST_SUBDIR= rocksndiamonds EXTRACT_ONLY= ${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} \ rocksndiamonds-3.3.1.0${EXTRACT_SUFX} \ ${PORTNAME}_icons.tar.gz MAINTAINER= ports@FreeBSD.org COMMENT= Colorful Boulderdash'n'Emerald Mine'n'Sokoban'n'Stuff jue WWW= https://www.jb-line.de/rnd/rnd_start_e.html LICENSE= GPLv2 -BROKEN_FreeBSD_13= ld: error: duplicate symbol: setup -BROKEN_FreeBSD_14= ld: error: duplicate symbol: setup - LIB_DEPENDS+= libsmpeg.so:multimedia/smpeg EXTRACT_DEPENDS+=${UNZIP_CMD}:archivers/unzip USES= gmake gnome sdl USE_SDL= image mixer net sdl MAKE_ARGS= CC="${CC}" MAKE="${MAKE_CMD}" OPTIONS="${CFLAGS}" \ RO_GAME_DIR="${DATADIR}" \ X11_PATH="${LOCALBASE}" ALL_TARGET= sdl SUB_FILES= pkg-message LEVELS_BD_FANS= JuergenBonhagen rnd_the_h_world Walpurgis_Collection PORTDOCS= * PORTDATA= * ICON_SIZES= 32x32 48x48 64x64 72x72 96x96 DESKTOP_ENTRIES="R'n'D jue" "" "${PORTNAME}" \ "${PORTNAME}" "Game;ArcadeGame;" "" OPTIONS_DEFINE= DOCS post-extract-script: @(cd ${WRKDIR}/rocksndiamonds* && ${COPYTREE_SHARE} levels ${WRKSRC}) .for l in ${LEVELS_BD_FANS:S/$/.zip/} @${UNZIP_CMD} -qo -d ${WRKSRC}/levels ${_DISTDIR}/${l} .endfor @${UNZIP_CMD} -qo -d ${WRKSRC}/levels/Tutorials \ ${_DISTDIR}/Tutorial_Alpha.zip @(cd ${WRKSRC}/levels/Tutorials && ${MV} \ "Tutorial Alpha" rnd_tutorial_alpha) @(cd ${WRKSRC}/levels/"Walpurgis Collection" && \ ${RM} -r "Walpurgis Gardens" "Walpurgis World") @(cd ${WRKSRC}/levels/rnd_the_h_world && ${RM} -r hwld_dceos) @${RM} ${WRKDIR}/${PORTNAME}/Readme.txt @${RM} ${WRKSRC}/levels/Readme.txt 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 @${REINPLACE_CMD} \ -e 's|machine/joystick.h|sys/joystick.h|' \ ${WRKSRC}/src/libgame/joystick.c do-install: ${INSTALL_PROGRAM} ${WRKSRC}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin/ .for dir in graphics levels music sounds @(cd ${WRKSRC} && ${COPYTREE_SHARE} ${dir} ${STAGEDIR}${DATADIR}) .endfor .for s in ${ICON_SIZES} @${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/ ${INSTALL_DATA} ${WRKDIR}/${PORTNAME}_${s}.png \ ${STAGEDIR}${PREFIX}/share/icons/hicolor/${s}/apps/${PORTNAME}.png .endfor - ${LN} -sf ${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ + ${RLN} ${STAGEDIR}${PREFIX}/share/icons/hicolor/48x48/apps/${PORTNAME}.png \ ${STAGEDIR}${PREFIX}/share/pixmaps/ cd ${WRKSRC} && ${COPYTREE_SHARE} "CREDITS ChangeLog docs/elements" \ ${STAGEDIR}${DOCSDIR}/ .include diff --git a/games/rnd_jue/files/patch-src-game_em-sound.c b/games/rnd_jue/files/patch-src-game_em-sound.c index f04d3bcf4fe8..3dafba08d794 100644 --- a/games/rnd_jue/files/patch-src-game_em-sound.c +++ b/games/rnd_jue/files/patch-src-game_em-sound.c @@ -1,18 +1,18 @@ ---- 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 +--- src/game_em/sound.c.orig 2007-04-25 21:37:09 UTC ++++ src/game_em/sound.c @@ -10,15 +10,8 @@ #if defined(PLATFORM_LINUX) || defined(PLATFORM_BSD) -#ifdef PLATFORM_LINUX #include #include -#endif - -#ifdef PLATFORM_BSD -#include -#include -#endif static char audioname[] = "/dev/audio"; diff --git a/games/rnd_jue/files/patch-src_main.c b/games/rnd_jue/files/patch-src_main.c new file mode 100644 index 000000000000..c709399d3edb --- /dev/null +++ b/games/rnd_jue/files/patch-src_main.c @@ -0,0 +1,35 @@ +--- src/main.c.orig 2023-04-13 09:22:55 UTC ++++ src/main.c +@@ -41,11 +41,11 @@ SDL_Thread *server_thread; + int key_joystick_mapping = 0; + + #if 1 +-boolean redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2]; ++extern boolean redraw[MAX_LEV_FIELDX + 2][MAX_LEV_FIELDY + 2]; + #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; ++extern int redraw_x1 = 0, redraw_y1 = 0; + + short Feld[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; + short MovPos[MAX_LEV_FIELDX][MAX_LEV_FIELDY]; +@@ -75,7 +75,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]; +@@ -131,7 +131,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;