diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
index c1755468439a..b24c056c6b8a 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -1,76 +1,76 @@
 PORTNAME=	ncbi-blast+
 DISTVERSION=	2.12.0
-PORTREVISION=	9
+PORTREVISION=	10
 CATEGORIES=	biology perl5 python
 MASTER_SITES=	https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/LATEST/ \
 		https://ftp.ncbi.nlm.nih.gov/blast/executables/blast+/${PORTVERSION}/
 DISTNAME=	ncbi-blast-${PORTVERSION}+-src
 
 MAINTAINER=	jwb@FreeBSD.org
 COMMENT=	NCBI implementation of Basic Local Alignment Search Tool
 WWW=		http://blast.ncbi.nlm.nih.gov
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/scripts/projects/blast/LICENSE
 
 LIB_DEPENDS=	libpcre.so:devel/pcre \
 		liblmdb.so:databases/lmdb \
 		liblzo2.so:archivers/lzo2 \
 		libgnutls.so:security/gnutls \
 		libtspi.so:security/trousers \
 		libgmp.so:math/gmp \
 		libidn2.so:dns/libidn2 \
 		libnettle.so:security/nettle \
 		libhogweed.so:security/nettle \
 		libtasn1.so:security/libtasn1 \
 		libp11-kit.so:security/p11-kit \
 		libgcrypt.so:security/libgcrypt \
 		libgpg-error.so:security/libgpg-error \
 		libsqlite3.so:databases/sqlite3 \
 		libuv.so:devel/libuv \
 		libnghttp2.so:www/libnghttp2 \
 		libgrpc.so:devel/grpc
 RUN_DEPENDS=	p5-List-MoreUtils>=0:lang/p5-List-MoreUtils \
 		p5-JSON>=0:converters/p5-JSON
 
 USES=		compiler:c++14-lang gmake localbase:ldflags shebangfix perl5 python:3.6+
 USE_LDCONFIG=	yes
 
 SHEBANG_FILES=	src/app/blast/legacy_blast.pl \
 		src/app/blast/update_blastdb.pl \
 		src/app/blast/cleanup-blastdb-volumes.py \
 		src/app/blast/get_species_taxids.sh \
 		src/app/winmasker/windowmasker_2.2.22_adapter.py
 GNU_CONFIGURE=	yes
 
 # configure chooses /usr/local/bin/ar with no flags
 # FreeBSD boost port flagged by configure as untested version
 # --libdir=${PREFIX}/lib/ncbi-tools++ doesn't respect DESTDIR, so do
 # a postinstall mv.
 CONFIGURE_ARGS=	AR="ar cr" --without-boost --libdir=${PREFIX}/lib/ncbi-tools++
 
 CONFLICTS_INSTALL=	ncbi-cxx-toolkit
 
 WRKSRC_SUBDIR=	c++
 
 .if !exists(/usr/include/omp.h)
 CONFIGURE_ARGS+=	--without-openmp
 .endif
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == gcc
 # In case of problems: https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=220822
 LDFLAGS+=	-latomic # Only exists in gcc libs
 .endif
 
 post-install:
 	@${RM} ${STAGEDIR}${PREFIX}/include/ncbi-tools++/*/*/.cvsignore.extra
 	@${RM} -rf ${STAGEDIR}${PREFIX}/lib/X11
 	@${RM} ${STAGEDIR}${PREFIX}/include/ncbi-tools++/common/config/ncbiconf_msvc_site.h.in
 	@${RM} ${STAGEDIR}${PREFIX}/include/ncbi-tools++/common/ncbi_build_ver.h.in
 	@${RM} ${STAGEDIR}${PREFIX}/include/ncbi-tools++/common/ncbi_revision.h.in
 	@${RMDIR} ${STAGEDIR}${PREFIX}/lib/debug
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/ncbi-tools++/*.so
 
 .include <bsd.port.post.mk>
diff --git a/databases/arrow/Makefile b/databases/arrow/Makefile
index fa9015cadc33..8359978de08b 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,238 +1,238 @@
 PORTNAME=	arrow
 DISTVERSION=	8.0.0
-PORTREVISION=	8
+PORTREVISION=	9
 CATEGORIES=	databases
 MASTER_SITES=	APACHE/${PORTNAME}/${PORTNAME}-${DISTVERSION} \
 		https://github.com/apache/orc/archive/rel/:orc
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}
 DISTFILES=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX} release-1.6.6${EXTRACT_SUFX}:orc
 EXTRACT_ONLY=	apache-${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Columnar in-memory analytics layer for big data
 WWW=		https://arrow.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../LICENSE.txt
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs
 
 USES=		cmake compiler:c++11-lang localbase pkgconfig python:build
 USE_LDCONFIG=	yes
 
 WRKSRC_SUBDIR=	cpp
 
 CMAKE_ARGS=	-DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=NONE
 CMAKE_OFF=	ARROW_BUILD_STATIC ARROW_WITH_BACKTRACE ARROW_BUILD_TESTS ARROW_BUILD_BENCHMARKS
 
 OPTIONS_GROUP=			COMPRESSION COMPONENTS # components are listed in cpp/cmake_modules/DefineOptions.cmake
 OPTIONS_GROUP_COMPRESSION=	BROTLI BZ2 LZ4 SNAPPY ZLIB ZSTD
 OPTIONS_GROUP_COMPONENTS=	COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS HIVESERVER2 IPC JSON MIMALLOC PARQUET ORC PLASMA PYTHON S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TESTING
 OPTIONS_SUB=			yes
 
 COMPRESSION_DESC=		Compression support:
 COMPONENTS_DESC=		Build components:
 
 ## Compression options
 
 BROTLI_CMAKE_BOOL=		ARROW_WITH_BROTLI
 BROTLI_LIB_DEPENDS=		libbrotlicommon.so:archivers/brotli
 
 BZ2_DESC=			bz2 compression support
 BZ2_CMAKE_BOOL=			ARROW_WITH_BZ2
 
 LZ4_CMAKE_BOOL=			ARROW_WITH_LZ4
 LZ4_LIB_DEPENDS=		liblz4.so:archivers/liblz4
 
 SNAPPY_CMAKE_BOOL=		ARROW_WITH_SNAPPY
 SNAPPY_LIB_DEPENDS=		libsnappy.so:archivers/snappy
 
 ZLIB_CMAKE_BOOL=		ARROW_WITH_ZLIB
 
 ZSTD_DESC=			zstd compression support
 ZSTD_CMAKE_BOOL=		ARROW_WITH_ZSTD
 ZSTD_LIB_DEPENDS=		libzstd.so:archivers/zstd
 
 ## Component options
 
 COMPUTE_DESC=			Arrow Compute Modules
 COMPUTE_CMAKE_BOOL=		ARROW_COMPUTE
 COMPUTE_LIB_DEPENDS=		libre2.so:devel/re2 \
 				libutf8proc.so:textproc/utf8proc
 
 CSV_DESC=			Arrow CSV Parser Module
 CSV_CMAKE_BOOL=			ARROW_CSV
 
 DATASET_DESC=			Arrow Dataset Modules
 DATASET_CMAKE_BOOL=		ARROW_DATASET
 DATASET_IMPLIES=		COMPUTE FILESYSTEM
 
 FILESYSTEM_DESC=		Arrow Filesystem Layer
 FILESYSTEM_CMAKE_BOOL=		ARROW_FILESYSTEM
 
 FLIGHT_DESC=			Arrow Flight RPC System
 FLIGHT_USES=			ssl
 FLIGHT_CMAKE_BOOL=		ARROW_FLIGHT
 FLIGHT_LIB_DEPENDS=		libgflags.so:devel/gflags \
 				libprotobuf.so:devel/protobuf \
 				libabsl_base.so:devel/abseil \
 				libcares.so:dns/c-ares \
 				libgrpc.so:devel/grpc \
 				libre2.so:devel/re2
 FLIGHT_IMPLIES=			IPC
 FLIGHT_BROKEN=			configure breaks: Could not find a package configuration file provided by "re2"
 
 GANDIVA_DESC=			Gandiva libraries
 GANDIVA_USES=			ssl
 GANDIVA_CMAKE_BOOL=		ARROW_GANDIVA
 GANDIVA_BUILD_DEPENDS=		${LOCALBASE}/bin/clang12:devel/llvm12 # explicitly requires llvm-12
 GANDIVA_LIB_DEPENDS=		libgrpc.so:devel/grpc \
 				libprotobuf.so:devel/protobuf \
 				libre2.so:devel/re2 \
 				libutf8proc.so:textproc/utf8proc
 
 HDFS_DESC=			Arrow HDFS bridge
 HDFS_CMAKE_BOOL=		ARROW_HDFS
 
 HIVESERVER2_DESC=		HiveServer2 client and Arrow adapter
 HIVESERVER2_USES=		python:build
 HIVESERVER2_VARS=		BINARY_ALIAS=python=${PYTHON_CMD}
 HIVESERVER2_BUILD_DEPENDS=	thrift:devel/thrift
 HIVESERVER2_CMAKE_BOOL=		ARROW_HIVESERVER2
 HIVESERVER2_BROKEN=		Pending conflict fix in thrift ports in bug#255538
 
 IPC_DESC=			Arrow IPC extensions
 IPC_CMAKE_BOOL=			ARROW_IPC
 
 JSON_DESC=			JSON support
 JSON_CMAKE_BOOL=		ARROW_JSON
 JSON_BUILD_DEPENDS=		${LOCALBASE}/include/rapidjson/rapidjson.h:devel/rapidjson
 
 MIMALLOC_DESC=			Arrow mimalloc-based allocato
 MIMALLOC_CMAKE_BOOL=		ARROW_MIMALLOC
 MIMALLOC_LIB_DEPENDS=		libmimalloc.so:devel/mimalloc
 MIMALLOC_BROKEN=		Pending paths fix in bug#255537
 
 PARQUET_DESC=			Parquet libraries
 PARQUET_CMAKE_BOOL=		ARROW_PARQUET PARQUET_REQUIRE_ENCRYPTION
 PARQUET_USES=			ssl
 PARQUET_LIB_DEPENDS=		libthrift.so:devel/thrift-cpp
 PARQUET_IMPLIES=		COMPUTE
 
 ORC_DESC=			Arrow ORC adapter
 ORC_CMAKE_BOOL=			ARROW_ORC
 ORC_LIB_DEPENDS=		libprotobuf.so:devel/protobuf
 ORC_CONFIGURE_ENV=		ARROW_ORC_URL=file://${DISTDIR}/${DIST_SUBDIR}/release-1.6.6${EXTRACT_SUFX}
 ORC_IMPLIES=			LZ4 SNAPPY ZLIB ZSTD # cpp/CMakeLists.txt
 ORC_BROKEN=			fatal error: 'orc/OrcFile.hh' file not found: https://issues.apache.org/jira/browse/ARROW-12624
 
 PLASMA_DESC=			Plasma object store
 PLASMA_CMAKE_BOOL=		ARROW_PLASMA
 PLASMA_LIB_DEPENDS=		libaws-c-auth.so:security/aws-c-auth \
 				libaws-c-compression.so:devel/aws-c-compression \
 				libaws-c-http.so:devel/aws-c-http \
 				libaws-c-mqtt.so:devel/aws-c-mqtt \
 				libaws-c-s3.so:devel/aws-c-s3 \
 				libaws-c-sdkutils.so:devel/aws-c-sdkutils \
 				libaws-crt-cpp.so:devel/aws-crt-cpp \
 				libgflags.so:devel/gflags
 
 BUILD_UTILITIES_DESC=		build Arrow commandline utilities
 BUILD_UTILITIES_CMAKE_BOOL=	ARROW_BUILD_UTILITIES
 
 PYTHON_DESC=			Build python extension support
 PYTHON_CMAKE_BOOL=		ARROW_PYTHON
 PYTHON_USES=			python:3.7+
 PYTHON_BUILD_DEPENDS=		${PYNUMPY} # see https://issues.apache.org/jira/browse/ARROW-16820
 PYTHON_CMAKE_ON=		-DPython3_EXECUTABLE=${PYTHON_CMD}
 PYTHON_LIB_DEPENDS=		libutf8proc.so:textproc/utf8proc
 PYTHON_RUN_DEPENDS=		${PYNUMPY}
 PYTHON_IMPLIES=			COMPUTE CSV DATASET FILESYSTEM HDFS JSON
 PYTHON_VARS=			PLIST_SUB+=PYTHON_SUFFIX=${PYTHON_SUFFIX}
 
 S3_DESC=			S3 support
 S3_CMAKE_BOOL=			ARROW_S3
 S3_USES=			ssl
 S3_LIB_DEPENDS=			\
 				libaws-c-cal.so:security/aws-c-cal \
 				libaws-c-common.so:devel/aws-c-common \
 				libaws-c-event-stream.so:devel/aws-c-event-stream \
 				libaws-c-io.so:devel/aws-c-io \
 				libaws-checksums.so:devel/aws-checksums \
 				libaws-cpp-sdk-s3.so:devel/aws-sdk-cpp \
 				libs2n.so:security/s2n-tls
 S3_IMPLIES=			ZLIB
 
 SKYHOOK_DESC=			Build the Skyhook libraries
 SKYHOOK_CMAKE_BOOL=		ARROW_SKYHOOK
 SKYHOOK_BROKEN=			could NOT find librados
 
 SUBSTRAIT_DESC=			Build the Arrow Substrait Consumer Module
 SUBSTRAIT_CMAKE_BOOL=		ARROW_SUBSTRAIT
 SUBSTRAIT_BROKEN=		needs investigation
 
 TESTING_DESC=			Arrow testing libraries
 TESTING_CMAKE_BOOL=		ARROW_TESTING
 TESTING_LIB_DEPENDS=		libgtest.so:devel/googletest
 
 .for opt in ${OPTIONS_GROUP_COMPRESSION} ${OPTIONS_GROUP_COMPONENTS}
 .  if "${${opt}_BROKEN}" == ""
 OPTIONS_DEFAULT+=	${opt}
 .  endif
 .endfor
 
 .include <bsd.port.pre.mk>
 
 pre-configure-PYTHON-on:
 	@${REINPLACE_CMD} -e ' \
 		s|arrow_python|arrow_python${PYTHON_SUFFIX}|g; \
 		s|arrow-python|arrow-python${PYTHON_SUFFIX}|g \
 		' \
 		${WRKSRC}/../ci/appveyor-cpp-build.bat \
 		${WRKSRC}/../cpp/cmake_modules/FindArrowPython.cmake \
 		${WRKSRC}/../cpp/cmake_modules/FindArrowPythonFlight.cmake \
 		${WRKSRC}/../cpp/src/arrow/python/arrow-python-flight.pc.in \
 		${WRKSRC}/../cpp/src/arrow/python/arrow-python.pc.in \
 		${WRKSRC}/../cpp/src/arrow/python/ArrowPythonConfig.cmake.in \
 		${WRKSRC}/../cpp/src/arrow/python/ArrowPythonFlightConfig.cmake.in \
 		${WRKSRC}/../cpp/src/arrow/python/CMakeLists.txt \
 		${WRKSRC}/../dev/release/rat_exclude_files.txt \
 		${WRKSRC}/../dev/release/verify-apt.sh \
 		${WRKSRC}/../dev/release/verify-yum.sh \
 		${WRKSRC}/../dev/tasks/conda-recipes/arrow-cpp/meta.yaml \
 		${WRKSRC}/../dev/tasks/tasks.yml \
 		${WRKSRC}/../docs/source/developers/python.rst \
 		${WRKSRC}/../python/cmake_modules/FindArrowPython.cmake \
 		${WRKSRC}/../python/cmake_modules/FindArrowPythonFlight.cmake \
 		${WRKSRC}/../python/CMakeLists.txt \
 		${WRKSRC}/../python/pyarrow/__init__.py \
 		${WRKSRC}/../python/pyarrow/plasma.py \
 		${WRKSRC}/../python/setup.py
 	@${MV} ${WRKSRC}/src/arrow/python/arrow-python.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}.pc.in
 	@${MV} ${WRKSRC}/src/arrow/python/arrow-python-flight.pc.in ${WRKSRC}/src/arrow/python/arrow-python${PYTHON_SUFFIX}-flight.pc.in
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MCOMPUTE} || ${PORT_OPTIONS:MFLIGHT} || ${PORT_OPTIONS:MGANDIVA}
 PLIST_FILES+=	lib/cmake/arrow/Findre2Alt.cmake
 .endif
 
 .if ${PORT_OPTIONS:MPYTHON} == "PYTHON" && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT"
     PLIST_SUB+=	PYTHONFLIGHT=""
 .else
     PLIST_SUB+=	PYTHONFLIGHT="@comment "
 .endif
 
 .if ${PORT_OPTIONS:MTESTING} && ${PORT_OPTIONS:MFLIGHT} == "FLIGHT"
     PLIST_SUB+=	TESTINGFLIGHT=""
 .else
     PLIST_SUB+=	TESTINGFLIGHT="@comment "
 .endif
 
 do-test: # tests fail to compile: https://issues.apache.org/jira/browse/ARROW-12625
 	@cd ${BUILD_WRKSRC} && \
 		${SETENV} ${CONFIGURE_ENV} ${CMAKE_BIN} ${CMAKE_ARGS} -DARROW_BUILD_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.post.mk>
diff --git a/devel/bear/Makefile b/devel/bear/Makefile
index d8f5e4bf3117..5592c9947678 100644
--- a/devel/bear/Makefile
+++ b/devel/bear/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	bear
 DISTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	devel
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Tool that generates a compilation database for clang tooling
 WWW=		https://github.com/rizsotto/Bear
 
 LICENSE=	GPLv3+
 
 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=	${PREFIX}/lib/${PORTNAME}
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR} \
 		-DENABLE_FUNC_TESTS=OFF \
 		-DENABLE_UNIT_TESTS=OFF
 
 OPTIONS_DEFINE=	DOCS
 
 pre-install:
 	${MV} ${STAGEDIR}/${CONFIGURE_WRKSRC}/stage ${CONFIGURE_WRKSRC}/
 	${RM} -r ${STAGEDIR}/wrkdirs
 
 post-install:
 .for l in lib/bear/libexec.so lib/bear/wrapper
 	@${STRIP_CMD} ${STAGEDIR}${PREFIX}/${l}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/devel/google-cloud-cpp/Makefile b/devel/google-cloud-cpp/Makefile
index 2e468360c2fa..30dd5fd2fee3 100644
--- a/devel/google-cloud-cpp/Makefile
+++ b/devel/google-cloud-cpp/Makefile
@@ -1,48 +1,48 @@
 PORTNAME=	google-cloud-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.21.0
-PORTREVISION=	18
+PORTREVISION=	19
 CATEGORIES=	devel
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	amzo1337@gmail.com
 COMMENT=	C++ Idiomatic Clients for Google Cloud Platform services
 WWW=		https://github.com/googleapis/google-cloud-cpp
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	i386 powerpc
 
 BUILD_DEPENDS=	grpc>=1.19.1:devel/grpc \
 		nlohmann-json>0:devel/nlohmann-json \
 		protobuf>=3.7.1:devel/protobuf
 LIB_DEPENDS=	libabsl_strings.so:devel/abseil \
 		libcares.so:dns/c-ares \
 		libcrc32c.so:devel/crc32c \
 		libcurl.so:ftp/curl \
 		libgrpc.so:devel/grpc \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2
 
 USES=		cmake compiler:c++17-lang pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_TUPLE=	googleapis:googleapis:370e9f9ac14dbc73f56e15257bccc06dfebd4196:googleapis
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DGOOGLE_CLOUD_CPP_CXX_STANDARD=17 \
 		-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTING GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS
 
 CFLAGS+=	-I${BUILD_WRKSRC}/external/googleapis/src/googleapis_project-build
 LDFLAGS+=	-L${BUILD_WRKSRC}/external/googleapis/src/googleapis_project-build
 
 post-extract:
 	@${MKDIR} ${BUILD_WRKSRC}/external/googleapis/src/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_googleapis} \
 		${BUILD_WRKSRC}/external/googleapis/src/370e9f9ac14dbc73f56e15257bccc06dfebd4196.tar.gz
 
 .include <bsd.port.mk>
diff --git a/devel/google-cloud-cpp117/Makefile b/devel/google-cloud-cpp117/Makefile
index a0e00d7bb02c..9dd52cdacd2f 100644
--- a/devel/google-cloud-cpp117/Makefile
+++ b/devel/google-cloud-cpp117/Makefile
@@ -1,49 +1,49 @@
 PORTNAME=	google-cloud-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.17.0
-PORTREVISION=	13
+PORTREVISION=	14
 CATEGORIES=	devel
 PKGNAMESUFFIX=	117
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	amzo1337@gmail.com
 COMMENT=	C++ Idiomatic Clients for Google Cloud Platform services
 WWW=		https://github.com/googleapis/google-cloud-cpp
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 NOT_FOR_ARCHS=	i386 powerpc
 
 BUILD_DEPENDS=	grpc>=1.19.1:devel/grpc \
 		nlohmann-json>0:devel/nlohmann-json \
 		protobuf>=3.7.1:devel/protobuf
 LIB_DEPENDS=	libabsl_strings.so:devel/abseil \
 		libcares.so:dns/c-ares \
 		libcrc32c.so:devel/crc32c \
 		libcurl.so:ftp/curl \
 		libgrpc.so:devel/grpc \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2
 
 USES=		cmake compiler:c++17-lang pkgconfig ssl
 USE_GITHUB=	yes
 GH_ACCOUNT=	GoogleCloudPlatform
 GH_TUPLE=	googleapis:googleapis:59f97e6044a1275f83427ab7962a154c00d915b5:googleapis
 USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DGOOGLE_CLOUD_CPP_CXX_STANDARD=17 \
 		-DGOOGLE_CLOUD_CPP_DEPENDENCY_PROVIDER=package
 CMAKE_ON=	BUILD_SHARED_LIBS
 CMAKE_OFF=	BUILD_TESTING GOOGLE_CLOUD_CPP_ENABLE_CXX_EXCEPTIONS
 
 CFLAGS+=	-I${BUILD_WRKSRC}/external/googleapis/src/googleapis_project-build
 LDFLAGS+=	-L${BUILD_WRKSRC}/external/googleapis/src/googleapis_project-build
 
 post-extract:
 	@${MKDIR} ${BUILD_WRKSRC}/external/googleapis/src/
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_googleapis} \
 		${BUILD_WRKSRC}/external/googleapis/src/59f97e6044a1275f83427ab7962a154c00d915b5.tar.gz
 
 .include <bsd.port.mk>
diff --git a/science/py-tensorflow/Makefile b/science/py-tensorflow/Makefile
index b9163d5676ee..5e63309b8d7e 100644
--- a/science/py-tensorflow/Makefile
+++ b/science/py-tensorflow/Makefile
@@ -1,232 +1,232 @@
 PORTNAME=	tensorflow
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.9.1
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	science python
 PKGNAMEPREFIX=	${PYTHON_PKGNAMEPREFIX}
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz
 
 MAINTAINER=	amzo1337@gmail.com
 COMMENT=	Computation using data flow graphs for scalable machine learning
 WWW=		https://www.tensorflow.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 ONLY_FOR_ARCHS=	amd64
 
 BUILD_DEPENDS=	${RUN_DEPENDS} \
 		${PYTHON_PKGNAMEPREFIX}grpcio-tools>=1.22.0:devel/py-grpcio-tools@${PY_FLAVOR} \
 		bash:shells/bash \
 		cython:lang/cython \
 		swig:devel/swig \
 		bazel:devel/bazel \
 		git:devel/git
 LIB_DEPENDS=	libnsync.so:devel/nsync \
 		libgpr.so:devel/grpc \
 		libpng.so:graphics/png \
 		libsnappy.so:archivers/snappy \
 		liblmdb.so:databases/lmdb \
 		libsqlite3.so:databases/sqlite3 \
 		libicuio.so:devel/icu \
 		libjsoncpp.so:devel/jsoncpp \
 		libpcre.so:devel/pcre \
 		libnsync.so:devel/nsync \
 		libprotobuf.so:devel/protobuf \
 		libprotobuf-c.so:devel/protobuf-c \
 		libre2.so:devel/re2 \
 		libgif.so:graphics/giflib \
 		libcurl.so:ftp/curl \
 		libflatbuffers.so:devel/flatbuffers \
 		libdouble-conversion.so:devel/double-conversion
 RUN_DEPENDS=	pybind11>=2.6.2:devel/pybind11 \
 		${PYTHON_PKGNAMEPREFIX}absl-py>=1.0.0:devel/py-absl-py \
 		${PYTHON_PKGNAMEPREFIX}astunparse>=1.6.3:devel/py-astunparse@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}typing-extensions>=4.3.0:devel/py-typing-extensions@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}h5py>=2.9.0:science/py-h5py@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}flatbuffers>=2.0:devel/py-flatbuffers@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}gast>=0.5.3:devel/py-gast@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}numpy>=1.20.0:math/py-numpy@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}google-pasta>=0.1.7:devel/py-google-pasta@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}protobuf>=3.7.1:devel/py-protobuf@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}six>=1.10.0:devel/py-six@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}termcolor>=1.1.0:devel/py-termcolor@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}grpcio>=1.22.0:devel/py-grpcio@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}keras-preprocessing>=1.1.1:math/py-keras-preprocessing@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wrapt>=1.14.1:devel/py-wrapt@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}wheel>=0.30.0:devel/py-wheel@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}opt-einsum>=3.3.0:math/py-opt-einsum@${PY_FLAVOR} \
 		${PYTHON_PKGNAMEPREFIX}packaging>=21.3:devel/py-packaging@${PY_FLAVOR} \
 		pybind11>=2.6.2:devel/pybind11
 
 USES=		jpeg llvm:16 python:3.7+ shebangfix ssl
 USE_CXXSTD=     c++17
 USE_GITHUB=	yes
 USE_PYTHON=	distutils
 
 SHEBANG_GLOB=	*.py
 
 BAZEL_BOOT=	--output_user_root=${WRKDIR}/bazel_out
 
 PLIST_SUB=	TF_PORT_VERSION=${PORTVERSION}
 
 OPTIONS_DEFINE=			CPU_OPTS XLA
 OPTIONS_RADIO=			PARALLEL_JOBS
 OPTIONS_RADIO_PARALLEL_JOBS=	JOBS_1 JOBS_HALF JOBS_ALL
 PARALLEL_JOBS_DESC=		How many jobs to run during build?
 OPTIONS_DEFAULT=		JOBS_1
 
 JOBS_1_DESC=			Run one job
 JOBS_1_VARS=			TF_JOBS_NUMBER=1
 JOBS_HALF_DESC=			Run half jobs
 JOBS_HALF_VARS=			TF_JOBS_NUMBER="`expr \( ${MAKE_JOBS_NUMBER} + 1 \) / 2`"
 JOBS_ALL_DESC=			Run all jobs
 JOBS_ALL_VARS=			TF_JOBS_NUMBER=${MAKE_JOBS_NUMBER}
 
 CPU_OPTS_DESC=			Enable optimisations using features available on your CPU
 CPU_OPTS_VARS=			CPU_TARGET=native BAZEL_COPT="-c opt --copt=-march=native --copt=-mfpmath=sse"
 CPU_OPTS_VARS_OFF=		CPU_TARGET=x86-64
 
 XLA_DESC=			Accelerated Linear Algebra
 XLA_VARS=			XLA_OPT="1"
 XLA_VARS_OFF=			XLA_OPT="0"
 
 .include "Makefile.MASTER_SITES"
 
 post-patch:
 	# Set up a local repository with our pre-downloaded packages
 	# This prevents bazel downloading the files without modifying
 	# the bzl files.
 	@${MKDIR} ${WRKDIR}/bazel-cache
 	@${MKDIR} ${WRKDIR}/bazel-dist
 	@${MKDIR} ${WRKDIR}/.bin
 
 .for file in ${DISTFILES:C/\:(.*)//}
 	@${ECHO} "Moving ${file} to ${WRKDIR}/bazel-dist"
 	@${CP} ${DISTDIR}/${DIST_SUBDIR}/${file} ${WRKDIR}/bazel-dist
 .endfor
 
 	@${CP} ${PATCHDIR}/bazelrc ${WRKDIR}/bazelrc
 	@${CP} -R ${PATCHDIR}/bazel/* \
 		${WRKSRC}/third_party/
 
 	@${LN} -s ${PYTHON_CMD} ${WRKDIR}/.bin/python3
 	
 	@cd ${WRKSRC} && \
 		${REINPLACE_CMD} "s#--batch#${BAZEL_BOOT}\', \'--batch#" \
 		configure.py
 
 	${REINPLACE_CMD} "s#%%PYTHON%%#${PYTHON_VERSION}#" ${WRKSRC}/configure \
 		${WRKSRC}/third_party/freebsd_python_fix.patch \
 		${WRKSRC}/tensorflow/compiler/mlir/quantization/tensorflow/BUILD
 
 	@${REINPLACE_CMD} "s#%%BAZEL_DIR%%#${WRKDIR}#" ${WRKDIR}/bazelrc
 	@${REINPLACE_CMD} "s#%%BAZEL_DIST%%#${WRKDIR}#" ${WRKDIR}/bazelrc
 	@${REINPLACE_CMD} "s#%%MLIR_LLVM_PATCH%%#/${WRKSRC}/bazel/bazel_llvm-raw_utils_bazel_configure.bzl#" \
 		${WRKSRC}/tensorflow/compiler/mlir/hlo/WORKSPACE
 
 	# use system pybind11, but use sed to fix includes, too many to maintain with patches
 	@${FIND} ${WRKSRC} -type f -name '*.cc' | ${XARGS} ${REINPLACE_CMD} "s#include\/pybind11#pybind11#"
 
 
 	# copy the toolchain over
 	@${CP} -R ${PATCHDIR}/freebsd \
 		${WRKSRC}/
 
 	@${REINPLACE_CMD} "s#%%PATH%%#${PATH}#" ${WRKDIR}/bazelrc
 
 	@${REINPLACE_CMD} "s#%%PYTHON%%#${PYTHON_CMD}#" ${WRKSRC}/.bazelrc
 
 	@${REINPLACE_CMD} \
 		-e "s#%%LOCALBASE%%#${LOCALBASE}#" \
 		-e "s#%%LLVM_PREFIX%%#${LLVM_PREFIX}#g" \
 		-e "s#%%LLVM_VERSION%%#${LLVM_VERSION}#g" \
 		${WRKDIR}/bazelrc \
 		${WRKSRC}/third_party/absl/system.absl.strings.BUILD \
 		${WRKSRC}/freebsd/cc_toolchain_config.bzl \
 		${WRKSRC}/.bazelrc \
 		${WRKSRC}/tensorflow/tools/proto_text/BUILD \
 		${WRKSRC}/tensorflow/BUILD \
 		${WRKSRC}/tensorflow/core/BUILD \
 		${WRKSRC}/third_party/systemlibs/protobuf.BUILD
 
 
 do-configure:
 	@cd ${WRKSRC} && ${SETENV} \
 		PYTHON_BIN_PATH=${PYTHON_CMD} \
 		PYTHON_LIB_PATH="${PYTHON_SITELIBDIR}" \
 		KERAS_HOME="${WRKDIR}/.keras" \
 		TF_NEED_OPENCL_SYCL=0 \
 		TF_ENABLE_XLA=${XLA_OPT} \
 		TF_NEED_OPENCL=0 \
 		TF_NEED_MPI=0 \
 		TF_NEED_TENSORRT=0 \
 		TF_NEED_NGRAPH=0 \
 		TF_NEED_IGNITE=0 \
 		TF_NEED_ROCM=0 \
 		TF_NEED_CUDA=0 \
 		TF_SET_ANDROID_WORKSPACE=0 \
 		TF_DOWNLOAD_CLANG=0 \
 		TF_NEED_NCCL=0 \
 		TF_IGNORE_MAX_BAZEL_VERSION=1 \
 		CC_OPT_FLAGS="-march=${CPU_TARGET} -I${LOCALBASE}/include" \
 		PREFIX="${LOCALBASE}" \
 		TF_SYSTEM_LIBS="absl_py astor_archive astunparse_archive boringssl com_github_googlecloudplatform_google_cloud_cpp com_github_grpc_grpc \
 				com_google_absl com_google_protobuf curl cython dill_archive double_conversion functools32_archive gast_archive \
 				gif hwloc icu jsoncpp_git libjpeg_turbo lmdb nasm nsync opt_einsum_archive org_sqlite pasta png pybind11 six_archive snappy \
 				tblib_archive termcolor_archive typing_extensions_archive wrapt zlib" \
 		./configure
 
 do-build:
 	@cd ${WRKSRC} && \
 		bazel --bazelrc="${WRKDIR}/bazelrc" ${BAZEL_BOOT} build --jobs ${TF_JOBS_NUMBER} ${BAZEL_COPT} --host_copt="-I${LOCALBASE}/include" \
 		--host_linkopt="-L${LOCALBASE}/lib -lexecinfo" --linkopt="-L${LOCALBASE}/lib -lexecinfo" --copt="-I${LOCALBASE}/include" \
 		--verbose_failures -s \
 		--distdir=${WRKDIR}/bazel-dist \
 		//tensorflow:libtensorflow_framework.so \
 		//tensorflow:libtensorflow.so \
 		//tensorflow:libtensorflow_cc.so \
 		//tensorflow:install_headers \
 		//tensorflow/tools/pip_package:build_pip_package
 
 
 	@cd ${WRKSRC} && ${SETENV} TMPDIR=${WRKDIR} \
 		bazel-bin/tensorflow/tools/pip_package/build_pip_package \
 		${WRKDIR}/whl
 
 do-install:
 	@${MKDIR} ${STAGEDIR}/${PYTHON_SITELIBDIR}
 	@${MKDIR} ${STAGEDIR}/${LOCALBASE}/include/tensorflow
 
 	@${UNZIP_NATIVE_CMD} -d ${STAGEDIR}/${PYTHON_SITELIBDIR} ${WRKDIR}/whl/${PORTNAME}-${PORTVERSION}-*.whl
 
 	# put headers in the right folder
 	${CP} -R ${WRKSRC}/bazel-bin/tensorflow/include/tensorflow \
 		${STAGEDIR}/${LOCALBASE}/include/
 
 	# pc files and libraries
 	${INSTALL_DATA} ${PATCHDIR}/tensorflow.pc ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/
 	${INSTALL_DATA} ${PATCHDIR}/tensorflow_cc.pc ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/
 
 	@${REINPLACE_CMD} "s#%%LOCALBASE%%#${LOCALBASE}#" \
 		${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/tensorflow.pc \
 		${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/tensorflow_cc.pc
 
 	@${REINPLACE_CMD} "s#%%VERSION%%#${PORTVERSION}#" \
 		${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/tensorflow.pc	
 
 	#cleanup
 	${RM} ${STAGEDIR}/${LOCALBASE}/libdata/pkgconfig/*.bak
 
 	# install the libraries and strip
 	@${FIND} ${WRKSRC}/bazel-bin/tensorflow/ -depth 1 -name "*.so*" | ${XARGS} -I{} \
 		${INSTALL_LIB} {} ${STAGEDIR}/${LOCALBASE}/lib/
 
 	@${FIND} ${STAGEDIR}/${LOCALBASE}/lib -name "*.so*" | ${XARGS} ${STRIP_CMD}
 
 post-install: # autoplist: thousands of files, all under ${PYTHON_SITELIBDIR}
 	@cd ${STAGEDIR}${PREFIX} && \
 		${FIND} ${PYTHON_SITELIBDIR:C|^${LOCALBASE}/||} -type f -or -type l | grep -v "egg-info/" >> ${TMPPLIST}
 
 .include <bsd.port.mk>