diff --git a/devel/bear/Makefile b/devel/bear/Makefile index f55574ded586..15addf396373 100644 --- a/devel/bear/Makefile +++ b/devel/bear/Makefile @@ -1,50 +1,52 @@ # Created by: Jov PORTNAME= bear DISTVERSION= 3.0.13 PORTREVISION= 2 CATEGORIES= devel MAINTAINER= jrm@FreeBSD.org COMMENT= Tool that generates a compilation database for clang tooling LICENSE= GPLv3+ +BROKEN= Incompatible with nlohmann-json-3.10.0, see https://github.com/rizsotto/Bear/issues/396 + BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libabsl_hash.so:devel/abseil \ libcares.so:dns/c-ares \ libfmt.so:devel/libfmt \ libgrpc.so:devel/grpc \ libprotobuf.so:devel/protobuf \ libre2.so:devel/re2 \ libspdlog.so:devel/spdlog USES= cmake compiler:c++17-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= rizsotto GH_PROJECT= Bear USE_LDCONFIG= yes CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \ -DENABLE_FUNC_TESTS=OFF \ -DENABLE_UNIT_TESTS=OFF OPTIONS_DEFINE= DOCS .include # Patch 11.x, which requires #define _WITH_DPRINTF .if ${OPSYS} == FreeBSD && ${OSVERSION} < 1200000 EXTRA_PATCHES= ${PATCHDIR}/extra-patch-source_intercept_source_report_libexec_Logger.cc .endif pre-install: ${MV} ${STAGEDIR}/${CONFIGURE_WRKSRC}/stage ${CONFIGURE_WRKSRC}/ ${RM} -r ${STAGEDIR}/wrkdirs post-install: .for l in bin/citnames bin/intercept libexec/bear/libexec.so libexec/bear/wrapper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${l} .endfor .include diff --git a/devel/nlohmann-json/Makefile b/devel/nlohmann-json/Makefile index 41b6ffcbce8c..a6e92b6c1a1f 100644 --- a/devel/nlohmann-json/Makefile +++ b/devel/nlohmann-json/Makefile @@ -1,32 +1,31 @@ # Created by: Viacheslav Mikerov PORTNAME= json DISTVERSIONPREFIX= v -DISTVERSION= 3.9.1 -PORTREVISION= 2 +DISTVERSION= 3.10.0 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 USE_GITHUB= yes GH_ACCOUNT= nlohmann NO_BUILD= yes NO_ARCH= yes CMAKE_ON= JSON_MultipleHeaders CMAKE_OFF= JSON_BuildTests -do-test: +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 .include diff --git a/devel/nlohmann-json/distinfo b/devel/nlohmann-json/distinfo index 5ef098df5d39..5d4b2d6adae9 100644 --- a/devel/nlohmann-json/distinfo +++ b/devel/nlohmann-json/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1596777581 -SHA256 (nlohmann-json-v3.9.1_GH0.tar.gz) = 4cf0df69731494668bdd6460ed8cb269b68de9c19ad8c27abc24cd72605b2d5b -SIZE (nlohmann-json-v3.9.1_GH0.tar.gz) = 6882818 +TIMESTAMP = 1629304548 +SHA256 (nlohmann-json-v3.10.0_GH0.tar.gz) = eb8b07806efa5f95b349766ccc7a8ec2348f3b2ee9975ad879259a371aea8084 +SIZE (nlohmann-json-v3.10.0_GH0.tar.gz) = 7006504 diff --git a/devel/nlohmann-json/pkg-plist b/devel/nlohmann-json/pkg-plist index 26cc1277304f..ab779029d441 100644 --- a/devel/nlohmann-json/pkg-plist +++ b/devel/nlohmann-json/pkg-plist @@ -1,41 +1,43 @@ include/nlohmann/adl_serializer.hpp include/nlohmann/byte_container_with_subtype.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/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/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_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