diff --git a/devel/jsoncpp/Makefile b/devel/jsoncpp/Makefile index a05c1bc14a4e..c694b53a7bb1 100644 --- a/devel/jsoncpp/Makefile +++ b/devel/jsoncpp/Makefile @@ -1,21 +1,22 @@ PORTNAME= jsoncpp DISTVERSION= 1.9.6 +PORTREVISION= 1 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 USE_GITHUB= yes GH_ACCOUNT= open-source-parsers MESON_ARGS= --default-library=both USE_LDCONFIG= yes CPE_VENDOR= jsoncpp_project TEST_TARGET= test .include diff --git a/devel/jsoncpp/files/patch-jsoncppConfig.cmake.meson.in b/devel/jsoncpp/files/patch-jsoncppConfig.cmake.meson.in new file mode 100644 index 000000000000..ea15d52a7708 --- /dev/null +++ b/devel/jsoncpp/files/patch-jsoncppConfig.cmake.meson.in @@ -0,0 +1,23 @@ +- 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)