diff --git a/devel/bear/Makefile b/devel/bear/Makefile
--- a/devel/bear/Makefile
+++ b/devel/bear/Makefile
@@ -1,33 +1,42 @@
 # Created by: Jov <amutu@amutu.com>
 
 PORTNAME=	bear
-DISTVERSION=	2.4.4
+DISTVERSION=	3.0.13
 CATEGORIES=	devel
-PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Tool that generates a compilation database for clang tooling
 
-LICENSE=	GPLv3
+LICENSE=	GPLv3+
 
-USES=		cmake python shebangfix
+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
 
-SHEBANG_FILES=	bear/bear.py
-python_OLD_CMD=	"/usr/bin/env @BEAR_PYTHON_EXECUTABLE@"
+CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \
+		-DENABLE_FUNC_TESTS=OFF \
+		-DENABLE_UNIT_TESTS=OFF
 
 OPTIONS_DEFINE=	DOCS
 
-post-patch:
-	${REINPLACE_CMD} -e '/install(FILES COPYING/d' \
-		-e '/{CMAKE_INSTALL_DOCDIR}/d' \
-		${WRKSRC}/CMakeLists.txt
+pre-install:
+	${MV} ${STAGEDIR}/${CONFIGURE_WRKSRC}/stage ${CONFIGURE_WRKSRC}/
+	${RM} -r ${STAGEDIR}/wrkdirs
 
-post-install-DOCS-on:
-	${MKDIR} ${STAGEDIR}${DOCSDIR}
-	${INSTALL_DATA} ${WRKSRC}/README.md ${STAGEDIR}${DOCSDIR}
+post-install:
+.for l in bin/citnames bin/intercept libexec/bear/libexec.so libexec/bear/wrapper
+	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${l}
+.endfor
 
 .include <bsd.port.mk>
diff --git a/devel/bear/distinfo b/devel/bear/distinfo
--- a/devel/bear/distinfo
+++ b/devel/bear/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1600094981
-SHA256 (rizsotto-Bear-2.4.4_GH0.tar.gz) = 5e95c9fe24714bcb98b858f0f0437aff76ad96b1d998940c0684c3a9d3920e82
-SIZE (rizsotto-Bear-2.4.4_GH0.tar.gz) = 50347
+TIMESTAMP = 1626064165
+SHA256 (rizsotto-Bear-3.0.13_GH0.tar.gz) = b57d9b139acbbad6439f5b1133266fa5afc5eb095a61cfa07cd9e8941943ae22
+SIZE (rizsotto-Bear-3.0.13_GH0.tar.gz) = 120488
diff --git a/devel/bear/pkg-plist b/devel/bear/pkg-plist
--- a/devel/bear/pkg-plist
+++ b/devel/bear/pkg-plist
@@ -1,5 +1,14 @@
 bin/bear
-lib/bear/libear.so
+bin/citnames
+bin/intercept
+libexec/bear/libexec.so
+libexec/bear/wrapper
 man/man1/bear.1.gz
-share/bash-completion/completions/bear
+man/man1/citnames.1.gz
+man/man1/intercept.1.gz
+%%PORTDOCS%%%%DOCSDIR%%/CODE_OF_CONDUCT.md
+%%PORTDOCS%%%%DOCSDIR%%/CONTRIBUTING.md
+%%PORTDOCS%%%%DOCSDIR%%/COPYING
+%%PORTDOCS%%%%DOCSDIR%%/INSTALL.md
 %%PORTDOCS%%%%DOCSDIR%%/README.md
+@dir libexec/bear/wrapper.d