From nobody Fri Apr 14 14:18:01 2023 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4Pydp26qyTz45L0k; Fri, 14 Apr 2023 14:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Pydp248zKz42nF; Fri, 14 Apr 2023 14:18:02 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4UfTPVrHjbb7oZZXeVRVm3UCtJh0a2cnvLzZkE4WYZQ=; b=IcAZGnB/loOI45ng+vocr2943T4Ghziiu81DKYNR4xTtIWPENNIIdS2tWtnCgmsvQk5Kt2 PPz2P989mf+sz/2wGNyqIUQeJ1f78+/zqsIx4krCCQfLObj1136btNmi9MY6Weu3Pgiw9G RknxyGWq3GdC5zFetCJ6SaRUN9fVa1TF+yC+vBpU0cwJM64Ae7Jo4IBJws2laO9eprRa94 9r0q/KcpiX/b22V/c1RVvPCNY6EZ8pBjV/ATWeGI+AwI5Y3PJSwhmvCVPpA/921KEFMhQJ V0KucsHjxlKe2/8QkByq3uMdr/JawJ6YEecmtzzlpt42/1+ezflQ9jBDBbx3dA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481882; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=4UfTPVrHjbb7oZZXeVRVm3UCtJh0a2cnvLzZkE4WYZQ=; b=xaLZfI+k7M5C6cz/d9+Tok8H7GxvjnMb0MrejHCchjiAkQkzY1PkDonystmfAZwWWNSIAM JQhOFniT9d1giYKJLWf3wDgsFHuX32ruxq/mPYm7iMbH4Od1JlW6NhUQrHyGk3L4v8gypG EEyCjHXaYc8BdYt6fuPpAGGmSB0mW4eI9nlNR+l0u4D13A25O7e9kYrvEearPQL91yG8La O6UNQogIvqO0jN6BbQJHdbvOxvlxQ/khx3GstXqtRioveO2UuVSRQN1wMn4JFgAzcw+efk l++QG5bqo6T7gcWapYcJyKCyXFRcM5z2CW15ddIZXA6RsnZJKfQTkDo8rDEZnA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681481882; a=rsa-sha256; cv=none; b=ghHfD76Wft3EhUqoWfvFSabADM1rgQ1a/Pe3chdCfclS7/Lx/4U1CT9EBu8IgMOfdG89Vs tk/4PJQFNBKqM1j4cQlTklXIUPn3hMzQkGfkRbXp6IZTlBhDtlevpD96p0oifxoKfLweuy dM1W2nrLY91hBHXda9USdxAYu0t4qc2Y9+JGUn0xjNEjSZhCX4ADLewxi59dacNwqD0J+7 AmcMKdhr3LbQ1kTnyFHT/oWu6E9a5qEO/wZclFiArydppNO+F6tlr9T8fDlta2q9iDxV0u 9ipzEXKGvuKBqSSK5BLS4oMB1agzKZjgali8PUJc2ICj2ZDEd4TXxx1zY+bpCw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4Pydp14NfjzRsQ; Fri, 14 Apr 2023 14:18:01 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 33EEI13b008507; Fri, 14 Apr 2023 14:18:01 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EEI130008506; Fri, 14 Apr 2023 14:18:01 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:18:01 GMT Message-Id: <202304141418.33EEI130008506@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Robert Clausecker Subject: git: e532faf32655 - main - games/rnd_jue: fix build with -fno-common List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: fuz X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e532faf32655926a26e0c58b8ca2518332de27d4 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e532faf32655926a26e0c58b8ca2518332de27d4 commit e532faf32655926a26e0c58b8ca2518332de27d4 Author: Robert Clausecker AuthorDate: 2023-04-13 09:27:26 +0000 Commit: Robert Clausecker CommitDate: 2023-04-14 14:16:08 +0000 games/rnd_jue: fix build with -fno-common Turn redefininitions of a bunch of symbols into declarations. This fixes the build on FreeBSD 13+. While we are at it, use RLN to avoid a link to an absolute path. --- games/rnd_jue/Makefile | 9 +++---- games/rnd_jue/files/patch-src-game_em-sound.c | 4 +-- games/rnd_jue/files/patch-src_main.c | 35 +++++++++++++++++++++++++++ 3 files changed, 40 insertions(+), 8 deletions(-) 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,6 +1,6 @@ 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/ @@ -20,9 +20,6 @@ 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 @@ -83,7 +80,7 @@ do-install: ${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}/ 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,5 +1,5 @@ ---- 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) 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;