diff --git a/net/bctoolbox/Makefile b/net/bctoolbox/Makefile
index 7dc10b37fdb5..e2b34adb2df2 100644
--- a/net/bctoolbox/Makefile
+++ b/net/bctoolbox/Makefile
@@ -1,33 +1,32 @@
 PORTNAME=	bctoolbox
-DISTVERSION=	5.1.38
-PORTREVISION=	1
+DISTVERSION=	5.2.37
 CATEGORIES=	net
 
 MAINTAINER=	bofh@FreeBSD.org
 COMMENT=	Belledonne Communications utility library
 WWW=		https://gitlab.linphone.org/BC/public/bctoolbox
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	mbedtls>=2.3.0_2:security/mbedtls
 LIB_DEPENDS=	libbcunit.so:devel/bcunit \
 	libmbedtls.so:security/mbedtls
 
-USES=		cmake compiler:c++11-lib
+USES=		cmake compiler:c++17-lang
 USE_GITLAB=	yes
 GL_SITE=	https://gitlab.linphone.org/BC
 GL_ACCOUNT=	public
-GL_COMMIT=	32ea3c32d3352400d49d89fcbc36ca7006a532d9
+GL_COMMIT=	02c84d3563ee054a977f5f2d8357d94d095145a5
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DENABLE_STATIC=NO -DENABLE_STRICT=NO \
 		-DCMAKE_PREFIX_PATH=${LOCALBASE} \
 		-DCMAKE_SKIP_INSTALL_RPATH=ON
 
 CFLAGS+=	-DHAVE_ARC4RANDOM
 
 post-patch:
 	@${REINPLACE_CMD} '/clock_gettime/d' ${WRKSRC}/CMakeLists.txt
 
 .include <bsd.port.mk>
diff --git a/net/bctoolbox/distinfo b/net/bctoolbox/distinfo
index f5e4aebdcaa8..f1056195d0b0 100644
--- a/net/bctoolbox/distinfo
+++ b/net/bctoolbox/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1665929746
-SHA256 (public-bctoolbox-32ea3c32d3352400d49d89fcbc36ca7006a532d9_GL0.tar.gz) = b51c66165ac824997416c78cd3e35056e26a2e698b8c2de72dcd9cc8f6532733
-SIZE (public-bctoolbox-32ea3c32d3352400d49d89fcbc36ca7006a532d9_GL0.tar.gz) = 181701
+TIMESTAMP = 1679153184
+SHA256 (public-bctoolbox-02c84d3563ee054a977f5f2d8357d94d095145a5_GL0.tar.gz) = 5c8b275098ef43715e8515481729c2493201b4e58b3a41ed8e4423ddcca2765a
+SIZE (public-bctoolbox-02c84d3563ee054a977f5f2d8357d94d095145a5_GL0.tar.gz) = 197723
diff --git a/net/bctoolbox/files/patch-src-CMakeLists.txt b/net/bctoolbox/files/patch-src-CMakeLists.txt
index 2ae0a23516fa..b4d9b84b2737 100644
--- a/net/bctoolbox/files/patch-src-CMakeLists.txt
+++ b/net/bctoolbox/files/patch-src-CMakeLists.txt
@@ -1,10 +1,10 @@
---- src/CMakeLists.txt.orig	2022-05-27 19:35:26 UTC
+--- src/CMakeLists.txt.orig	2023-03-14 19:53:03 UTC
 +++ src/CMakeLists.txt
-@@ -177,6 +177,7 @@ if(ENABLE_SHARED)
+@@ -195,6 +195,7 @@ if(ENABLE_SHARED)
  			)
  		endif()
  	endif()
 +	target_link_libraries(bctoolbox PRIVATE execinfo)
  	if(HAVE_LIBRT)
  		target_link_libraries(bctoolbox PRIVATE rt)
  	endif()
diff --git a/net/bctoolbox/files/patch-src-utils-port.c b/net/bctoolbox/files/patch-src-utils-port.c
index c6bc479b4ef7..fed17d6fe56c 100644
--- a/net/bctoolbox/files/patch-src-utils-port.c
+++ b/net/bctoolbox/files/patch-src-utils-port.c
@@ -1,11 +1,20 @@
---- src/utils/port.c.orig	2022-05-27 19:35:26 UTC
+--- src/utils/port.c.orig	2023-03-14 19:53:03 UTC
 +++ src/utils/port.c
-@@ -1438,7 +1438,7 @@ void bctbx_sockaddr_remove_nat64_mapping(const struct 
+@@ -371,7 +371,7 @@ void bctbx_set_self_thread_name(const char *name){
+ 	prctl(PR_SET_NAME, name, NULL, NULL, NULL);
+ #elif TARGET_OS_MAC
+ 	pthread_setname_np(name);
+-#elif
++#else
+ 	bctbx_warning("bctbx_set_self_thread_name(): not implemented on this platform.");
+ #endif
+ }
+@@ -1642,7 +1642,7 @@ void bctbx_sockaddr_remove_nat64_mapping(const struct 
  		if (htonl(0x0064ff9b) ==
  #ifdef _MSC_VER
  			((in6->sin6_addr.u.Word[0] << 16) & in6->sin6_addr.u.Word[1])
 -#elif __APPLE__
 +#elif __APPLE__ || __FreeBSD__
  			in6->sin6_addr.__u6_addr.__u6_addr32[0]
  #else
  			in6->sin6_addr.s6_addr32[0]
diff --git a/net/bctoolbox/pkg-plist b/net/bctoolbox/pkg-plist
index 295b3edfd659..09d81acf3588 100644
--- a/net/bctoolbox/pkg-plist
+++ b/net/bctoolbox/pkg-plist
@@ -1,34 +1,35 @@
 include/bctoolbox/charconv.h
 include/bctoolbox/compiler.h
 include/bctoolbox/crypto.h
 include/bctoolbox/crypto.hh
 include/bctoolbox/defs.h
 include/bctoolbox/exception.hh
 include/bctoolbox/list.h
 include/bctoolbox/logging.h
 include/bctoolbox/map.h
+include/bctoolbox/ownership.hh
 include/bctoolbox/param_string.h
 include/bctoolbox/parser.h
 include/bctoolbox/port.h
 include/bctoolbox/regex.h
 include/bctoolbox/tester.h
 include/bctoolbox/utils.hh
 include/bctoolbox/vconnect.h
 include/bctoolbox/vfs.h
 include/bctoolbox/vfs_encrypted.hh
 include/bctoolbox/vfs_standard.h
 lib/libbctoolbox.so
 lib/libbctoolbox.so.1
 lib/libbctoolbox-tester.so
 lib/libbctoolbox-tester.so.1
 libdata/pkgconfig/bctoolbox.pc
 libdata/pkgconfig/bctoolbox-tester.pc
 %%DATADIR%%/cmake/ConfigureSpecfile.cmake
 %%DATADIR%%/cmake/MakeArchive.cmake
 %%DATADIR%%/cmake/bctoolboxCMakeUtils.cmake
 %%DATADIR%%/cmake/bctoolboxConfig.cmake
 %%DATADIR%%/cmake/bctoolboxConfigVersion.cmake
 %%DATADIR%%/cmake/bctoolboxTargets-%%CMAKE_BUILD_TYPE%%.cmake
 %%DATADIR%%/cmake/bctoolboxTargets.cmake
 %%DATADIR%%/cmake/BcGitVersion.cmake
 %%DATADIR%%/cmake/gitversion.h.in