diff --git a/chinese/librime/Makefile b/chinese/librime/Makefile
index b1cd8f3abe62..bcbaaa034123 100644
--- a/chinese/librime/Makefile
+++ b/chinese/librime/Makefile
@@ -1,40 +1,44 @@
 PORTNAME=	librime
 PORTVERSION=	1.7.3
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	chinese textproc
 
+PATCH_SITES=	https://github.com/rime/librime/commit/
+PATCHFILES=	c34c9ea4069bdba9d0f829e615769d79549701a9.patch:-p1
+
 MAINTAINER=	khng@FreeBSD.org
 COMMENT=	Rime Input Method Engine, the core library
 WWW=		https://rime.github.io/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_thread.so:devel/boost-libs \
 		libcapnp.so:devel/capnproto \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libleveldb.so:databases/leveldb \
 		libmarisa.so:devel/marisa-trie \
 		libopencc.so:chinese/opencc \
 		libyaml-cpp.so:devel/yaml-cpp \
 
 USES=		cmake compiler:c++14-lang gettext pathfix perl5 pkgconfig xorg
 USE_PERL5=	build patch
 
 CMAKE_OFF=	BUILD_TEST
 
 USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 USE_XORG=	xorgproto
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 LDFLAGS+=	-lintl
 USE_GITHUB=	yes
 GH_ACCOUNT=	rime
 
 PLIST_SUB=	VER=${PORTVERSION}
 
 post-patch:
 	@${FIND} ${WRKSRC} \( -name '*.cc' -or -name '*.h' \) \
 		-exec ${PERL} -i -pe '$$. == 1 && s/^\xef\xbb\xbf//;' {} \;
 
 .include <bsd.port.mk>
diff --git a/chinese/librime/distinfo b/chinese/librime/distinfo
index 8da45344ab8b..b5246846ba5c 100644
--- a/chinese/librime/distinfo
+++ b/chinese/librime/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1638225885
+TIMESTAMP = 1709459567
 SHA256 (rime-librime-1.7.3_GH0.tar.gz) = c76b937a27d7b9352c3eea9eb3adaebf70c93457104c7d47d40c006009092c20
 SIZE (rime-librime-1.7.3_GH0.tar.gz) = 2859513
+SHA256 (c34c9ea4069bdba9d0f829e615769d79549701a9.patch) = a2600c1e70e9d009552a69c71f16d7e73586a1ac42be44afad80b3157841f83d
+SIZE (c34c9ea4069bdba9d0f829e615769d79549701a9.patch) = 1751
diff --git a/devel/fbthrift/Makefile b/devel/fbthrift/Makefile
index b9385a585fd4..a7293f071ef8 100644
--- a/devel/fbthrift/Makefile
+++ b/devel/fbthrift/Makefile
@@ -1,49 +1,51 @@
 PORTNAME=	fbthrift
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2024.03.04.00
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Facebook's branch of Apache Thrift, including a new C++ server
 WWW=		https://github.com/facebook/fbthrift
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	range-v3>0:devel/range-v3
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libmvfst_state_machine.so:net/mvfst \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libwangle.so:net/wangle \
 		libzstd.so:archivers/zstd
 
 USES=		bison cmake:testing compiler:c++17-lang ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_TESTING_ON=	enable_tests
 
 CXXFLAGS+=	-fPIC # https://github.com/facebook/fbthrift/issues/399
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 post-install: # https://github.com/facebook/fbthrift/issues/393
 	@${FIND} ${STAGEDIR}${PREFIX}/include -type d -empty -delete
 
 do-test: # no 'test' target, contrary to what the documentation says, see https://github.com/facebook/fbthrift/issues/533
 	@cd ${TEST_WRKSRC} && ${MAKE_CMD} test
 
 .include <bsd.port.mk>
diff --git a/devel/folly/Makefile b/devel/folly/Makefile
index 01f0ef611f5c..db803423431a 100644
--- a/devel/folly/Makefile
+++ b/devel/folly/Makefile
@@ -1,54 +1,56 @@
 PORTNAME=	folly
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2024.03.04.00
+PORTREVISION=	1
 CATEGORIES=	devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++ library developed and used at Facebook
 WWW=		https://github.com/facebook/folly
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_i386=	error: use of undeclared identifier 'DCHECK': https://github.com/facebook/folly/issues/1168
 BROKEN_powerpc=		compilation fails: Big endian requires a redesigned table (assert in folly/detail/base64_detail/Base64SWAR.cpp:107)
 BROKEN_powerpc64=	compilation fails: Big endian requires a redesigned table (assert in folly/detail/base64_detail/Base64SWAR.cpp:107)
 
 BUILD_DEPENDS=	elfutils>0:devel/elfutils # workaround for missing symbols like DW_UT_compile: https://github.com/facebook/folly/issues/1654
 LIB_DEPENDS=	libboost_atomic.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfmt.so:devel/libfmt \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	elfutils>0:devel/elfutils # workaround for missing symbols like DW_UT_compile: https://github.com/facebook/folly/issues/1654
 TEST_DEPENDS=	googletest>0:devel/googletest
 
 USES=		cmake compiler:c++17-lang cpe localbase ssl
 USE_LDCONFIG=	yes
 
 CPE_VENDOR=	facebook
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	FREEBSD_BUILD_EXAMPLES FREEBSD_FOLLY_USE_SYMBOLIZER # enabling symbolizer causes undefined symbol _r_debug, see https://github.com/facebook/folly/issues/1373
 #CMAKE_OFF+=	FOLLY_USE_JEMALLOC # Build fails with FOLLY_USE_JEMALLOC=OFF, see https://github.com/facebook/folly/issues/1893
 
 CXXFLAGS+=	-fPIC
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 CXXFLAGS_powerpc64=	-DFOLLY_QUOTIENT_MULTI_SET_SUPPORTED=0
 
 do-test: # tests fail to compile, see https://github.com/facebook/folly/issues/2032
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DBUILD_TESTS:BOOL=ON ${CMAKE_SOURCE_PATH} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} ${ALL_TARGET} && \
 		${SETENV} ${MAKE_ENV} ${MAKE_CMD} ${MAKE_ARGS} test
 
 .include <bsd.port.mk>
diff --git a/devel/folly/files/patch-folly_experimental_symbolizer_Elf.cpp b/devel/folly/files/patch-folly_experimental_symbolizer_Elf.cpp
new file mode 100644
index 000000000000..a829255f948d
--- /dev/null
+++ b/devel/folly/files/patch-folly_experimental_symbolizer_Elf.cpp
@@ -0,0 +1,10 @@
+--- folly/experimental/symbolizer/Elf.cpp.orig	2024-02-16 02:33:47 UTC
++++ folly/experimental/symbolizer/Elf.cpp
+@@ -19,6 +19,7 @@
+ #include <fcntl.h>
+ #include <sys/stat.h>
+ #include <sys/types.h>
++#include <unistd.h>
+ #include <cstring>
+ #include <string>
+ 
diff --git a/devel/glog/Makefile b/devel/glog/Makefile
index 87253513c661..c1f209b7f80b 100644
--- a/devel/glog/Makefile
+++ b/devel/glog/Makefile
@@ -1,31 +1,32 @@
 PORTNAME=	glog
-PORTVERSION=	0.6.0
+PORTVERSION=	0.7.0
 DISTVERSIONPREFIX=	v
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Library of C++ classes for flexible logging
 WWW=		https://github.com/google/glog
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libgflags.so:devel/gflags \
 		libunwind.so:devel/libunwind
+TEST_DEPENDS=	googletest>=0:devel/googletest
 
-USES=		cmake compiler:c++11-lang pkgconfig
-
-CMAKE_ON=	BUILD_SHARED_LIBS WITH_CUSTOM_PREFIX WITH_GFLAGS WITH_PKGCONFIG WITH_SYMBOLIZE WITH_THREADS WITH_TLS WITH_UNWIND
-CMAKE_OFF=	PRINT_UNSYMBOLIZED_STACK_TRACES WITH_GTEST
+USES=		cmake:testing compiler:c++14-lang
 
+CMAKE_ARGS=	-DWITH_FUZZING=none -DWITH_UNWIND=libunwind
+CMAKE_OFF=	PRINT_UNSYMBOLIZED_STACK_TRACES WITH_GMOCK WITH_GTEST
+CMAKE_ON=	BUILD_SHARED_LIBS WITH_GFLAGS WITH_PKGCONFIG WITH_SYMBOLIZE WITH_TLS
+CMAKE_TESTING_ON=	WITH_GMOCK WITH_GTEST
 LDFLAGS+=	-lexecinfo
-TEST_TARGET=	test
-USE_CXXSTD=	c++11
+USE_CXXSTD=	c++14
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 GH_ACCOUNT=	google
 USE_GITHUB=	yes
 
 .include <bsd.port.mk>
diff --git a/devel/glog/distinfo b/devel/glog/distinfo
index fbf79f12bee4..4d3884beb31f 100644
--- a/devel/glog/distinfo
+++ b/devel/glog/distinfo
@@ -1,3 +1,5 @@
-TIMESTAMP = 1650084662
-SHA256 (google-glog-v0.6.0_GH0.tar.gz) = 8a83bf982f37bb70825df71a9709fa90ea9f4447fb3c099e1d720a439d88bad6
-SIZE (google-glog-v0.6.0_GH0.tar.gz) = 193267
+TIMESTAMP = 1709390360
+SHA256 (google-glog-v0.7.0_GH0.tar.gz) = 375106b5976231b92e66879c1a92ce062923b9ae573c42b56ba28b112ee4cc11
+SIZE (google-glog-v0.7.0_GH0.tar.gz) = 182654
+SHA256 (5a7856ab964356990b948e5ea98b55938ed271c7.patch) = fc7c4d2af7c658fa408c60136d60aa3967db20b239c71281060e492e54d4c188
+SIZE (5a7856ab964356990b948e5ea98b55938ed271c7.patch) = 2712
diff --git a/devel/glog/files/patch-CMakeLists.txt b/devel/glog/files/patch-CMakeLists.txt
index 9b41ba3d0dd9..3099f664f63e 100644
--- a/devel/glog/files/patch-CMakeLists.txt
+++ b/devel/glog/files/patch-CMakeLists.txt
@@ -1,23 +1,11 @@
---- CMakeLists.txt.orig	2021-05-07 23:05:04 UTC
+--- CMakeLists.txt.orig	2024-02-17 17:49:26 UTC
 +++ CMakeLists.txt
-@@ -113,8 +113,6 @@ check_include_file_cxx (unistd.h HAVE_UNISTD_H)
- check_include_file_cxx ("ext/hash_map" HAVE_EXT_HASH_MAP)
- check_include_file_cxx ("ext/hash_set" HAVE_EXT_HASH_SET)
- check_include_file_cxx ("ext/slist" HAVE_EXT_SLIST)
--check_include_file_cxx ("tr1/unordered_map" HAVE_TR1_UNORDERED_MAP)
--check_include_file_cxx ("tr1/unordered_set" HAVE_TR1_UNORDERED_SET)
- check_include_file_cxx ("unordered_map" HAVE_UNORDERED_MAP)
- check_include_file_cxx ("unordered_set" HAVE_UNORDERED_SET)
+@@ -970,7 +970,7 @@ if (WITH_PKGCONFIG)
+ if (WITH_PKGCONFIG)
+   install (
+     FILES "${glog_BINARY_DIR}/libglog.pc"
+-    DESTINATION "${_glog_CMake_LIBDIR}/pkgconfig"
++    DESTINATION "${CMAKE_INSTALL_PREFIX}/libdata/pkgconfig"
+   )
+ endif (WITH_PKGCONFIG)
  
-@@ -678,11 +676,6 @@ if (BUILD_TESTING)
-     target_compile_definitions (stl_logging_unittest PRIVATE
-       GLOG_STL_LOGGING_FOR_UNORDERED)
-   endif (HAVE_UNORDERED_MAP AND HAVE_UNORDERED_SET)
--
--  if (HAVE_TR1_UNORDERED_MAP AND HAVE_TR1_UNORDERED_SET)
--    target_compile_definitions (stl_logging_unittest PRIVATE
--      GLOG_STL_LOGGING_FOR_TR1_UNORDERED)
--  endif (HAVE_TR1_UNORDERED_MAP AND HAVE_TR1_UNORDERED_SET)
- 
-   if (HAVE_EXT_HASH_MAP AND HAVE_EXT_HASH_SET)
-     target_compile_definitions (stl_logging_unittest PRIVATE
diff --git a/devel/glog/files/patch-src-glog-stl_logging.h.in b/devel/glog/files/patch-src-glog-stl_logging.h.in
deleted file mode 100644
index ba10427f9ce1..000000000000
--- a/devel/glog/files/patch-src-glog-stl_logging.h.in
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/glog/stl_logging.h.in.orig	2021-05-07 23:05:04 UTC
-+++ src/glog/stl_logging.h.in
-@@ -39,7 +39,6 @@
- // need to define macros before including this file:
- //
- // - GLOG_STL_LOGGING_FOR_UNORDERED     - <unordered_map> and <unordered_set>
--// - GLOG_STL_LOGGING_FOR_TR1_UNORDERED - <tr1/unordered_(map|set)>
- // - GLOG_STL_LOGGING_FOR_EXT_HASH      - <ext/hash_(map|set)>
- // - GLOG_STL_LOGGING_FOR_EXT_SLIST     - <ext/slist>
- //
-@@ -64,11 +63,6 @@
- # include <unordered_set>
- #endif
- 
--#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED
--# include <tr1/unordered_map>
--# include <tr1/unordered_set>
--#endif
--
- #ifdef GLOG_STL_LOGGING_FOR_EXT_HASH
- # include <ext/hash_set>
- # include <ext/hash_map>
-@@ -134,10 +128,6 @@ OUTPUT_FOUR_ARG_CONTAINER(std::multimap)
- OUTPUT_FOUR_ARG_CONTAINER(std::unordered_set)
- OUTPUT_FOUR_ARG_CONTAINER(std::unordered_multiset)
- #endif
--#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED
--OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_set)
--OUTPUT_FOUR_ARG_CONTAINER(std::tr1::unordered_multiset)
--#endif
- #ifdef GLOG_STL_LOGGING_FOR_EXT_HASH
- OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_set)
- OUTPUT_FOUR_ARG_CONTAINER(__gnu_cxx::hash_multiset)
-@@ -156,10 +146,6 @@ inline std::ostream& operator<<(std::ostream& out, \
- #ifdef GLOG_STL_LOGGING_FOR_UNORDERED
- OUTPUT_FIVE_ARG_CONTAINER(std::unordered_map)
- OUTPUT_FIVE_ARG_CONTAINER(std::unordered_multimap)
--#endif
--#ifdef GLOG_STL_LOGGING_FOR_TR1_UNORDERED
--OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_map)
--OUTPUT_FIVE_ARG_CONTAINER(std::tr1::unordered_multimap)
- #endif
- #ifdef GLOG_STL_LOGGING_FOR_EXT_HASH
- OUTPUT_FIVE_ARG_CONTAINER(__gnu_cxx::hash_map)
diff --git a/devel/glog/files/patch-src-stacktrace_powerpc-inl.h b/devel/glog/files/patch-src-stacktrace_powerpc-inl.h
index 45d700c3489a..3703766a0a35 100644
--- a/devel/glog/files/patch-src-stacktrace_powerpc-inl.h
+++ b/devel/glog/files/patch-src-stacktrace_powerpc-inl.h
@@ -1,11 +1,11 @@
---- src/stacktrace_powerpc-inl.h.orig	2019-12-01 18:35:43 UTC
+--- src/stacktrace_powerpc-inl.h.orig	2024-02-17 17:49:26 UTC
 +++ src/stacktrace_powerpc-inl.h
-@@ -107,7 +107,7 @@ int GetStackTrace(void** result, int max_depth, int sk
+@@ -111,7 +111,7 @@ int GetStackTrace(void** result, int max_depth, int sk
        // Link Register is.  For DARWIN and AIX (used by apple and
        // linux ppc64), it's in sp[2].  For SYSV (used by linux ppc),
        // it's in sp[1].
 -#if defined(_CALL_AIX) || defined(_CALL_DARWIN)
 +#if defined(_CALL_AIX) || defined(_CALL_DARWIN) || defined(_CALL_ELF)
-       result[n++] = *(sp+2);
+       result[n++] = *(sp + 2);
  #elif defined(_CALL_SYSV)
-       result[n++] = *(sp+1);
+       result[n++] = *(sp + 1);
diff --git a/devel/glog/files/patch-src-stl_logging_unittest.cc b/devel/glog/files/patch-src-stl_logging_unittest.cc
deleted file mode 100644
index dcf45e53b816..000000000000
--- a/devel/glog/files/patch-src-stl_logging_unittest.cc
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/stl_logging_unittest.cc.orig	2021-05-07 23:05:04 UTC
-+++ src/stl_logging_unittest.cc
-@@ -52,9 +52,6 @@
- #  ifndef GLOG_STL_LOGGING_FOR_EXT_SLIST
- #  define GLOG_STL_LOGGING_FOR_EXT_SLIST
- #  endif
--#  ifndef GLOG_STL_LOGGING_FOR_TR1_UNORDERED
--#  define GLOG_STL_LOGGING_FOR_TR1_UNORDERED
--#  endif
- # endif
- #endif
- 
diff --git a/devel/glog/pkg-plist b/devel/glog/pkg-plist
index 88328a610726..cebcc9ad8535 100644
--- a/devel/glog/pkg-plist
+++ b/devel/glog/pkg-plist
@@ -1,17 +1,19 @@
 include/glog/export.h
+include/glog/flags.h
 include/glog/log_severity.h
 include/glog/logging.h
 include/glog/platform.h
 include/glog/raw_logging.h
 include/glog/stl_logging.h
+include/glog/types.h
 include/glog/vlog_is_on.h
 lib/cmake/glog/glog-config-version.cmake
 lib/cmake/glog/glog-config.cmake
 lib/cmake/glog/glog-modules.cmake
 lib/cmake/glog/glog-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/glog/glog-targets.cmake
 lib/libglog.so
-lib/libglog.so.1
 lib/libglog.so.%%PORTVERSION%%
+lib/libglog.so.2
 libdata/pkgconfig/libglog.pc
 %%DATADIR%%/cmake/FindUnwind.cmake
diff --git a/graphics/blender/Makefile b/graphics/blender/Makefile
index 9ea843b1f390..8a2577e5e206 100644
--- a/graphics/blender/Makefile
+++ b/graphics/blender/Makefile
@@ -1,234 +1,235 @@
 PORTNAME=	blender
 DISTVERSION=	3.6.1
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	graphics multimedia
 MASTER_SITES=	http://download.blender.org/source/ \
 		http://mirror.cs.umn.edu/blender.org/source/ \
 		http://public.planetmirror.com/pub/blender/source/
 
 MAINTAINER=	FreeBSD@Shaneware.biz
 COMMENT=	3D modeling/rendering/animation package
 WWW=		https://www.blender.org/
 
 LICENSE=	GPLv3+
 LICENSE_FILE=	${WRKSRC}/doc/license/GPL3-license.txt
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	uses 64bit atomic functions
 
 BUILD_DEPENDS=	${PYNUMPY}
 LIB_DEPENDS=	libpng.so:graphics/png \
 		libepoxy.so:graphics/libepoxy \
 		libfreetype.so:print/freetype2 \
 		libboost_regex.so:devel/boost-libs \
 		libzstd.so:archivers/zstd
 RUN_DEPENDS=	${PYNUMPY}
 # libboost_regex.so just acts as a placeholder; several boost
 # libraries are used, if either of the most common options in blender
 # are set. We will pull boost in just to be on the safe side.
 
 USES=		cmake compiler:c++17-lang cpe gl jpeg llvm:min=9,max=15 \
 		python:3.10 shebangfix tar:xz xorg
 USE_XORG=	x11 xext xfixes xmu xrender
 USE_GL=		gl glu glew
 
 CMAKE_OFF=	WITH_PYTHON_INSTALL \
 		WITH_PYTHON_INSTALL_NUMPY WITH_INSTALL_PORTABLE \
 		WITH_USD
 
 SHEBANG_FILES=	scripts/modules/bl_i18n_utils/merge_po.py \
 		scripts/modules/bl_i18n_utils/utils_rtl.py \
 		scripts/modules/blend_render_info.py
 CFLAGS+=	${CFLAGS_${CHOSEN_COMPILER_TYPE}}
 CFLAGS_gcc=	-Wno-float-conversion
 CFLAGS_i386=	-march=i586
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 CXXFLAGS_i386=	-march=i586
 
 PLIST_SUB+=	VER=${DISTVERSION:R}
 OPTIONS_SUB=	yes
 SUB_FILES=	blender
 
 .include "${.CURDIR}/Makefile.options"
 
 ALEMBIC_CMAKE_BOOL=		WITH_ALEMBIC
 ALEMBIC_LIB_DEPENDS=		libAlembic.so:graphics/alembic
 # note that this needs to be set to match alembics hdf5 option
 ALEMBIC_HDF5_REQUIRES=		ALEMBIC
 ALEMBIC_HDF5_CMAKE_BOOL=	WITH_ALEMBIC_HDF5
 ALEMBIC_HDF5_LIB_DEPENDS=	libhdf5.so:science/hdf5
 AVI_CMAKE_BOOL=			WITH_CODEC_AVI
 BULLET_CMAKE_BOOL=		WITH_BULLET
 CAMERATRACK_CMAKE_BOOL=		WITH_LIBMV WITH_SYSTEM_GLOG
 CAMERATRACK_LIB_DEPENDS=	libunwind.so:devel/libunwind \
 				libglog.so:devel/glog
 CAMERATRACK_ONLY_FOR_ARCHS=	i386 amd64 aarch64 powerpc64 powerpc64le
 CAMERATRACK_ONLY_FOR_ARCHS_REASON=	libunwind only supports x86/amd64/aarch64/powerpc64/powerpc64le
 CINEON_CMAKE_BOOL=		WITH_IMAGE_CINEON
 COLLADA_CMAKE_BOOL=		WITH_OPENCOLLADA
 COLLADA_LIB_DEPENDS=		libOpenCOLLADABaseUtils.so:graphics/opencollada \
 				libpcre.so:devel/pcre
 COLLADA_USE=			GNOME=libxml2
 COLLADA_USES=			gnome
 COMPOSITOR_CMAKE_BOOL=		WITH_COMPOSITOR
 CYCLES_IMPLIES=			OPENIMAGEIO TBB
 CYCLES_CMAKE_BOOL=		WITH_CYCLES WITH_CYCLES_LOGGING
 CYCLES_LIB_DEPENDS=		libgflags.so:devel/gflags
 CYCLES_LDFLAGS=			-L${LOCALBASE}/lib -lgflags
 CYCLESEMBR_IMPLIES=		CYCLES
 CYCLESEMBR_CMAKE_BOOL=		WITH_CYCLES_EMBREE
 CYCLESEMBR_LIB_DEPENDS=		libembree3.so:graphics/embree
 CYCLESEMBR_ONLY_FOR_ARCHS=	amd64
 CYCLESEMBR_ONLY_FOR_ARCHS_REASON=	embree only supports amd64
 CYCLESOSL_IMPLIES=		CYCLES
 CYCLESOSL_CMAKE_BOOL=		WITH_CYCLES_OSL WITH_LLVM
 CYCLESOSL_CMAKE_ON=		-DLLVM_STATIC:BOOL=OFF \
 				-DLLVM_CONFIG:STRING="${LOCALBASE}/bin/llvm-config${LLVM_VERSION}" \
 				-DOSL_SHADER_DIR:STRING="${LOCALBASE}/share/openshadinglanguage/shaders"
 CYCLESOSL_BUILD_DEPENDS=	llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 CYCLESOSL_LIB_DEPENDS=		liboslcomp.so:graphics/openshadinglanguage
 CYCLESOSL_RUN_DEPENDS=		llvm-config${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 DDS_CMAKE_BOOL=			WITH_IMAGE_DDS
 DRACO_CMAKE_BOOL=		WITH_DRACO
 DRACO_USE=			LDCONFIG=${PYTHON_SITELIBDIR}
 EBOOL_CMAKE_BOOL=		WITH_GMP
 EBOOL_LIB_DEPENDS=		libgmp.so:math/gmp
 FFMPEG_CMAKE_BOOL=		WITH_CODEC_FFMPEG
 FFMPEG_LIB_DEPENDS=		libavutil.so:multimedia/ffmpeg \
 				libflite.so:audio/flite
 FFMPEG_LDFLAGS=			-L${LOCALBASE}/lib -lflite -lflite_cmu_us_kal -lflite_cmulex -lflite_usenglish
 FFTW3_CMAKE_BOOL=		WITH_FFTW3
 FFTW3_LIB_DEPENDS=		libfftw3.so:math/fftw3
 FRAMESERVER_CMAKE_BOOL=		WITH_IMAGE_FRAMESERVER
 FREESTYLE_CMAKE_BOOL=		WITH_FREESTYLE
 HARU_CMAKE_BOOL=		WITH_HARU
 HARU_LIB_DEPENDS=		libhpdf.so:print/libharu
 HDR_CMAKE_BOOL=			WITH_IMAGE_HDR
 HEADLESS_PREVENTS=		MENU XINPUT XF86VMODE
 HEADLESS_PREVENTS_MSG=		X11 options can't be used in headless mode
 HEADLESS_CMAKE_BOOL=		WITH_HEADLESS
 INPUT_NDOF_CMAKE_BOOL=		WITH_INPUT_NDOF
 JACK_CMAKE_BOOL=		WITH_JACK WITH_JACK_DYNLOAD
 JACK_LIB_DEPENDS=		libjack.so:audio/jack
 LZO_CMAKE_BOOL=			WITH_LZO
 LZMA_CMAKE_BOOL=		WITH_LZMA
 MENU_USES=			desktop-file-utils
 MOD_BOOLEAN_CMAKE_BOOL=		WITH_MOD_BOOLEAN
 MOD_FLUID_IMPLIES=		TBB
 MOD_FLUID_CMAKE_BOOL=		WITH_MOD_FLUID
 MOD_OCEANSIM_IMPLIES=		FFTW3
 MOD_OCEANSIM_CMAKE_BOOL=	WITH_MOD_OCEANSIM
 MOD_REMESH_CMAKE_BOOL=		WITH_MOD_REMESH
 MOD_SMOKE_CMAKE_BOOL=		WITH_MOD_SMOKE
 NLS_CMAKE_BOOL=			WITH_INTERNATIONAL
 # Use iconv:wchar_t to force the usage of iconv from ports.
 # libboost_locale.so uses libiconv_open, while we only provide
 # iconv_open in 10.x+
 NLS_USES=			gettext iconv:lib,wchar_t
 OPENAL_CMAKE_BOOL=		WITH_OPENAL
 OPENAL_USES=			openal:al,alut
 OPENCOLORIO_CMAKE_BOOL=		WITH_OPENCOLORIO
 OPENCOLORIO_LIB_DEPENDS=	libOpenColorIO.so:graphics/opencolorio \
 				libyaml-cpp.so:devel/yaml-cpp \
 				libtinyxml.so:textproc/tinyxml \
 				libexpat.so:textproc/expat2 \
 				libpystring.so:devel/pystring
 OPENCOLORIO_USES=		minizip:ng
 OPENEXR_CMAKE_BOOL=		WITH_IMAGE_OPENEXR
 OPENEXR_CFLAGS=			-I${LOCALBASE}/include/Imath
 OPENEXR_LIB_DEPENDS=		libImath.so:math/Imath \
 				libOpenEXR.so:graphics/openexr
 OPENIMAGEIO_IMPLIES=		OPENEXR TIFF PUGIXML
 OPENIMAGEIO_CMAKE_BOOL=		WITH_OPENIMAGEIO
 OPENIMAGEIO_LIB_DEPENDS=	libOpenImageIO.so:graphics/openimageio
 OPENIMAGEIO_LDFLAGS=		-lOpenImageIO_Util
 OPENIMAGEDN_IMPLIES=		TBB
 OPENIMAGEDN_CMAKE_BOOL=		WITH_OPENIMAGEDENOISE
 OPENIMAGEDN_LIB_DEPENDS=	libOpenImageDenoise.so:graphics/oidn
 OPENIMAGEDN_ONLY_FOR_ARCHS=	amd64
 OPENIMAGEDN_ONLY_FOR_ARCHS_REASON=	oidn only supports amd64
 OPENJPEG_CMAKE_BOOL=		WITH_IMAGE_OPENJPEG
 OPENJPEG_LIB_DEPENDS=		libopenjp2.so:graphics/openjpeg
 # openmp usually works on amd64
 OPENMP_CMAKE_BOOL=		WITH_OPENMP
 OPENPGL_ONLY_FOR_ARCHS=		amd64 armv6 armv7
 OPENPGL_ONLY_FOR_ARCHS_REASON=	requires supported SIMD ISA
 OPENPGL_CMAKE_BOOL=		WITH_CYCLES_PATH_GUIDING
 OPENPGL_LIB_DEPENDS=		libopenpgl.so:graphics/openpgl
 OPENSUBDIV_CMAKE_BOOL=		WITH_OPENSUBDIV
 OPENSUBDIV_LIB_DEPENDS=		libosdCPU.so:graphics/opensubdiv
 OPENVDB_IMPLIES=		TBB
 OPENVDB_CMAKE_BOOL=		WITH_OPENVDB WITH_OPENVDB_BLOSC
 OPENVDB_LIB_DEPENDS=		libblosc.so:archivers/c-blosc \
 				libopenvdb.so:misc/openvdb
 POTRACE_CMAKE_BOOL=		WITH_POTRACE
 POTRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
 PUGIXML_CMAKE_BOOL=		WITH_PUGIXML
 PUGIXML_LIB_DEPENDS=		libpugixml.so:textproc/pugixml
 PULSEAUDIO_CMAKE_BOOL=		WITH_PULSEAUDIO WITH_PULSEAUDIO_DYNLOAD
 PULSEAUDIO_LIB_DEPENDS=		libpulse.so:audio/pulseaudio
 QUADRIFLOW_CMAKE_BOOL=		WITH_QUADRIFLOW
 RAYOPTIMIZATION_CMAKE_BOOL=	WITH_RAYOPTIMIZATION
 SDL_CMAKE_BOOL=			WITH_SDL WITH_SDL_DYNLOAD
 SDL_USE=			SDL=sdl2
 SDL_USES=			sdl
 SNDFILE_CMAKE_BOOL=		WITH_CODEC_SNDFILE
 SNDFILE_LIB_DEPENDS=		libsndfile.so:audio/libsndfile
 TBB_CMAKE_BOOL=			WITH_TBB
 TBB_LIB_DEPENDS=		libtbb.so:devel/onetbb
 THUMBNAILER_CMAKE_BOOL=		WITH_BLENDER_THUMBNAILER
 TIFF_CMAKE_BOOL=		WITH_IMAGE_TIFF
 TIFF_LIB_DEPENDS=		libtiff.so:graphics/tiff
 TRACE_CMAKE_BOOL=		WITH_POTRACE
 TRACE_LIB_DEPENDS=		libpotrace.so:graphics/libpotrace
 WAYLAND_CATEGORIES=		wayland
 WAYLAND_CMAKE_BOOL=		WITH_GHOST_WAYLAND
 WAYLAND_USES=			pkgconfig
 WAYLAND_BUILD_DEPENDS=		wayland-protocols>=1.15:graphics/wayland-protocols \
 				wayland>=1.12:graphics/wayland \
 				libdecor>0:x11-toolkits/libdecor
 WAYLAND_LIB_DEPENDS=		libxkbcommon.so:x11/libxkbcommon
 WEBP_CMAKE_BOOL=		WITH_IMAGE_WEBP
 WEBP_LIB_DEPENDS=		libwebp.so:graphics/webp
 XINPUT_CMAKE_BOOL=		WITH_X11_XINPUT
 XINPUT_USE=			XORG=xi
 XF86VMODE_CMAKE_BOOL=		WITH_X11_XF86VMODE
 XF86VMODE_USE=			XORG=xi,xxf86vm
 
 .if defined(WITH_DEBUG)
 CMAKE_ARGS+=		-DWITH_GHOST_DEBUG:BOOL=ON
 .endif
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} != amd64 && ${ARCH} != i386
 CMAKE_ARGS+=	-DWITH_CPU_SIMD:BOOL=OFF
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LLVM_VER%%|${LLVM_VERSION}|g' \
 		${WRKSRC}/intern/cycles/kernel/osl/CMakeLists.txt
 
 post-build:
 	@(cd ${WRKSRC}/doc/manpage && \
 		${PYTHON_CMD} blender.1.py \
 			--blender ${INSTALL_WRKSRC}/bin/blender \
 			--output ${INSTALL_WRKSRC}/bin/${PORTNAME}.1)
 
 post-install:
 	${INSTALL_MAN} ${INSTALL_WRKSRC}/bin/${PORTNAME}.1 \
 		${STAGEDIR}${PREFIX}/share/man/man1
 	${MV} ${STAGEDIR}/${PREFIX}/bin/blender ${STAGEDIR}/${PREFIX}/bin/blender-bin
 	${REINPLACE_CMD} -e 's|%%PYTHON_SITELIBDIR%%|${PYTHON_SITELIBDIR}|g' ${WRKDIR}/blender
 	${INSTALL_SCRIPT} ${WRKDIR}/blender ${STAGEDIR}/${PREFIX}/bin/blender
 
 post-install-DRACO-on:
 	# move draco pylib into site-packages
 	${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${INSTALL_LIB} ${INSTALL_WRKSRC}/lib/libextern_draco.so ${STAGEDIR}/${PYTHON_SITELIBDIR}/
 	${STRIP_CMD} ${STAGEDIR}/${PYTHON_SITELIBDIR}/libextern_draco.so
 	@${RM} -R ${STAGEDIR}/${DATADIR}/${DISTVERSION:R}/python
 
 post-install-MENU-on:
 	@-update-desktop-database -q
 
 .include <bsd.port.mk>
diff --git a/graphics/opencv/Makefile b/graphics/opencv/Makefile
index 92dd1d81cbe6..b22f8cf4aeb1 100644
--- a/graphics/opencv/Makefile
+++ b/graphics/opencv/Makefile
@@ -1,251 +1,251 @@
 PORTNAME=	opencv
 DISTVERSION=	4.6.0
-PORTREVISION=	16
+PORTREVISION=	17
 CATEGORIES=	graphics
 
 PATCH_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/commit/
 PATCHFILES=	496eed950f6d0e7fd92619d47e3cec8f06e96ace.patch:-p1
 
 MAINTAINER=	desktop@FreeBSD.org
 COMMENT=	Open Source Computer Vision library
 WWW=		https://www.opencv.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libfreetype.so:print/freetype2 \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libharfbuzz.so:print/harfbuzz \
 		libhdf5.so:science/hdf5
 
 USES=		cmake compiler:c++14-lang cpe localbase:ldflags pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	WeChatCV:wechat
 GH_PROJECT=	opencv_contrib:contrib \
 		ade:ade \
 		opencv_3rdparty:extra_mod_3rdparty_boost_descr \
 		opencv_3rdparty:extra_mod_3rdparty_vgg \
 		opencv_3rdparty:wechat \
 		opencv_3rdparty:face \
 		opencv_3rdparty:ippicv
 GH_TAGNAME=	v0.1.1f:ade \
 		34e4206aef44d50e6bbcd0ab06354b52e7466d26:extra_mod_3rdparty_boost_descr \
 		fccf7cd6a4b12079f73bbfb21745f9babcd4eb1d:extra_mod_3rdparty_vgg \
 		a8b69ccc738421293254aec5ddb38bd523503252:wechat \
 		8afa57abc8229d611c4937165d20e2a2d9fc5a12:face \
 		a56b6ac6f030c312b2dce17430eef13aed9af274:ippicv
 
 CMAKE_ON=	OPENCV_GENERATE_PKGCONFIG
 CMAKE_OFF=	OPENCV_GENERATE_SETUPVARS \
 		BUILD_opencv_python2 \
 		BUILD_TESTS
 CMAKE_ARGS=	-DOPENCV_EXTRA_MODULES_PATH="${WRKSRC}/contrib/modules"
 
 DATADIR=	${PREFIX}/share/${PORTNAME}4
 
 PLIST_SUB=	SHLIB_VER=${DISTVERSION}
 
 OPTIONS_DEFINE=		EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL \
 			PATENTED PROTOBUF PYTHON TBB TESSERACT
 
 OPTIONS_GROUP=		GUI IMAGE VIDEO
 OPTIONS_GROUP_GUI=	GTK3 VTK
 OPTIONS_GROUP_IMAGE=	GPHOTO2 JPEG OPENEXR PNG TIFF
 OPTIONS_GROUP_VIDEO=	DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE
 
 OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NOBLAS
 
 OPTIONS_RADIO=		JPEG2K
 OPTIONS_RADIO_JPEG2K=	JASPER OPENJPEG
 
 OPTIONS_DEFAULT=	EIGEN GDAL GDCM OPENCL PROTOBUF PYTHON \
 			DC1394 GSTREAMER V4L VULKAN WEBP \
 			GPHOTO2 JPEG OPENEXR PNG TIFF \
 			OPENBLAS \
 			OPENJPEG
 OPTIONS_SUB=		yes
 
 # Normal options (EIGEN GDAL GDCM HARDENING JAVA LTO OPENCL PATENTED PROTOBUF PYTHON TBB)
 EIGEN_DESC=		Add Eigen v3 Support, builds sfm modules
 EIGEN_CMAKE_BOOL=	WITH_EIGEN
 EIGEN_USES=		eigen:3
 
 GDAL_DESC=		Add Geospatial Data Abstraction Library Support
 GDAL_CMAKE_BOOL=	WITH_GDAL
 GDAL_LIB_DEPENDS=	libgdal.so:graphics/gdal
 
 GDCM_DESC=		Add Open source DICOM library Support
 GDCM_CMAKE_BOOL=	WITH_GDCM
 GDCM_LIB_DEPENDS=	libgdcmMSFF.so:devel/gdcm
 
 HARDENING_DESC=		Enables Build Hardening
 HARDENING_CMAKE_BOOL=	ENABLE_BUILD_HARDENING
 
 JAVA_DESC=		Enable Java Support
 JAVA_BUILD_DEPENDS=	ant:devel/apache-ant
 JAVA_CMAKE_BOOL=	BUILD_opencv_java BUILD_opencv_java_bindings_generator BUILD_JAVA
 JAVA_MAKE_ENV=		JAVACMD=${JAVA}
 JAVA_USE=		JAVA=yes
 
 LTO_DESC=		Enables Link Time Optimizations
 LTO_CMAKE_BOOL=		ENABLE_THIN_LTO
 
 OPENCL_DESC=		Add OpenCL Support
 OPENCL_CMAKE_BOOL=	WITH_OPENCL
 OPENCL_BUILD_DEPENDS=	opencl>=0:devel/opencl
 OPENCL_RUN_DEPENDS=	opencl>=0:devel/opencl
 
 PATENTED_DESC=		Enable patented 2d feature detection USE AT OWN RISK
 PATENTED_CMAKE_BOOL=	OPENCV_ENABLE_NONFREE
 
 PROTOBUF_DESC=		Enable protobuf support, builds dnn modules
 PROTOBUF_CMAKE_BOOL=	WITH_PROTOBUF
 PROTOBUF_LIB_DEPENDS=	libprotobuf.so:devel/protobuf
 
 PYTHON_DESC=		Enable Python Support 3.6 or greater
 PYTHON_BUILD_DEPENDS=	${PYNUMPY}
 PYTHON_RUN_DEPENDS=	${PYNUMPY}
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_opencv_python3
 PYTHON_CMAKE_ON=	-DOPENCV_PYTHON3_INSTALL_PATH=${PYTHON_SITELIBDIR}
 
 TBB_DESC=		Add Intel Threading Building Blocks Support
 TBB_CMAKE_BOOL=		WITH_TBB
 TBB_LIB_DEPENDS=	libtbb.so:devel/onetbb
 
 TESSERACT_DESC=		Add Tesseract-based OCR
 TESSERACT_LIB_DEPENDS=	libtesseract.so:graphics/tesseract
 TESSERACT_CMAKE_BOOL=	WITH_TESSERACT
 ###
 
 # GUI group options (GTK3 VTK)
 GTK3_USES=		gnome
 GTK3_USE=		gnome=gtk30,cairo,gdkpixbuf2
 GTK3_CMAKE_BOOL=	WITH_GTK
 
 VTK_DESC=		Include VTK library support (build opencv_viz module)
 VTK_CMAKE_BOOL=		WITH_VTK
 VTK_LIB_DEPENDS=	libvtkCommonCore-${VTK_VER}.so:math/vtk${VTK_VER:R}
 VTK_USES=		qt:5
 VTK_USE=		QT=buildtools:build,qmake:build
 ###
 
 # IMAGE group options (GPHOTO2 JPEG OPENEXR PNG TIFF)
 GPHOTO2_DESC=		Add Gphoto2 Support
 GPHOTO2_CMAKE_BOOL=	WITH_GPHOTO2
 GPHOTO2_LIB_DEPENDS=	libgphoto2.so:graphics/libgphoto2
 
 JPEG_DESC=		Add LibJpeg Support
 JPEG_CMAKE_BOOL=	WITH_JPEG
 JPEG_USES=		jpeg
 
 OPENEXR_DESC=		Add OpenEXR Support
 OPENEXR_CMAKE_BOOL=	WITH_OPENEXR
 OPENEXR_LIB_DEPENDS=	libOpenEXR.so:graphics/openexr
 
 PNG_DESC=		Add LibPNG Support
 PNG_CMAKE_BOOL=		WITH_PNG
 PNG_LIB_DEPENDS=	libpng16.so:graphics/png
 
 TIFF_DESC=		Add LibTIFF Support
 TIFF_CMAKE_BOOL=	WITH_TIFF
 TIFF_LIB_DEPENDS=	libtiff.so:graphics/tiff
 ###
 
 # VIDEO group options (DC1394 FFMPEG GSTREAMER V4L VULKAN WEBP XINE)
 DC1394_DESC=		IEEE 1394 camera support
 DC1394_CMAKE_BOOL=	WITH_1394
 DC1394_LIB_DEPENDS=	libdc1394.so:multimedia/libdc1394
 
 FFMPEG_DESC=		Link with ffmpeg
 FFMPEG_CMAKE_BOOL=	WITH_FFMPEG
 FFMPEG_LIB_DEPENDS=	libavcodec.so:multimedia/ffmpeg
 
 GSTREAMER_DESC=		Add GSTREAMER Support
 GSTREAMER_CMAKE_BOOL=	WITH_GSTREAMER
 GSTREAMER_USES=		gstreamer
 GSTREAMER_USE=		gnome=glib20
 
 V4L_DESC=		Enable support for Video for Linux
 V4L_CMAKE_BOOL=		WITH_V4L WITH_LIBV4L
 V4L_BUILD_DEPENDS=	${LOCALBASE}/include/linux/videodev2.h:multimedia/v4l_compat
 V4L_LIB_DEPENDS=	libv4l2.so:multimedia/libv4l
 
 VULKAN_DESC=		Add Vulkan Support
 VULKAN_CMAKE_BOOL=	WITH_VULKAN
 VULKAN_CMAKE_ON=	-DVULKAN_INCLUDE_DIRS=${LOCALBASE}/include
 VULKAN_BUILD_DEPENDS=	vulkan-headers>0:graphics/vulkan-headers
 
 WEBP_DESC=		Add Webp Support
 WEBP_CMAKE_BOOL=	WITH_WEBP
 WEBP_LIB_DEPENDS=	libwebp.so:graphics/webp
 
 XINE_DESC=		Add Xine Support
 XINE_CMAKE_BOOL=	WITH_XINE
 XINE_LIB_DEPENDS=	libxine.so:multimedia/libxine
 ###
 
 # BLAS group options (ATLAS OPENBLAS NOBLAS)
 ATLAS_DESC=		ATLAS blas implementation with lapacke
 ATLAS_USES=		blaslapack:atlas
 ATLAS_BUILD_DEPENDS=	cblas>0:math/cblas \
 			lapacke>0:math/lapacke
 
 OPENBLAS_DESC=		OpenBLAS blas implementation with lapacke
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_BUILD_DEPENDS=	cblas>0:math/cblas \
 			lapacke>0:math/lapacke
 
 NOBLAS_DESC=		Disable support for lapack/blas
 NOBLAS_CMAKE_BOOL_OFF=	WITH_LAPACK
 ###
 
 # JPEG2K group options (JASPER OPENJPEG)
 JASPER_DESC=		Add Jasper Support for JPEG2000
 JASPER_CMAKE_BOOL=	WITH_JASPER
 JASPER_LIB_DEPENDS=	libjasper.so:graphics/jasper
 
 OPENJPEG_DESC=		Add OpenJPEG Support for JPEG2000, OpenCV preferred
 OPENJPEG_CMAKE_BOOL=	WITH_OPENJPEG
 OPENJPEG_LIB_DEPENDS=	libopenjp2.so:graphics/openjpeg
 ###
 
 _IPPICV_i386=		ippicv/ippicv_2020_lnx_ia32_20191018_general.tgz
 _IPPICV_amd64=		ippicv/ippicv_2020_lnx_intel64_20191018_general.tgz
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64le && defined(MACHINE_CPU) && ${MACHINE_CPU:Mvsx3}
 CMAKE_ARGS+=		-DCPU_BASELINE:STRING="VSX;VSX3;"
 .endif
 
 post-extract:
 	# Handle contrib
 	${MV} ${WRKSRC_contrib} ${WRKSRC}/contrib
 	# Handle prefetched ade modul
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ade
 	${MV} ${WRKSRC_ade} ${BUILD_WRKSRC}/3rdparty/ade
 	# Handle prefetched xfeatures2d
 	${MKDIR} ${BUILD_WRKSRC}/downloads/xfeatures2d
 	${CP} ${WRKSRC_extra_mod_3rdparty_boost_descr}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
 	${CP} ${WRKSRC_extra_mod_3rdparty_vgg}/* ${BUILD_WRKSRC}/downloads/xfeatures2d
 	# Handle prefetched wechat
 	${MKDIR} ${BUILD_WRKSRC}/downloads/wechat_qrcode
 	${CP} ${WRKSRC_wechat}/* ${BUILD_WRKSRC}/downloads/wechat_qrcode/
 	# Handle Face
 	${MKDIR} ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
 	${CP} ${WRKSRC_face}/* ${BUILD_WRKSRC}/share/opencv4/testdata/cv/face
 	# Handle ippicv
 .if defined(_IPPICV_${ARCH})
 	${MKDIR} ${BUILD_WRKSRC}/3rdparty/ippicv
 	(cd ${BUILD_WRKSRC}/3rdparty/ippicv && ${EXTRACT_CMD} -xf ${WRKSRC_ippicv}/${_IPPICV_${ARCH}})
 .endif
 
 post-patch:
 	${REINPLACE_CMD} -e 's|/usr/lib/atlas-base|${LOCALBASE}/lib|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 	${REINPLACE_CMD} -e 's|/usr/include/atlas|${LOCALBASE}/include|g' ${WRKSRC}/cmake/OpenCVFindAtlas.cmake
 
 .include <../../math/vtk9/Makefile.version>
 .include <bsd.port.mk>
diff --git a/graphics/s2/Makefile b/graphics/s2/Makefile
index bb7c57aa5e2a..11c5595c864f 100644
--- a/graphics/s2/Makefile
+++ b/graphics/s2/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	s2
 PORTVERSION=	0.11.1
+PORTREVISION=	1
 DISTVERSIONPREFIX=	v
 CATEGORIES=	graphics
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	S2 Geometry Library
 WWW=		https://s2geometry.io/ \
 		https://github.com/google/s2geometry
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	i386
 NOT_FOR_ARCHS_REASON=	is currently 64-bit only
 
 LIB_DEPENDS=	libabsl_base.so:devel/abseil
 
 USES=		cmake compiler:c++17-lang localbase ssl
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17
 CMAKE_OFF=	BUILD_TESTS S2_USE_SYSTEM_INCLUDES WITH_PYTHON
 CMAKE_ON=	BUILD_SHARED_LIBS
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION}
 
 GH_ACCOUNT=	google
 GH_PROJECT=	s2geometry
 USE_GITHUB=	yes
 
 OPTIONS_DEFINE=	EXAMPLES GFLAGS GLOG
 OPTIONS_DEFAULT=GFLAGS GLOG
 GFLAGS_DESC=	Use gflags to change command line flags
 GLOG_DESC=	Use glog for logging
 
 EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES
 GFLAGS_CMAKE_BOOL=	WITH_GFLAGS
 GFLAGS_LIB_DEPENDS=	libgflags.so:devel/gflags
 GLOG_CMAKE_BOOL=	WITH_GLOG
 GLOG_LIB_DEPENDS=	libglog.so:devel/glog
 
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == powerpc64 && !defined(CPUTYPE)
 CXXFLAGS+=	-mcpu=power7
 .endif
 
 post-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/examples/point_index.cc ${WRKSRC}/doc/examples/term_index.cc ${STAGEDIR}${EXAMPLESDIR}
 
 .include <bsd.port.mk>
diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile
index abcfb46e2d2c..0b4e083ea19b 100644
--- a/math/ceres-solver/Makefile
+++ b/math/ceres-solver/Makefile
@@ -1,110 +1,110 @@
 PORTNAME=	ceres-solver
 DISTVERSION=	2.2.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Nonlinear least squares minimizer
 WWW=		http://ceres-solver.org/
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	glog>=0.5.0:devel/glog
 LIB_DEPENDS=	libglog.so:devel/glog
 RUN_DEPENDS:=	${BUILD_DEPENDS:Meigen*}
 
 USES=		cmake:testing compiler:${OPENMP}c++11-lib eigen:3 localbase shebangfix
 USE_GITHUB=	yes
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	examples/slam/pose_graph_*/plot_results.py \
 		scripts/make_docs.py
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_BENCHMARKS BUILD_TESTING
 
 LDFLAGS+=	-Wl,--as-needed # -lccolamd -lcholmod -lrt from suitesparse
 PLIST_SUB=	VERSION=${DISTVERSION:C/rc.*//}
 
 EXAMPLESDIR=	${PREFIX}/share/examples/${PORTNAME:S/-solver//}
 DOCSDIR=	${PREFIX}/share/doc/Ceres
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=		CUSTOM_BLAS EXAMPLES DOCS GFLAGS LAPACK OPENMP SCHUR
 OPTIONS_DEFAULT=	CUSTOM_BLAS CXSPARSE GFLAGS OPENBLAS OPENMP SCHUR SUITESPARSE
 OPTIONS_RADIO=		LAPACK THREADS
 OPTIONS_RADIO_LAPACK=	ATLAS NETLIB OPENBLAS
 OPTIONS_GROUP=		SPARSE
 OPTIONS_GROUP_SPARSE=	CXSPARSE EIGENSPARSE SUITESPARSE
 
 CUSTOM_BLAS_DESC=	Handcoded BLAS routines instead of Eigen
 CUSTOM_BLAS_CMAKE_BOOL=	CUSTOM_BLAS
 
 DOCS_BUILD_DEPENDS=	sphinx-build:textproc/py-sphinx \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 DOCS_USES=		python:build
 DOCS_CMAKE_BOOL=	BUILD_DOCUMENTATION
 
 EXAMPLES_CMAKE_BOOL=	BUILD_EXAMPLES
 EXAMPLES_IMPLIES=	GFLAGS
 
 GFLAGS_DESC=		Google Flags support
 GFLAGS_LIB_DEPENDS=	libgflags.so:devel/gflags
 GFLAGS_CMAKE_BOOL=	GFLAGS
 
 OPENMP_CMAKE_ON=	-DCERES_THREADING_MODEL:STRING="OPENMP"
 .if !exists(/usr/include/omp.h)
 # XXX ports/199603: LLVM openmp in base doesn't support armv6, armv7 yet
 OPENMP_VARS=		OPENMP=gcc-
 .endif
 
 SCHUR_DESC=		Fixed-size schur specializations
 SCHUR_CMAKE_BOOL=	SCHUR_SPECIALIZATIONS
 
 # XXX Unbundle googletest/googlemock
 
 LAPACK_DESC=		Linear Algebra PACKage
 LAPACK_CMAKE_BOOL=	LAPACK
 ATLAS_USES=		blaslapack:atlas
 ATLAS_CMAKE_ON=		-DBLA_VENDOR:STRING="ATLAS" \
 			-DBLAS_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libcblas.so" \
 			-DLAPACK_LIBRARIES:FILEPATH="${LOCALBASE}/lib/libalapack.so"
 ATLAS_IMPLIES=		LAPACK
 NETLIB_USES=		blaslapack:netlib
 NETLIB_CMAKE_ON=	-DBLA_VENDOR:STRING="Generic"
 NETLIB_IMPLIES=		LAPACK
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_CMAKE_ON=	-DBLA_VENDOR:STRING="OpenBLAS"
 OPENBLAS_IMPLIES=	LAPACK
 
 SPARSE_DESC=		Sparse linear algebra library
 CXSPARSE_DESC=		CXSparse support
 CXSPARSE_LIB_DEPENDS=	libcxsparse.so:math/suitesparse-cxsparse
 CXSPARSE_CMAKE_ON=	-DCXSPARSE_INCLUDE_DIR:PATH="${LOCALBASE}/include/suitesparse"
 CXSPARSE_CMAKE_BOOL=	CXSPARSE
 EIGENSPARSE_DESC=	Simplicial Cholesky factorization in Eigen
 EIGENSPARSE_CMAKE_BOOL=	EIGENSPARSE
 EIGENSPARSE_VARS=	LICENSE+=LGPL21+ LICENSE_COMB=multi \
 			LICENSE_FILE_BSD3CLAUSE="${LICENSE_FILE}"
 SUITESPARSE_DESC=	SuiteSparse support
 SUITESPARSE_LIB_DEPENDS=libspqr.so:math/suitesparse-spqr	\
 			libcholmod.so:math/suitesparse-cholmod
 SUITESPARSE_CMAKE_BOOL=	SUITESPARSE
 
 post-patch-DOCS-on:
 	@${REINPLACE_CMD} -e 's,python,${PYTHON_CMD:T},' \
 		${WRKSRC}/docs/source/CMakeLists.txt
 
 pre-install-TEST-on: do-test
 
 post-install-EXAMPLES-on:
 # Copy examples (stripped), their source and sample data but not tests programs
 	(cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR})
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} data ${STAGEDIR}${EXAMPLESDIR})
 	(cd ${BUILD_WRKSRC} && ${COPYTREE_SHARE} bin ${STAGEDIR}${EXAMPLESDIR})
 	@${RM} -r ${STAGEDIR}${EXAMPLESDIR}/bin/*_test
 	-@${STRIP_CMD} ${STAGEDIR}${EXAMPLESDIR}/bin/* # may fail for non-root
 
 .include <bsd.port.mk>
diff --git a/math/openturns/Makefile b/math/openturns/Makefile
index b2d9c6520053..32ecfac2a9a5 100644
--- a/math/openturns/Makefile
+++ b/math/openturns/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	openturns
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.22
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Uncertainty treatment library
 WWW=		https://openturns.github.io/www/
 
 LICENSE=	LGPL3
 LICENSE_FILE=	${WRKSRC}/COPYING.LESSER
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		flex:textproc/flex \
 		spectra>0:math/spectra
 LIB_DEPENDS=	libamd.so:math/suitesparse-amd \
 		libblas.so:math/blas \
 		libbonmin.so:math/bonmin \
 		libboost_serialization.so:devel/boost-libs \
 		libcamd.so:math/suitesparse-camd \
 		libceres.so:math/ceres-solver \
 		libCbc.so:math/cbc \
 		libccolamd.so:math/suitesparse-ccolamd \
 		libCgl.so:math/cgl \
 		libcholmod.so:math/suitesparse-cholmod \
 		libClp.so:math/clp \
 		libcminpack.so:math/cminpack \
 		libcoinasl.so:math/asl \
 		libCoinUtils.so:math/coinutils \
 		libcolamd.so:math/suitesparse-colamd \
 		libcxsparse.so:math/suitesparse-cxsparse \
 		libdlib.so:science/dlib-cpp \
 		libgif.so:graphics/giflib \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libgmp.so:math/gmp \
 		libhdf5_cpp.so:science/hdf5 \
 		libipopt.so:math/ipopt \
 		liblapack.so:math/lapack \
 		libmpc.so:math/mpc \
 		libmpfr.so:math/mpfr \
 		libnlopt.so:math/nlopt \
 		libOsi.so:math/osi \
 		libpagmo.so:science/pagmo2 \
 		libpng16.so:graphics/png \
 		libprimesieve.so:math/primesieve \
 		libspqr.so:math/suitesparse-spqr \
 		libsuitesparseconfig.so:math/suitesparse-config \
 		libsz.so:science/libaec \
 		libtbb.so:devel/onetbb
 
 USES=		bison blaslapack:openblas cmake eigen:3 gnome jpeg localbase:ldflags pkgconfig sqlite xorg # compiler:c++17-lang
 USE_GITHUB=	yes
 USE_GNOME=	libxml2
 USE_XORG=	ice sm x11 xau xcb xdmcp xext
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DBLAS_LIBRARIES=${LOCALBASE}/lib/libopenblas.so -DLAPACK_LIBRARIES=${LOCALBASE}/lib/libopenblas.so \
 		-DOPENTURNS_EXAMPLE_PATH:STRING=share/examples/openturns \
 		-DOPENTURNS_DOC_PATH:STRING=share/doc/openturns
 CMAKE_OFF=	USE_DOXYGEN USE_SPHINX
 CMAKE_OFF+=	USE_HMAT # broken with hmat-oss-1.7.1: https://github.com/openturns/openturns/issues/1868
 CMAKE_OFF+=	USE_CERES # ceres-solver-2.2.0 fails to be found by cmake, see https://github.com/ceres-solver/ceres-solver/issues/1023
 
 TEST_TARGET=	check # 10 tests are known to fail: https://github.com/openturns/openturns/issues/1919
 
 OPTIONS_DEFINE=		PYTHON EXAMPLES
 OPTIONS_DEFAULT=	PYTHON
 OPTIONS_SUB=		yes
 
 PYTHON_USES=		python
 PYTHON_CMAKE_BOOL=	BUILD_PYTHON
 PYTHON_CMAKE_ON=	-DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig
 PYTHON_PY_DEPENDS=	${PYNUMPY} \
 			${PYTHON_PKGNAMEPREFIX}chaospy>0:math/py-chaospy@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}dill>0:devel/py-dill@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}matplotlib>=1.3.1:math/py-matplotlib@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}pandas>0:math/py-pandas@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 PYTHON_BUILD_DEPENDS=	swig:devel/swig \
 			${PYTHON_PY_DEPENDS}
 PYTHON_RUN_DEPENDS=	${PYTHON_PY_DEPENDS}
 
 PORTEXAMPLES=		*
 
 LLVM_VERSION=	12 # workaround for clang-13 crash: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=261341
 
 # use clang from ports because cmake can't find base llvm for JIT
 BUILD_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 RUN_DEPENDS+=	clang${LLVM_VERSION}:devel/llvm${LLVM_VERSION}
 CPP=		clang-cpp${LLVM_VERSION}
 CC=		clang${LLVM_VERSION}
 CXX=		clang++${LLVM_VERSION}
 
 post-install:
 	@${RM} -r ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/math/or-tools/Makefile b/math/or-tools/Makefile
index b2eea9e6099a..fe520dd8ede8 100644
--- a/math/or-tools/Makefile
+++ b/math/or-tools/Makefile
@@ -1,61 +1,61 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Google's Operations Research tools
 WWW=		https://github.com/google/or-tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 PATCH_DEPENDS=	gsed:textproc/gsed
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/coin-or-mumps \
 		libCoinUtils.so:math/coinutils \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libOsiClp.so:math/clp \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2
 
 USES=		blaslapack cmake:testing compiler:c++17-lang eigen:3 pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 USE_LDCONFIG=	yes
 
 CMAKE_OFF=	BUILD_PYTHON BUILD_DEPS INSTALL_BUILD_DEPS BUILD_EXAMPLES BUILD_SAMPLES
 CMAKE_ON=	BUILD_CXX
 CMAKE_TESTING_ON=	BUILD_EXAMPLES BUILD_CXX_EXAMPLES
 CXXFLAGS+=	-DABSL_LEGACY_THREAD_ANNOTATIONS
 
 CONFIGURE_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 
 OPTIONS_DEFINE=		DOCS FLATZINC SCIP
 OPTIONS_DEFAULT=	FLATZINC #SCIP
 OPTIONS_SUB=		yes
 
 FLATZINC_DESC=		Build FlatZinc - MiniZinc interface
 FLATZINC_CMAKE_BOOL=	BUILD_FLATZINC
 
 SCIP_DESC=		Use the SCIP solver # SCIP package isn't built because of licensing restrictions
 SCIP_CMAKE_BOOL=	USE_SCIP
 SCIP_LIB_DEPENDS=	libscip.so:math/SCIP
 
 DOCSDIR=	${PREFIX}/share/doc/${PORTNAME:S/-//}
 PORTDOCS=	*
 
 # 3 tests are known to fail, see https://github.com/google/or-tools/issues/3429
 
 post-install:
 	@${FIND} ${STAGEDIR}${PREFIX} -type d -empty -delete
 
 .include <bsd.port.mk>
diff --git a/math/py-or-tools/Makefile b/math/py-or-tools/Makefile
index 397e0d8a537a..49df6989db25 100644
--- a/math/py-or-tools/Makefile
+++ b/math/py-or-tools/Makefile
@@ -1,87 +1,87 @@
 PORTNAME=	or-tools
 DISTVERSIONPREFIX=	v
 DISTVERSION=	9.5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Google's Operations Research tools (Python binding)
 WWW=		https://github.com/google/or-tools
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_armv7=	SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32
 BROKEN_i386=	SWIG wrapped code invalid in 32 bit architecture, regenerate code using -DSWIGWORDSIZE32 # see https://github.com/google/or-tools/issues/2130
 
 PY_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}absl-py>0:devel/py-absl-py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR}
 BUILD_DEPENDS=	${PY_DEPENDS} \
 		pybind11>0:devel/pybind11 \
 		protoc-gen-mypy:devel/py-mypy-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pip>0:devel/py-pip@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}virtualenv>0:devel/py-virtualenv@${PY_FLAVOR} \
 		swig:devel/swig
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libCbc.so:math/cbc \
 		libCgl.so:math/cgl \
 		libcoinasl.so:math/asl \
 		libcoinmumps.so:math/coin-or-mumps \
 		libCoinUtils.so:math/coinutils \
 		libnauty.so:math/nauty \
 		libopenblas.so:math/openblas \
 		libOsi.so:math/osi \
 		libOsiClp.so:math/clp \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2
 RUN_DEPENDS=	${PY_DEPENDS}
 
 USES=		blaslapack cmake:insource compiler:c++17-lang eigen:3 pkgconfig python
 USE_PYTHON=	flavors pytest # tests fail, see https://github.com/google/or-tools/issues/3464
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	google
 
 CMAKE_OFF=	BUILD_DEPS BUILD_pybind11 INSTALL_BUILD_DEPS BUILD_TESTING BUILD_EXAMPLES
 CMAKE_ON=	BUILD_PYTHON
 CMAKE_ARGS=	-DSWIG_EXECUTABLE=${LOCALBASE}/bin/swig -DFREEBSD_PYTHON_VER=${PYTHON_VER}
 CONFIGURE_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 CXXFLAGS+=	-DABSL_LEGACY_THREAD_ANNOTATIONS
 BUILD_ENV=	UNIX_CBC_DIR=${LOCALBASE} UNIX_CLP_DIR=${LOCALBASE}
 
 TEST_ENV=	${MAKE_ENV} PYTHONPATH=${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 
 OPTIONS_DEFINE=		SCIP
 
 SCIP_DESC=		Use the SCIP solver # SCIP package isn't built because of licensing restrictions
 SCIP_CMAKE_BOOL=	USE_SCIP
 SCIP_LIB_DEPENDS=	libscip.so:math/SCIP
 
 post-patch:
 	@${REINPLACE_CMD} -e '/absl::container/s,^,#,' \
 		${WRKSRC}/ortools/constraint_solver/CMakeLists.txt \
 		${WRKSRC}/ortools/glop/CMakeLists.txt \
 		${WRKSRC}/ortools/linear_solver/CMakeLists.txt \
 		${WRKSRC}/ortools/sat/CMakeLists.txt
 
 do-install: # by default cmake installs the whole or-tools project without the python part, so extract the wheel and install python files manually here
 	${MKDIR} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR}
 	cd ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} && \
 		unzip ${BUILD_WRKSRC}/python/dist/ortools-${DISTVERSION}*.whl && \
 		${RM} -rf ortools-*.dist-info
 	${FIND} ${STAGEDIR}${PYTHONPREFIX_SITELIBDIR} -name "*.so" -o -name "*.so.*" | ${XARGS} ${STRIP_CMD}
 
 run-examples: # one of the examples fail: https://github.com/google/or-tools/issues/3463
 .for e in arc_flow_cutting_stock_sat.py bus_driver_scheduling_sat.py cover_rectangle_sat.py cvrptw_plot.py qubo_sat.py # list is from examples/python/CMakeLists.txt
 	@cd ${WRKSRC}/examples/python && \
 		${ECHO} "==> Running ${PORTNAME} test ${e} ..." && \
 		${SETENV} ${TEST_ENV} ${PYTHON_CMD} ${e} && \
 		${ECHO} "... test ${e} succeeded"
 .endfor
 
 .include <bsd.port.mk>
diff --git a/misc/caffe/Makefile b/misc/caffe/Makefile
index 28de9bf51bff..dad6a4a66330 100644
--- a/misc/caffe/Makefile
+++ b/misc/caffe/Makefile
@@ -1,53 +1,54 @@
 PORTNAME=	caffe
 DISTVERSION=	1.0-136
 DISTVERSIONSUFFIX=	-g9b891540
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc # machine-learning
 
 PATCH_SITES=	https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/commit/
 PATCHFILES+=	7f503bd9a19758a173064e299ab9d4cac65ed60f.patch:-p1 # opencv4 fix
 PATCHFILES+=	1b317bab3f6413a1b5d87c9d3a300d785a4173f9.patch:-p1 # protobuf3 fix
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Fast open framework for deep learning
 WWW=		https://caffe.berkeleyvision.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		${PYNUMPY}
 LIB_DEPENDS=	libsnappy.so:archivers/snappy \
 		libleveldb.so:databases/leveldb \
 		liblmdb.so:databases/lmdb \
 		libboost_system.so:devel/boost-libs \
 		${PY_BOOST} \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libprotobuf.so:devel/protobuf \
 		libopencv_highgui.so:graphics/opencv \
 		libopenblas.so:math/openblas \
 		libhdf5.so:science/hdf5
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>0:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydot>0:graphics/py-pydot@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}pydotplus>0:graphics/py-pydotplus@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scikit-image>0:graphics/py-scikit-image@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>0:devel/py-six@${PY_FLAVOR}
 
 USES=		cmake compiler:c++17-lang fortran localbase:ldflags pkgconfig python
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	BVLC
 
 CMAKE_ARGS=	-DBLAS=Open \
 		-DPYTHON_EXECUTABLE=${PYTHON_CMD} \
 		-DFREEBSD_PYTHONPREFIX_SITELIBDIR=${PYTHONPREFIX_SITELIBDIR}
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 LDFLAGS+=	-lpython${PYTHON_VER}
 
 PORTSCOUT=	limit:^[0-9].*[0-9]$$ # should begin and end with a digit to prevent tags like rcnn-release and rc5
 
 .include <bsd.port.mk>
diff --git a/misc/openmvg/Makefile b/misc/openmvg/Makefile
index 8a432ef290b2..fdc1ab4333b3 100644
--- a/misc/openmvg/Makefile
+++ b/misc/openmvg/Makefile
@@ -1,80 +1,80 @@
 PORTNAME=	openmvg
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	misc science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Multiple View Geometry (MVG) library
 WWW=		https://imagine.enpc.fr/%7Emoulonp/openMVG/
 
 LICENSE=	MPL20
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 ONLY_FOR_ARCHS=	amd64 armv7 i386 powerpc64 powerpc64le
 ONLY_FOR_ARCHS_REASON=	need to figure out which TARGET_ARCHITECTURE values correspond to other architectures, plus "generic" is broken
 
 #HPP_DEPENDS=	cereal>0:devel/cereal # external cereal is currently broken, see https://github.com/openMVG/openMVG/issues/1963
 #BUILD_DEPENDS=	${HPP_DEPENDS}
 BUILD_DEPENDS=	tbb>0:devel/tbb # configure only checks TBB headers
 LIB_DEPENDS=	libblas.so:math/blas \
 		libceres.so:math/ceres-solver \
 		libClp.so:math/clp \
 		libCoinUtils.so:math/coinutils \
 		libemon.so:math/lemon \
 		libflann_cpp.so:math/flann \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libmetis.so:math/metis \
 		libOsi.so:math/osi \
 		libpng.so:graphics/png \
 		libtiff.so:graphics/tiff \
 		libunwind.so:devel/libunwind
 LIB_DEPENDS+=	liblz4.so:archivers/liblz4 # workaround for https://github.com/openMVG/openMVG/issues/1798
 #RUN_DEPENDS=	${HPP_DEPENDS}
 
 USES=		cmake compiler:c++11-lang eigen:3 jpeg qt:5
 USE_GITHUB=	yes
 GH_ACCOUNT=	openMVG
 GH_PROJECT=	openMVG
 GH_TUPLE=	openMVG-thirdparty:cereal:ac168fe:cereal/dependencies/cereal
 WRKSRC_SUBDIR=	src
 USE_QT=		core gui opengl svg widgets buildtools:build qmake:build
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DEIGEN_INCLUDE_DIR_HINTS=${LOCALBASE}/include/eigen3 \
 		-DFLANN_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DLEMON_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DOSI_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DCOINUTILS_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DCLP_INCLUDE_DIR_HINTS=${LOCALBASE}/include \
 		-DCERES_DIR_HINTS=${LOCALBASE}/include
 CMAKE_ON=	OpenMVG_BUILD_SHARED
 CMAKE_OFF=	OpenMVG_BUILD_TESTS OpenMVG_BUILD_EXAMPLES
 
 CXXFLAGS+=	-fPIC \
 		-I${LOCALBASE}/include # because flann is looked for in a wrong directiory: https://github.com/openMVG/openMVG/issues/1284
 LDFLAGS+=	-L${LOCALBASE}/lib -llz4 # workaround for https://github.com/openMVG/openMVG/issues/1798
 
 OPTIONS_SINGLE=			SIMD_${ARCH:tu}
 OPTIONS_SINGLE_SIMD_AMD64=	K8 CORE MEROM NEHALEM
 OPTIONS_SINGLE_SIMD_I386=	${OPTIONS_SINGLE_SIMD_AMD64}
 OPTIONS_DEFAULT_amd64=		K8
 OPTIONS_DEFAULT_i386=		K8
 
 SIMD_AMD64_DESC=		Use SSE SIMD optimizations for
 SIMD_I386_DESC=			${SIMD_AMD64_DESC}
 K8_DESC=			K8 architecture (SSE2)
 CORE_DESC=			Core architecture (up to SSE3)
 MEROM_DESC=			Merom architecture (up to SSSE3)
 NEHALEM_DESC=			Nehalem architecture (up to SSE4.2)
 
 K8_CMAKE_ON=			-DTARGET_ARCHITECTURE=k8
 CORE_CMAKE_ON=			-DTARGET_ARCHITECTURE=core
 MEROM_CMAKE_ON=			-DTARGET_ARCHITECTURE=merom
 NEHALEM_CMAKE_ON=		-DTARGET_ARCHITECTURE=nehalem
 
 post-install:
 	@${RM} -r ${STAGEDIR}${PREFIX}/include/openMVG_dependencies/osi_clp
 
 .include <bsd.port.mk>
diff --git a/net/fb303/Makefile b/net/fb303/Makefile
index 7e812d1d37d5..eb27ff0cb247 100644
--- a/net/fb303/Makefile
+++ b/net/fb303/Makefile
@@ -1,48 +1,50 @@
 PORTNAME=	fb303
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2024.03.04.00
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Base Thrift service and a common set of functionality
 WWW=		https://github.com/facebook/fb303
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicuuc.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libmvfst_server.so:net/mvfst \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libthriftcpp2.so:devel/fbthrift \
 		libunwind.so:devel/libunwind \
 		libwangle.so:net/wangle \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CXXFLAGS+=	-fPIC
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	PYTHON_EXTENSIONS
 
 post-install:
 	@${RMDIR} \
 		${STAGEDIR}${PREFIX}/include/fb303/test \
 		${STAGEDIR}${PREFIX}/include/fb303/thrift/types # see https://github.com/facebook/fb303/issues/37
 
 .include <bsd.port.mk>
diff --git a/net/fbzmq/Makefile b/net/fbzmq/Makefile
index f96b77bf6346..bb09279b7e01 100644
--- a/net/fbzmq/Makefile
+++ b/net/fbzmq/Makefile
@@ -1,42 +1,43 @@
 PORTNAME=	fbzmq
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2022.05.30.00
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for writing services in C++ while leveraging libzmq
 WWW=		https://github.com/facebook/fbzmq
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	libepoll-shim>0:devel/libepoll-shim
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libthriftcpp2.so:devel/fbthrift \
 		libunwind.so:devel/libunwind \
 		libwangle.so:net/wangle \
 		libzmq.so:net/libzmq4 \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 USE_LDCONFIG=	yes
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS
 
 CXXFLAGS+=	-I${LOCALBASE}/include/libepoll-shim -fPIC
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 .include <bsd.port.mk>
diff --git a/net/mvfst/Makefile b/net/mvfst/Makefile
index ade334e8b274..81974e4f45cf 100644
--- a/net/mvfst/Makefile
+++ b/net/mvfst/Makefile
@@ -1,43 +1,45 @@
 PORTNAME=	mvfst
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2024.03.04.00
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Implementation of the QUIC transport protocol
 WWW=		https://github.com/facebook/mvfst
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libbzip2.so:misc/vxl \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:testing compiler:c++17-lang cpe ssl
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 
 CPE_VENDOR=	facebook
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS
 CMAKE_TESTING_ON=	BUILD_TESTS # several tests fail, see https://github.com/facebookincubator/mvfst/issues/275
 
 CXXFLAGS+=	-fPIC
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 .include <bsd.port.mk>
diff --git a/net/wangle/Makefile b/net/wangle/Makefile
index 08aaee1f7a65..04b2246b11a9 100644
--- a/net/wangle/Makefile
+++ b/net/wangle/Makefile
@@ -1,46 +1,48 @@
 PORTNAME=	wangle
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2024.03.04.00
+PORTREVISION=	1
 CATEGORIES=	net
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Framework for building services in a consistent/modular/composable way
 WWW=		https://github.com/facebook/wangle
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libunwind.so:devel/libunwind \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++17-lang cpe ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 USE_LDCONFIG=	yes
 CPE_VENDOR=	facebook
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 post-install: # https://github.com/facebook/wangle/issues/179
 	cd ${STAGEDIR}${PREFIX} && \
 		${RMDIR} \
 			include/wangle/service/test \
 			include/wangle/ssl/test/certs \
 			include/wangle/util/test
 
 .include <bsd.port.mk>
diff --git a/security/fizz/Makefile b/security/fizz/Makefile
index 2043385b0693..1ad98af2bd9e 100644
--- a/security/fizz/Makefile
+++ b/security/fizz/Makefile
@@ -1,45 +1,47 @@
 PORTNAME=	fizz
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2024.03.04.00
+PORTREVISION=	1
 CATEGORIES=	security
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	C++14 implementation of the TLS-1.3 standard
 WWW=		https://github.com/facebookincubator/fizz
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 LIB_DEPENDS=	libboost_filesystem.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libzstd.so:archivers/zstd
 
 USES=		cmake:testing compiler:c++14-lang ssl cpe
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebookincubator
 
 CPE_VENDOR=	facebook
 
 WRKSRC_SUBDIR=	${PORTNAME}
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTS BUILD_EXAMPLES
 CMAKE_TESTING_ON=	BUILD_TESTS
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 
 post-install: # https://github.com/facebookincubator/fizz/issues/55
 	cd ${STAGEDIR}${PREFIX} && ${RMDIR} include/fizz/tool/test include/fizz/util/test
 
 .include <bsd.port.mk>
diff --git a/www/proxygen/Makefile b/www/proxygen/Makefile
index 0dee9104fe92..f4cb3e3c2dc0 100644
--- a/www/proxygen/Makefile
+++ b/www/proxygen/Makefile
@@ -1,46 +1,48 @@
 PORTNAME=	proxygen
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2024.03.04.00
+PORTREVISION=	1
 CATEGORIES=	www
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Collection of C++ HTTP libraries including easy way to use HTTP server
 WWW=		https://github.com/facebook/proxygen
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BUILD_DEPENDS=	bash:shells/bash \
 		gperf>0:devel/gperf
 LIB_DEPENDS=	libboost_iostreams.so:devel/boost-libs \
 		libbzip2.so:misc/vxl \
 		libdouble-conversion.so:devel/double-conversion \
 		libevent.so:devel/libevent \
 		libfizz.so:security/fizz \
 		libfmt.so:devel/libfmt \
 		libfolly.so:devel/folly \
 		libgflags.so:devel/gflags \
 		libglog.so:devel/glog \
 		libicui18n.so:devel/icu \
 		liblz4.so:archivers/liblz4 \
 		libmvfst_server.so:net/mvfst \
 		libsnappy.so:archivers/snappy \
 		libsodium.so:security/libsodium \
 		libunwind.so:devel/libunwind \
 		libwangle.so:net/wangle \
 		libzstd.so:archivers/zstd
 
 USES=		cmake compiler:c++14-lang cpe perl5 python:build ssl
 CPE_VENDOR=	facebook
 USE_GITHUB=	yes
 GH_ACCOUNT=	facebook
 USE_LDCONFIG=	yes
 
 CXXFLAGS+=	-fPIC
+CXXFLAGS+=	-DGLOG_USE_GLOG_EXPORT
 LDFLAGS+=	-lexecinfo
 
 CMAKE_ON=	BUILD_SHARED_LIBS
 
 BINARY_ALIAS=	python3=${PYTHON_CMD}
 
 .include <bsd.port.mk>