From nobody Tue Mar 15 11:50:42 2022 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 1329F1A14E1D; Tue, 15 Mar 2022 11:50:43 +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 4KHsDL3sc6z3LFt; Tue, 15 Mar 2022 11:50:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647345042; 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=K2kz71Rv1RFix4Sj9XLh8BCmGKdRNuTLyL/rWWyGYRY=; b=rldaN/bOcmiP6Z9/2B2QN8EmaJ5IdVtUlh6ZfzPDQI3vDzWQS/jcZCzQg4pwqX0Z4Jp62b p1TXjvvXY8qhDKcnWvTyaqNRgjpQ0VEU63E1fJvYyup5XCAoKAAqdD9lWKDW4G0634Y0j1 kgPC6x0LNJC6tYvE1ABPZo/YRpKdFfA2kZ1tlagBxyRNymxcRbi6F9ki0+lkXJhDKl3pr6 IhiFdgGAuhKP71z7LoSYe9rgMNEO9ez9R5CFG3JNT1t/+dUkeP6ZX7AKPqARndYi6oz3UY XRm6DTMfUOB69axMM1/KQLPFUk1GPnNrWiOhko11Dx4LYevD0tP3QM+9tFp4QA== 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 3B3AF213A2; Tue, 15 Mar 2022 11:50:42 +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 22FBogXq059138; Tue, 15 Mar 2022 11:50:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 22FBogFu059137; Tue, 15 Mar 2022 11:50:42 GMT (envelope-from git) Date: Tue, 15 Mar 2022 11:50:42 GMT Message-Id: <202203151150.22FBogFu059137@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Dmitry Marakasov Subject: git: d0fb1df5698e - main - =?utf-8?Q?games/arx-libertatis: update 1.1.2 =E2=86=92 1.2?= 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: amdmi3 X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: d0fb1df5698e5e27706e117ccf0529a0caee04b1 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1647345042; 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=K2kz71Rv1RFix4Sj9XLh8BCmGKdRNuTLyL/rWWyGYRY=; b=CRc4XMmiwUDdwaWUNv6/G4AS/8qAbr/Uwio4GMO/9UTSh+EDkHUkDbrKpbk/ZKMLZsGuwr 6NvGKQxt9XKur/0jqWGhtkMlW3aUoaoTS8S2EOB8GSDNBgpfPHymiiUBUNf7oip+COIjpd Br9eSGKq92erqQtCdBmRkHyvThKAJCrk0imjRxFXRondjKGm9I7NbKoV04El8b2THiRIv0 CeVj85O9BOvpSiIXQKeRUiox15mPaeC5xAZg8jgLN8DFQJjqjE2fY7tKRlqFrTrGa180G1 6fSXlx02qwZJJSZNrvX6Up3IVhGwAWo3raHB+a47ofM7mQPTY+KnaORLpxZDxg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1647345042; a=rsa-sha256; cv=none; b=bN8i2ltQPDlgWrOhAh9GCc8HLs/+zvRMkkdLDPZ40+Mn5nk+fpHBRQ3De+PjVYW+dflBiG 8pP/zZsIsI7sRiGUGvRQcvT3MYk9SazCqbVKG/+qrUMEli8B/MtIYlRj3Rcry6q4P2TuIG 9r8EQipaFhRCYeZ9wcXHPOTpYOoZNrPoKENmOjlYKz74oxbCjSxNgQbwAt4wQIGolJJ7/R C51W3JewuQywO6Hmp24XRrftFNq/5r6RsK1u1hK7mxkKYd4msKZOQSq+RZFoTwnjDMIE2e IB/p85IYaVtud8HFqz43rlOWyE3UfnSe/dxUkfjlxt6tm7ZKECSeiS1l0khI9Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=d0fb1df5698e5e27706e117ccf0529a0caee04b1 commit d0fb1df5698e5e27706e117ccf0529a0caee04b1 Author: Dmitry Marakasov AuthorDate: 2021-07-16 14:55:02 +0000 Commit: Dmitry Marakasov CommitDate: 2022-03-15 11:50:06 +0000 games/arx-libertatis: update 1.1.2 → 1.2 --- games/arx-libertatis/Makefile | 44 +++++++++++++--------- games/arx-libertatis/distinfo | 5 ++- games/arx-libertatis/files/patch-CMakeLists.txt | 16 -------- .../files/patch-src_platform_Dialog.cpp | 11 ++++++ ...src_platform_crashhandler_CrashHandlerPOSIX.cpp | 11 ++++++ games/arx-libertatis/pkg-descr | 2 +- games/arx-libertatis/pkg-plist | 20 ++++++++-- 7 files changed, 68 insertions(+), 41 deletions(-) diff --git a/games/arx-libertatis/Makefile b/games/arx-libertatis/Makefile index ec4ef67ef0b9..db30258bd51f 100644 --- a/games/arx-libertatis/Makefile +++ b/games/arx-libertatis/Makefile @@ -1,35 +1,42 @@ PORTNAME= arx-libertatis -PORTVERSION= 1.1.2 -PORTREVISION= 18 +PORTVERSION= 1.2 CATEGORIES= games -MASTER_SITES= http://downloads.sourceforge.net/arx/ \ - http://arx-libertatis.org/files/ +MASTER_SITES= https://arx-libertatis.org/files/ \ + https://github.com/arx/ArxLibertatis/releases/download/${PORTVERSION}/ MAINTAINER= amdmi3@FreeBSD.org COMMENT= Cross-platform port of Arx Fatalis LICENSE= GPLv3+ -LICENSE_FILE= ${WRKSRC}/ARX_PUBLIC_LICENSE.txt - -LIB_DEPENDS= libfreetype.so:print/freetype2 -BUILD_DEPENDS= ${LOCALBASE}/include/boost/foreach.hpp:devel/boost-libs - -USES= cmake compiler:c++11-lang gl openal sdl tar:xz -USE_SDL= sdl -USE_GL= gl glew -CMAKE_ARGS= -DDATA_DIR=arx \ - -DSTRICT_USE=ON \ - -DBUILD_CRASHREPORTER=OFF -LDFLAGS_i386= -Wl,-znotext +LICENSE_FILE= ${WRKSRC}/LICENSE + +LIB_DEPENDS= libfreetype.so:print/freetype2 \ + libepoxy.so:graphics/libepoxy +BUILD_DEPENDS= ${LOCALBASE}/include/boost/foreach.hpp:devel/boost-libs \ + ${LOCALBASE}/include/glm/glm.hpp:math/glm + +USES= cmake compiler:c++17-lang openal sdl tar:xz +USE_SDL= sdl2 +CMAKE_ON= STRICT_USE +CMAKE_OFF= INSTALL_BLENDER_PLUGIN \ + SET_OPTIMIZATION_FLAGS +CMAKE_ARGS= -DWITH_SDL=2 \ + -DDATA_DIR:STRING=arx \ + -DDATA_DIR_PREFIXES:STRING="\$${XDG_DATA_DIRS:-${PREFIX}/share/}" \ + -DINSTALL_DATADIR:STRING="${DATADIR}" \ + -DIGNORE_EXE_DIR:STRING="${PREFIX}/bin:${LOCABASE}/bin" \ + -DCMAKE_INSTALL_MANDIR="${PREFIX}/share/man" + +LDFLAGS_i386= -Wl,-znotext CONFLICTS_INSTALL= rnv SUB_FILES= pkg-message PORTDOCS= AUTHORS CHANGELOG README.md +PORTDATA= * OPTIONS_DEFINE= DOCS -OPTIONS_SUB= yes .include @@ -38,7 +45,8 @@ CFLAGS+= -mminimal-toc .endif post-patch: - @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' ${WRKSRC}/CMakeLists.txt + @${REINPLACE_CMD} -e 's|/usr/local|${LOCALBASE}|g' \ + ${WRKSRC}/CMakeLists.txt ${WRKSRC}/cmake/*.cmake post-install: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/games/arx-libertatis/distinfo b/games/arx-libertatis/distinfo index a5da95812c36..2b55db20905f 100644 --- a/games/arx-libertatis/distinfo +++ b/games/arx-libertatis/distinfo @@ -1,2 +1,3 @@ -SHA256 (arx-libertatis-1.1.2.tar.xz) = 82adb440a9c86673e74b84abd480cae968e1296d625b6d40c69ca35b35ed4e42 -SIZE (arx-libertatis-1.1.2.tar.xz) = 970608 +TIMESTAMP = 1626354922 +SHA256 (arx-libertatis-1.2.tar.xz) = bacf7768c4e21c9166c7ea57083d4f20db0deb8f0ee7d96b5f2829e73a75ad0c +SIZE (arx-libertatis-1.2.tar.xz) = 2478640 diff --git a/games/arx-libertatis/files/patch-CMakeLists.txt b/games/arx-libertatis/files/patch-CMakeLists.txt deleted file mode 100644 index 93096fe5d4d4..000000000000 --- a/games/arx-libertatis/files/patch-CMakeLists.txt +++ /dev/null @@ -1,16 +0,0 @@ ---- CMakeLists.txt.orig 2014-10-08 15:46:26.000000000 +0400 -+++ CMakeLists.txt 2014-10-08 15:48:25.000000000 +0400 -@@ -132,11 +132,11 @@ - set(USER_DIR_PREFIXES "~/Library/Application Support" CACHE STRING "User dir paths") - else() - set(DATA_DIR -- "games/arx:arx" -+ "arx" - CACHE STRING "Data dir names" - ) - set(DATA_DIR_PREFIXES -- "\${XDG_DATA_DIRS:-/usr/local/share/:/usr/share/}:/opt" -+ "\${XDG_DATA_DIRS:-/usr/local/share/}" - CACHE STRING "Data dir paths" - ) - set(USER_DIR diff --git a/games/arx-libertatis/files/patch-src_platform_Dialog.cpp b/games/arx-libertatis/files/patch-src_platform_Dialog.cpp new file mode 100644 index 000000000000..7492c7063743 --- /dev/null +++ b/games/arx-libertatis/files/patch-src_platform_Dialog.cpp @@ -0,0 +1,11 @@ +--- src/platform/Dialog.cpp.orig 2021-07-14 00:04:34 UTC ++++ src/platform/Dialog.cpp +@@ -175,7 +175,7 @@ static std::string formatAsHtml(const std::string & te + oss << "http://"; + i += 6; + } else if(!link && line.compare(i, 8, "https://", 8) == 0) { +- oss << "