diff options
Diffstat (limited to 'devel/simpleini')
| -rw-r--r-- | devel/simpleini/Makefile | 11 | ||||
| -rw-r--r-- | devel/simpleini/distinfo | 6 | ||||
| -rw-r--r-- | devel/simpleini/files/patch-CMakeLists.txt | 17 | ||||
| -rw-r--r-- | devel/simpleini/files/patch-cmake-targets | 41 | ||||
| -rw-r--r-- | devel/simpleini/pkg-plist | 6 |
5 files changed, 20 insertions, 61 deletions
diff --git a/devel/simpleini/Makefile b/devel/simpleini/Makefile index 5275e60d32db..1ca5305a3e29 100644 --- a/devel/simpleini/Makefile +++ b/devel/simpleini/Makefile @@ -1,7 +1,6 @@ PORTNAME= simpleini DISTVERSIONPREFIX= v -DISTVERSION= 4.22 -PORTREVISION= 1 +DISTVERSION= 4.24 CATEGORIES= devel MAINTAINER= amdmi3@FreeBSD.org @@ -11,20 +10,20 @@ WWW= https://github.com/brofield/simpleini LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENCE.txt -USES= cmake:testing USE_GITHUB= yes GH_ACCOUNT= brofield NO_ARCH= yes CMAKE_ON= SIMPLEINI_USE_SYSTEM_GTEST +CMAKE_OFF= SIMPLEINI_BUILD_EXAMPLES PORTDOCS= * OPTIONS_DEFINE= TEST DOCS TEST_BUILD_DEPENDS= googletest>=0:devel/googletest - -post-patch-TEST-off: - @${REINPLACE_CMD} -e '/add_subdirectory(tests/ d' ${WRKSRC}/CMakeLists.txt +TEST_USES= cmake:testing +TEST_USES_OFF= cmake +TEST_CMAKE_BOOL= SIMPLEINI_BUILD_TESTS post-install-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} diff --git a/devel/simpleini/distinfo b/devel/simpleini/distinfo index 06af64af86de..c4809d581d2c 100644 --- a/devel/simpleini/distinfo +++ b/devel/simpleini/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1708445050 -SHA256 (brofield-simpleini-v4.22_GH0.tar.gz) = b3a4b8f9e03aabd491aa55fd57457115857b9b9c7ecf4abf7ff035ca9d026eb8 -SIZE (brofield-simpleini-v4.22_GH0.tar.gz) = 65923 +TIMESTAMP = 1763036688 +SHA256 (brofield-simpleini-v4.24_GH0.tar.gz) = 56ea1183879be33dbe8b094a4b18ac82a0828551a0aec8f307b0e7645b3a07af +SIZE (brofield-simpleini-v4.24_GH0.tar.gz) = 72173 diff --git a/devel/simpleini/files/patch-CMakeLists.txt b/devel/simpleini/files/patch-CMakeLists.txt index 835b583840f6..55a6a21cdb34 100644 --- a/devel/simpleini/files/patch-CMakeLists.txt +++ b/devel/simpleini/files/patch-CMakeLists.txt @@ -1,10 +1,11 @@ ---- CMakeLists.txt.orig 2023-12-29 02:44:28 UTC +--- CMakeLists.txt.orig 2025-11-13 10:32:32 UTC +++ CMakeLists.txt -@@ -34,6 +34,7 @@ add_library(${EXPORT_NAMESPACE}${PROJECT_NAME} ALIAS $ - - add_library(${PROJECT_NAME} INTERFACE) - add_library(${EXPORT_NAMESPACE}${PROJECT_NAME} ALIAS ${PROJECT_NAME}) -+target_compile_definitions(${PROJECT_NAME} INTERFACE SI_NO_CONVERSION) - - include(GNUInstallDirs) +@@ -80,7 +80,7 @@ install(FILES + ) + # only build tests when top level and testing enabled +-if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME) ++if(CMAKE_PROJECT_NAME STREQUAL PROJECT_NAME AND SIMPLEINI_BUILD_TESTS) + include(CTest) + if(BUILD_TESTING) + add_subdirectory(tests) diff --git a/devel/simpleini/files/patch-cmake-targets b/devel/simpleini/files/patch-cmake-targets deleted file mode 100644 index 966b2529a634..000000000000 --- a/devel/simpleini/files/patch-cmake-targets +++ /dev/null @@ -1,41 +0,0 @@ -From aeacf861a8ad8add5f4974792a88ffea393e41db Mon Sep 17 00:00:00 2001 -From: Alexandre Bouvier <contact@amb.tf> -Date: Tue, 2 Jan 2024 08:42:03 +0100 -Subject: [PATCH] cmake: fix namespace and include dir (#74) - ---- - CMakeLists.txt | 11 +++++++---- - 1 file changed, 7 insertions(+), 4 deletions(-) - -diff --git CMakeLists.txt CMakeLists.txt -index 8f09295..7804947 100644 ---- CMakeLists.txt -+++ CMakeLists.txt -@@ -48,7 +48,7 @@ configure_package_config_file(${PROJECT_NAME}Config.cmake.in - ) - - install(FILES SimpleIni.h -- DESTINATION ${CMAKE_INSTALL_INCLUDEDIR}/${PROJECT_NAME} -+ DESTINATION ${CMAKE_INSTALL_INCLUDEDIR} - ) - - install(TARGETS ${PROJECT_NAME} -@@ -62,12 +62,15 @@ install(FILES - ) - install(EXPORT ${PROJECT_NAME}Targets - DESTINATION ${CMAKE_INSTALL_DATADIR}/cmake/${PROJECT_NAME} -- NAMESPACE EXPORT_NAMESPACE -+ NAMESPACE ${EXPORT_NAMESPACE} - ) - --target_include_directories(${PROJECT_NAME} INTERFACE $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}>) -+target_include_directories(${PROJECT_NAME} INTERFACE -+ $<BUILD_INTERFACE:${CMAKE_CURRENT_SOURCE_DIR}> -+ $<INSTALL_INTERFACE:${CMAKE_INSTALL_INCLUDEDIR}> -+) - - if(IS_TOPLEVEL_PROJECT) -- enable_testing() -+ include(CTest) - add_subdirectory(tests) - endif() diff --git a/devel/simpleini/pkg-plist b/devel/simpleini/pkg-plist index 36349f911b1b..caf5985052d2 100644 --- a/devel/simpleini/pkg-plist +++ b/devel/simpleini/pkg-plist @@ -1,4 +1,4 @@ include/SimpleIni.h -share/cmake/SimpleIni/SimpleIniConfig.cmake -share/cmake/SimpleIni/SimpleIniConfigVersion.cmake -share/cmake/SimpleIni/SimpleIniTargets.cmake +lib/cmake/SimpleIni/SimpleIniConfig.cmake +lib/cmake/SimpleIni/SimpleIniConfigVersion.cmake +lib/cmake/SimpleIni/SimpleIniTargets.cmake |