diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile index c694b53a7bb1..4e8ff10741e6 100644 --- a/devel/jsoncpp/Makefile +++ b/devel/jsoncpp/Makefile @@ -1,22 +1,24 @@ PORTNAME= jsoncpp -DISTVERSION= 1.9.6 -PORTREVISION= 1 +DISTVERSION= 1.9.8 CATEGORIES= devel MAINTAINER= yuri@FreeBSD.org COMMENT= JSON reader and writer library for C++ WWW= https://github.com/open-source-parsers/jsoncpp LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE USES= compiler:c++11-lang cpe meson pkgconfig python:build,test +CPE_VENDOR= jsoncpp_project +USE_LDCONFIG= yes + USE_GITHUB= yes GH_ACCOUNT= open-source-parsers -MESON_ARGS= --default-library=both -USE_LDCONFIG= yes -CPE_VENDOR= jsoncpp_project TEST_TARGET= test +MESON_ARGS= --default-library=both \ + --includedir include/jsoncpp + .include diff --git a/devel/jsoncpp/distinfo b/devel/jsoncpp/distinfo index d64eafba4b44..1f3bec276167 100644 --- a/devel/jsoncpp/distinfo +++ b/devel/jsoncpp/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1726117118 -SHA256 (open-source-parsers-jsoncpp-1.9.6_GH0.tar.gz) = f93b6dd7ce796b13d02c108bc9f79812245a82e577581c4c9aabe57075c90ea2 -SIZE (open-source-parsers-jsoncpp-1.9.6_GH0.tar.gz) = 212682 +TIMESTAMP = 1786780167 +SHA256 (open-source-parsers-jsoncpp-1.9.8_GH0.tar.gz) = 51828cf3574281d2b79ec2a1c56a9e4c20cc1103711321ea96384cffb8d2d904 +SIZE (open-source-parsers-jsoncpp-1.9.8_GH0.tar.gz) = 220066 diff --git a/devel/jsoncpp/files/patch-jsoncpp-namespaced-targets.cmake b/devel/jsoncpp/files/patch-jsoncpp-namespaced-targets.cmake new file mode 100644 index 000000000000..e0961cb6cef8 --- /dev/null +++ b/devel/jsoncpp/files/patch-jsoncpp-namespaced-targets.cmake @@ -0,0 +1,18 @@ +--- jsoncpp-namespaced-targets.cmake.orig 2026-06-14 03:16:10 UTC ++++ jsoncpp-namespaced-targets.cmake +@@ -1,9 +1,11 @@ if (NOT TARGET JsonCpp::JsonCpp) + if (NOT TARGET JsonCpp::JsonCpp) +- if (TARGET jsoncpp_static) ++ # Prefer shared library over static library. ++ # This diverges from upstream but makes more sense in Debian ++ if (TARGET jsoncpp_lib) + add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) +- set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_static") +- elseif (TARGET jsoncpp_lib) +- add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) + set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_lib") ++ elseif (TARGET jsoncpp_static) ++ add_library(JsonCpp::JsonCpp INTERFACE IMPORTED) ++ set_target_properties(JsonCpp::JsonCpp PROPERTIES INTERFACE_LINK_LIBRARIES "jsoncpp_static") + endif () + endif () diff --git a/devel/jsoncpp/files/patch-jsoncppConfig.cmake.meson.in b/devel/jsoncpp/files/patch-jsoncppConfig.cmake.meson.in deleted file mode 100644 index ea15d52a7708..000000000000 --- a/devel/jsoncpp/files/patch-jsoncppConfig.cmake.meson.in +++ /dev/null @@ -1,23 +0,0 @@ -- workaround for https://github.com/open-source-parsers/jsoncpp/issues/1568 -- [1.9.6 regression] 'find_package(jsoncpp REQUIRED)' fails: Unknown CMake command "check_required_components" - ---- jsoncppConfig.cmake.meson.in.orig 2024-09-13 17:50:33 UTC -+++ jsoncppConfig.cmake.meson.in -@@ -3,6 +3,17 @@ - @MESON_SHARED_TARGET@ - @MESON_STATIC_TARGET@ - -+macro(check_required_components _NAME) -+ foreach(comp ${${_NAME}_FIND_COMPONENTS}) -+ if(NOT ${_NAME}_${comp}_FOUND) -+ if(${_NAME}_FIND_REQUIRED_${comp}) -+ set(${_NAME}_FOUND FALSE) -+ endif() -+ endif() -+ endforeach() -+endmacro() -+ -+ - include ( "${CMAKE_CURRENT_LIST_DIR}/jsoncpp-namespaced-targets.cmake" ) - - check_required_components(JsonCpp) diff --git a/devel/jsoncpp/pkg-plist b/devel/jsoncpp/pkg-plist index 68d39b9c29fd..223dbcc296de 100644 --- a/devel/jsoncpp/pkg-plist +++ b/devel/jsoncpp/pkg-plist @@ -1,16 +1,16 @@ -include/json/allocator.h -include/json/assertions.h -include/json/config.h -include/json/forwards.h -include/json/json.h -include/json/json_features.h -include/json/reader.h -include/json/value.h -include/json/version.h -include/json/writer.h +include/jsoncpp/json/allocator.h +include/jsoncpp/json/assertions.h +include/jsoncpp/json/config.h +include/jsoncpp/json/forwards.h +include/jsoncpp/json/json.h +include/jsoncpp/json/json_features.h +include/jsoncpp/json/reader.h +include/jsoncpp/json/value.h +include/jsoncpp/json/version.h +include/jsoncpp/json/writer.h lib/cmake/jsoncpp/jsoncpp-namespaced-targets.cmake lib/cmake/jsoncpp/jsoncppConfig.cmake lib/libjsoncpp.a lib/libjsoncpp.so -lib/libjsoncpp.so.26 +lib/libjsoncpp.so.27 libdata/pkgconfig/jsoncpp.pc