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,28 +1,27 @@ PORTNAME= Ri-li DISTVERSIONPREFIX= v -DISTVERSION= 3.1.4 -PORTREVISION= 1 +DISTVERSION= 3.1.5 CATEGORIES= games MAINTAINER= amdmi3@FreeBSD.org COMMENT= Drive a toy wood train in many levels - snake-like arcade game WWW= https://github.com/petitlapin/Li-Ri LICENSE= GPLv2 GPLv3 LICENSE_COMB= dual LICENSE_FILE_GPLv3= ${WRKSRC}/COPYING BUILD_DEPENDS= ${LOCALBASE}/include/SimpleIni.h:devel/simpleini USES= cmake pkgconfig sdl 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 PORTDATA= * .include 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)