Date: Tue, 13 Aug 2024 11:56:46 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 3c356febe33d - 2024Q3 - games/assaultcube: fix build on i386 and minor port improvements Message-ID: <202408131156.47DBukj9075740@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2024Q3 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=3c356febe33d5ac3883cd8834f089f5514994723 commit 3c356febe33d5ac3883cd8834f089f5514994723 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-08-06 01:13:55 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> CommitDate: 2024-08-13 11:56:27 +0000 games/assaultcube: fix build on i386 and minor port improvements PR: 280604 Approved by: Kevin Zheng <kevinz5000@gmail.com> (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 <bsd.port.pre.mk> -.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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202408131156.47DBukj9075740>