From nobody Wed Apr 17 01:03:24 2024 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 4VK2hs0ysLz5HTBc; Wed, 17 Apr 2024 01:03:25 +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 4VK2hs0RXXz4832; Wed, 17 Apr 2024 01:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1713315805; 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=wtftaHGCid/eTUvknlRvKv67IqlJ1Pv628vmvhrVPBw=; b=Rz5iHYMjS5ieBZj6fLZaM8bQP20nkGP9sgj0OCkXkOv2eQX3pu95rR/EL8ZRaT9nTcba1p ke2S+gNuMG3KT4omBLHu8IXdfcgOdawBRnfjvtaUZ+n4Pw+QB0IDjKMoBbur/JsQtRZDXQ 9D3MqU7GLTUj5J2mboFRy2FX9xRf6HqQ30ARO7PwHsTgNsj8W1galm658IqHXGKCmLmBnc pmAR5bKkQ9rw+pHwnBc9Yru5Gq9EFlbtqYdPmjHF5tbWEHmVos16iARG+WXn6PxzcsbCq4 WwSCjSK33Gw6tsJjJKpF45/OFqH6nlh2hzjEvFXW6bs8gbk2hVv/GP2FcIRdaw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1713315805; a=rsa-sha256; cv=none; b=IT3AgnthpAJpKRpOEWxoOgwvdByNchJrmwa1DwiJrvpwyU6yJ3tGZxJKEiQc3oD1rXsRfZ DXp272HkzDPZ0zpyg65Mav+vM48drWoS+a8W4eOED/v8G8YFXKKNGTtP7lZ4rgMItHkZ4e bV5eVf5ZDGyj64ApdDM+f2CTWSpgA61NCXVZ37GEXgRa+BsdKoQjVIE4EnIPIe4PDlqVc2 xqpqmzNdtBSieHltEDx/q1tKEwidAUewekrswHsUs1xAKF2ogDjDsL4m+qsoUlXki8FesF AGSBMprf2z/88/gIseiK8PZk+qwDRttYXNDohWFxjGl0tKZspHc0IgJoFAHnzQ== 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=1713315805; 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=wtftaHGCid/eTUvknlRvKv67IqlJ1Pv628vmvhrVPBw=; b=o5Mo7lRjWJUFWeJCZVOS4OYF0XfM0R2zXjuKfsLJvNqEpe1zLkuvJWd3BuPtql+4Eri5tO qNMPB1DismAOHdMGjl3v0seK4Yw2SX5dTP71kdyoj7HTdDThwqqDgucLZdSBDaWRezqeWq R2cdaVeIAXNCYNJfbWzyt29/xv79GSAjfvfNLXGfcjuBu/YRWZZZZ43URln9Tuf/0l+eGD icdfs0urgdw4lQ0FA+yp0/UIvuDzalayRMGkJpxNTF5L9eyxUvXXQF9qA5kdCjseUn6VJ+ ZY5w9PFkSf32YKVAvaFgE3Ij+wmcFJaHnOMbC3J+w1mgryXmtvM3DE2Ow/4hMw== 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 4VK2hs03B1z15q0; Wed, 17 Apr 2024 01:03:25 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 43H13ObX032530; Wed, 17 Apr 2024 01:03:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 43H13OOR032527; Wed, 17 Apr 2024 01:03:24 GMT (envelope-from git) Date: Wed, 17 Apr 2024 01:03:24 GMT Message-Id: <202404170103.43H13OOR032527@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: e46a5d6bc08d - main - games/maxr: update 0.2.15 =?utf-8?Q?=E2=86=92?= 0.2.16 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: e46a5d6bc08d56bfdd5fedabecdf3d03b81c4d4c Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=e46a5d6bc08d56bfdd5fedabecdf3d03b81c4d4c commit e46a5d6bc08d56bfdd5fedabecdf3d03b81c4d4c Author: Dmitry Marakasov AuthorDate: 2024-04-15 15:41:21 +0000 Commit: Dmitry Marakasov CommitDate: 2024-04-17 01:02:45 +0000 games/maxr: update 0.2.15 → 0.2.16 --- games/maxr/Makefile | 9 +++------ games/maxr/distinfo | 6 +++--- games/maxr/files/patch-CMakeLists.txt | 28 ++++++++++++---------------- 3 files changed, 18 insertions(+), 25 deletions(-) diff --git a/games/maxr/Makefile b/games/maxr/Makefile index 90cb7a9921e2..b0e25fc3c85d 100644 --- a/games/maxr/Makefile +++ b/games/maxr/Makefile @@ -1,6 +1,6 @@ PORTNAME= maxr DISTVERSIONPREFIX= release- -DISTVERSION= 0.2.15 +DISTVERSION= 0.2.16 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -11,8 +11,7 @@ WWW= https://www.maxr.org/ \ LICENSE= GPLv2+ LICENSE_FILE= ${WRKSRC}/data/COPYING -BUILD_DEPENDS= ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json \ - ${LOCALBASE}/include/doctest/doctest.h:devel/doctest +BUILD_DEPENDS= ${LOCALBASE}/include/nlohmann/json.hpp:devel/nlohmann-json BUILD_DEPENDS+= ${LOCALBASE}/lib/libvorbis.so:audio/libvorbis # used to build a binary which is not installed USES= cmake compiler:c++17-lang sdl @@ -20,6 +19,7 @@ USE_GITHUB= yes GH_ACCOUNT= maxr-dot-org GH_TUPLE= oo13:spiritless_po:5d729be:spiritless_po/submodules/spiritless_po USE_SDL= sdl2 mixer2 net2 +CMAKE_OFF= BUILD_TESTING PLIST_FILES= bin/${PORTNAME} PORTDATA= * @@ -31,7 +31,4 @@ DESKTOP_ENTRIES="M.A.X.R." \ "Game;StrategyGame;" \ false -post-patch: - @${REINPLACE_CMD} -e '/include/ s|doctest.h|doctest/&|' ${WRKSRC}/tests/*.cpp - .include diff --git a/games/maxr/distinfo b/games/maxr/distinfo index 1938bad59307..a9b276c27917 100644 --- a/games/maxr/distinfo +++ b/games/maxr/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1712336240 -SHA256 (maxr-dot-org-maxr-release-0.2.15_GH0.tar.gz) = 2ef00bf84461c43b4e87e2c42dba18e8126813a19c96103241e6ce9d1223b987 -SIZE (maxr-dot-org-maxr-release-0.2.15_GH0.tar.gz) = 18548869 +TIMESTAMP = 1713194338 +SHA256 (maxr-dot-org-maxr-release-0.2.16_GH0.tar.gz) = 3a1cc3f7d0d2958374c3484b6a031be4528ec89883e950fe64a48bfa3a5f4223 +SIZE (maxr-dot-org-maxr-release-0.2.16_GH0.tar.gz) = 18548453 SHA256 (oo13-spiritless_po-5d729be_GH0.tar.gz) = 8ebb2f6c38a9ef4b76f088a90519928fb1ad9b7abb5dc878a590018a16fae3a0 SIZE (oo13-spiritless_po-5d729be_GH0.tar.gz) = 68073 diff --git a/games/maxr/files/patch-CMakeLists.txt b/games/maxr/files/patch-CMakeLists.txt index 27acfa07c12c..6731fc7b422a 100644 --- a/games/maxr/files/patch-CMakeLists.txt +++ b/games/maxr/files/patch-CMakeLists.txt @@ -1,4 +1,4 @@ ---- CMakeLists.txt.orig 2024-03-19 16:53:32 UTC +--- CMakeLists.txt.orig 2024-04-12 08:07:57 UTC +++ CMakeLists.txt @@ -22,7 +22,6 @@ if ("${CMAKE_CXX_COMPILER_ID}" MATCHES "Clang") @@ -8,32 +8,28 @@ elseif ("${CMAKE_CXX_COMPILER_ID}" STREQUAL "MSVC") set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} /MP /bigobj") set(CMAKE_CXX_FLAGS_DEBUG "${CMAKE_CXX_FLAGS_DEBUG} /ZI /bigobj") -@@ -47,16 +46,20 @@ endif() +@@ -47,8 +46,8 @@ endif() # ============================================ # nlohmann is a library header for json -add_library(nlohmann INTERFACE IMPORTED) -target_include_directories(nlohmann SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/nlohmann/single_include") -+#add_library(nlohmann INTERFACE IMPORTED) -+#target_include_directories(nlohmann SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/nlohmann/single_include") +find_package(nlohmann_json REQUIRED) +add_library(nlohmann ALIAS nlohmann_json::nlohmann_json) # spiritless_po is a library header for gettext po translation add_library(spiritless_po INTERFACE IMPORTED) - target_include_directories(spiritless_po SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/spiritless_po/include") - +@@ -57,7 +56,8 @@ if(BUILD_TESTING) # doctest is a library header for test framework --add_library(doctest INTERFACE IMPORTED) --target_include_directories(doctest SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/doctest/doctest") -+#add_library(doctest INTERFACE IMPORTED) -+#target_include_directories(doctest SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/doctest/doctest") -+find_package(doctest REQUIRED) -+add_library(doctest ALIAS doctest::doctest) - - # SDL_flic - add_library(SDL_flic src/3rd/SDL_flic/SDL_flic.c src/3rd/SDL_flic/SDL_flic.h) -@@ -83,17 +86,6 @@ if(CRASH_RPT_INCLUDE_DIR) + include(CTest) + if(BUILD_TESTING) +- add_library(doctest INTERFACE IMPORTED) ++ #find_package(doctest REQUIRED) ++ #add_library(doctest ALIAS doctest::doctest) + target_include_directories(doctest SYSTEM INTERFACE "${CMAKE_CURRENT_SOURCE_DIR}/submodules/doctest/doctest") + set(CMAKE_MODULE_PATH ${CMAKE_MODULE_PATH} "${CMAKE_CURRENT_SOURCE_DIR}/submodules/doctest/scripts/cmake") + include(doctest) +@@ -88,17 +88,6 @@ if(CRASH_RPT_INCLUDE_DIR) target_compile_definitions(maxr_lib PUBLIC USE_CRASH_RPT) target_include_directories(maxr_lib PUBLIC ${CRASH_RPT_INCLUDE_DIR}) target_link_libraries(maxr_lib PUBLIC ${CRASH_RPT_LIB})