diff --git a/devel/bear/Makefile b/devel/bear/Makefile index 0dabf69465ed..36faaf347409 100644 --- a/devel/bear/Makefile +++ b/devel/bear/Makefile @@ -1,39 +1,58 @@ PORTNAME= bear -DISTVERSION= 3.1.3 -PORTREVISION= 10 +DISTVERSION= 3.1.4 CATEGORIES= devel MAINTAINER= jrm@FreeBSD.org COMMENT= Tool that generates a compilation database for clang tooling WWW= https://github.com/rizsotto/Bear LICENSE= GPLv3+ +LICENSE_FILE= ${WRKSRC}/COPYING BUILD_DEPENDS= nlohmann-json>0:devel/nlohmann-json LIB_DEPENDS= libabsl_hash.so:devel/abseil \ libfmt.so:devel/libfmt \ libgrpc.so:devel/grpc \ libprotobuf.so:devel/protobuf \ libspdlog.so:devel/spdlog USES= cmake compiler:c++17-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= rizsotto GH_PROJECT= Bear CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \ -DENABLE_FUNC_TESTS=OFF \ -DENABLE_UNIT_TESTS=OFF +SUB_FILES= pkg-message + OPTIONS_DEFINE= DOCS +CLANG_COMPILERS= 33 34 35 36 37 38 39 40 50 60 70 80 90 10 11 12 13 14 \ + 15 16 17 18 19 20 +GNU_COMPILERS= 34 42 43 44 45 46 47 48 49 5 6 7 8 9 10 11 12 13 14 15 +COMPILERS= cc c++ CC clang clang++ ${CLANG_COMPILERS:S|^|clang|} \ + ${CLANG_COMPILERS:S|^|clang++|} \ + ${CLANG_COMPILERS:S|^|cpp|} gcc g++ \ + ${GNU_COMPILERS:S|^|gcc|} ${GNU_COMPILERS:S|^|g++|} \ + ${GNU_COMPILERS:S|^|cpp|} icc icpc llvm-gcc llvm-c++ \ + llvm-g++ +WRAPPERS= ${COMPILERS} R ar as bison ctangle cweave f77 flex \ + gfortran ld lex lint m2c makeinfo nm objcopy objdump pc \ + ranlib readelf strip tangle tex tex2dvi weave yacc + pre-install: ${MV} ${STAGEDIR}/${CONFIGURE_WRKSRC}/stage ${CONFIGURE_WRKSRC}/ ${RM} -r ${STAGEDIR}/wrkdirs post-install: .for l in bin/bear lib/bear/libexec.so lib/bear/wrapper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${l} .endfor +.for w in ${WRAPPERS} + ${RLN} ${STAGEDIR}${PREFIX}/lib/bear/wrapper \ + ${STAGEDIR}${PREFIX}/lib/bear/wrapper.d/${w} +.endfor .include diff --git a/devel/bear/distinfo b/devel/bear/distinfo index 57d5fc1d7d10..d9d94c3ce7d6 100644 --- a/devel/bear/distinfo +++ b/devel/bear/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1693499687 -SHA256 (rizsotto-Bear-3.1.3_GH0.tar.gz) = 8314438428069ffeca15e2644eaa51284f884b7a1b2ddfdafe12152581b13398 -SIZE (rizsotto-Bear-3.1.3_GH0.tar.gz) = 127766 +TIMESTAMP = 1723773120 +SHA256 (rizsotto-Bear-3.1.4_GH0.tar.gz) = a1105023795b3e1b9abc29c088cdec5464cc9f3b640b5078dc90a505498da5ff +SIZE (rizsotto-Bear-3.1.4_GH0.tar.gz) = 127672 diff --git a/devel/bear/files/patch-protobuf b/devel/bear/files/patch-protobuf deleted file mode 100644 index 4f7ea7ae961b..000000000000 --- a/devel/bear/files/patch-protobuf +++ /dev/null @@ -1,24 +0,0 @@ -Obtained from: https://github.com/rizsotto/Bear/commit/3ba056a6cdebd1608279e89b021e7c28bcee3ea3 - ---- source/intercept/source/collect/db/EventsDatabaseWriter.cc.orig 2023-08-28 08:46:17 UTC -+++ source/intercept/source/collect/db/EventsDatabaseWriter.cc -@@ -21,6 +21,8 @@ - #include "libsys/Errors.h" - - #include -+#include -+ - #include - - #include -@@ -36,7 +38,9 @@ namespace { - JsonPrintOptions create_print_options() { - JsonPrintOptions print_options; - print_options.add_whitespace = false; -- print_options.always_print_primitive_fields = true; -+#if GOOGLE_PROTOBUF_VERSION < 5026000 -+ print_options.always_print_primitive_fields = true; -+#endif - print_options.preserve_proto_field_names = true; - print_options.always_print_enums_as_ints = false; - return print_options; diff --git a/devel/bear/files/pkg-message.in b/devel/bear/files/pkg-message.in new file mode 100644 index 000000000000..50b7d1aa64ec --- /dev/null +++ b/devel/bear/files/pkg-message.in @@ -0,0 +1,20 @@ +[ +{type: [install, upgrade], message: <