diff --git a/biology/ncbi-blast+/Makefile b/biology/ncbi-blast+/Makefile
index 5e3ccea79b43..32b48c153334 100644
--- a/biology/ncbi-blast+/Makefile
+++ b/biology/ncbi-blast+/Makefile
@@ -1,81 +1,81 @@
 PORTNAME=	ncbi-blast+
 DISTVERSION=	2.14.1
-PORTREVISION=	3
+PORTREVISION=	4
 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=		https://blast.ncbi.nlm.nih.gov
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/scripts/projects/blast/LICENSE
 
 ONLY_FOR_ARCHS=		aarch64 amd64 powerpc64 powerpc64le riscv64
 ONLY_FOR_ARCHS_REASON=	Requires 64-bit processor
 
 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 \
 		libzstd.so:archivers/zstd \
 		libdw.so:devel/elfutils
 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
 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 c748eea3ed4f..f1a5d93fc56a 100644
--- a/databases/arrow/Makefile
+++ b/databases/arrow/Makefile
@@ -1,227 +1,227 @@
 PORTNAME=	arrow
 DISTVERSION=	17.0.0
-PORTREVISION=	1
+PORTREVISION=	2
 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++17-lang localbase pkgconfig python:build
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	nodefault
 GH_ACCOUNT=	apache
 
 WRKSRC_SUBDIR=	cpp
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 -DARROW_SIMD_LEVEL=NONE -DARROW_RUNTIME_SIMD_LEVEL=NONE \
 		-DPython3_EXECUTABLE=${PYTHON_CMD}
 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=	ACERO COMPUTE CSV DATASET FILESYSTEM FLIGHT GANDIVA HDFS IPC JSON MIMALLOC PARQUET ORC S3 SKYHOOK SUBSTRAIT BUILD_UTILITIES TENSORFLOW TESTING
 OPTIONS_SUB=			yes
 
 ## DESCs
 
 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
 
 ACERO_DESC=			Arrow Acero Engine Module
 ACERO_CMAKE_BOOL=		ARROW_ACERO
 ACERO_IMPLIES=			COMPUTE IPC
 
 COMPUTE_DESC=			Arrow Compute Modules
 COMPUTE_CMAKE_BOOL=		ARROW_COMPUTE
 COMPUTE_CMAKE_ON=		-DARROW_WITH_UTF8PROC=ON
 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=		ACERO 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 COMPUTE # see https://github.com/apache/arrow/issues/40766
 
 GANDIVA_DESC=			Gandiva libraries
 GANDIVA_USES=			llvm:17,lib ssl
 GANDIVA_CMAKE_BOOL=		ARROW_GANDIVA
 GANDIVA_CMAKE_ON=		-DARROW_WITH_UTF8PROC=ON
 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
 
 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=		IPC
 
 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
 
 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
 #PYTHON_BUILD_DEPENDS=		${PYNUMPY} # see https://issues.apache.org/jira/browse/ARROW-16820
 #PYTHON_CMAKE_ON=		-DPython3_EXECUTABLE=${PYTHON_CMD}
 #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-auth.so:security/aws-c-auth \
 				libaws-c-cal.so:security/aws-c-cal \
 				libaws-c-common.so:devel/aws-c-common \
 				libaws-c-compression.so:devel/aws-c-compression \
 				libaws-c-event-stream.so:devel/aws-c-event-stream \
 				libaws-c-http.so:devel/aws-c-http \
 				libaws-c-io.so:devel/aws-c-io \
 				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-checksums.so:devel/aws-checksums \
 				libaws-crt-cpp.so:devel/aws-crt-cpp \
 				libaws-cpp-sdk-s3.so:devel/aws-sdk-cpp \
 				libs2n.so:security/s2n-tls
 
 SKYHOOK_DESC=			Build the Skyhook libraries
 SKYHOOK_CMAKE_BOOL=		ARROW_SKYHOOK
 SKYHOOK_IMPLIES=		DATASET PARQUET
 SKYHOOK_BROKEN=			could NOT find librados
 
 SUBSTRAIT_DESC=			Build the Arrow Substrait Consumer Module
 SUBSTRAIT_CMAKE_BOOL=		ARROW_SUBSTRAIT
 SUBSTRAIT_IMPLIES=		DATASET IPC PARQUET
 SUBSTRAIT_BROKEN=		needs investigation
 
 TENSORFLOW_DESC=		TensorFlow support
 TENSORFLOW_CMAKE_BOOL=		ARROW_TENSORFLOW
 TENSORFLOW_BROKEN=		needs testing
 
 TESTING_DESC=			Arrow testing libraries
 TESTING_CMAKE_BOOL=		ARROW_TESTING
 TESTING_LIB_DEPENDS=		libgtest.so:devel/googletest
 
 # form OPTIONS_DEFAULT
 .for opt in ${OPTIONS_GROUP_COMPONENTS}
 .  if "${${opt}_BROKEN}" == ""
 OPTIONS_DEFAULT+=	${opt}
 .  endif
 .endfor
 
 .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:MIPC} && ${PORT_OPTIONS:MBUILD_UTILITIES}
 PLIST_FILES+=	bin/arrow-file-to-stream \
 		bin/arrow-stream-to-file
 .endif
 .if ${PORT_OPTIONS:MGANDIVA} || ${PORT_OPTIONS:MCOMPUTE}
 PLIST_FILES+=	lib/cmake/Arrow/Findutf8proc.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
 
 post-install:
 	# based on the user's report on 2024-04-12, the R extension expects only "ON" and "OFF" values in lib/cmake/Arrow/ArrowOptions.cmake
 	# other values confuse the R extension build, so we adjust these values to "ON" and "OFF" as a workaround
 	${REINPLACE_CMD} -i '' \
 		-e 's|"true"|"ON"|; s|"false"|"OFF"|' \
 		${STAGEDIR}${PREFIX}/lib/cmake/Arrow/ArrowOptions.cmake
 
 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.mk>
diff --git a/devel/bear/Makefile b/devel/bear/Makefile
index 5d3c31a16e2b..ca7c64940920 100644
--- a/devel/bear/Makefile
+++ b/devel/bear/Makefile
@@ -1,39 +1,39 @@
 PORTNAME=	bear
 DISTVERSION=	3.1.3
-PORTREVISION=	8
+PORTREVISION=	9
 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 \
 		libfmt.so:devel/libfmt \
 		libgrpc.so:devel/grpc \
 		libprotobuf.so:devel/protobuf \
 		libspdlog.so:devel/spdlog
 
 USES=		cmake compiler:c++17-lang pkgconfig
 USE_GITHUB=	yes
 GH_ACCOUNT=	rizsotto
 GH_PROJECT=	Bear
 
 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 bin/bear 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 1b9c7884fa02..96edfbf1a7c7 100644
--- a/devel/google-cloud-cpp/Makefile
+++ b/devel/google-cloud-cpp/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	google-cloud-cpp
 DISTVERSIONPREFIX=	v
 DISTVERSION=	2.27.0
-PORTREVISION=	1
+PORTREVISION=	2
 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 pathfix pkgconfig ssl
 PATHFIX_CMAKELISTSTXT=	AddPkgConfig.cmake CMakeLists.txt CompileProtos.cmake
 USE_CXXSTD=	c++17
 USE_GITHUB=	yes
 GH_ACCOUNT=	googleapis
 GH_TUPLE=	googleapis:googleapis:${GOOGLEAPI_GH_TAG}: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 \
 		GOOGLE_CLOUD_CPP_WITH_MOCKS
 
 GOOGLEAPI_GH_TAG=	e3838fbf057c3b69efc1e0b8e1a5a288ee91a00d
 
 post-extract:
 	${MKDIR} ${BUILD_WRKSRC}/external/googleapis/src/
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/${DISTFILE_googleapis} \
 		${BUILD_WRKSRC}/external/googleapis/src/${GOOGLEAPI_GH_TAG}.tar.gz
 
 .include <bsd.port.mk>
diff --git a/devel/grpc/Makefile b/devel/grpc/Makefile
index 7c568f89b27a..0d4ad19c9a6e 100644
--- a/devel/grpc/Makefile
+++ b/devel/grpc/Makefile
@@ -1,81 +1,82 @@
 PORTNAME=	grpc
-PORTVERSION=	1.62.2
-PORTREVISION=	3
+PORTVERSION=	1.65.4
 DISTVERSIONPREFIX=	v
-PORTEPOCH=	2
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	HTTP/2-based RPC framework
 WWW=		https://grpc.io/ \
 		https://github.com/grpc/grpc
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/include/xxhash.h:devel/xxhash
+BUILD_DEPENDS=	abseil>=20240116.0:devel/abseil \
+		xxhash>=0:devel/xxhash
 LIB_DEPENDS=	libabsl_base.so:devel/abseil \
 		libbenchmark.so:devel/benchmark \
 		libcares.so:dns/c-ares \
+		libopentelemetry_common.so:devel/opentelemetry-cpp \
 		libprotobuf.so:devel/protobuf \
 		libre2.so:devel/re2
 
 USES=		cmake compiler:c++17-lang cpe localbase:ldflags pkgconfig ssl
 
 USE_GITHUB=	yes
 
 CMAKE_ARGS=	-DCMAKE_CXX_STANDARD=17 \
 		-DgRPC_ABSL_PROVIDER=package \
 		-DgRPC_BENCHMARK_PROVIDER=package \
 		-DgRPC_CARES_PROVIDER=package \
+		-DgRPC_OPENTELEMETRY_PROVIDER=package \
 		-DgRPC_PROTOBUF_PROVIDER=package \
 		-DgRPC_RE2_PROVIDER=package \
 		-DgRPC_SSL_PROVIDER=package \
 		-DgRPC_ZLIB_PROVIDER=package
 CMAKE_OFF=	CMAKE_CXX_EXTENSIONS \
 		gRPC_BUILD_TESTS \
 		gRPC_DOWNLOAD_ARCHIVES
 CMAKE_ON=	BUILD_SHARED_LIBS \
 		gRPC_BUILD_CODEGEN \
 		gRPC_BUILD_GRPC_CPP_PLUGIN \
 		gRPC_BUILD_GRPC_CSHARP_PLUGIN \
 		gRPC_BUILD_GRPC_NODE_PLUGIN \
 		gRPC_BUILD_GRPC_OBJECTIVE_C_PLUGIN \
 		gRPC_BUILD_GRPC_PHP_PLUGIN \
 		gRPC_BUILD_GRPC_PYTHON_PLUGIN \
 		gRPC_BUILD_GRPC_RUBY_PLUGIN
 USE_CSTD=	c11
 USE_CXXSTD=	c++17
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	PORTVERSION=${PORTVERSION} \
 		SHLIB_VER=${PORTVERSION:R}
 
 CONFLICTS_INSTALL=	grpc[0-9][0-9][0-9]
 
 # Clean up bundled libraries
 .if !defined(MAINTAINER_MODE)
 EXTRACT_AFTER_ARGS=	--exclude ${DISTNAME}/third_party/abseil-cpp/ \
 			--exclude ${DISTNAME}/third_party/benchmark/ \
 			--exclude ${DISTNAME}/third_party/boringssl-with-bazel/ \
 			--exclude ${DISTNAME}/third_party/cares/ \
 			--exclude ${DISTNAME}/third_party/protobuf/ \
 			--exclude ${DISTNAME}/third_party/re2/ \
 			--exclude ${DISTNAME}/third_party/xxhash/ \
 			--exclude ${DISTNAME}/third_party/zlib/ \
 			--no-same-owner --no-same-permissions
 .else
 post-patch:
 	@${RM} -r ${WRKSRC}/third_party/abseil-cpp/
 	@${RM} -r ${WRKSRC}/third_party/benchmark/
 	@${RM} -r ${WRKSRC}/third_party/boringssl-with-bazel/
 	@${RM} -r ${WRKSRC}/third_party/cares/
 	@${RM} -r ${WRKSRC}/third_party/protobuf/
 	@${RM} -r ${WRKSRC}/third_party/re2/
 	#@${RM} -r ${WRKSRC}/third_party/upb/
 	#@${RM} -r ${WRKSRC}/third_party/utf8_range/
 	@${RM} -r ${WRKSRC}/third_party/xxhash/
 	@${RM} -r ${WRKSRC}/third_party/zlib/
 .endif
 
 .include <bsd.port.mk>
diff --git a/devel/grpc/distinfo b/devel/grpc/distinfo
index 785c241874e2..ca6097f50a19 100644
--- a/devel/grpc/distinfo
+++ b/devel/grpc/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1713528492
-SHA256 (grpc-grpc-v1.62.2_GH0.tar.gz) = e5d5e0dd96fe9452fe24cc8c827381dca484c54d171fb512a198025fec81a3c8
-SIZE (grpc-grpc-v1.62.2_GH0.tar.gz) = 22384704
+TIMESTAMP = 1722795187
+SHA256 (grpc-grpc-v1.65.4_GH0.tar.gz) = 853b4ff0e1c3e1c4e19f8cc77bbab402981920997716003cea6db9970657f8c9
+SIZE (grpc-grpc-v1.65.4_GH0.tar.gz) = 22538037
diff --git a/devel/grpc/files/patch-src-core-lib-surface-wait_for_cq_end_op.cc b/devel/grpc/files/patch-src-core-lib-surface-wait_for_cq_end_op.cc
deleted file mode 100644
index fe71b1d50e39..000000000000
--- a/devel/grpc/files/patch-src-core-lib-surface-wait_for_cq_end_op.cc
+++ /dev/null
@@ -1,17 +0,0 @@
---- src/core/lib/surface/wait_for_cq_end_op.cc.orig	2024-03-08 01:33:47 UTC
-+++ src/core/lib/surface/wait_for_cq_end_op.cc
-@@ -12,6 +12,7 @@
- // See the License for the specific language governing permissions and
- // limitations under the License.
- 
-+#include <absl/strings/str_format.h>
- #include <grpc/support/port_platform.h>
- 
- #include "src/core/lib/surface/wait_for_cq_end_op.h"
-@@ -72,4 +73,4 @@ std::string WaitForCqEndOp::StateString(const State& s
-       [](const Invalid&) -> std::string { return "Invalid{}"; });
- }
- 
--}  // namespace grpc_core
-\ No newline at end of file
-+}  // namespace grpc_core
diff --git a/devel/grpc/pkg-plist b/devel/grpc/pkg-plist
index cc65492f7cec..7f2c6a87fd26 100644
--- a/devel/grpc/pkg-plist
+++ b/devel/grpc/pkg-plist
@@ -1,362 +1,367 @@
 bin/grpc_cpp_plugin
 bin/grpc_csharp_plugin
 bin/grpc_node_plugin
 bin/grpc_objective_c_plugin
 bin/grpc_php_plugin
 bin/grpc_python_plugin
 bin/grpc_ruby_plugin
 include/grpc++/alarm.h
 include/grpc++/channel.h
 include/grpc++/client_context.h
 include/grpc++/completion_queue.h
 include/grpc++/create_channel.h
 include/grpc++/create_channel_posix.h
 include/grpc++/ext/health_check_service_server_builder_option.h
 include/grpc++/ext/proto_server_reflection_plugin.h
 include/grpc++/generic/async_generic_service.h
 include/grpc++/generic/generic_stub.h
 include/grpc++/grpc++.h
 include/grpc++/health_check_service_interface.h
 include/grpc++/impl/call.h
 include/grpc++/impl/channel_argument_option.h
 include/grpc++/impl/client_unary_call.h
 include/grpc++/impl/codegen/async_stream.h
 include/grpc++/impl/codegen/async_unary_call.h
 include/grpc++/impl/codegen/byte_buffer.h
 include/grpc++/impl/codegen/call.h
 include/grpc++/impl/codegen/call_hook.h
 include/grpc++/impl/codegen/channel_interface.h
 include/grpc++/impl/codegen/client_context.h
 include/grpc++/impl/codegen/client_unary_call.h
 include/grpc++/impl/codegen/completion_queue.h
 include/grpc++/impl/codegen/completion_queue_tag.h
 include/grpc++/impl/codegen/config.h
 include/grpc++/impl/codegen/config_protobuf.h
 include/grpc++/impl/codegen/create_auth_context.h
 include/grpc++/impl/codegen/metadata_map.h
 include/grpc++/impl/codegen/method_handler_impl.h
 include/grpc++/impl/codegen/proto_utils.h
 include/grpc++/impl/codegen/rpc_method.h
 include/grpc++/impl/codegen/rpc_service_method.h
 include/grpc++/impl/codegen/security/auth_context.h
 include/grpc++/impl/codegen/serialization_traits.h
 include/grpc++/impl/codegen/server_context.h
 include/grpc++/impl/codegen/server_interface.h
 include/grpc++/impl/codegen/service_type.h
 include/grpc++/impl/codegen/slice.h
 include/grpc++/impl/codegen/status.h
 include/grpc++/impl/codegen/status_code_enum.h
 include/grpc++/impl/codegen/string_ref.h
 include/grpc++/impl/codegen/stub_options.h
 include/grpc++/impl/codegen/sync_stream.h
 include/grpc++/impl/codegen/time.h
 include/grpc++/impl/grpc_library.h
 include/grpc++/impl/method_handler_impl.h
 include/grpc++/impl/rpc_method.h
 include/grpc++/impl/rpc_service_method.h
 include/grpc++/impl/serialization_traits.h
 include/grpc++/impl/server_builder_option.h
 include/grpc++/impl/server_builder_plugin.h
 include/grpc++/impl/server_initializer.h
 include/grpc++/impl/service_type.h
 include/grpc++/resource_quota.h
 include/grpc++/security/auth_context.h
 include/grpc++/security/auth_metadata_processor.h
 include/grpc++/security/credentials.h
 include/grpc++/security/server_credentials.h
 include/grpc++/server.h
 include/grpc++/server_builder.h
 include/grpc++/server_context.h
 include/grpc++/server_posix.h
 include/grpc++/support/async_stream.h
 include/grpc++/support/async_unary_call.h
 include/grpc++/support/byte_buffer.h
 include/grpc++/support/channel_arguments.h
 include/grpc++/support/config.h
 include/grpc++/support/error_details.h
 include/grpc++/support/slice.h
 include/grpc++/support/status.h
 include/grpc++/support/status_code_enum.h
 include/grpc++/support/string_ref.h
 include/grpc++/support/stub_options.h
 include/grpc++/support/sync_stream.h
 include/grpc++/support/time.h
 include/grpc/byte_buffer.h
 include/grpc/byte_buffer_reader.h
 include/grpc/census.h
 include/grpc/compression.h
+include/grpc/credentials.h
 include/grpc/event_engine/endpoint_config.h
 include/grpc/event_engine/event_engine.h
 include/grpc/event_engine/extensible.h
 include/grpc/event_engine/internal/memory_allocator_impl.h
 include/grpc/event_engine/internal/slice_cast.h
 include/grpc/event_engine/memory_allocator.h
 include/grpc/event_engine/memory_request.h
 include/grpc/event_engine/port.h
 include/grpc/event_engine/slice.h
 include/grpc/event_engine/slice_buffer.h
 include/grpc/fork.h
 include/grpc/grpc.h
 include/grpc/grpc_audit_logging.h
 include/grpc/grpc_crl_provider.h
 include/grpc/grpc_posix.h
 include/grpc/grpc_security.h
 include/grpc/grpc_security_constants.h
 include/grpc/impl/call.h
 include/grpc/impl/channel_arg_names.h
 include/grpc/impl/codegen/atm.h
 include/grpc/impl/codegen/atm_gcc_atomic.h
 include/grpc/impl/codegen/atm_gcc_sync.h
 include/grpc/impl/codegen/atm_windows.h
 include/grpc/impl/codegen/byte_buffer.h
 include/grpc/impl/codegen/byte_buffer_reader.h
 include/grpc/impl/codegen/compression_types.h
 include/grpc/impl/codegen/connectivity_state.h
 include/grpc/impl/codegen/fork.h
 include/grpc/impl/codegen/gpr_types.h
 include/grpc/impl/codegen/grpc_types.h
 include/grpc/impl/codegen/log.h
 include/grpc/impl/codegen/port_platform.h
 include/grpc/impl/codegen/propagation_bits.h
 include/grpc/impl/codegen/slice.h
 include/grpc/impl/codegen/status.h
 include/grpc/impl/codegen/sync.h
 include/grpc/impl/codegen/sync_abseil.h
 include/grpc/impl/codegen/sync_custom.h
 include/grpc/impl/codegen/sync_generic.h
 include/grpc/impl/codegen/sync_posix.h
 include/grpc/impl/codegen/sync_windows.h
 include/grpc/impl/compression_types.h
 include/grpc/impl/connectivity_state.h
 include/grpc/impl/grpc_types.h
 include/grpc/impl/propagation_bits.h
 include/grpc/impl/slice_type.h
 include/grpc/load_reporting.h
+include/grpc/passive_listener.h
 include/grpc/slice.h
 include/grpc/slice_buffer.h
 include/grpc/status.h
 include/grpc/support/alloc.h
 include/grpc/support/atm.h
 include/grpc/support/atm_gcc_atomic.h
 include/grpc/support/atm_gcc_sync.h
 include/grpc/support/atm_windows.h
 include/grpc/support/cpu.h
 include/grpc/support/json.h
 include/grpc/support/log.h
 include/grpc/support/log_windows.h
+include/grpc/support/metrics.h
 include/grpc/support/port_platform.h
 include/grpc/support/string_util.h
 include/grpc/support/sync.h
 include/grpc/support/sync_abseil.h
 include/grpc/support/sync_custom.h
 include/grpc/support/sync_generic.h
 include/grpc/support/sync_posix.h
 include/grpc/support/sync_windows.h
 include/grpc/support/thd_id.h
 include/grpc/support/time.h
 include/grpc/support/workaround_list.h
 include/grpcpp/alarm.h
 include/grpcpp/channel.h
 include/grpcpp/client_context.h
 include/grpcpp/completion_queue.h
 include/grpcpp/create_channel.h
 include/grpcpp/create_channel_binder.h
 include/grpcpp/create_channel_posix.h
 include/grpcpp/ext/call_metric_recorder.h
 include/grpcpp/ext/channelz_service_plugin.h
 include/grpcpp/ext/health_check_service_server_builder_option.h
 include/grpcpp/ext/proto_server_reflection_plugin.h
 include/grpcpp/ext/server_metric_recorder.h
 include/grpcpp/generic/async_generic_service.h
 include/grpcpp/generic/generic_stub.h
 include/grpcpp/grpcpp.h
 include/grpcpp/health_check_service_interface.h
 include/grpcpp/impl/call.h
 include/grpcpp/impl/call_hook.h
 include/grpcpp/impl/call_op_set.h
 include/grpcpp/impl/call_op_set_interface.h
 include/grpcpp/impl/channel_argument_option.h
 include/grpcpp/impl/channel_interface.h
 include/grpcpp/impl/client_unary_call.h
 include/grpcpp/impl/codegen/async_generic_service.h
 include/grpcpp/impl/codegen/async_stream.h
 include/grpcpp/impl/codegen/async_unary_call.h
 include/grpcpp/impl/codegen/byte_buffer.h
 include/grpcpp/impl/codegen/call.h
 include/grpcpp/impl/codegen/call_hook.h
 include/grpcpp/impl/codegen/call_op_set.h
 include/grpcpp/impl/codegen/call_op_set_interface.h
 include/grpcpp/impl/codegen/callback_common.h
 include/grpcpp/impl/codegen/channel_interface.h
 include/grpcpp/impl/codegen/client_callback.h
 include/grpcpp/impl/codegen/client_context.h
 include/grpcpp/impl/codegen/client_interceptor.h
 include/grpcpp/impl/codegen/client_unary_call.h
 include/grpcpp/impl/codegen/completion_queue.h
 include/grpcpp/impl/codegen/completion_queue_tag.h
 include/grpcpp/impl/codegen/config.h
 include/grpcpp/impl/codegen/config_protobuf.h
 include/grpcpp/impl/codegen/create_auth_context.h
 include/grpcpp/impl/codegen/delegating_channel.h
 include/grpcpp/impl/codegen/intercepted_channel.h
 include/grpcpp/impl/codegen/interceptor.h
 include/grpcpp/impl/codegen/interceptor_common.h
 include/grpcpp/impl/codegen/message_allocator.h
 include/grpcpp/impl/codegen/metadata_map.h
 include/grpcpp/impl/codegen/method_handler.h
 include/grpcpp/impl/codegen/method_handler_impl.h
 include/grpcpp/impl/codegen/proto_buffer_reader.h
 include/grpcpp/impl/codegen/proto_buffer_writer.h
 include/grpcpp/impl/codegen/proto_utils.h
 include/grpcpp/impl/codegen/rpc_method.h
 include/grpcpp/impl/codegen/rpc_service_method.h
 include/grpcpp/impl/codegen/security/auth_context.h
 include/grpcpp/impl/codegen/serialization_traits.h
 include/grpcpp/impl/codegen/server_callback.h
 include/grpcpp/impl/codegen/server_callback_handlers.h
 include/grpcpp/impl/codegen/server_context.h
 include/grpcpp/impl/codegen/server_interceptor.h
 include/grpcpp/impl/codegen/server_interface.h
 include/grpcpp/impl/codegen/service_type.h
 include/grpcpp/impl/codegen/slice.h
 include/grpcpp/impl/codegen/status.h
 include/grpcpp/impl/codegen/status_code_enum.h
 include/grpcpp/impl/codegen/string_ref.h
 include/grpcpp/impl/codegen/stub_options.h
 include/grpcpp/impl/codegen/sync.h
 include/grpcpp/impl/codegen/sync_stream.h
 include/grpcpp/impl/codegen/time.h
 include/grpcpp/impl/completion_queue_tag.h
 include/grpcpp/impl/create_auth_context.h
 include/grpcpp/impl/delegating_channel.h
 include/grpcpp/impl/grpc_library.h
 include/grpcpp/impl/intercepted_channel.h
 include/grpcpp/impl/interceptor_common.h
 include/grpcpp/impl/metadata_map.h
 include/grpcpp/impl/method_handler_impl.h
 include/grpcpp/impl/proto_utils.h
 include/grpcpp/impl/rpc_method.h
 include/grpcpp/impl/rpc_service_method.h
 include/grpcpp/impl/serialization_traits.h
 include/grpcpp/impl/server_builder_option.h
 include/grpcpp/impl/server_builder_plugin.h
 include/grpcpp/impl/server_callback_handlers.h
 include/grpcpp/impl/server_initializer.h
 include/grpcpp/impl/service_type.h
 include/grpcpp/impl/status.h
 include/grpcpp/impl/sync.h
+include/grpcpp/passive_listener.h
 include/grpcpp/resource_quota.h
 include/grpcpp/security/alts_context.h
 include/grpcpp/security/alts_util.h
 include/grpcpp/security/audit_logging.h
 include/grpcpp/security/auth_context.h
 include/grpcpp/security/auth_metadata_processor.h
 include/grpcpp/security/authorization_policy_provider.h
 include/grpcpp/security/binder_credentials.h
 include/grpcpp/security/binder_security_policy.h
 include/grpcpp/security/credentials.h
 include/grpcpp/security/server_credentials.h
 include/grpcpp/security/tls_certificate_provider.h
 include/grpcpp/security/tls_certificate_verifier.h
 include/grpcpp/security/tls_credentials_options.h
 include/grpcpp/security/tls_crl_provider.h
 include/grpcpp/server.h
 include/grpcpp/server_builder.h
 include/grpcpp/server_context.h
 include/grpcpp/server_interface.h
 include/grpcpp/server_posix.h
 include/grpcpp/support/async_stream.h
 include/grpcpp/support/async_unary_call.h
 include/grpcpp/support/byte_buffer.h
 include/grpcpp/support/callback_common.h
 include/grpcpp/support/channel_arguments.h
 include/grpcpp/support/client_callback.h
 include/grpcpp/support/client_interceptor.h
 include/grpcpp/support/config.h
 include/grpcpp/support/error_details.h
 include/grpcpp/support/interceptor.h
 include/grpcpp/support/message_allocator.h
 include/grpcpp/support/method_handler.h
 include/grpcpp/support/proto_buffer_reader.h
 include/grpcpp/support/proto_buffer_writer.h
 include/grpcpp/support/server_callback.h
 include/grpcpp/support/server_interceptor.h
 include/grpcpp/support/slice.h
 include/grpcpp/support/status.h
 include/grpcpp/support/status_code_enum.h
 include/grpcpp/support/string_ref.h
 include/grpcpp/support/stub_options.h
 include/grpcpp/support/sync_stream.h
 include/grpcpp/support/time.h
 include/grpcpp/support/validate_service_config.h
 include/grpcpp/version_info.h
 include/grpcpp/xds_server_builder.h
 lib/cmake/grpc/gRPCConfig.cmake
 lib/cmake/grpc/gRPCConfigVersion.cmake
 lib/cmake/grpc/gRPCPluginTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/grpc/gRPCPluginTargets.cmake
 lib/cmake/grpc/gRPCTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/grpc/gRPCTargets.cmake
 lib/cmake/grpc/modules/Findc-ares.cmake
 lib/cmake/grpc/modules/Findre2.cmake
 lib/cmake/grpc/modules/Findsystemd.cmake
 lib/libaddress_sorting.so
-lib/libaddress_sorting.so.39
-lib/libaddress_sorting.so.39.0.0
+lib/libaddress_sorting.so.42
+lib/libaddress_sorting.so.42.0.0
 lib/libgpr.so
-lib/libgpr.so.39
-lib/libgpr.so.39.0.0
+lib/libgpr.so.42
+lib/libgpr.so.42.0.0
 lib/libgrpc++.so
 lib/libgrpc++.so.%%SHLIB_VER%%
 lib/libgrpc++.so.%%PORTVERSION%%
 lib/libgrpc++_alts.so
 lib/libgrpc++_alts.so.%%SHLIB_VER%%
 lib/libgrpc++_alts.so.%%PORTVERSION%%
 lib/libgrpc++_error_details.so
 lib/libgrpc++_error_details.so.%%SHLIB_VER%%
 lib/libgrpc++_error_details.so.%%PORTVERSION%%
 lib/libgrpc++_reflection.so
 lib/libgrpc++_reflection.so.%%SHLIB_VER%%
 lib/libgrpc++_reflection.so.%%PORTVERSION%%
 lib/libgrpc++_unsecure.so
 lib/libgrpc++_unsecure.so.%%SHLIB_VER%%
 lib/libgrpc++_unsecure.so.%%PORTVERSION%%
 lib/libgrpc.so
-lib/libgrpc.so.39
-lib/libgrpc.so.39.0.0
+lib/libgrpc.so.42
+lib/libgrpc.so.42.0.0
 lib/libgrpc_authorization_provider.so
 lib/libgrpc_authorization_provider.so.%%SHLIB_VER%%
 lib/libgrpc_authorization_provider.so.%%PORTVERSION%%
 lib/libgrpc_plugin_support.so
 lib/libgrpc_plugin_support.so.%%SHLIB_VER%%
 lib/libgrpc_plugin_support.so.%%PORTVERSION%%
 lib/libgrpc_unsecure.so
-lib/libgrpc_unsecure.so.39
-lib/libgrpc_unsecure.so.39.0.0
+lib/libgrpc_unsecure.so.42
+lib/libgrpc_unsecure.so.42.0.0
 lib/libgrpcpp_channelz.so
 lib/libgrpcpp_channelz.so.%%SHLIB_VER%%
 lib/libgrpcpp_channelz.so.%%PORTVERSION%%
 lib/libupb_base_lib.so
-lib/libupb_base_lib.so.39
-lib/libupb_base_lib.so.39.0.0
+lib/libupb_base_lib.so.42
+lib/libupb_base_lib.so.42.0.0
 lib/libupb_json_lib.so
-lib/libupb_json_lib.so.39
-lib/libupb_json_lib.so.39.0.0
+lib/libupb_json_lib.so.42
+lib/libupb_json_lib.so.42.0.0
 lib/libupb_mem_lib.so
-lib/libupb_mem_lib.so.39
-lib/libupb_mem_lib.so.39.0.0
+lib/libupb_mem_lib.so.42
+lib/libupb_mem_lib.so.42.0.0
 lib/libupb_message_lib.so
-lib/libupb_message_lib.so.39
-lib/libupb_message_lib.so.39.0.0
+lib/libupb_message_lib.so.42
+lib/libupb_message_lib.so.42.0.0
 lib/libupb_textformat_lib.so
-lib/libupb_textformat_lib.so.39
-lib/libupb_textformat_lib.so.39.0.0
+lib/libupb_textformat_lib.so.42
+lib/libupb_textformat_lib.so.42.0.0
 lib/libutf8_range_lib.so
-lib/libutf8_range_lib.so.39
-lib/libutf8_range_lib.so.39.0.0
+lib/libutf8_range_lib.so.42
+lib/libutf8_range_lib.so.42.0.0
 libdata/pkgconfig/gpr.pc
 libdata/pkgconfig/grpc++.pc
 libdata/pkgconfig/grpc++_unsecure.pc
 libdata/pkgconfig/grpc.pc
 libdata/pkgconfig/grpc_unsecure.pc
+libdata/pkgconfig/grpcpp_otel_plugin.pc
 %%DATADIR%%/roots.pem
diff --git a/net-mgmt/fastnetmon/Makefile b/net-mgmt/fastnetmon/Makefile
index 57e6501f518a..96f8d2bcb945 100644
--- a/net-mgmt/fastnetmon/Makefile
+++ b/net-mgmt/fastnetmon/Makefile
@@ -1,62 +1,63 @@
 PORTNAME=		fastnetmon
 DISTVERSIONPREFIX=	v
 DISTVERSION=		1.2.7
+PORTREVISION=	1
 CATEGORIES=		net-mgmt security
 
 MAINTAINER=		farrokhi@FreeBSD.org
 COMMENT=		Very fast DDoS analyzer with sflow/netflow/mirror support
 WWW=			https://fastnetmon.com
 
 LICENSE=	GPLv2
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
 BROKEN_armv6=	does not build: invokes x86 assembler
 BROKEN_armv7=	does not build: invokes x86 assembler
 
 LIB_DEPENDS=	libboost_regex.so:devel/boost-libs \
 		liblog4cpp.so:devel/log4cpp \
 		libmongoc-1.0.so:devel/mongo-c-driver \
 		libbson-1.0.so:devel/libbson \
 		libcapnp.so:devel/capnproto \
 		libgrpc.so:devel/grpc \
 		libprotobuf.so:devel/protobuf \
 		libabsl_base.so:devel/abseil \
 		libhiredis.so:databases/hiredis
 
 USES=		cmake compiler:c++20-lang localbase:ldflags pkgconfig ssl
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	pavel-odintsov
 
 WRKSRC_SUBDIR=	src
 
 USE_RC_SUBR=	${PORTNAME}
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 PORTDOCS=	*
 
 CFLAGS_i386=	-march=i586
 CXXFLAGS+=	-D_GNU_SOURCE
 
 CMAKE_OFF=	SET_ABSOLUTE_INSTALL_PATH
 CMAKE_ON=	ENABLE_NETMAP_SUPPORT \
 		LINK_WITH_ABSL
 
 OPTIONS_DEFINE=	DOCS
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|/etc/networks|${PREFIX}/etc/networks|g' \
 		-e 's|/var/run|/var/run/${PORTNAME}|g' ${WRKSRC}/fastnetmon.conf
 	@${REINPLACE_CMD} -e 's|/etc/|${PREFIX}/etc/|g' ${WRKSRC}/man/fastnetmon.8
 
 post-install:
 	${INSTALL_DATA} ${WRKSRC}/fastnetmon.conf ${STAGEDIR}${PREFIX}/etc/fastnetmon.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/networks_list ${STAGEDIR}${PREFIX}/etc/networks_list.sample
 	${INSTALL_DATA} ${WRKSRC}/networks_whitelist ${STAGEDIR}${PREFIX}/etc/networks_whitelist.sample
 	${MKDIR} ${STAGEDIR}/var/run/fastnetmon ${STAGEDIR}/var/log/fastnetmon ${STAGEDIR}/var/log/fastnetmon_attacks
 	${INSTALL_SCRIPT} ${WRKSRC}/notify_about_attack.sh ${STAGEDIR}${PREFIX}/bin/notify_about_attack.sh.sample
 
 post-install-DOCS-on:
 	cd ${WRKSRC}/../ && ${COPYTREE_SHARE} "README.md docs" ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/sysutils/syslog-ng/Makefile b/sysutils/syslog-ng/Makefile
index 384b6de5803c..1f214e695062 100644
--- a/sysutils/syslog-ng/Makefile
+++ b/sysutils/syslog-ng/Makefile
@@ -1,308 +1,309 @@
 PORTNAME=	syslog-ng
 DISTVERSION=	4.8.0
+PORTREVISION=	1
 CATEGORIES=	sysutils
 # official master site:
 MASTER_SITES=	https://github.com/balabit/syslog-ng/releases/download/syslog-ng-${DISTVERSION}/
 # for development snapshots:
 # MASTER_SITES=	https://peter.czanik.hu/freebsd/
 
 MAINTAINER=	cy@FreeBSD.org
 COMMENT=	Powerful syslogd replacement
 WWW=		https://www.syslog-ng.org/
 
 LICENSE=	GPLv2+ LGPL21+
 LICENSE_COMB=	multi
 LICENSE_FILE=	${WRKSRC}/COPYING
 
 LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libuuid.so:misc/e2fsprogs-libuuid \
 		libivykis.so:devel/ivykis
 
 USES=		autoreconf:build compiler:c11 cpe gettext-runtime gmake gnome \
 		libtool pathfix pkgconfig python:build shebangfix ssl
 
 CPE_VENDOR=	oneidentity
 
 CONFLICTS?=	syslog-ng syslog-ng[0-9] \
 		syslog-ng[0-9][0-9] \
 		syslog-ng-devel eventlog*
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 MAKE_JOBS_UNSAFE=	yes
 OPTIONS_DEFINE=	TCP_WRAPPERS SQL SPOOF IPV6 SMTP JSON GEOIP2 DOCS REDIS JAVA PYTHON PYTHON_MOD MONGO CURL JAVA_MOD AMQP RIEMANN KAFKA SNMPDEST GRPC
 OPTIONS_DEFAULT=	CURL JSON
 TCP_WRAPPERS_DESC=	Build with TCP Wrappers
 SQL_DESC=		Build with database (libdbi) support
 SPOOF_DESC=		Build with spoof source support
 SMTP_DESC=		Build with SMTP support
 JSON_DESC=		Build with JSON-C support
 GEOIP2_DESC=		Build with geoip2 (MaxMindDB) support
 REDIS_DESC=		Build with Redis support
 JAVA_DESC=		Build with Java support (no modules)
 JAVA_MOD_DESC=		Build with Java modules (needs Maven / Internet access)
 PYTHON_DESC=		Build with Python ${PYTHON_VER} support
 PYTHON_MOD_DESC=	Build with Python modules (Kubernetes, Hyper, etc.)
 CURL_DESC=		Build with Curl HTTP support
 AMQP_DESC=		Build with AMQP support
 RIEMANN_DESC=		Build with Riemann support
 KAFKA_DESC=		Build with Kafka (librdkafka) support
 SNMPDEST_DESC=		Build with SNMP destination (net-snmp) support
 GRPC_DESC=		Build with experimental GRPC-based modules (OpenTelemetry, Loki, etc.)
 
 USE_LDCONFIG=	yes
 USE_RC_SUBR=	syslog-ng
 SHEBANG_FILES=	lib/merge-grammar.py
 GNU_CONFIGURE=	yes
 # Note: Even if PYTHON is deselected, glib20 will install python.
 USE_GNOME=	glib20
 SUB_FILES=	pkg-message
 INSTALL_TARGET=	install-strip
 
 CONFIGURE_ARGS=	--sysconfdir=${LOCALBASE}/etc --localstatedir=/var/db \
 		--enable-dynamic-linking --disable-manpages-install \
 		--disable-linux-caps \
 		--datadir=${PREFIX}/share/ --with-ivykis=system \
 		--with-python=${PYTHON_VER} --with-python-packages=none
 
 CONFIGURE_ENV+=		OPENSSL_CFLAGS="-I${OPENSSLINC}" \
 			OPENSSL_LIBS="-L${OPENSSLLIB} -lcrypto -lssl"
 
 TCP_WRAPPERS_CONFIGURE_ENABLE=	tcp-wrapper
 
 SPOOF_LIB_DEPENDS=		libnet.so:net/libnet
 SPOOF_CONFIGURE_ENABLE=		spoof-source
 SPOOF_CONFIGURE_ON=		--with-libnet=${LOCALBASE}/bin
 SPOOF_CONFIGURE_ENV=		LIBNET_CFLAGS="-I${LOCALBASE}/include" \
 				LIBNET_LIBS="-L${LOCALBASE}/lib -lnet"
 
 IPV6_CONFIGURE_ENABLE=		ipv6
 
 AMQP_CONFIGURE_ENABLE=		amqp
 AMQP_PLIST_FILES=		lib/syslog-ng/libafamqp.so
 AMQP_LIB_DEPENDS=		librabbitmq.so:net/rabbitmq-c
 
 GEOIP2_CONFIGURE_ENABLE=	geoip2
 GEOIP2_LIB_DEPENDS=		libmaxminddb.so:net/libmaxminddb
 GEOIP2_LDFLAGS=			-L${LOCALBASE}/lib
 GEOIP2_PLIST_FILES=		lib/syslog-ng/libgeoip2-plugin.so
 
 REDIS_CONFIGURE_ENABLE=		redis
 REDIS_LIB_DEPENDS=		libhiredis.so:databases/hiredis
 REDIS_PLIST_FILES=		lib/syslog-ng/libredis.so
 
 SNMPDEST_CONFIGURE_ENABLE=	afsnmp
 SNMPDEST_LIB_DEPENDS=		libnetsnmp.so:net-mgmt/net-snmp
 SNMPDEST_PLIST_FILES=		lib/syslog-ng/libafsnmp.so
 
 SMTP_CONFIGURE_ON=		--with-libesmtp=${LOCALBASE} --enable-smtp
 SMTP_CONFIGURE_OFF=		--without-libesmtp --disable-smtp
 SMTP_LIB_DEPENDS=		libesmtp.so:mail/libesmtp
 SMTP_PLIST_FILES=		lib/syslog-ng/libafsmtp.so
 
 SQL_CONFIGURE_ENABLE=		sql
 SQL_LIB_DEPENDS=		libdbi.so:databases/libdbi
 SQL_CONFIGURE_ENV=		LIBDBI_LIBS="-L${LOCALBASE}/lib -ldbi"
 SQL_PLIST_FILES=		lib/syslog-ng/libafsql.so
 
 MONGO_CONFIGURE_ENABLE=		mongodb
 MONGO_CONFIGURE_ON=		--with-mongoc=system
 MONGO_LIB_DEPENDS=		libmongoc-1.0.so:devel/mongo-c-driver
 MONGO_LIB_DEPENDS+=		libbson-1.0.so:devel/libbson
 MONGO_PLIST_FILES=		lib/syslog-ng/libafmongodb.so
 
 JSON_CONFIGURE_ENABLE=		json
 JSON_LIB_DEPENDS=		libjson-c.so:devel/json-c
 JSON_PLIST_FILES=		lib/syslog-ng/libjson-plugin.so \
 				share/syslog-ng/include/scl/cim/template.conf
 
 JAVA_CONFIGURE_ENABLE=		java
 JAVA_USE=			JAVA=yes
 JAVA_PLIST_FILES=		lib/syslog-ng/libmod-java.so \
 				lib/syslog-ng/java-modules/syslog-ng-core.jar
 
 JAVA_MOD_IMPLIES=		JAVA
 JAVA_MOD_CONFIGURE_ENABLE=	java-modules
 JAVA_MOD_USE=			JAVA=yes
 JAVA_MOD_BUILD_DEPENDS=		gradle:devel/gradle \
 				bash:shells/bash
 JAVA_MOD_PLIST_DIRS=		lib/syslog-ng/java-modules/elastic-jest-client
 JAVA_MOD_PLIST_FILES=		lib/syslog-ng/java-modules/log4j-api-2.17.2.jar \
 				lib/syslog-ng/java-modules/log4j-core-2.17.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/jest-2.0.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/jest-common-2.0.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/httpcore-nio-4.4.4.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/httpclient-4.5.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/httpasyncclient-4.1.1.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/slf4j-api-1.7.13.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/guava-19.0.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/gson-2.6.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/commons-lang3-3.4.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/httpcore-4.4.4.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/commons-logging-1.2.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/commons-codec-1.9.jar \
 				lib/syslog-ng/java-modules/elastic-jest-client/slf4j-simple-1.7.13.jar \
 				lib/syslog-ng/java-modules/hdfs.jar \
 				lib/syslog-ng/java-modules/elastic-v2.jar \
 				lib/syslog-ng/java-modules/kafka.jar \
 				lib/syslog-ng/java-modules/dummy.jar \
 				lib/syslog-ng/java-modules/http.jar \
 				lib/syslog-ng/java-modules/syslog-ng-common.jar
 
 PYTHON_BUILD_DEPENDS=		${PY_SETUPTOOLS}
 PYTHON_USES=			python
 PYTHON_CONFIGURE_ON=		--enable-python
 PYTHON_CONFIGURE_OFF=		--disable-python
 PYTHON_PLIST_FILES=		lib/syslog-ng/libmod-python.so \
 		etc/python/README.md \
 		lib/syslog-ng/python/requirements.txt \
 		lib/syslog-ng/python/syslogng/__pycache__/confgen%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/confgen.py \
 		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/PKG-INFO \
 		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/SOURCES.txt \
 		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/dependency_links.txt \
 		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/top_level.txt \
 		lib/syslog-ng/python/syslogng/__pycache__/dest%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/__pycache__/logger%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/__pycache__/message%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/__pycache__/parser%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/__pycache__/persist%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/__pycache__/source%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/__pycache__/template%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/__pycache__/reloc%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/dest.py \
 		lib/syslog-ng/python/syslogng/logger.py \
 		lib/syslog-ng/python/syslogng/message.py \
 		lib/syslog-ng/python/syslogng/parser.py \
 		lib/syslog-ng/python/syslogng/persist.py \
 		lib/syslog-ng/python/syslogng/source.py \
 		lib/syslog-ng/python/syslogng/template.py \
 		lib/syslog-ng/python/syslogng/reloc.py \
 		lib/syslog-ng/python/syslogng/__init__.py \
 		lib/syslog-ng/python/syslogng/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/__init__.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/__init__.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/choicecompleter.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/choicecompleter.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/commandlinelexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/commandlinelexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/completer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/completerlang.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/completerlang.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/debuggercli.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuggercli.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/debuglang.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/debuglang.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/getoptlexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/getoptlexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/langcompleter.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/langcompleter.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/lexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/lexertoken.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/lexertoken.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/macrocompleter.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/macrocompleter.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/readline.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/readline.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/syslognginternals.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/syslognginternals.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/tablexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tablexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/templatelang.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelang.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/templatelexer.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/templatelexer.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/editline.cpython-${PYTHON_SUFFIX}.pyc \
 		lib/syslog-ng/python/syslogng/debuggercli/editline.py \
 		lib/syslog-ng/python/syslogng/debuggercli/tflang.py \
 		lib/syslog-ng/python/syslogng/debuggercli/__pycache__/tflang.cpython-${PYTHON_SUFFIX}.pyc
 
 PYTHON_MOD_IMPLIES=		PYTHON
 PYTHON_MOD_CONFIGURE_ON=	--enable-python-modules
 PYTHON_MOD_CONFIGURE_OFF=	--disable-python-modules
 PYTHON_MOD_PLIST_FILES=		lib/syslog-ng/python/syslogng-1.0-py%%PYTHON_VER%%.egg-info/requires.txt \
 		lib/syslog-ng/python/syslogng/modules/kubernetes/__init__.py \
 		lib/syslog-ng/python/syslogng/modules/kubernetes/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/modules/kubernetes/scl/kubernetes.conf \
 		lib/syslog-ng/python/syslogng/modules/example/__init__.py \
 		lib/syslog-ng/python/syslogng/modules/example/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/modules/example/scl/example.conf \
 		lib/syslog-ng/python/syslogng/modules/hypr/__init__.py \
 		lib/syslog-ng/python/syslogng/modules/hypr/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/modules/hypr/scl/hypr.conf \
 		lib/syslog-ng/python/syslogng/modules/s3/__init__.py \
 		lib/syslog-ng/python/syslogng/modules/s3/__pycache__/__init__%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/modules/s3/__pycache__/compressable_file_buffer%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_destination%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/modules/s3/__pycache__/s3_object%%PYTHON_EXT_SUFFIX%%.pyc \
 		lib/syslog-ng/python/syslogng/modules/s3/compressable_file_buffer.py \
 		lib/syslog-ng/python/syslogng/modules/s3/s3_destination.py \
 		lib/syslog-ng/python/syslogng/modules/s3/s3_object.py \
 		lib/syslog-ng/python/syslogng/modules/s3/scl/s3.conf
 
 
 CURL_CONFIGURE_OFF=		--with-libcurl=off
 CURL_CONFIGURE_ON=		--enable-http
 CURL_LIB_DEPENDS=		libcurl.so:ftp/curl
 CURL_PLIST_FILES=		lib/syslog-ng/libhttp.so \
 				include/syslog-ng/modules/http/http-signals.h
 
 RIEMANN_CONFIGURE_ON=		--enable-riemann
 RIEMANN_CONFIGURE_OFF=		--disable-riemann
 RIEMANN_LIB_DEPENDS=		libriemann-client-gnutls.so:net-mgmt/riemann-c-client
 RIEMANN_PLIST_FILES=		lib/syslog-ng/libriemann.so
 
 KAFKA_CONFIGURE_ON=		--enable-kafka
 KAFKA_CONFIGURE_OFF=		--disable-kafka
 KAFKA_LIB_DEPENDS=		librdkafka.so:net/librdkafka
 KAFKA_PLIST_FILES=		lib/syslog-ng/libkafka.so
 
 GRPC_CONFIGURE_ON=		--enable-cpp
 GRPC_CONFIGURE_OFF=		--disable-cpp
 GRPC_LIB_DEPENDS=		libgrpc.so:devel/grpc
 GRPC_PLIST_FILES=		lib/libgrpc-protos.so \
 				lib/libgrpc-protos.so.0 \
 				lib/libgrpc-protos.so.0.0.0 \
 				lib/syslog-ng/libloki.so \
 				lib/syslog-ng/libotel.so \
 				lib/syslog-ng/libbigquery.so \
 				lib/syslog-ng/libcloud_auth.so
 
 
 .include <bsd.port.pre.mk>
 
 .if !${PORT_OPTIONS:MJSON}
 BROKEN=		Default configuration does not currently support non-JSON builds
 .endif
 
 .if ${PORT_OPTIONS:MJAVA_MOD}
 BROKEN=		Java modules do not build currently
 .endif
 
 post-patch:
 	@${CP} ${WRKSRC}/scl/syslog-ng.conf ${WRKSRC}/scl/syslog-ng.conf.dist
 	touch -r ${WRKSRC}/lib/cfg-grammar.y ${WRKSRC}/lib/merge-grammar.py
 
 post-patch-JAVA_MOD-on:
 	@${REINPLACE_CMD} 's,$$(GRADLE),& --no-daemon,g' ${WRKSRC}/Makefile.in
 
 post-install:
 .if ${PORT_OPTIONS:MDOCS}
 	${INSTALL} -d ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/AUTHORS ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/COPYING ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NEWS.md ${STAGEDIR}${DOCSDIR}
 .endif
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.1 ${STAGEDIR}${PREFIX}/share/man/man1/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.5 ${STAGEDIR}${PREFIX}/share/man/man5/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.7 ${STAGEDIR}${PREFIX}/share/man/man7/
 	${INSTALL_MAN} ${WRKSRC}/doc/man/*.8 ${STAGEDIR}${PREFIX}/share/man/man8/
 	${INSTALL_DATA} ${FILESDIR}/syslog-ng.conf.sample \
 		${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/scl/syslog-ng.conf.dist \
 		${STAGEDIR}${PREFIX}/etc
 	${INSTALL_DATA} ${WRKSRC}/lib/ivykis/src/include/iv*.h \
 		${STAGEDIR}${PREFIX}/include/syslog-ng/
 
 .include <bsd.port.post.mk>
diff --git a/www/freenginx-devel/Makefile b/www/freenginx-devel/Makefile
index f15a0a4841e6..3ee252349c65 100644
--- a/www/freenginx-devel/Makefile
+++ b/www/freenginx-devel/Makefile
@@ -1,383 +1,383 @@
 PORTNAME=	freenginx
 PORTVERSION=	1.27.2
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/joneum
 PKGNAMESUFFIX=	-devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	joneum@FreeBSD.org
 COMMENT?=	Robust and small WWW server
 WWW=		https://freenginx.org/
 
 LICENSE?=	BSD2CLAUSE
 LICENSE_FILE?=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	nginx
 
 PORTSCOUT=	limit:^1\.2[7-8]\.[0-9]*
 
 USES=		cpe
 
 CPE_VENDOR=	freenginx
 CPE_PRODUCT=	freenginx
 USE_GITHUB=	nodefault
 
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
 NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
 HTTP_PORT?=	80
 
 NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
 CONFLICTS?=	nginx-1.* \
 		nginx-full-1.* \
 		nginx-lite-1.* \
 		nginx-naxsi-1.*
 USE_RC_SUBR?=	nginx
 SUB_FILES?=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} \
 		NGINX_RUNDIR=${NGINX_RUNDIR} \
 		NGINX_TMPDIR=${NGINX_TMPDIR} \
 		PREFIX=${PREFIX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${ETCDIR} \
 		--with-cc-opt="-I ${LOCALBASE}/include" \
 		--conf-path=${ETCDIR}/nginx.conf \
 		--sbin-path=${PREFIX}/sbin/nginx \
 		--pid-path=${NGINX_RUNDIR}/nginx.pid \
 		--error-log-path=${NGINX_ERRORLOG} \
 		--user=${WWWOWN} --group=${WWWGRP} \
 		--with-compat \
 		--with-pcre
 ALL_TARGET=
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_GROUP=	HTTPGRP MAILGRP STREAMGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
 	HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
 	HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \
 	HTTPV3_QTLS
 
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 
 OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_REALIP STREAM_SSL \
 	STREAM_SSL_PREREAD
 
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML OTEL THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 		HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
 		HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 		HTTP_STATUS HTTP_SUB HTTPV2 HTTPV3 MAIL MAIL_SSL STREAM \
 		STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
 
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
 OPTIONS_RADIO+=		GSSAPI
 OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
 GSSAPI_MIT_USES=	gssapi:mit
 
 OPTIONS_SUB=	yes
 
 .include "Makefile.options.desc"
 
 .for opt in ${OPTIONS_GROUP_MAILGRP:NMAIL}
 ${opt}_IMPLIES=	MAIL
 .endfor
 
 .for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW
 ${opt}_IMPLIES=	HTTP
 .endfor
 
 .for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM}
 ${opt}_IMPLIES=	STREAM
 .endfor
 
 GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
 # If the target is makesum, make sure that every distfile is fetched.
 .if ${.TARGETS:Mmakesum}
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTPGRP} \
 	${OPTIONS_GROUP_MAILGRP} ${OPTIONS_GROUP_STREAMGRP} \
 	${OPTIONS_GROUP_THIRDPARTYGRP}
 .endif
 
 # Non-module options handling
 DEBUG_CFLAGS=		-g
 DEBUG_VARS=		STRIP=#do not strip if nginx with debug information
 DEBUGLOG_CONFIGURE_ON=	--with-debug
 DSO_CONFIGURE_ON=	--modules-path=${MODULESDIR}
 DSO_VARS=		MODULESDIR=${PREFIX}/libexec/${PORTNAME}
 FILE_AIO_CONFIGURE_ON=	--with-file-aio
 IPV6_CONFIGURE_OFF=	--with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include"
 THREADS_CONFIGURE_ON=	--with-threads
 
 # Bundled modules
 GOOGLE_PERFTOOLS_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 GOOGLE_PERFTOOLS_CONFIGURE_ON=	--with-google_perftools_module
 HTTP_CONFIGURE_ON=		--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
 				--http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
 				--http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
 				--http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
 				--http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
 				--http-log-path=${NGINX_ACCESSLOG}
 HTTP_CONFIGURE_OFF=		--without-http
 HTTP_ADDITION_CONFIGURE_ON=	--with-http_addition_module
 HTTP_AUTH_REQ_CONFIGURE_ON=	--with-http_auth_request_module
 HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
 HTTP_DAV_CONFIGURE_ON=		--with-http_dav_module
 HTTP_DEGRADATION_CONFIGURE_ON=	--with-http_degradation_module
 HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
 HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
 HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
 HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd
 HTTP_IMAGE_FILTER_VARS=		DSO_BASEMODS+=http_image_filter_module
 HTTP_MP4_CONFIGURE_ON=		--with-http_mp4_module
 HTTP_PERL_CATEGORIES=		perl5
 HTTP_PERL_USES=			perl5
 # Fix build failure on clang >= 12
 HTTP_PERL_CFLAGS=		-Wno-compound-token-split-by-macro
 HTTP_PERL_VARS=			DSO_BASEMODS+=http_perl_module
 HTTP_RANDOM_INDEX_CONFIGURE_ON=	--with-http_random_index_module
 HTTP_REALIP_CONFIGURE_ON=	--with-http_realip_module
 HTTP_SECURE_LINK_CONFIGURE_ON=	--with-http_secure_link_module
 HTTP_SLICE_CONFIGURE_ON=	--with-http_slice_module
 HTTP_SSL_CONFIGURE_ON=		--with-http_ssl_module
 HTTP_SSL_USES=			ssl
 HTTP_STATUS_CONFIGURE_ON=	--with-http_stub_status_module
 HTTP_SUB_CONFIGURE_ON=		--with-http_sub_module
 HTTP_XSLT_CONFIGURE_ON=		--with-http_xslt_module
 HTTP_XSLT_LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
 				libxslt.so:textproc/libxslt
 HTTP_XSLT_VARS=			DSO_BASEMODS+=http_xslt_module
 HTTPV2_IMPLIES=			HTTP_SSL
 HTTPV2_CONFIGURE_ON=		--with-http_v2_module
 HTTPV3_CONFIGURE_ON=		--with-http_v3_module
 HTTPV3_BORING_BUILD_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_RUN_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_IMPLIES=		HTTPV3
 HTTPV3_BORING_PREVENTS=		HTTPV3_LSSL HTTPV3_QTLS
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_IMPLIES=		HTTPV3
 HTTPV3_LSSL_PREVENTS=		HTTPV3_BORING HTTPV3_QTLS
 HTTPV3_QTLS_BUILD_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_RUN_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_IMPLIES=		HTTPV3
 HTTPV3_QTLS_PREVENTS=		HTTPV3_BORING HTTPV3_LSSL
 MAIL_VARS=			DSO_BASEMODS+=mail
 MAIL_IMAP_CONFIGURE_OFF=	--without-mail_imap_module
 MAIL_POP3_CONFIGURE_OFF=	--without-mail_pop3_module
 MAIL_SMTP_CONFIGURE_OFF=	--without-mail_smtp_module
 MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
 STREAM_CONFIGURE_ON=		--with-stream
 STREAM_REALIP_CONFIGURE_ON=	--with-stream_realip_module
 STREAM_SSL_USES=		ssl
 STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
 STREAM_SSL_PREREAD_CONFIGURE_ON=--with-stream_ssl_preread_module
 
 ### External modules
 .include "Makefile.extmod"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDSO}
 _addbasemod=	=dynamic
 _addextmod=	add-dynamic-module
 .else
 _addextmod=	add-module
 .endif
 
 .for mod in ${DSO_BASEMODS}
 CONFIGURE_ARGS+=	--with-${mod}${_addbasemod}
 .endfor
 
 # Some modules depend on other being there before, for example, devel_kit needs
 # to be there before a few other.
 .for mod in ${FIRST_DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 
 .for mod in ${DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 # For non-GitHub hosted modules
 .for moddir in ${DSO_EXTDIRS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKDIR}/${moddir}
 .endfor
 
 .if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
 IGNORE=		requires at least HTTP or MAIL to \
 		be defined.  Please do 'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT))
 IGNORE=		required at least GSSAPI_HEIMDAL or \
 		GSSAPI_MIT to be defined. Please do \
 		'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
 CONFIGURE_ENV+=	EXTRA_PRE_CXXFLAGS="-std=c++14"
 .endif
 
 .if empty(PORT_OPTIONS:MMODSECURITY3)
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib"
 .else
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
 LIB_DEPENDS+=		libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML)
 CONFIGURE_ENV+=		NJS_LIBXSLT=NO
 NJS_CONFIGURE_ARGS=	--no-libxml2
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
 	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
 	@${ECHO_MSG} "This port install Passenger module only"
 .endif
 	@${ECHO_MSG}
 
 post-extract-NAXSI-on:
 	@${RMDIR} ${WRKSRC_naxsi}/naxsi_src/libinjection
 	@${LN} -s ${WRKSRC_libinjection} ${WRKSRC_naxsi}/naxsi_src/libinjection
 
 pre-patch-HTTPV3-on:
 	@${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
 
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!; \
 		s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
 		${WRKSRC}/conf/nginx.conf
 
 post-patch-BROTLI-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_brotli}/filter/config
 
 post-patch-DRIZZLE-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config
 
 post-patch-FASTDFS-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \
 		${WRKSRC_fastdfs}/src/config
 
 post-patch-GRIDFS-on:
 	@${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \
 		${WRKSRC_gridfs}/nginx-gridfs/config
 
 post-patch-HTTP_AUTH_KRB5-on:
 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g; \
 		s!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!g' ${WRKSRC_auth_krb5}/config
 
 post-patch-HTTP_TARANTOOL-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
 
 post-patch-ICONV-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
 
 post-patch-PASSENGER-on:
 	@${REINPLACE_CMD} \
 		'168,170s!true!false!' \
 		${WRKSRC_PASSENGER}/build/basics.rb
 	@${REINPLACE_CMD} \
 		's!-I/usr/include/libev!!; \
 		s!-lev!!; \
 		s!-Iext/libev!!; \
 		s!-I/usr/include/libeio!!; \
 		s!-leio!!; \
 		s!-Iext/libeio!!' \
 		${WRKSRC_PASSENGER}/build/common_library.rb
 
 post-patch-POSTGRES-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_postgres}/config
 
 post-patch-SFLOW-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
 		${WRKSRC_sflow}/ngx_http_sflow_config.h
 
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
 .if !target(do-install)
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
 .endfor
 .for i in fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist
 .endfor
 
 do-install-HTTP_PERL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 
 # Install dynamic modules
 do-install-DSO-on:
 	${MKDIR} ${STAGEDIR}${MODULESDIR}
 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
 		-exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;)
 
 do-install-LINK-on:
 	${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include
 
 do-install-NAXSI-on:
 	${INSTALL_DATA} \
 	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_rules/naxsi_core.rules \
 	${STAGEDIR}${ETCDIR}
 .endif
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 post-install-WWW-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \
 	${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/freenginx/Makefile b/www/freenginx/Makefile
index de5c3700b960..a1b047302b97 100644
--- a/www/freenginx/Makefile
+++ b/www/freenginx/Makefile
@@ -1,384 +1,384 @@
 PORTNAME=	nginx
 PORTVERSION=	1.26.0
-PORTREVISION?=	1
+PORTREVISION?=	2
 CATEGORIES=	www
 MASTER_SITES=	https://freenginx.org/download/ \
 		LOCAL/joneum
 PKGNAMEPREFIX=	free
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	joneum@FreeBSD.org
 COMMENT?=	Robust and small WWW server
 WWW=		https://freenginx.org/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	nginx nginx-devel
 
 PORTSCOUT=	limit:^1\.26\.[0-9]*
 
 USES=		cpe
 
 CPE_VENDOR=	freenginx
 CPE_PRODUCT=	freenginx
 USE_GITHUB=	nodefault
 
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
 NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
 HTTP_PORT?=	80
 
 NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
 CONFLICTS?=	nginx-1.* \
 		nginx-devel-1.* \
 		nginx-full-1.* \
 		nginx-lite-1.* \
 		nginx-naxsi-1.*
 USE_RC_SUBR?=	nginx
 SUB_FILES?=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} \
 		NGINX_RUNDIR=${NGINX_RUNDIR} \
 		NGINX_TMPDIR=${NGINX_TMPDIR} \
 		PREFIX=${PREFIX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${ETCDIR} \
 		--with-cc-opt="-I ${LOCALBASE}/include" \
 		--conf-path=${ETCDIR}/nginx.conf \
 		--sbin-path=${PREFIX}/sbin/nginx \
 		--pid-path=${NGINX_RUNDIR}/nginx.pid \
 		--error-log-path=${NGINX_ERRORLOG} \
 		--user=${WWWOWN} --group=${WWWGRP} \
 		--with-compat \
 		--with-pcre
 ALL_TARGET=
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_GROUP=	HTTPGRP MAILGRP STREAMGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
 	HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
 	HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \
 	HTTPV3_QTLS
 
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 
 OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_REALIP STREAM_SSL \
 	STREAM_SSL_PREREAD
 
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML OTEL THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 		HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
 		HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 		HTTP_STATUS HTTP_SUB HTTPV2 HTTPV3 MAIL MAIL_SSL STREAM \
 		STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
 
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
 OPTIONS_RADIO+=		GSSAPI
 OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
 GSSAPI_MIT_USES=	gssapi:mit
 
 OPTIONS_SUB=	yes
 
 .include "Makefile.options.desc"
 
 .for opt in ${OPTIONS_GROUP_MAILGRP:NMAIL}
 ${opt}_IMPLIES=	MAIL
 .endfor
 
 .for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW
 ${opt}_IMPLIES=	HTTP
 .endfor
 
 .for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM}
 ${opt}_IMPLIES=	STREAM
 .endfor
 
 GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
 # If the target is makesum, make sure that every distfile is fetched.
 .if ${.TARGETS:Mmakesum}
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTPGRP} \
 	${OPTIONS_GROUP_MAILGRP} ${OPTIONS_GROUP_STREAMGRP} \
 	${OPTIONS_GROUP_THIRDPARTYGRP}
 .endif
 
 # Non-module options handling
 DEBUG_CFLAGS=		-g
 DEBUG_VARS=		STRIP=#do not strip if nginx with debug information
 DEBUGLOG_CONFIGURE_ON=	--with-debug
 DSO_CONFIGURE_ON=	--modules-path=${MODULESDIR}
 DSO_VARS=		MODULESDIR=${PREFIX}/libexec/${PORTNAME}
 FILE_AIO_CONFIGURE_ON=	--with-file-aio
 IPV6_CONFIGURE_OFF=	--with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include"
 THREADS_CONFIGURE_ON=	--with-threads
 
 # Bundled modules
 GOOGLE_PERFTOOLS_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 GOOGLE_PERFTOOLS_CONFIGURE_ON=	--with-google_perftools_module
 HTTP_CONFIGURE_ON=		--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
 				--http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
 				--http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
 				--http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
 				--http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
 				--http-log-path=${NGINX_ACCESSLOG}
 HTTP_CONFIGURE_OFF=		--without-http
 HTTP_ADDITION_CONFIGURE_ON=	--with-http_addition_module
 HTTP_AUTH_REQ_CONFIGURE_ON=	--with-http_auth_request_module
 HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
 HTTP_DAV_CONFIGURE_ON=		--with-http_dav_module
 HTTP_DEGRADATION_CONFIGURE_ON=	--with-http_degradation_module
 HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
 HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
 HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
 HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd
 HTTP_IMAGE_FILTER_VARS=		DSO_BASEMODS+=http_image_filter_module
 HTTP_MP4_CONFIGURE_ON=		--with-http_mp4_module
 HTTP_PERL_CATEGORIES=		perl5
 HTTP_PERL_USES=			perl5
 # Fix build failure on clang >= 12
 HTTP_PERL_CFLAGS=		-Wno-compound-token-split-by-macro
 HTTP_PERL_VARS=			DSO_BASEMODS+=http_perl_module
 HTTP_RANDOM_INDEX_CONFIGURE_ON=	--with-http_random_index_module
 HTTP_REALIP_CONFIGURE_ON=	--with-http_realip_module
 HTTP_SECURE_LINK_CONFIGURE_ON=	--with-http_secure_link_module
 HTTP_SLICE_CONFIGURE_ON=	--with-http_slice_module
 HTTP_SSL_CONFIGURE_ON=		--with-http_ssl_module
 HTTP_SSL_USES=			ssl
 HTTP_STATUS_CONFIGURE_ON=	--with-http_stub_status_module
 HTTP_SUB_CONFIGURE_ON=		--with-http_sub_module
 HTTP_XSLT_CONFIGURE_ON=		--with-http_xslt_module
 HTTP_XSLT_LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
 				libxslt.so:textproc/libxslt
 HTTP_XSLT_VARS=			DSO_BASEMODS+=http_xslt_module
 HTTPV2_IMPLIES=			HTTP_SSL
 HTTPV2_CONFIGURE_ON=		--with-http_v2_module
 HTTPV3_CONFIGURE_ON=		--with-http_v3_module
 HTTPV3_BORING_BUILD_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_RUN_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_IMPLIES=		HTTPV3
 HTTPV3_BORING_PREVENTS=		HTTPV3_LSSL HTTPV3_QTLS
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_IMPLIES=		HTTPV3
 HTTPV3_LSSL_PREVENTS=		HTTPV3_BORING HTTPV3_QTLS
 HTTPV3_QTLS_BUILD_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_RUN_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_IMPLIES=		HTTPV3
 HTTPV3_QTLS_PREVENTS=		HTTPV3_BORING HTTPV3_LSSL
 MAIL_VARS=			DSO_BASEMODS+=mail
 MAIL_IMAP_CONFIGURE_OFF=	--without-mail_imap_module
 MAIL_POP3_CONFIGURE_OFF=	--without-mail_pop3_module
 MAIL_SMTP_CONFIGURE_OFF=	--without-mail_smtp_module
 MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
 STREAM_CONFIGURE_ON=		--with-stream
 STREAM_REALIP_CONFIGURE_ON=	--with-stream_realip_module
 STREAM_SSL_USES=		ssl
 STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
 STREAM_SSL_PREREAD_CONFIGURE_ON=--with-stream_ssl_preread_module
 
 ### External modules
 .include "Makefile.extmod"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDSO}
 _addbasemod=	=dynamic
 _addextmod=	add-dynamic-module
 .else
 _addextmod=	add-module
 .endif
 
 .for mod in ${DSO_BASEMODS}
 CONFIGURE_ARGS+=	--with-${mod}${_addbasemod}
 .endfor
 
 # Some modules depend on other being there before, for example, devel_kit needs
 # to be there before a few other.
 .for mod in ${FIRST_DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 
 .for mod in ${DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 # For non-GitHub hosted modules
 .for moddir in ${DSO_EXTDIRS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKDIR}/${moddir}
 .endfor
 
 .if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
 IGNORE=		requires at least HTTP or MAIL to \
 		be defined.  Please do 'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT))
 IGNORE=		required at least GSSAPI_HEIMDAL or \
 		GSSAPI_MIT to be defined. Please do \
 		'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
 CONFIGURE_ENV+=	EXTRA_PRE_CXXFLAGS="-std=c++14"
 .endif
 
 .if empty(PORT_OPTIONS:MMODSECURITY3) && empty(PORT_OPTIONS:MPASSENGER)
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib"
 .else
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
 LIB_DEPENDS+=		libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML)
 CONFIGURE_ENV+=		NJS_LIBXSLT=NO
 NJS_CONFIGURE_ARGS=	--no-libxml2
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
 	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
 	@${ECHO_MSG} "This port install Passenger module only"
 .endif
 	@${ECHO_MSG}
 
 post-extract-NAXSI-on:
 	@${RMDIR} ${WRKSRC_naxsi}/naxsi_src/libinjection
 	@${LN} -s ${WRKSRC_libinjection} ${WRKSRC_naxsi}/naxsi_src/libinjection
 
 pre-patch-HTTPV3-on:
 	@${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
 
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!; \
 		s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
 		${WRKSRC}/conf/nginx.conf
 
 post-patch-BROTLI-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_brotli}/filter/config
 
 post-patch-DRIZZLE-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config
 
 post-patch-FASTDFS-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \
 		${WRKSRC_fastdfs}/src/config
 
 post-patch-GRIDFS-on:
 	@${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \
 		${WRKSRC_gridfs}/nginx-gridfs/config
 
 post-patch-HTTP_AUTH_KRB5-on:
 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g; \
 		s!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!g' ${WRKSRC_auth_krb5}/config
 
 post-patch-HTTP_TARANTOOL-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
 
 post-patch-ICONV-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
 
 post-patch-PASSENGER-on:
 	@${REINPLACE_CMD} \
 		'168,170s!true!false!' \
 		${WRKSRC_PASSENGER}/build/basics.rb
 	@${REINPLACE_CMD} \
 		's!-I/usr/include/libev!!; \
 		s!-lev!!; \
 		s!-Iext/libev!!; \
 		s!-I/usr/include/libeio!!; \
 		s!-leio!!; \
 		s!-Iext/libeio!!' \
 		${WRKSRC_PASSENGER}/build/common_library.rb
 
 post-patch-POSTGRES-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_postgres}/config
 
 post-patch-SFLOW-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
 		${WRKSRC_sflow}/ngx_http_sflow_config.h
 
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
 .if !target(do-install)
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
 .endfor
 .for i in fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist
 .endfor
 
 do-install-HTTP_PERL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 
 # Install dynamic modules
 do-install-DSO-on:
 	${MKDIR} ${STAGEDIR}${MODULESDIR}
 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
 		-exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;)
 
 do-install-LINK-on:
 	${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include
 
 do-install-NAXSI-on:
 	${INSTALL_DATA} \
 	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_rules/naxsi_core.rules \
 	${STAGEDIR}${ETCDIR}
 .endif
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 post-install-WWW-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \
 	${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/nginx-devel/Makefile b/www/nginx-devel/Makefile
index 03f87a8c8450..9f8d7791c334 100644
--- a/www/nginx-devel/Makefile
+++ b/www/nginx-devel/Makefile
@@ -1,392 +1,392 @@
 PORTNAME?=	nginx
 PORTVERSION=	1.27.0
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/osa
 PKGNAMESUFFIX?=	-devel
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	osa@FreeBSD.org
 COMMENT?=	Robust and small WWW server
 WWW=		https://nginx.com/
 
 LICENSE?=	BSD2CLAUSE
 LICENSE_FILE?=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	nginx
 
 PORTSCOUT=	limit:^1\.2[7-8]\.[0-9]*
 
 USES=		cpe
 
 CPE_VENDOR=	f5
 CPE_PRODUCT=	nginx
 USE_GITHUB=	nodefault
 
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
 NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
 HTTP_PORT?=	80
 
 NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
 CONFLICTS?=	nginx-1.* \
 		nginx-full-1.* \
 		nginx-lite-1.* \
 		nginx-naxsi-1.*
 USE_RC_SUBR?=	nginx
 SUB_FILES?=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} \
 		NGINX_RUNDIR=${NGINX_RUNDIR} \
 		NGINX_TMPDIR=${NGINX_TMPDIR} \
 		PREFIX=${PREFIX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${ETCDIR} \
 		--with-cc-opt="-I ${LOCALBASE}/include" \
 		--conf-path=${ETCDIR}/nginx.conf \
 		--sbin-path=${PREFIX}/sbin/nginx \
 		--pid-path=${NGINX_RUNDIR}/nginx.pid \
 		--error-log-path=${NGINX_ERRORLOG} \
 		--user=${WWWOWN} --group=${WWWGRP} \
 		--with-compat \
 		--with-pcre
 ALL_TARGET=
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_GROUP=	HTTPGRP MAILGRP STREAMGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
 	HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
 	HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \
 	HTTPV3_QTLS
 
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 
 OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_REALIP STREAM_SSL \
 	STREAM_SSL_PREREAD
 
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_QJS NJS_XML \
 		OTEL THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 		HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
 		HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 		HTTP_STATUS HTTP_SUB HTTPV2 HTTPV3 MAIL MAIL_SSL STREAM \
 		STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
 
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
 OPTIONS_RADIO+=		GSSAPI
 OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
 GSSAPI_MIT_USES=	gssapi:mit
 
 OPTIONS_SUB=	yes
 
 .include "Makefile.options.desc"
 
 .for opt in ${OPTIONS_GROUP_MAILGRP:NMAIL}
 ${opt}_IMPLIES=	MAIL
 .endfor
 
 .for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW
 ${opt}_IMPLIES=	HTTP
 .endfor
 
 .for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM}
 ${opt}_IMPLIES=	STREAM
 .endfor
 
 GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
 # If the target is makesum, make sure that every distfile is fetched.
 .if ${.TARGETS:Mmakesum}
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTPGRP} \
 	${OPTIONS_GROUP_MAILGRP} ${OPTIONS_GROUP_STREAMGRP} \
 	${OPTIONS_GROUP_THIRDPARTYGRP}
 .endif
 
 # Non-module options handling
 DEBUG_CFLAGS=		-g
 DEBUG_VARS=		STRIP=#do not strip if nginx with debug information
 DEBUGLOG_CONFIGURE_ON=	--with-debug
 DSO_CONFIGURE_ON=	--modules-path=${MODULESDIR}
 DSO_VARS=		MODULESDIR=${PREFIX}/libexec/${PORTNAME}
 FILE_AIO_CONFIGURE_ON=	--with-file-aio
 IPV6_CONFIGURE_OFF=	--with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include"
 THREADS_CONFIGURE_ON=	--with-threads
 
 # Bundled modules
 GOOGLE_PERFTOOLS_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 GOOGLE_PERFTOOLS_CONFIGURE_ON=	--with-google_perftools_module
 HTTP_CONFIGURE_ON=		--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
 				--http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
 				--http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
 				--http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
 				--http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
 				--http-log-path=${NGINX_ACCESSLOG}
 HTTP_CONFIGURE_OFF=		--without-http
 HTTP_ADDITION_CONFIGURE_ON=	--with-http_addition_module
 HTTP_AUTH_REQ_CONFIGURE_ON=	--with-http_auth_request_module
 HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
 HTTP_DAV_CONFIGURE_ON=		--with-http_dav_module
 HTTP_DEGRADATION_CONFIGURE_ON=	--with-http_degradation_module
 HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
 HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
 HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
 HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd
 HTTP_IMAGE_FILTER_VARS=		DSO_BASEMODS+=http_image_filter_module
 HTTP_MP4_CONFIGURE_ON=		--with-http_mp4_module
 HTTP_PERL_CATEGORIES=		perl5
 HTTP_PERL_USES=			perl5
 # Fix build failure on clang >= 12
 HTTP_PERL_CFLAGS=		-Wno-compound-token-split-by-macro
 HTTP_PERL_VARS=			DSO_BASEMODS+=http_perl_module
 HTTP_RANDOM_INDEX_CONFIGURE_ON=	--with-http_random_index_module
 HTTP_REALIP_CONFIGURE_ON=	--with-http_realip_module
 HTTP_SECURE_LINK_CONFIGURE_ON=	--with-http_secure_link_module
 HTTP_SLICE_CONFIGURE_ON=	--with-http_slice_module
 HTTP_SSL_CONFIGURE_ON=		--with-http_ssl_module
 HTTP_SSL_USES=			ssl
 HTTP_STATUS_CONFIGURE_ON=	--with-http_stub_status_module
 HTTP_SUB_CONFIGURE_ON=		--with-http_sub_module
 HTTP_XSLT_CONFIGURE_ON=		--with-http_xslt_module
 HTTP_XSLT_LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
 				libxslt.so:textproc/libxslt
 HTTP_XSLT_VARS=			DSO_BASEMODS+=http_xslt_module
 HTTPV2_IMPLIES=			HTTP_SSL
 HTTPV2_CONFIGURE_ON=		--with-http_v2_module
 HTTPV3_CONFIGURE_ON=		--with-http_v3_module
 HTTPV3_BORING_BUILD_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_RUN_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_IMPLIES=		HTTPV3
 HTTPV3_BORING_PREVENTS=		HTTPV3_LSSL HTTPV3_QTLS
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_RUN_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_IMPLIES=		HTTPV3
 HTTPV3_LSSL_PREVENTS=		HTTPV3_BORING HTTPV3_QTLS
 HTTPV3_QTLS_BUILD_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_RUN_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_IMPLIES=		HTTPV3
 HTTPV3_QTLS_PREVENTS=		HTTPV3_BORING HTTPV3_LSSL
 MAIL_VARS=			DSO_BASEMODS+=mail
 MAIL_IMAP_CONFIGURE_OFF=	--without-mail_imap_module
 MAIL_POP3_CONFIGURE_OFF=	--without-mail_pop3_module
 MAIL_SMTP_CONFIGURE_OFF=	--without-mail_smtp_module
 MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
 STREAM_CONFIGURE_ON=		--with-stream
 STREAM_REALIP_CONFIGURE_ON=	--with-stream_realip_module
 STREAM_SSL_USES=		ssl
 STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
 STREAM_SSL_PREREAD_CONFIGURE_ON=--with-stream_ssl_preread_module
 
 ### External modules
 .include "Makefile.extmod"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDSO}
 _addbasemod=	=dynamic
 _addextmod=	add-dynamic-module
 .else
 _addextmod=	add-module
 .endif
 
 .for mod in ${DSO_BASEMODS}
 CONFIGURE_ARGS+=	--with-${mod}${_addbasemod}
 .endfor
 
 # Some modules depend on other being there before, for example, devel_kit needs
 # to be there before a few other.
 .for mod in ${FIRST_DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 
 .for mod in ${DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 # For non-GitHub hosted modules
 .for moddir in ${DSO_EXTDIRS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKDIR}/${moddir}
 .endfor
 
 .if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
 IGNORE=		requires at least HTTP or MAIL to \
 		be defined.  Please do 'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT))
 IGNORE=		required at least GSSAPI_HEIMDAL or \
 		GSSAPI_MIT to be defined. Please do \
 		'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
 CONFIGURE_ENV+=	EXTRA_PRE_CXXFLAGS="-std=c++14"
 .endif
 
 .if empty(PORT_OPTIONS:MMODSECURITY3)
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib"
 .else
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
 LIB_DEPENDS+=		libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MNJS}
 . if empty(PORT_OPTIONS:MNJS_QJS)
 NJS_CONFIGURE_ARGS+=	--no-quickjs
 . endif
 . if empty(PORT_OPTIONS:MNJS_XML)
 CONFIGURE_ENV+=		NJS_LIBXSLT=NO
 NJS_CONFIGURE_ARGS+=	--no-libxml2
 . endif
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
 	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
 	@${ECHO_MSG} "This port install Passenger module only"
 .endif
 	@${ECHO_MSG}
 
 post-extract-NAXSI-on:
 	@${RMDIR} ${WRKSRC_naxsi}/naxsi_src/libinjection
 	@${LN} -s ${WRKSRC_libinjection} ${WRKSRC_naxsi}/naxsi_src/libinjection
 
 pre-patch-HTTPV3-on:
 	@${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
 
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!; \
 		s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
 		${WRKSRC}/conf/nginx.conf
 
 post-patch-BROTLI-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_brotli}/filter/config
 
 post-patch-DRIZZLE-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config
 
 post-patch-FASTDFS-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \
 		${WRKSRC_fastdfs}/src/config
 
 post-patch-GRIDFS-on:
 	@${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \
 		${WRKSRC_gridfs}/nginx-gridfs/config
 
 post-patch-HTTP_AUTH_KRB5-on:
 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g; \
 		s!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!g' ${WRKSRC_auth_krb5}/config
 
 post-patch-HTTP_TARANTOOL-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
 
 post-patch-ICONV-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
 
 post-patch-NJS_QJS-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_njs}/auto/quickjs
 
 post-patch-PASSENGER-on:
 	@${REINPLACE_CMD} \
 		'168,170s!true!false!' \
 		${WRKSRC_PASSENGER}/build/basics.rb
 	@${REINPLACE_CMD} \
 		's!-I/usr/include/libev!!; \
 		s!-lev!!; \
 		s!-Iext/libev!!; \
 		s!-I/usr/include/libeio!!; \
 		s!-leio!!; \
 		s!-Iext/libeio!!' \
 		${WRKSRC_PASSENGER}/build/common_library.rb
 
 post-patch-POSTGRES-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_postgres}/config
 
 post-patch-SFLOW-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
 		${WRKSRC_sflow}/ngx_http_sflow_config.h
 
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
 .if !target(do-install)
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
 .endfor
 .for i in fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist
 .endfor
 
 do-install-HTTP_PERL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 
 # Install dynamic modules
 do-install-DSO-on:
 	${MKDIR} ${STAGEDIR}${MODULESDIR}
 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
 		-exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;)
 
 do-install-LINK-on:
 	${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include
 
 do-install-NAXSI-on:
 	${INSTALL_DATA} \
 	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_rules/naxsi_core.rules \
 	${STAGEDIR}${ETCDIR}
 .endif
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 post-install-WWW-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \
 	${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING)
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/www/nginx/Makefile b/www/nginx/Makefile
index 3b75f5bc5593..3e3aaef091db 100644
--- a/www/nginx/Makefile
+++ b/www/nginx/Makefile
@@ -1,383 +1,383 @@
 PORTNAME=	nginx
 PORTVERSION=	1.26.1
-PORTREVISION=	1
+PORTREVISION=	2
 PORTEPOCH=	3
 CATEGORIES=	www
 MASTER_SITES=	https://nginx.org/download/ \
 		LOCAL/joneum
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER?=	joneum@FreeBSD.org
 COMMENT?=	Robust and small WWW server
 WWW=		https://nginx.com/
 
 LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 CONFLICTS_INSTALL=	nginx-devel
 
 PORTSCOUT=	limit:^1\.2[6-7]\.[0-9]*
 
 USES=		cpe
 
 CPE_VENDOR=	f5
 CPE_PRODUCT=	nginx
 USE_GITHUB=	nodefault
 
 NGINX_VARDIR?=	/var
 NGINX_LOGDIR?=	${NGINX_VARDIR}/log/nginx
 NGINX_RUNDIR?=	${NGINX_VARDIR}/run
 NGINX_TMPDIR?=	${NGINX_VARDIR}/tmp/nginx
 HTTP_PORT?=	80
 
 NGINX_ACCESSLOG?=	${NGINX_LOGDIR}/access.log
 NGINX_ERRORLOG?=	${NGINX_LOGDIR}/error.log
 
 CONFLICTS?=	nginx-devel-1.* \
 		nginx-full-1.* \
 		nginx-lite-1.* \
 		nginx-naxsi-1.*
 USE_RC_SUBR?=	nginx
 SUB_FILES?=	pkg-message
 SUB_LIST+=	WWWOWN=${WWWOWN} \
 		WWWGRP=${WWWGRP} \
 		NGINX_RUNDIR=${NGINX_RUNDIR} \
 		NGINX_TMPDIR=${NGINX_TMPDIR} \
 		PREFIX=${PREFIX}
 
 HAS_CONFIGURE=	yes
 CONFIGURE_ARGS+=--prefix=${ETCDIR} \
 		--with-cc-opt="-I ${LOCALBASE}/include" \
 		--conf-path=${ETCDIR}/nginx.conf \
 		--sbin-path=${PREFIX}/sbin/nginx \
 		--pid-path=${NGINX_RUNDIR}/nginx.pid \
 		--error-log-path=${NGINX_ERRORLOG} \
 		--user=${WWWOWN} --group=${WWWGRP} \
 		--with-compat \
 		--with-pcre
 ALL_TARGET=
 
 PLIST_SUB+=	NGINX_TMPDIR=${NGINX_TMPDIR} NGINX_LOGDIR=${NGINX_LOGDIR} WWWOWN=${WWWOWN} WWWGRP=${WWWGRP}
 
 USERS?=	${WWWOWN}
 GROUPS?=${WWWGRP}
 
 NO_OPTIONS_SORT=	yes
 
 OPTIONS_GROUP=	HTTPGRP MAILGRP STREAMGRP
 # Modules that are part of the base nginx distribution
 OPTIONS_GROUP_HTTPGRP=	GOOGLE_PERFTOOLS HTTP HTTP_ADDITION HTTP_AUTH_REQ \
 	HTTP_CACHE HTTP_DAV HTTP_DEGRADATION HTTP_FLV HTTP_GUNZIP_FILTER \
 	HTTP_GZIP_STATIC HTTP_IMAGE_FILTER HTTP_MP4 HTTP_PERL \
 	HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 	HTTP_STATUS HTTP_SUB HTTP_XSLT HTTPV2 HTTPV3 HTTPV3_BORING HTTPV3_LSSL \
 	HTTPV3_QTLS
 
 OPTIONS_GROUP_MAILGRP=	MAIL MAIL_IMAP MAIL_POP3 MAIL_SMTP MAIL_SSL
 
 OPTIONS_GROUP_STREAMGRP=	STREAM STREAM_REALIP STREAM_SSL \
 	STREAM_SSL_PREREAD
 
 OPTIONS_DEFINE=		DEBUG DEBUGLOG DSO FILE_AIO IPV6 NJS NJS_XML OTEL THREADS WWW
 OPTIONS_DEFAULT?=	DSO FILE_AIO HTTP HTTP_ADDITION HTTP_AUTH_REQ HTTP_CACHE \
 		HTTP_DAV HTTP_FLV HTTP_GUNZIP_FILTER HTTP_GZIP_STATIC HTTP_MP4 \
 		HTTP_RANDOM_INDEX HTTP_REALIP HTTP_SECURE_LINK HTTP_SLICE HTTP_SSL \
 		HTTP_STATUS HTTP_SUB HTTPV2 HTTPV3 MAIL MAIL_SSL STREAM \
 		STREAM_REALIP STREAM_SSL STREAM_SSL_PREREAD THREADS WWW
 
 LIB_DEPENDS+=	libpcre2-8.so:devel/pcre2
 
 OPTIONS_RADIO+=		GSSAPI
 OPTIONS_RADIO_GSSAPI=	GSSAPI_HEIMDAL GSSAPI_MIT
 GSSAPI_HEIMDAL_USES=	gssapi:heimdal,flags
 GSSAPI_MIT_USES=	gssapi:mit
 
 OPTIONS_SUB=	yes
 
 .include "Makefile.options.desc"
 
 .for opt in ${OPTIONS_GROUP_MAILGRP:NMAIL}
 ${opt}_IMPLIES=	MAIL
 .endfor
 
 .for opt in ${OPTIONS_GROUP_HTTPGRP:NHTTP} WWW
 ${opt}_IMPLIES=	HTTP
 .endfor
 
 .for opt in ${OPTIONS_GROUP_STREAMGRP:NSTREAM}
 ${opt}_IMPLIES=	STREAM
 .endfor
 
 GSSAPI_HEIMDAL_IMPLIES=	HTTP_AUTH_KRB5
 GSSAPI_MIT_IMPLIES=	HTTP_AUTH_KRB5
 
 # If the target is makesum, make sure that every distfile is fetched.
 .if ${.TARGETS:Mmakesum}
 OPTIONS_DEFAULT=	${OPTIONS_DEFINE} ${OPTIONS_GROUP_HTTPGRP} \
 	${OPTIONS_GROUP_MAILGRP} ${OPTIONS_GROUP_STREAMGRP} \
 	${OPTIONS_GROUP_THIRDPARTYGRP}
 .endif
 
 # Non-module options handling
 DEBUG_CFLAGS=		-g
 DEBUG_VARS=		STRIP=#do not strip if nginx with debug information
 DEBUGLOG_CONFIGURE_ON=	--with-debug
 DSO_CONFIGURE_ON=	--modules-path=${MODULESDIR}
 DSO_VARS=		MODULESDIR=${PREFIX}/libexec/${PORTNAME}
 FILE_AIO_CONFIGURE_ON=	--with-file-aio
 IPV6_CONFIGURE_OFF=	--with-cc-opt="-DNGX_HAVE_INET6=0 -I ${LOCALBASE}/include"
 THREADS_CONFIGURE_ON=	--with-threads
 
 # Bundled modules
 GOOGLE_PERFTOOLS_LIB_DEPENDS=	libprofiler.so:devel/google-perftools
 GOOGLE_PERFTOOLS_CONFIGURE_ON=	--with-google_perftools_module
 HTTP_CONFIGURE_ON=		--http-client-body-temp-path=${NGINX_TMPDIR}/client_body_temp \
 				--http-fastcgi-temp-path=${NGINX_TMPDIR}/fastcgi_temp \
 				--http-proxy-temp-path=${NGINX_TMPDIR}/proxy_temp \
 				--http-scgi-temp-path=${NGINX_TMPDIR}/scgi_temp \
 				--http-uwsgi-temp-path=${NGINX_TMPDIR}/uwsgi_temp \
 				--http-log-path=${NGINX_ACCESSLOG}
 HTTP_CONFIGURE_OFF=		--without-http
 HTTP_ADDITION_CONFIGURE_ON=	--with-http_addition_module
 HTTP_AUTH_REQ_CONFIGURE_ON=	--with-http_auth_request_module
 HTTP_CACHE_CONFIGURE_OFF=	--without-http-cache
 HTTP_DAV_CONFIGURE_ON=		--with-http_dav_module
 HTTP_DEGRADATION_CONFIGURE_ON=	--with-http_degradation_module
 HTTP_FLV_CONFIGURE_ON=		--with-http_flv_module
 HTTP_GZIP_STATIC_CONFIGURE_ON=	--with-http_gzip_static_module
 HTTP_GUNZIP_FILTER_CONFIGURE_ON=--with-http_gunzip_module
 HTTP_IMAGE_FILTER_LIB_DEPENDS=	libgd.so:graphics/gd
 HTTP_IMAGE_FILTER_VARS=		DSO_BASEMODS+=http_image_filter_module
 HTTP_MP4_CONFIGURE_ON=		--with-http_mp4_module
 HTTP_PERL_CATEGORIES=		perl5
 HTTP_PERL_USES=			perl5
 # Fix build failure on clang >= 12
 HTTP_PERL_CFLAGS=		-Wno-compound-token-split-by-macro
 HTTP_PERL_VARS=			DSO_BASEMODS+=http_perl_module
 HTTP_RANDOM_INDEX_CONFIGURE_ON=	--with-http_random_index_module
 HTTP_REALIP_CONFIGURE_ON=	--with-http_realip_module
 HTTP_SECURE_LINK_CONFIGURE_ON=	--with-http_secure_link_module
 HTTP_SLICE_CONFIGURE_ON=	--with-http_slice_module
 HTTP_SSL_CONFIGURE_ON=		--with-http_ssl_module
 HTTP_SSL_USES=			ssl
 HTTP_STATUS_CONFIGURE_ON=	--with-http_stub_status_module
 HTTP_SUB_CONFIGURE_ON=		--with-http_sub_module
 HTTP_XSLT_CONFIGURE_ON=		--with-http_xslt_module
 HTTP_XSLT_LIB_DEPENDS=		libxml2.so:textproc/libxml2 \
 				libxslt.so:textproc/libxslt
 HTTP_XSLT_VARS=			DSO_BASEMODS+=http_xslt_module
 HTTPV2_IMPLIES=			HTTP_SSL
 HTTPV2_CONFIGURE_ON=		--with-http_v2_module
 HTTPV3_CONFIGURE_ON=		--with-http_v3_module
 HTTPV3_BORING_BUILD_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_RUN_DEPENDS=	${LOCALBASE}/bin/bssl:security/boringssl
 HTTPV3_BORING_IMPLIES=		HTTPV3
 HTTPV3_BORING_PREVENTS=		HTTPV3_LSSL HTTPV3_QTLS
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_BUILD_DEPENDS=	${LOCALBASE}/include/tls.h:security/libressl-devel
 HTTPV3_LSSL_IMPLIES=		HTTPV3
 HTTPV3_LSSL_PREVENTS=		HTTPV3_BORING HTTPV3_QTLS
 HTTPV3_QTLS_BUILD_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_RUN_DEPENDS=	${LOCALBASE}/include/openssl/quic.h:security/openssl-quictls
 HTTPV3_QTLS_IMPLIES=		HTTPV3
 HTTPV3_QTLS_PREVENTS=		HTTPV3_BORING HTTPV3_LSSL
 MAIL_VARS=			DSO_BASEMODS+=mail
 MAIL_IMAP_CONFIGURE_OFF=	--without-mail_imap_module
 MAIL_POP3_CONFIGURE_OFF=	--without-mail_pop3_module
 MAIL_SMTP_CONFIGURE_OFF=	--without-mail_smtp_module
 MAIL_SSL_USES=			ssl
 MAIL_SSL_CONFIGURE_ON=		--with-mail_ssl_module
 STREAM_VARS=			DSO_BASEMODS+=stream
 STREAM_CONFIGURE_ON=		--with-stream
 STREAM_REALIP_CONFIGURE_ON=	--with-stream_realip_module
 STREAM_SSL_USES=		ssl
 STREAM_SSL_CONFIGURE_ON=	--with-stream_ssl_module
 STREAM_SSL_PREREAD_CONFIGURE_ON=--with-stream_ssl_preread_module
 
 ### External modules
 .include "Makefile.extmod"
 
 .include <bsd.port.pre.mk>
 
 .if ${PORT_OPTIONS:MDSO}
 _addbasemod=	=dynamic
 _addextmod=	add-dynamic-module
 .else
 _addextmod=	add-module
 .endif
 
 .for mod in ${DSO_BASEMODS}
 CONFIGURE_ARGS+=	--with-${mod}${_addbasemod}
 .endfor
 
 # Some modules depend on other being there before, for example, devel_kit needs
 # to be there before a few other.
 .for mod in ${FIRST_DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 
 .for mod in ${DSO_EXTMODS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKSRC_${mod}}${${mod:tu}_SUBDIR}
 .endfor
 # For non-GitHub hosted modules
 .for moddir in ${DSO_EXTDIRS}
 CONFIGURE_ARGS+=	--${_addextmod}=${WRKDIR}/${moddir}
 .endfor
 
 .if empty(PORT_OPTIONS:MHTTP) && empty(PORT_OPTIONS:MMAIL)
 IGNORE=		requires at least HTTP or MAIL to \
 		be defined.  Please do 'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MHTTP_AUTH_KRB5} && (empty(PORT_OPTIONS:MGSSAPI_HEIMDAL) && empty(PORT_OPTIONS:MGSSAPI_MIT))
 IGNORE=		required at least GSSAPI_HEIMDAL or \
 		GSSAPI_MIT to be defined. Please do \
 		'make config' again
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER} && empty(PORT_OPTIONS:MDEBUG)
 CONFIGURE_ENV+=	OPTIMIZE="yes"
 CFLAGS+=	-DNDEBUG
 .endif
 
 .if ${PORT_OPTIONS:MPASSENGER}
 CONFIGURE_ENV+=	EXTRA_PRE_CXXFLAGS="-std=c++14"
 .endif
 
 .if empty(PORT_OPTIONS:MMODSECURITY3) && empty(PORT_OPTIONS:MPASSENGER)
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib"
 .else
 CONFIGURE_ARGS+=	--with-ld-opt="-L ${LOCALBASE}/lib -lpcre"
 LIB_DEPENDS+=		libpcre.so:devel/pcre
 .endif
 
 .if ${PORT_OPTIONS:MNJS} && empty(PORT_OPTIONS:MNJS_XML)
 CONFIGURE_ENV+=		NJS_LIBXSLT=NO
 NJS_CONFIGURE_ARGS=	--no-libxml2
 .endif
 
 pre-everything::
 	@${ECHO_MSG}
 .if ${PORT_OPTIONS:MHTTP_UPSTREAM_FAIR}
 	@${ECHO_MSG} "Enable http_ssl module to build upstream_fair with SSL support"
 .endif
 .if ${PORT_OPTIONS:MPASSENGER}
 	@${ECHO_MSG} "This port install Passenger module only"
 .endif
 	@${ECHO_MSG}
 
 post-extract-NAXSI-on:
 	@${RMDIR} ${WRKSRC_naxsi}/naxsi_src/libinjection
 	@${LN} -s ${WRKSRC_libinjection} ${WRKSRC_naxsi}/naxsi_src/libinjection
 
 pre-patch-HTTPV3-on:
 	@${MV} ${WRKSRC}/README ${WRKSRC}/README.1st
 
 post-patch:
 	@${REINPLACE_CMD} 's!%%HTTP_PORT%%!${HTTP_PORT}!; \
 		s!%%PREFIX%%!${PREFIX}!; \
 		s!%%NGINX_ERRORLOG%%!${NGINX_ERRORLOG}!' \
 		${WRKSRC}/conf/nginx.conf
 
 post-patch-BROTLI-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_brotli}/filter/config
 
 post-patch-DRIZZLE-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_drizzle}/config
 
 post-patch-FASTDFS-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${PREFIX}!g;s!%%LOCALBASE%%!${LOCALBASE}!g' \
 		${WRKSRC_fastdfs}/src/config
 
 post-patch-GRIDFS-on:
 	@${REINPLACE_CMD} 's!\/usr!${LOCALBASE}!g' \
 		${WRKSRC_gridfs}/nginx-gridfs/config
 
 post-patch-HTTP_AUTH_KRB5-on:
 	@${REINPLACE_CMD} 's!%%GSSAPILIBS%%!${GSSAPILIBS}!g; \
 		s!%%GSSAPIINCDIR%%!${GSSAPIINCDIR}!g; \
 		s!%%GSSAPILIBDIR%%!${GSSAPILIBDIR}!g' ${WRKSRC_auth_krb5}/config
 
 post-patch-HTTP_TARANTOOL-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_nginx_tarantool}/config
 
 post-patch-ICONV-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_iconv}/config
 
 post-patch-PASSENGER-on:
 	@${REINPLACE_CMD} \
 		'168,170s!true!false!' \
 		${WRKSRC_PASSENGER}/build/basics.rb
 	@${REINPLACE_CMD} \
 		's!-I/usr/include/libev!!; \
 		s!-lev!!; \
 		s!-Iext/libev!!; \
 		s!-I/usr/include/libeio!!; \
 		s!-leio!!; \
 		s!-Iext/libeio!!' \
 		${WRKSRC_PASSENGER}/build/common_library.rb
 
 post-patch-POSTGRES-on:
 	@${REINPLACE_CMD} 's!%%PREFIX%%!${LOCALBASE}!g' ${WRKSRC_postgres}/config
 
 post-patch-SFLOW-on:
 	@${REINPLACE_CMD} \
 		's!%%PREFIX%%!${LOCALBASE}!g' \
 		${WRKSRC_sflow}/ngx_http_sflow_config.h
 
 pre-configure-SMALL_LIGHT-on:
 	( cd ${WRKSRC_small_light} && ./setup )
 
 do-configure-NJS-on:
 	( cd ${WRKSRC_njs} && ${SETENV} ${CONFIGURE_ENV} ${CONFIGURE_CMD} ${NJS_CONFIGURE_ARGS} )
 
 .if !target(do-install)
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_TMPDIR}
 	${MKDIR} ${STAGEDIR}${NGINX_LOGDIR}
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/nginx ${STAGEDIR}${PREFIX}/sbin
 .for i in koi-utf koi-win win-utf
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}
 .endfor
 .for i in fastcgi_params mime.types scgi_params uwsgi_params
 	${INSTALL_DATA} ${WRKSRC}/conf/${i} ${STAGEDIR}${ETCDIR}/${i}-dist
 .endfor
 
 do-install-HTTP_PERL-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_PROGRAM} ${WRKSRC}/objs/src/http/modules/perl/blib/arch/auto/nginx/nginx.so \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/auto/nginx
 	${INSTALL_DATA} ${WRKSRC}/objs/src/http/modules/perl/blib/lib/nginx.pm \
 		${STAGEDIR}${PREFIX}/${SITE_ARCH_REL}/
 
 # Install dynamic modules
 do-install-DSO-on:
 	${MKDIR} ${STAGEDIR}${MODULESDIR}
 	(cd ${WRKSRC}/objs/ && ${FIND} . -name '*.so' -maxdepth 1 -type f \
 		-exec ${INSTALL_PROGRAM} {} ${STAGEDIR}${MODULESDIR} \;)
 
 do-install-LINK-on:
 	${INSTALL_DATA} ${WRKSRC_link}/src/ngx_link_func_module.h ${STAGEDIR}${PREFIX}/include
 
 do-install-NAXSI-on:
 	${INSTALL_DATA} \
 	${WRKDIR}/naxsi-${NAXSI_NGINX_VER}/naxsi_rules/naxsi_core.rules \
 	${STAGEDIR}${ETCDIR}
 .endif
 
 .if !target(post-install)
 post-install:
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	cd ${WRKSRC}/contrib/vim && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/vim/vimfiles
 	${INSTALL_MAN} ${WRKSRC}/objs/nginx.8 ${STAGEDIR}${PREFIX}/share/man/man8
 	${CAT} ${WRKSRC}/conf/nginx.conf >> ${STAGEDIR}${ETCDIR}/nginx.conf-dist
 
 post-install-WWW-on:
 	${MKDIR} ${STAGEDIR}${PREFIX}/www/nginx-dist
 	(cd ${WRKSRC}/html && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/www/nginx-dist && \
 	${TOUCH} ${STAGEDIR}${PREFIX}/www/nginx-dist/EXAMPLE_DIRECTORY-DONT_ADD_OR_TOUCH_ANYTHING)
 .endif
 
 .include <bsd.port.post.mk>