From nobody Fri Jul 05 01:48:38 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 4WFbyb0VDXz5PxXf; Fri, 05 Jul 2024 01:48:39 +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 4WFbyZ6wmKz41xH; Fri, 5 Jul 2024 01:48:38 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1720144119; 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=1zqBLxuxw4EB3WQzJJizhnoNR+KISIsdKSpOewJRCAs=; b=kKevSoD4vaC+EKsK3vzKpEcd+vbgTcQ6bi0Gt7zofDo+wFnSUap/otP8LzxlpREkgN0gQ4 x9EFGdeYOLgLN/0u43n3FgW2MsB2WGVcZalgcbwlmgRG+STO9kd2Wj+2JKVOVmk3pK3xCj BfGx43hfwU2ab8+sXP6di6FFMacGiZPVIrNtZFFMy3CHFzX32QA56z6oUOG2bu+ivIbMbf xlRQ3OCuoK2tQ5oVpda8/99NnYdBtdOBft2H6G27sHX+YLClX/Bp90HM9F78b6FeAfWzc9 aahF/++/RTOSodDaF6hwK+2uABUNwWWv/qdvDONgmzHSCbcAEIS78KuayQWYZg== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1720144119; a=rsa-sha256; cv=none; b=ysnO1WQjWEwasD43EuAog9N0tXrB2WalHWnyN6ApZxIVxShd892qLlUMW7lye5ozQu+r1A 8YNzrBiNHwn0L2LrGKwiUYcx2LzLfjHmSdZv5Ww2nDRbG/flhdHy/HSEjR3b9iUKR9T5Wm 8/nMkVhPQH6OmCmcrrTpYjWPrDTkCOty4+esKOU7iceNpeEpQ3EmPAndvUzzTLTV8HVrnO tSx17Po3niYaEkE3rgJtBVRTnuAPzt8e83zPO7+fxcGGviFwVp04PJOC4zhk7kd1fj3Ijx Bc+TN+z7XufRX33k/Mxc5d+p1CP6wKvDDUzzVUh0XZJCIsmnFlTo09Y95/MvIA== 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=1720144119; 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=1zqBLxuxw4EB3WQzJJizhnoNR+KISIsdKSpOewJRCAs=; b=oRvoM8XfxosJecxN+P7vIkmUSoaZLdTqkLyhmrqArriMhqBmkC+PWro6/AT+Bf8SWaRv/7 t0BUIRBEOT2nvexs1/coqhnyELxkTcAMBDVwaXQry/eeQsPnV/jHRcC+BIHwPleUz69/kJ 8LvHODukKpCGERKfePnasoAKFP9VpoveTgGao1lWAfm2nuIhSB2OoDlVyA7I8kSFu34OhH qsMz03r7ysjTO9RVrGkel/Vn3FBfTq0pIiCF5OfDb5xGJ8gBAQQ3F2wIXI1qZhGjbXwToH QNo4M705Q/68dgtpsJ5r4OLLqRshtCOqZBmcuL44lb3q+uDb/AijuiQrXsqe6Q== 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 4WFbyZ6XCgzcYQ; Fri, 5 Jul 2024 01:48:38 +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 4651mcFO032790; Fri, 5 Jul 2024 01:48:38 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4651mc5n032787; Fri, 5 Jul 2024 01:48:38 GMT (envelope-from git) Date: Fri, 5 Jul 2024 01:48:38 GMT Message-Id: <202407050148.4651mc5n032787@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: 813b577677f3 - main - games/ri-li: update 3.1.4 =?utf-8?Q?=E2=86=92?= 3.1.5 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: 813b577677f30a53e8b88b96f95cd277b9db0e43 Auto-Submitted: auto-generated The branch main has been updated by amdmi3: URL: https://cgit.FreeBSD.org/ports/commit/?id=813b577677f30a53e8b88b96f95cd277b9db0e43 commit 813b577677f30a53e8b88b96f95cd277b9db0e43 Author: Dmitry Marakasov AuthorDate: 2024-06-03 16:55:38 +0000 Commit: Dmitry Marakasov CommitDate: 2024-07-05 01:45:39 +0000 games/ri-li: update 3.1.4 → 3.1.5 --- games/ri-li/Makefile | 5 ++--- games/ri-li/distinfo | 6 +++--- games/ri-li/files/patch-CMakeLists.txt | 25 ------------------------- 3 files changed, 5 insertions(+), 31 deletions(-) diff --git a/games/ri-li/Makefile b/games/ri-li/Makefile index b17939091fff..6d4e15dbc2e9 100644 --- a/games/ri-li/Makefile +++ b/games/ri-li/Makefile @@ -1,7 +1,6 @@ PORTNAME= Ri-li DISTVERSIONPREFIX= v -DISTVERSION= 3.1.4 -PORTREVISION= 1 +DISTVERSION= 3.1.5 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org @@ -19,7 +18,7 @@ USE_GITHUB= yes GH_ACCOUNT= petitlapin GH_PROJECT= Li-Ri USE_SDL= sdl2 mixer2 -CMAKE_ON= USE_CONAN # doesn't really use conan, just handles system depends properly +CMAKE_ON= USE_SYSTEM_SIMPLEINI CMAKE_ARGS= -DLIRI_DATA_DIR="${DATADIR}" DATADIR= ${PREFIX}/share/Li-ri diff --git a/games/ri-li/distinfo b/games/ri-li/distinfo index fd10a7a3778f..5b0c05607a20 100644 --- a/games/ri-li/distinfo +++ b/games/ri-li/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1715015770 -SHA256 (petitlapin-Li-Ri-v3.1.4_GH0.tar.gz) = 56687ef201c915bef44fa9ce0f4e195d6e6d0cda5d960ba33b67caf2148324f6 -SIZE (petitlapin-Li-Ri-v3.1.4_GH0.tar.gz) = 47178812 +TIMESTAMP = 1717427884 +SHA256 (petitlapin-Li-Ri-v3.1.5_GH0.tar.gz) = 6c0eedf5fdd12ef4d6a4cc2d20b0899b0fa40d332e10b61cf1402b6aab31814a +SIZE (petitlapin-Li-Ri-v3.1.5_GH0.tar.gz) = 47164007 diff --git a/games/ri-li/files/patch-CMakeLists.txt b/games/ri-li/files/patch-CMakeLists.txt deleted file mode 100644 index da6d3b62dd11..000000000000 --- a/games/ri-li/files/patch-CMakeLists.txt +++ /dev/null @@ -1,25 +0,0 @@ ---- CMakeLists.txt.orig 2024-01-15 20:22:00 UTC -+++ CMakeLists.txt -@@ -25,6 +25,7 @@ if(USE_CONAN) - if(USE_CONAN) - find_package(SDL2 REQUIRED CONFIG) - find_package(SDL2_mixer REQUIRED CONFIG) -+ find_path(SIMPLEINI_INCLUDE_DIR SimpleIni.h) - else() - find_package(PkgConfig REQUIRED) - pkg_check_modules(SDL2 REQUIRED sdl2 SDL2_mixer) -@@ -69,12 +70,13 @@ if(USE_CONAN) - - if(USE_CONAN) - target_link_libraries(${LIRI_EXECUTABLE_NAME} PRIVATE SDL2::SDL2 SDL2_mixer::SDL2_mixer) -+ target_include_directories(${LIRI_EXECUTABLE_NAME} PRIVATE ${SIMPLEINI_INCLUDE_DIR}) -+ target_compile_definitions(${LIRI_EXECUTABLE_NAME} PRIVATE SI_NO_CONVERSION) - else() - target_include_directories(${LIRI_EXECUTABLE_NAME} PUBLIC ${SDL2_INCLUDE_DIRS}) - target_link_libraries(${LIRI_EXECUTABLE_NAME} PRIVATE ${SDL2_LINK_LIBRARIES}) - endif() - --target_link_libraries(${LIRI_EXECUTABLE_NAME} PRIVATE SimpleIni::SimpleIni) - - - include(GNUInstallDirs)