From nobody Fri Apr 14 14:18:04 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 4Pydp636Jnz45Kmk; Fri, 14 Apr 2023 14:18:06 +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 4Pydp55ckfz42wJ; Fri, 14 Apr 2023 14:18:05 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481885; 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=W6s/91ot8aXDtvEk2VkU/8lSgicgmTRkltOsfEXLFVc=; b=AjAfWH5+xlUwqsyFi3eBcDcHWWfHaZI07J+kwxvv3KXEaAM3KHSu51mVq8JQIrhwNdH/Jb aWGIJbwcZQZG7+LJ5JmPoRD4A+57skW0FOb7qpvlftno9d455tO3QOkHy2LqFZIkrJ5et1 FcspyDFgwZC+f2DgoxA9qBekET7QGLPVsvln3MeahGd22dpLGn4YbyBCSARGrehKeBrJE+ VgpfBG6DuqsIPIByDafIDv6lkIUJeViqjVZA6jmowHgY7e6NoZmtk66kj1g8RZEw31VnLc tEeKQXmfAIY8gWEbXaZZIau7Els9GhaCO0W4qUZzRoH0dQhYlo1s27XeKk6Q+g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481885; 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=W6s/91ot8aXDtvEk2VkU/8lSgicgmTRkltOsfEXLFVc=; b=omOCmhfBBs4KJEhLbY061krIyFSMoMO2GHvjhUQHxZJZ5ig986u5x3xOjQPVtXPtiGfzPS ktZ4ospoISnx67qaZzrhHrBAgznKX7zwgLo2p+GmVdgYJZZgBQ/it3xauvwjCbvbSnz//Z 7kRZ4M4N/bLtGL3GSQrFq91lHFDxzlUlqG7t9tIk+u+1LP3xbAcb7XpxgPvbhBKD7VxO5g xRHo/AnneYYBz+HSpcyI0PVjVv5hLc/4eZGlx6iky95d9BVkk17VwmqybDms9SlglyzuFo tFNg72Qac7qo6pKqGKNE6FebItMpVKpawdeIS5eY/CIFP0dzGYv99KZwV+x8LQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681481885; a=rsa-sha256; cv=none; b=KJJ5hm8JQmKGRWkX8KRvMyvw+lsFiAXNel71ES3ykUD9nMfgKb/DEPbdlfotEo1UV9fX8t UECRfaAs900nDDjmxtUGg1UhFkG4aAd+GpMzvyooqH43XnBeKsYNT3TqLWo39kK7oVdYWN 6XlukJDLq3KUqNww/rvXs2AkWaFL/NwqMUAToY6hl+zZ+BXNMfQTT3+VbHVHedVSlptqL0 tnDlqwBGFJ9vxg4eaVrzTxlXoNxaxcpkM6XG1u1euonQt/Snh6VyBFtmodcd8uHKRhgQGS VZ1dTFCtWqAOwrSGO0EJmQCkM0t9L4wk5iWtZCvbQCFo+lNrEEIT1oNO42iRqQ== 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 4Pydp46vChzS0S; Fri, 14 Apr 2023 14:18:04 +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 33EEI4Pf008564; Fri, 14 Apr 2023 14:18:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EEI4PS008563; Fri, 14 Apr 2023 14:18:04 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:18:04 GMT Message-Id: <202304141418.33EEI4PS008563@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: e19be2d61bfb - main - games/rocksndiamonds: 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: e19be2d61bfbee1d5b8975fc8e223385beb9cf5c Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=e19be2d61bfbee1d5b8975fc8e223385beb9cf5c commit e19be2d61bfbee1d5b8975fc8e223385beb9cf5c Author: Robert Clausecker AuthorDate: 2023-04-13 13:39:11 +0000 Commit: Robert Clausecker CommitDate: 2023-04-14 14:16:09 +0000 games/rocksndiamonds: fix build with -fno-common Same changes as to games/rnd_jue: Turn redefinitions 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/rocksndiamonds/Makefile | 9 +++----- games/rocksndiamonds/files/patch-src_main.c | 36 +++++++++++++++++++++++++++++ 2 files changed, 39 insertions(+), 6 deletions(-) diff --git a/games/rocksndiamonds/Makefile b/games/rocksndiamonds/Makefile index 4f2a5e918fb3..93e8c473eb7c 100644 --- a/games/rocksndiamonds/Makefile +++ b/games/rocksndiamonds/Makefile @@ -1,6 +1,6 @@ PORTNAME= rocksndiamonds -PORTVERSION= 3.3.1.2 -PORTREVISION= 5 +DISTVERSION= 3.3.1.2 +PORTREVISION= 6 CATEGORIES= games MASTER_SITES= http://www.artsoft.org/RELEASES/unix/rocksndiamonds/:game \ http://www.artsoft.org/RELEASES/rocksndiamonds/levels/:levels_artsoft \ @@ -24,9 +24,6 @@ WWW= https://www.artsoft.org/rocksndiamonds/ LICENSE= GPLv2 LICENSE_FILE= ${WRKSRC}/COPYING -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 @@ -102,7 +99,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/ @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/games/rocksndiamonds/files/patch-src_main.c b/games/rocksndiamonds/files/patch-src_main.c new file mode 100644 index 000000000000..01d8b5a15c09 --- /dev/null +++ b/games/rocksndiamonds/files/patch-src_main.c @@ -0,0 +1,36 @@ +--- 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;