From nobody Fri Apr 14 14:17:56 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 4Pydnx6HqQz45Kcb; Fri, 14 Apr 2023 14:17:57 +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 4Pydnx1s1qz42Pb; Fri, 14 Apr 2023 14:17:57 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481877; 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=/vWqmJPvOHOHevPoMpPH17qsYc3PCMpTiDoHWm8xqi8=; b=pPuVMmYPMK2si+/ItVFREiKKf71+y3iScNu+nMgvHVBltQsuC5Rvbcwm5N+6CpEhdOnKL0 QmsgG2oU1e8kksWt5Hrm58zVnVyTvIf/MG424pM0KnW4xG8GpjPdLZaneOhmPA+D3MInBI bPuDLBbSOAPRYh6nLXe36w5decTpMiin0Muiz7woSGaWYMsOO0K1h1vIc8XiF3y/KaoqKw U0FdPJLseufnKa/e1zfK5umKG8xZ1QeHq1IULY9rp5FnGF6715pwoRcNoHi/rkeV+A1j58 /3d7tyFIr48i2/5i3AXsPA6aba+Xcj3JlDX87SpLBwSH6pr1onmH4fLvawWNiw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1681481877; 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=/vWqmJPvOHOHevPoMpPH17qsYc3PCMpTiDoHWm8xqi8=; b=WEx/mjnvf9eZYh/VWsggYE6c7m3qF8q/R/hhmX/svK50egDRochFsCTRpXVMJF79YuB00T 52qqSQxhSVoqtd+A3iwGON8rXncukDP8iJOfRB+9CR3It3degCHt2oq1zevsFRueNMje2o uEWZBIj53w0Ymm2tAEuB8BK814cESGPr3b6vxij/6Si+L3yTaYn91wMKgyX+e816G31q2H Mh2Bi7rpCuUKpyRt62K7e4yo9KokSR5Bgf8ErwrZyR9oftmW+8AZGeNWH13Wb5493l37yS /dZYq5e5ry+WMbB59W4/NPpxb/BHXlWb2QbrQSZzgOsw6KlkQUDB7/iWQIUFMA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1681481877; a=rsa-sha256; cv=none; b=gUwFpO9/LmjxS2DSQHxgA4kjchsrCt6bi7c283iGGEj1oeX9O7y/WcHwbsLGBLGvU9Mm1v vyQsbUA7/sBfX6gonIk/qw2hF9TQXcu8iA7ngh8GOAViFlpvbcrvqqinoj3w1i7Wo9dmEd WK6OjWifWJiavs670T4w+8dM85Ht+kiteeqWKzWndc6CoV7fnsui4LJC6cAaPnQNCK1eyl KYg5bAtPu1WiF7GB5IOswbG+arw9nxarlFULuZBH1RKCCcRhxyBUFMOiAl6HHDc1MtPLCC Cy+KQ6Ywm49T5vtbpbyHnhLrrez/DlMR6RDN43Ot86lfkpZ3j4/cliJ4mDJ8WQ== 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 4Pydnx0bR4zRsP; Fri, 14 Apr 2023 14:17:57 +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 33EEHu5P008422; Fri, 14 Apr 2023 14:17:56 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 33EEHuSX008421; Fri, 14 Apr 2023 14:17:56 GMT (envelope-from git) Date: Fri, 14 Apr 2023 14:17:56 GMT Message-Id: <202304141417.33EEHuSX008421@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: 9f0f032b1f0d - main - games/joequake: work around duplicate symbol issues 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: 9f0f032b1f0dd9fc2013b6742061b4e2e31c51cc Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by fuz: URL: https://cgit.FreeBSD.org/ports/commit/?id=9f0f032b1f0dd9fc2013b6742061b4e2e31c51cc commit 9f0f032b1f0dd9fc2013b6742061b4e2e31c51cc Author: Robert Clausecker AuthorDate: 2023-04-13 00:50:31 +0000 Commit: Robert Clausecker CommitDate: 2023-04-14 14:16:07 +0000 games/joequake: work around duplicate symbol issues Supply -fcommon to enable a build with recent clang. This fixes the build on FreeBSD 13+. --- games/joequake/Makefile | 9 +++------ 1 file changed, 3 insertions(+), 6 deletions(-) diff --git a/games/joequake/Makefile b/games/joequake/Makefile index 0990f58dee6d..e7a62c5b3590 100644 --- a/games/joequake/Makefile +++ b/games/joequake/Makefile @@ -1,6 +1,6 @@ PORTNAME= joequake PORTVERSION= 0.15b1329 -PORTREVISION= 10 +PORTREVISION= 11 CATEGORIES= games MASTER_SITES= http://joequake.runecentral.com/ DISTNAME= ${PORTNAME}-v${PORTVERSION}-source @@ -14,17 +14,14 @@ WWW= http://runecentral.com/joequake/ LICENSE= GPLv2+ -BROKEN_FreeBSD_13= ld: error: duplicate symbol: com_searchpaths -BROKEN_FreeBSD_14= ld: error: duplicate symbol: com_searchpaths - LIB_DEPENDS= libpng.so:graphics/png -WRKSRC= ${WRKDIR}/src - USES= gmake zip USE_CSTD= gnu89 MAKEFILE= Makefile.linux +CFLAGS+= -fcommon +WRKSRC= ${WRKDIR}/src OPTIONS_MULTI= UI OPTIONS_MULTI_UI= OPENGL X11