From nobody Tue Aug 13 11:56:46 2024 X-Original-To: dev-commits-ports-all@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 4WjqcG6llJz5SXsX; Tue, 13 Aug 2024 11:56:46 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4WjqcG66jHz4sbV; Tue, 13 Aug 2024 11:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723550206; 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=l78T7bvYaSNgYPwU/jODLpEfRpIt19X4bWI5vk/P/Ls=; b=uvwa9efDyyEZvQ89JjYbNXc56om2GchFZLc+wgAzIIGZanrWg9cCmNlugGIR1TsoY/+r2N KEaEe/8Yc7YIFAegeNr2OoPxLt7Jyedc/okVnP0iQ6zoDkxOJAx8gWVDv8C5EcBj/XsAjj PftUs/p/mHLuoc+gtkV02o2OCGYUdO8EOYBuPhe2k3TJVg3An8HcISRo21h9RlMfxmr0wo umnpM3+3JN05/qS+oCk6clxwWWm03+cZQZJzXV4Mo3tWa88YX8gCHv3iLCxyYaJO/OZ4Ca rAm9fiSBHQHQEq9t/5SaQhx2PRsMOhi22quS2tg1s/LFMUoZOuzansNulfvMRw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1723550206; a=rsa-sha256; cv=none; b=VzHBsJyybHkNtUhl+uOeNNZXCoxHgdCC+SMP91o+p0xl0Sbme+cSBMOZy1GaqYJecSiUDh gmoDPAaP9pIQ5urjPI+XqYLdwM7KoCVQlrD8wGWaE3VDdAe5G1G4XvfhytaBriUqfVWQ+9 mlZ/8EKtLcXRQZScjxCmhk6Agt18nB1eWd63Sr4MwR1hYbw+MkWPxnioaxpqPOBTRkqiCP DVQ7qCTsjJnt89CN7lO1Ivzoj3K7FW9vAdkAV5JEEGfTajN2fnFmSFj6jTspL7fKmNp6B/ a+/BP7HDFEr67eDBtr0boiISuF8mWCXtcTVcJJpCdEzk3TfVv9XJTikK7mlaAQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1723550206; 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=l78T7bvYaSNgYPwU/jODLpEfRpIt19X4bWI5vk/P/Ls=; b=O5QAnwpHLrW/6g6gwb6BiGrxTeBxMOhfxj+wrgDQc1FoO9zo/1IEMn8wVk2kUfnveNaCBq cxiApSfVQNYmmUaR9syxzXNAbm05SwGTnNHRZEDiStLNfJCV8sG6IEyxT8DJi79F0Fb6La WnSFoRBOU9QIQpvaFS+TUCWTWe35hw+lG1fWUENCtp9GBS3j2fdMvHQ2FTtURatzjK1J8v AOEK7S26/J48HyPOnSv5ib2lkz7U/IdVsEDlAIgXQNEYgTTq8NdZnELl7bHUxhnNjOsAp4 FK7kkrvOale2FG+nciBaDrOwHcQEFHeXdqqnMacc8dfnRczfpA4UKNUw5YKCCQ== 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 4WjqcG5k3sz18r5; Tue, 13 Aug 2024 11:56:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 47DBukeL075743; Tue, 13 Aug 2024 11:56:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 47DBukj9075740; Tue, 13 Aug 2024 11:56:46 GMT (envelope-from git) Date: Tue, 13 Aug 2024 11:56:46 GMT Message-Id: <202408131156.47DBukj9075740@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 3c356febe33d - 2024Q3 - games/assaultcube: fix build on i386 and minor port improvements List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2024Q3 X-Git-Reftype: branch X-Git-Commit: 3c356febe33d5ac3883cd8834f089f5514994723 Auto-Submitted: auto-generated The branch 2024Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c356febe33d5ac3883cd8834f089f5514994723 commit 3c356febe33d5ac3883cd8834f089f5514994723 Author: Vladimir Druzenko AuthorDate: 2024-08-06 01:13:55 +0000 Commit: Vladimir Druzenko CommitDate: 2024-08-13 11:56:27 +0000 games/assaultcube: fix build on i386 and minor port improvements PR: 280604 Approved by: Kevin Zheng (maintainer) (cherry picked from commit 0ceefe288a8bcdee752666493a5720c532c7b0a4) --- games/assaultcube/Makefile | 26 ++++++++++---------------- games/assaultcube/distinfo | 6 +++--- 2 files changed, 13 insertions(+), 19 deletions(-) diff --git a/games/assaultcube/Makefile b/games/assaultcube/Makefile index 4cf7d35c0548..7fde4f0e5093 100644 --- a/games/assaultcube/Makefile +++ b/games/assaultcube/Makefile @@ -1,13 +1,14 @@ PORTNAME= assaultcube -PORTVERSION= 1.3.0.2 +DISTVERSIONPREFIX= v +DISTVERSION= 1.3.0.2 CATEGORIES= games MAINTAINER= kevinz5000@gmail.com COMMENT= Free, multiplayer, first-person shooter game based on the CUBE engine WWW= https://assault.cubers.net/ -LICENSE= ACUBE CUBE MIT OTHER -LICENSE_COMB= multi +LICENSE= ACUBE CUBE MIT OTHER +LICENSE_COMB= multi LICENSE_NAME_ACUBE= AssaultCube ZLIB-like license with additions LICENSE_NAME_CUBE= Cube game engine ZLIB-like license with additions LICENSE_NAME_OTHER= various package licences @@ -19,11 +20,8 @@ LICENSE_PERMS_CUBE= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept LICENSE_PERMS_OTHER= dist-mirror pkg-mirror auto-accept USES= compiler:c++11-lang gmake tar:bzip2 - USE_GITHUB= yes -GH_ACCOUNT= assaultcube GH_PROJECT= AC -GH_TAGNAME= v1.3.0.2 LDFLAGS_i386= -Wl,-znotext SUB_FILES= ${PLIST_FILES:Mbin/*:T} @@ -33,11 +31,11 @@ PLIST_DIRS= ${DATADIR}/packages/maps/servermaps/incoming PORTDATA= config packages OPTIONS_DEFAULT= CLIENT DEDICATED -OPTIONS_MULTI= BUILD +OPTIONS_MULTI= BUILD OPTIONS_MULTI_BUILD= CLIENT DEDICATED #MASTER is currently broken -CLIENT_DESC= Build client -DEDICATED_DESC= Build dedicated server +CLIENT_DESC= Build client +DEDICATED_DESC= Build dedicated server CLIENT_LIB_DEPENDS= libvorbisfile.so:audio/libvorbis \ libcurl.so:ftp/curl @@ -46,23 +44,19 @@ CLIENT_USES= desktop-file-utils gettext-runtime gl openal:al sdl \ CLIENT_USE= GL=gl SDL=sdl2,image2 XORG=x11 CLIENT_ALL_TARGET= client CLIENT_DESKTOP_ENTRIES= "AssaultCube" "${COMMENT}" \ - "${PORTNAME}" "${PORTNAME}_client" \ - "Game;" false + "${PORTNAME}" "${PORTNAME}_client" \ + "Game;" false CLIENT_PLIST_FILES= bin/${PORTNAME}_client libexec/${PORTNAME}_client \ share/pixmaps/${PORTNAME}.png DEDICATED_ALL_TARGET= server DEDICATED_PLIST_FILES= bin/${PORTNAME}_server libexec/${PORTNAME}_server -#MASTER_DESC= Build master server +#MASTER_DESC= Build master server #MASTER_ALL_TARGET= master #MASTER_PLIST_FILES= bin/${PORTNAME}_master libexec/${PORTNAME}_master .include -.if ${COMPILER_TYPE} == "clang" -LDFLAGS_i386+=--no-check-dynamic-relocations -.endif - post-patch: .SILENT ${REINPLACE_CMD} -e '/^CXXFLAGS=/d ; /^CXX=/d ; /^CLIENT_PCH/d ; \ /^INCLUDES=/s|$$| -I$$(LOCALBASE)/include| ; \ diff --git a/games/assaultcube/distinfo b/games/assaultcube/distinfo index a19afe1053a5..79a83771c1fb 100644 --- a/games/assaultcube/distinfo +++ b/games/assaultcube/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1676156238 -SHA256 (assaultcube-AC-1.3.0.2-v1.3.0.2_GH0.tar.gz) = 05f21db1f20ee5cc8f83c2cd4e8746f16224654343959f29a4902859479e2dec -SIZE (assaultcube-AC-1.3.0.2-v1.3.0.2_GH0.tar.gz) = 51034819 +TIMESTAMP = 1722890543 +SHA256 (assaultcube-AC-v1.3.0.2_GH0.tar.gz) = 05f21db1f20ee5cc8f83c2cd4e8746f16224654343959f29a4902859479e2dec +SIZE (assaultcube-AC-v1.3.0.2_GH0.tar.gz) = 51034819