Date: Fri, 17 Sep 2021 03:02:05 GMT From: Joseph Mingrone <jrm@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: a7a9b15e4716 - main - devel/bear: Update to 3.0.15 Message-ID: <202109170302.18H325WS077268@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=a7a9b15e4716dc8fb8ac3791efbb74a309fb04a4 commit a7a9b15e4716dc8fb8ac3791efbb74a309fb04a4 Author: Joseph Mingrone <jrm@FreeBSD.org> AuthorDate: 2021-09-13 17:33:56 +0000 Commit: Joseph Mingrone <jrm@FreeBSD.org> CommitDate: 2021-09-17 03:00:51 +0000 devel/bear: Update to 3.0.15 Unlike the dynamic linker included with GNU/Linux distributions, $LIB is not a token strings that our dynamic linker defines. This update includes a local patch to fix a runtime problem by hardcoding bear's $LIB dynamic token with the value 'lib'. Upstream PR: https://github.com/rizsotto/Bear/issues/409 Release notes: https://github.com/rizsotto/Bear/releases/tag/3.0.15 --- devel/bear/Makefile | 6 +++--- devel/bear/distinfo | 6 +++--- devel/bear/files/patch-source_config.h.in | 11 +++++++++++ devel/bear/pkg-plist | 6 +++--- 4 files changed, 20 insertions(+), 9 deletions(-) diff --git a/devel/bear/Makefile b/devel/bear/Makefile index dc81e49283b6..9f47a29c02fd 100644 --- a/devel/bear/Makefile +++ b/devel/bear/Makefile @@ -1,7 +1,7 @@ # Created by: Jov <amutu@amutu.com> PORTNAME= bear -DISTVERSION= 3.0.14 +DISTVERSION= 3.0.15 CATEGORIES= devel MAINTAINER= jrm@FreeBSD.org @@ -22,7 +22,7 @@ USES= cmake compiler:c++17-lang pkgconfig USE_GITHUB= yes GH_ACCOUNT= rizsotto GH_PROJECT= Bear -USE_LDCONFIG= yes +USE_LDCONFIG= ${PREFIX}/lib/${PORTNAME} CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \ -DENABLE_FUNC_TESTS=OFF \ @@ -42,7 +42,7 @@ pre-install: ${RM} -r ${STAGEDIR}/wrkdirs post-install: -.for l in bin/citnames bin/intercept libexec/bear/libexec.so libexec/bear/wrapper +.for l in bin/citnames bin/intercept lib/bear/libexec.so lib/bear/wrapper @${STRIP_CMD} ${STAGEDIR}${PREFIX}/${l} .endfor diff --git a/devel/bear/distinfo b/devel/bear/distinfo index dd538b7d4bd7..75cc4e475a1a 100644 --- a/devel/bear/distinfo +++ b/devel/bear/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1630542283 -SHA256 (rizsotto-Bear-3.0.14_GH0.tar.gz) = aaf7c615b306bb39ffb2ba80f961784818f3d69c7f4cbffbeb04fc1b91bb6000 -SIZE (rizsotto-Bear-3.0.14_GH0.tar.gz) = 122896 +TIMESTAMP = 1631501724 +SHA256 (rizsotto-Bear-3.0.15_GH0.tar.gz) = a121ef68f58fdd0cc9fade11a98ae87c7d4d69cbf8d05b3c19624095d23b9a39 +SIZE (rizsotto-Bear-3.0.15_GH0.tar.gz) = 122875 diff --git a/devel/bear/files/patch-source_config.h.in b/devel/bear/files/patch-source_config.h.in new file mode 100644 index 000000000000..66bba3ec6b3f --- /dev/null +++ b/devel/bear/files/patch-source_config.h.in @@ -0,0 +1,11 @@ +--- source/config.h.in.orig 2021-09-17 02:20:21 UTC ++++ source/config.h.in +@@ -132,7 +132,7 @@ namespace cmd { + // And use the `libexec.so` path default value with a single path, + // that matches both. (The match can be achieved by the $LIB token + // expansion from the dynamic loader. See `man ld.so` for more.) +- constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/$LIB/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; ++ constexpr char DEFAULT_PATH[] = "@ROOT_INSTALL_PREFIX@/lib/bear/@CMAKE_SHARED_LIBRARY_PREFIX@exec@CMAKE_SHARED_LIBRARY_SUFFIX@"; + + constexpr char KEY_REPORTER[] = "INTERCEPT_REPORT_COMMAND"; + constexpr char KEY_DESTINATION[] = "INTERCEPT_REPORT_DESTINATION"; diff --git a/devel/bear/pkg-plist b/devel/bear/pkg-plist index 039ad0511ae8..c903877d1fb2 100644 --- a/devel/bear/pkg-plist +++ b/devel/bear/pkg-plist @@ -1,8 +1,8 @@ bin/bear bin/citnames bin/intercept -libexec/bear/libexec.so -libexec/bear/wrapper +lib/bear/libexec.so +lib/bear/wrapper man/man1/bear.1.gz man/man1/citnames.1.gz man/man1/intercept.1.gz @@ -11,4 +11,4 @@ man/man1/intercept.1.gz %%PORTDOCS%%%%DOCSDIR%%/COPYING %%PORTDOCS%%%%DOCSDIR%%/INSTALL.md %%PORTDOCS%%%%DOCSDIR%%/README.md -@dir libexec/bear/wrapper.d +@dir lib/bear/wrapper.d
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202109170302.18H325WS077268>