diff --git a/devel/nlohmann-json/Makefile b/devel/nlohmann-json/Makefile index 486dd2fac750..3953ace69711 100644 --- a/devel/nlohmann-json/Makefile +++ b/devel/nlohmann-json/Makefile @@ -1,29 +1,24 @@ PORTNAME= json DISTVERSIONPREFIX= v -DISTVERSION= 3.10.5 +DISTVERSION= 3.11.2 CATEGORIES= devel PKGNAMEPREFIX= nlohmann- MAINTAINER= yuri@FreeBSD.org COMMENT= JSON library for Modern C++ LICENSE= MIT LICENSE_FILE= ${WRKSRC}/LICENSE.MIT -USES= cmake compiler:c++11-lib +USES= cmake:testing compiler:c++11-lib USE_GITHUB= yes GH_ACCOUNT= nlohmann NO_BUILD= yes NO_ARCH= yes CMAKE_ON= JSON_MultipleHeaders CMAKE_OFF= JSON_BuildTests - -do-test: # 2 tests are expected to fail, see https://github.com/nlohmann/json/issues/2951 - @cd ${BUILD_WRKSRC} && \ - ${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DJSON_BuildTests:BOOL=ON ${CMAKE_SOURCE_PATH} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \ - ${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test +CMAKE_TESTING_ON= JSON_BuildTests # 2 tests are expected to fail, see https://github.com/nlohmann/json/issues/2951 .include diff --git a/devel/nlohmann-json/distinfo b/devel/nlohmann-json/distinfo index 29373766e0b0..4a257e5d0596 100644 --- a/devel/nlohmann-json/distinfo +++ b/devel/nlohmann-json/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1642035129 -SHA256 (nlohmann-json-v3.10.5_GH0.tar.gz) = 5daca6ca216495edf89d167f808d1d03c4a4d929cef7da5e10f135ae1540c7e4 -SIZE (nlohmann-json-v3.10.5_GH0.tar.gz) = 7021996 +TIMESTAMP = 1660396550 +SHA256 (nlohmann-json-v3.11.2_GH0.tar.gz) = d69f9deb6a75e2580465c6c4c5111b89c4dc2fa94e3a85fcd2ffcd9a143d9273 +SIZE (nlohmann-json-v3.11.2_GH0.tar.gz) = 8097673 diff --git a/devel/nlohmann-json/pkg-plist b/devel/nlohmann-json/pkg-plist index 302a0c6cf5c1..fb15794bdf36 100644 --- a/devel/nlohmann-json/pkg-plist +++ b/devel/nlohmann-json/pkg-plist @@ -1,45 +1,48 @@ include/nlohmann/adl_serializer.hpp include/nlohmann/byte_container_with_subtype.hpp +include/nlohmann/detail/abi_macros.hpp include/nlohmann/detail/conversions/from_json.hpp include/nlohmann/detail/conversions/to_chars.hpp include/nlohmann/detail/conversions/to_json.hpp include/nlohmann/detail/exceptions.hpp include/nlohmann/detail/hash.hpp include/nlohmann/detail/input/binary_reader.hpp include/nlohmann/detail/input/input_adapters.hpp include/nlohmann/detail/input/json_sax.hpp include/nlohmann/detail/input/lexer.hpp include/nlohmann/detail/input/parser.hpp include/nlohmann/detail/input/position_t.hpp include/nlohmann/detail/iterators/internal_iterator.hpp include/nlohmann/detail/iterators/iter_impl.hpp include/nlohmann/detail/iterators/iteration_proxy.hpp include/nlohmann/detail/iterators/iterator_traits.hpp include/nlohmann/detail/iterators/json_reverse_iterator.hpp include/nlohmann/detail/iterators/primitive_iterator.hpp include/nlohmann/detail/json_pointer.hpp include/nlohmann/detail/json_ref.hpp include/nlohmann/detail/macro_scope.hpp include/nlohmann/detail/macro_unscope.hpp include/nlohmann/detail/meta/call_std/begin.hpp include/nlohmann/detail/meta/call_std/end.hpp include/nlohmann/detail/meta/cpp_future.hpp include/nlohmann/detail/meta/detected.hpp include/nlohmann/detail/meta/identity_tag.hpp include/nlohmann/detail/meta/is_sax.hpp +include/nlohmann/detail/meta/std_fs.hpp include/nlohmann/detail/meta/type_traits.hpp include/nlohmann/detail/meta/void_t.hpp include/nlohmann/detail/output/binary_writer.hpp include/nlohmann/detail/output/output_adapters.hpp include/nlohmann/detail/output/serializer.hpp +include/nlohmann/detail/string_concat.hpp include/nlohmann/detail/string_escape.hpp include/nlohmann/detail/value_t.hpp include/nlohmann/json.hpp include/nlohmann/json_fwd.hpp include/nlohmann/ordered_map.hpp include/nlohmann/thirdparty/hedley/hedley.hpp include/nlohmann/thirdparty/hedley/hedley_undef.hpp -lib/cmake/nlohmann_json/nlohmann_jsonConfig.cmake -lib/cmake/nlohmann_json/nlohmann_jsonConfigVersion.cmake -lib/cmake/nlohmann_json/nlohmann_jsonTargets.cmake -libdata/pkgconfig/nlohmann_json.pc +share/cmake/nlohmann_json/nlohmann_jsonConfig.cmake +share/cmake/nlohmann_json/nlohmann_jsonConfigVersion.cmake +share/cmake/nlohmann_json/nlohmann_jsonTargets.cmake +share/pkgconfig/nlohmann_json.pc