diff --git a/biology/gkl/Makefile b/biology/gkl/Makefile
index f7b48235265b..8e0cd443f0d2 100644
--- a/biology/gkl/Makefile
+++ b/biology/gkl/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	gkl
 DISTVERSION=	0.9.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	biology devel
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Accelerated kernel library for genomics
 WWW=		https://github.com/Intel-HLS/GKL
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN_aarch64=	/usr/lib/clang/19/include/ia32intrin.h:312:10: error: use of undeclared identifier '__builtin_ia32_readeflags_u32'
 
 BUILD_DEPENDS=	gmake:devel/gmake
 LIB_DEPENDS=	libisal.so:devel/isa-l
 
 USES=		cmake:noninja java localbase:ldflags
 USE_LDCONFIG=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Intel-HLS
 GH_PROJECT=	GKL
 JAVA_VERSION=	8 11
 
 BINARY_ALIAS=	make=${GMAKE}
 
 .include <bsd.port.mk>
diff --git a/databases/cassandra4/Makefile b/databases/cassandra4/Makefile
index dd27f971d99d..16a0cc54cd93 100644
--- a/databases/cassandra4/Makefile
+++ b/databases/cassandra4/Makefile
@@ -1,198 +1,198 @@
 PORTNAME=	cassandra
 DISTVERSION=	4.0.8
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	databases java
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${DISTVERSION}/:apache \
 		https://repo1.maven.org/maven2/com/github/luben/zstd-jni/1.5.0-4/:maven
 PKGNAMESUFFIX=	4
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-src
 DISTFILES=	${DISTNAME}.tar.gz:apache \
 		${ZSTD_DISTFILE} \
 		${MAVEN_CACHE_FILE}:prefetch
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}.tar.gz \
 		${MAVEN_CACHE_FILE}
 
 MAINTAINER=	language.devel@gmail.com
 COMMENT=	Highly scalable distributed database
 WWW=		https://cassandra.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 FETCH_DEPENDS=	${JAVA}:${JAVA_PORT} \
 		ant:devel/apache-ant
 RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java \
 		netty>0:java/netty
 
 USES=		cpe java:ant python shebangfix
 USE_RC_SUBR=	cassandra
 SHEBANG_FILES=	bin/cqlsh.py pylib/setup.py
 TEST_TARGET=	test
 CPE_VENDOR=	apache
 
 CONFLICTS=	cassandra3
 
 JAVA_VERSION=	8 11
 JAVA_VENDOR=	openjdk
 
 FETCH_ENV+=	JAVA_HOME=${JAVA_HOME}
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 USERS=		cassandra
 GROUPS=		cassandra
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 BUILD_DIST_DIR=	${WRKSRC}/build/dist
 REPO_DIR=	${WRKDIR}/repository
 
 CONFIG_FILES=	cassandra-env.sh \
 		cassandra-jaas.config \
 		cassandra-rackdc.properties \
 		cassandra-topology.properties \
 		cassandra.yaml \
 		commitlog_archiving.properties \
 		hotspot_compiler \
 		logback-tools.xml \
 		logback.xml \
 		jvm8-clients.options \
 		jvm8-server.options \
 		jvm11-clients.options \
 		jvm11-server.options \
 		jvm-clients.options \
 		jvm-server.options
 
 SCRIPT_FILES=	cassandra \
 		nodetool \
 		sstableloader \
 		sstablescrub \
 		sstableupgrade \
 		sstableutil \
 		sstableverify
 
 ZSTDJNI_VERSION=	${MASTER_SITES:M*\:maven:H:T}
 PLIST_SUB=	DISTVERSION=${DISTVERSION} ZSTDJNI_VERSION=${ZSTDJNI_VERSION}
 
 OPTIONS_DEFINE=		SIGAR DOCS
 OPTIONS_DEFAULT=	SIGAR
 OPTIONS_SUB=		yes
 
 SIGAR_DESC=		Use SIGAR to collect system information
 SIGAR_RUN_DEPENDS=	java-sigar>=1.6.4:java/sigar
 
 DOCS_BUILD_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sphinx>=0,1:textproc/py-sphinx@${PY_FLAVOR} \
 			${PYTHON_PKGNAMEPREFIX}sphinx_rtd_theme>0:textproc/py-sphinx_rtd_theme@${PY_FLAVOR}
 
 PORTDOCS=		*
 
 MAVEN_CACHE_FILE=	apache-${PORTNAME}-${DISTVERSION}-repo.tar.xz
 
 .if !exists(${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE})
 pre-fetch:
 	${MKDIR} ${DISTDIR}/${DIST_SUBDIR}
 	${MKDIR} ${WRKSRC}/.build
 	${MKDIR} ${WRKSRC}/src/java
 	${CP} ${FILESDIR}/maven/build.* ${WRKSRC}
 	${CP} ${FILESDIR}/maven/build-* ${WRKSRC}/.build
 	cd ${WRKSRC} && ${FETCH_ENV} ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} resolver-dist-lib
 	cd ${REPO_DIR} && ${FIND} . -type f -name "*.repositories" -a -exec ${SED} -i '' -e '2s,.*,Mon Aug 08 20:40:04 CEST 2022,' {} +
 	cd ${WRKDIR} && ${MTREE_CMD} -cbnSp repository | ${MTREE_CMD} -C | ${SED} \
 		-e 's:time=[0-9.]*:time=0.000000000:' \
 		-e 's:\([gu]id\)=[0-9]*:\1=0:g' \
 		-e 's:flags=.*:flags=none:' \
 		-e 's:^\.:./repository:' \
 		> maven-offline-cache.mtree
 	cd ${WRKDIR} && ${TAR} cJf ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE} \
 		@maven-offline-cache.mtree
 	${SHA256} ${WRKDIR}/maven-offline-cache.mtree ${DISTDIR}/${DIST_SUBDIR}/${MAVEN_CACHE_FILE}
 .endif
 
 do-build:
 	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
 
 do-build-DOCS-on:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} CASSANDRA_LOG_DIR=${WRKDIR}/gen-doc-log ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dpycmd=${PYTHON_CMD} -Dpyver=${PYTHON_VER} freebsd-stage-doc
 
 do-build-DOCS-off:
 	cd ${WRKSRC} && ${MAKE_ENV} ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} freebsd-stage
 
 post-build:
 .for f in ${SCRIPT_FILES}
 	@${REINPLACE_CMD} -e 's|/usr/share/cassandra|${DATADIR}/bin|' ${BUILD_DIST_DIR}/bin/${f}
 .endfor
 	@${REINPLACE_CMD} -e 's|`dirname "$$0"`/..|${DATADIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
 	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
 	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/lib/sigar-bin|${JAVAJARDIR}|' ${BUILD_DIST_DIR}/conf/cassandra-env.sh
 	@${REINPLACE_CMD} -e 's|$$CASSANDRA_HOME/conf|${ETCDIR}|' ${BUILD_DIST_DIR}/bin/cassandra.in.sh
 .for f in ${CONFIG_FILES}
 	@${MV} ${BUILD_DIST_DIR}/conf/${f} ${BUILD_DIST_DIR}/conf/${f}.sample
 .endfor
 	@${RM} ${BUILD_DIST_DIR}/lib/licenses/sigar*
 	@${RMDIR} ${BUILD_DIST_DIR}/lib/sigar-bin
 	@${RM} ${BUILD_DIST_DIR}/lib/zstd-jni*
 	@${RM} ${BUILD_DIST_DIR}/lib/licenses/zstd-jni*
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 .for f in CHANGES LICENSE NEWS NOTICE
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} ${f}.txt ${STAGEDIR}${DATADIR}/
 .endfor
 .for d in lib pylib tools
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DATADIR}/ "! -path '*/bin/*'"
 .endfor
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	cd ${BUILD_DIST_DIR}/conf && ${COPYTREE_SHARE} . ${STAGEDIR}${ETCDIR}/
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} bin ${STAGEDIR}${DATADIR}
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/bin/
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_BIN} tools/bin ${STAGEDIR}${DATADIR}/
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/bin/cassandra.in.sh ${STAGEDIR}${DATADIR}/tools/bin/
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/fqltool.jar ${STAGEDIR}${DATADIR}/tools/lib/
 	cd ${BUILD_DIST_DIR} && ${INSTALL_DATA} tools/lib/stress.jar ${STAGEDIR}${DATADIR}/tools/lib/
 .for f in ${SCRIPT_FILES}
 	${RLN} ${STAGEDIR}${DATADIR}/bin/${f} ${STAGEDIR}${PREFIX}/bin/${f}
 .endfor
 	${RLN} ${STAGEDIR}${DATADIR}/bin/cqlsh ${STAGEDIR}${PREFIX}/bin/cqlsh
 	${LN} -s ${JAVAJARDIR}/snappy-java.jar ${STAGEDIR}${DATADIR}/lib/snappy-java.jar
 
 do-test:
 	@cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} -Dstagedlib=${STAGEDIR}${DATADIR}/lib test
 
 .include <bsd.port.pre.mk>
 
 .if ${JAVA_PORT_VERSION} == 11
 USEJDK11=	-Duse.jdk11=true -Drat.skip=true
 .endif
 
 .if ${ARCH} == amd64
 PLIST_SUB+=		AMD64ONLY=""
 PLIST_SUB+=		I386ONLY="@comment "
 .elif ${ARCH} == i386
 PLIST_SUB+=		AMD64ONLY="@comment "
 PLIST_SUB+=		I386ONLY=""
 .else
 PLIST_SUB+=		AMD64ONLY="@comment "
 PLIST_SUB+=		I386ONLY="@comment "
 .endif
 
 .if ${ARCH} == amd64 || ${ARCH} == i386
 ZSTD_DISTFILE=	zstd-jni-${MASTER_SITES:M*\:maven:H:T}-freebsd_${ARCH}.jar:maven
 .else
 ZSTD_DISTFILE=
 .endif
 
 post-install:
 	${LN} -s ${JAVAJARDIR}/netty.jar ${STAGEDIR}${DATADIR}/lib/netty.jar
 .if ${ARCH} == amd64 || ${ARCH} == i386
 	${CP} ${DISTDIR}/${DIST_SUBDIR}/zstd-jni-${ZSTDJNI_VERSION}-freebsd_${ARCH}.jar ${STAGEDIR}${DATADIR}/lib/
 .endif
 
 post-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for d in doc javadoc
 	cd ${BUILD_DIST_DIR} && ${COPYTREE_SHARE} ${d} ${STAGEDIR}${DOCSDIR}/
 .endfor
 
 post-install-SIGAR-on:
 	${LN} -s ${JAVAJARDIR}/sigar.jar ${STAGEDIR}${DATADIR}/lib/sigar.jar
 
 .include <bsd.port.post.mk>
diff --git a/devel/argouml/Makefile b/devel/argouml/Makefile
index e7230f907792..628b7e9fdab1 100644
--- a/devel/argouml/Makefile
+++ b/devel/argouml/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	argouml
 DISTVERSION=	0.35.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel java
 MASTER_SITES=	https://github.com/argouml-tigris-org/argouml/releases/download/VERSION_${DISTVERSION:C/\./_/g}/
 DISTNAME=	ArgoUML-${DISTVERSION}
 DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
 		manual-${DISTVERSION}.pdf \
 		quickguide-${DISTVERSION}.pdf
 DIST_SUBDIR=	${PORTNAME}
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	UML design tool with cognitive support
 WWW=		https://github.com/argouml-tigris-org/argouml/wiki
 
 LICENSE=	EPL
 
 USES=		java
 JAVA_VERSION=	${ARGOUML_JAVA_VERSION:U8 11 17 18}
 
 DESKTOP_ENTRIES=	"ArgoUML" \
 			"Create advanced UML diagrams" \
 			"${DATADIR}/icon/ArgoIcon128x128.png" \
 			"argouml" \
 			"Development;Building;Java;" \
 			false
 NO_ARCH=	yes
 NO_BUILD=	yes
 PORTSCOUT=	limitw:1,even \
 		site:${MASTER_SITES:S/argouml-${DISTVERSION}\///}
 SUB_FILES=	argouml.sh
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 PORTDOCS=	manual-${DISTVERSION}.pdf quickguide-${DISTVERSION}.pdf
 
 OPTIONS_DEFINE=	DOCS
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/argouml.sh ${STAGEDIR}${PREFIX}/bin/argouml
 	@${MKDIR} ${STAGEDIR}${DATADIR}
 	${INSTALL_DATA} ${WRKSRC}/*.jar ${STAGEDIR}${DATADIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/ext
 	${INSTALL_DATA} ${WRKSRC}/ext/*.jar ${STAGEDIR}${DATADIR}/ext
 	${INSTALL_DATA} ${WRKSRC}/ext/*.xml ${STAGEDIR}${DATADIR}/ext
 	@${MKDIR} ${STAGEDIR}${DATADIR}/icon
 	${INSTALL_DATA} ${WRKSRC}/icon/*.png ${STAGEDIR}${DATADIR}/icon
 	${INSTALL_DATA} ${WRKSRC}/icon/*.svg ${STAGEDIR}${DATADIR}/icon
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/manual-${DISTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DIST_SUBDIR}/quickguide-${DISTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/devel/gradle5/Makefile b/devel/gradle5/Makefile
index 5f99cbcd3316..af39f1008ce0 100644
--- a/devel/gradle5/Makefile
+++ b/devel/gradle5/Makefile
@@ -1,30 +1,30 @@
 PORTNAME=	gradle
 PORTVERSION=	5.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel java
 MASTER_SITES=	https://downloads.gradle.org/distributions/
 EXTRACT_SUFX=	-bin.zip
 PKGNAMESUFFIX=	5
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Project automation tool
 WWW=		https://www.gradle.org/
 
 LICENSE=	APACHE20
 
 USES=		cpe java zip
 JAVA_VERSION=	8 11 # Fails on runtime with jdk 12+.
 NO_ARCH=	yes
 NO_BUILD=	yes
 DATADIR=	${PREFIX}/share/${PORTNAME}${PKGNAMESUFFIX}
 PORTSCOUT=	ignore:1
 PLIST_SUB=	PKGNAMESUFFIX=${PKGNAMESUFFIX}
 SUB_LIST=	PORTVERSION=${PORTVERSION} \
 		JAVA=${JAVA}
 SUB_FILES=	gradle
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/gradle ${STAGEDIR}${PREFIX}/bin/gradle${PKGNAMESUFFIX}
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} lib ${STAGEDIR}${DATADIR})
 
 .include <bsd.port.mk>
diff --git a/devel/jetbrains-sqlite/Makefile b/devel/jetbrains-sqlite/Makefile
index 64d3f08e22d2..e767d80af159 100644
--- a/devel/jetbrains-sqlite/Makefile
+++ b/devel/jetbrains-sqlite/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	sqlite
 PORTVERSION=	242.23726.38
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel
 PKGNAMEPREFIX=	jetbrains-
 DIST_SUBDIR=	jetbrains
 
 MAINTAINER=	dmitry.wagin@ya.ru
 COMMENT=	IntelliJ SQLite native library
 WWW=		https://github.com/JetBrains/intellij-community/tree/master/platform/sqlite
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/../../LICENSE.txt
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64le
 
 BUILD_DEPENDS=	bash:shells/bash
 
 USES=		java:build
 USE_GITHUB=	yes
 GH_ACCOUNT=	JetBrains
 GH_PROJECT=	intellij-community
 GH_TAGNAME=	idea/242.23726.38
 JAVA_VERSION=	17 21
 
 DATADIR=	${PREFIX}/share/jetbrains/${PORTNAME}
 WRKSRC_SUBDIR=	platform/sqlite
 PLIST_FILES=	share/jetbrains/${PORTNAME}/${ARCH}/libsqliteij.so
 
 do-build:
 	(cd ${WRKSRC} && \
 		${SETENV} JAVA_HOME=${JAVA_HOME} OS=freebsd ARCH=${ARCH} ./make.sh)
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/${ARCH}
 	${INSTALL_LIB} \
 		${WRKSRC}/target/sqlite/freebsd-${ARCH}/libsqliteij.so \
 		${STAGEDIR}${DATADIR}/${ARCH}
 
 .include <bsd.port.mk>
diff --git a/devel/spark/Makefile b/devel/spark/Makefile
index 131a7888a2fe..7aefee16f472 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -1,97 +1,97 @@
 PORTNAME=	spark
 PORTVERSION=	3.3.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	devel java
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ \
 		LOCAL/vvd:deps
 PKGNAMEPREFIX=	apache-
 DISTFILES=	${PORTNAME}-${PORTVERSION}.tgz \
 		${PORTNAME}-${PORTVERSION}-deps.tgz:deps
 
 MAINTAINER=	freebsd@sysctl.cz
 COMMENT=	Fast big data processing engine
 WWW=		http://spark.apache.org/
 
 LICENSE=	APACHE20
 
 BROKEN_armv6=	fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
 BROKEN_armv7=	fails to build: maven-assembly-plugin: Failed to retrieve numeric file attributes
 BROKEN_i386=	not enough memory on this architecture to build the port
 BROKEN_powerpc=	not enough memory on this architecture to build the port
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsnappyjava.so:archivers/snappy-java \
 		bash:shells/bash \
 		maven>0:devel/maven
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe java python shebangfix
 CPE_VENDOR=	apache
 JAVA_VERSION=	8 11 17
 
 USE_RC_SUBR=	spark_master spark_worker
 SHEBANG_FILES=	bin/sparkR
 
 NO_ARCH=	yes
 
 SUB_LIST=	SPARK_GROUP=spark \
 		SPARK_USER=spark
 
 USERS=		spark
 GROUPS=		spark
 
 PLIST_SUB=	VER=${PORTVERSION}
 
 .include <bsd.port.pre.mk>
 
 .if ${ARCH:Marmv?} || ${ARCH} == "i386"
 MAKE_ENV+=	MAVEN_OPTS="-Xmx1g -XX:ReservedCodeCacheSize=1g" \
 		JAVA_HOME=${JAVA_HOME}
 .else
 MAKE_ENV+=	MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=2g" \
 		JAVA_HOME=${JAVA_HOME}
 .endif
 
 .if ${ARCH} == "amd64"
 JAVA_ARCH=	x86_64
 .elif ${ARCH} == "i386"
 JAVA_ARCH=	x86
 .else
 JAVA_ARCH=	${ARCH}
 .endif
 
 # Update spark-*-dist.tgz if the hadoop version is changed!
 HADOOP_VERSION=	3.3.4
 # Comment out next line for download m2 and update ${PORTNAME}-${PORTVERSION}-deps.tgz
 OFFLINE=	-o
 
 do-build:
 	${MKDIR} ${WRKDIR}/snappy/org/xerial/snappy/native/${OPSYS}/${JAVA_ARCH}
 	${CP} ${LOCALBASE}/lib/libsnappyjava.so \
 		${WRKDIR}/snappy/org/xerial/snappy/native/${OPSYS}/${JAVA_ARCH}
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LOCALBASE}/bin/mvn ${OFFLINE} \
 		-Duser.home=${WRKDIR} \
 		-Dmaven.repo.local=${WRKDIR}/m2 \
 		-Dhadoop.version=${HADOOP_VERSION} \
 		-Pyarn -Phive -Phive-thriftserver -DskipTests \
 		clean package
 	${JAR} uvf ${WRKSRC}/assembly/target/scala*/jars/snappy-java-*.jar \
 		-C ${WRKDIR}/snappy org
 
 post-build:
 	${RM} ${WRKSRC}/bin/*.cmd ${WRKSRC}/sbin/spark-daemon.sh.orig
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}/lib ${STAGEDIR}${DATADIR}/examples/jars ${STAGEDIR}${DATADIR}/bin ${STAGEDIR}${DATADIR}/sbin ${STAGEDIR}${DATADIR}/conf
 	${ECHO_CMD} "Spark ${PORTVERSION} built for Hadoop ${HADOOP_VERSION}" > ${STAGEDIR}${DATADIR}/RELEASE
 	(cd  ${WRKSRC}/assembly/target/scala* && ${COPYTREE_SHARE} jars  ${STAGEDIR}${DATADIR})
 	${INSTALL_DATA} ${WRKSRC}/examples/target/spark-examples*.jar ${STAGEDIR}${DATADIR}/examples/jars
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} src ${STAGEDIR}${DATADIR}/examples
 	cd ${WRKSRC}/bin && ${INSTALL_SCRIPT} * ${STAGEDIR}${DATADIR}/bin/
 	cd ${WRKSRC}/sbin && ${INSTALL_SCRIPT} * ${STAGEDIR}${DATADIR}/sbin/
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "python" ${STAGEDIR}${DATADIR}/
 	${INSTALL_DATA} ${WRKSRC}/conf/*.template ${STAGEDIR}${DATADIR}/conf/
 	${MKDIR} ${STAGEDIR}/var/run/spark
 	${MKDIR} ${STAGEDIR}/var/log/spark
 
 .include <bsd.port.post.mk>
diff --git a/java/apache-commons-collections/Makefile b/java/apache-commons-collections/Makefile
index ffa6267b58f5..418fb814fc48 100644
--- a/java/apache-commons-collections/Makefile
+++ b/java/apache-commons-collections/Makefile
@@ -1,40 +1,40 @@
 PORTNAME=	commons-collections
 PORTVERSION=	3.2.2
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	java devel
 MASTER_SITES=	APACHE_COMMONS_SOURCE
 PKGNAMEPREFIX=	apache-
 DISTNAME=	${PORTNAME}-${PORTVERSION}-src
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Classes that extend/augment the Java Collections Framework
 WWW=		https://commons.apache.org/proper/commons-collections/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		java:ant,run
 JAVA_VERSION=	8 11 17 18 19 20
 
 ALL_TARGET=	jar
 NO_ARCH=	yes
 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar
 OTHERDOCS=	DEVELOPERS-GUIDE.html PROPOSAL.html README.txt RELEASE-NOTES.txt
 PORTDOCS=	apidocs ${OTHERDOCS}
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_ALL_TARGET=	javadoc
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/build/${PORTNAME}-${PORTVERSION}.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${WRKSRC}/build/docs && \
 		${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR})
 	${INSTALL_DATA} ${OTHERDOCS:S,^,${WRKSRC}/,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/lang/kawa/Makefile b/lang/kawa/Makefile
index abd7dcd09968..c2f13edb14fa 100644
--- a/lang/kawa/Makefile
+++ b/lang/kawa/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	kawa
 PORTVERSION=	3.1.1
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	lang scheme java
 MASTER_SITES=	GNU
 
 MAINTAINER=	ashish@FreeBSD.org
 COMMENT=	Java-based Scheme implementation
 WWW=		https://www.gnu.org/software/kawa/
 
 LICENSE=	MIT
 
 USES=		gmake groff java readline
 JAVA_VERSION=	8 11
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--enable-kawa-frontend \
 		--with-java-source=${JAVA_PORT_VERSION}
 CONFIGURE_ENV=	JAVA="${JAVA}" JAVAC="${JAVAC}"
 MAKE_ARGS=	JAR="${JAR}" READLINE_LIB_PATH="-L${LOCALBASE}/lib"
 MAKE_ENV=	JAVA_TOOL_OPTIONS=-Dfile.encoding=UTF8
 TEST_TARGET=	check
 TEST_ARGS=	# must be empty, otherwise tests fail
 TEST_ENV=	# must be empty, otherwise tests fail
 
 MAKE_JOBS_UNSAFE=yes
 
 INFO=		kawa
 PLIST_FILES=	bin/kawa bin/qexo \
 		share/kawa/bin/kawa share/kawa/lib/kawa.jar \
 		share/man/man1/kawa.1.gz share/man/man1/qexo.1.gz \
 
 post-patch:
 	@${REINPLACE_CMD} -e '/life-grid.log$$/s,>&,>,' \
 		${WRKSRC}/testsuite/Makefile.in
 
 .include <bsd.port.mk>
diff --git a/math/jacop/Makefile b/math/jacop/Makefile
index f9e0a77bfa1a..75b625d29e6a 100644
--- a/math/jacop/Makefile
+++ b/math/jacop/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	jacop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.8.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math java
 MASTER_SITES=	LOCAL/yuri/:maven \
 		http://people.freebsd.org/~yuri/:maven
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Java Constraint Programming solver
 WWW=		https://github.com/radsz/jacop
 
 LICENSE=	AGPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.md
 
 BUILD_DEPENDS=	maven>0:devel/maven
 
 USES=		java
 USE_GITHUB=	yes
 GH_ACCOUNT=	radsz
 JAVA_VERSION=	8 11 17
 
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 
 NO_ARCH=	yes
 
 SUB_FILES=	${PORTNAME}.sh
 SUB_LIST=	PORTVERSION=${PORTVERSION} JAVA=${JAVA}
 
 PLIST_SUB=	VERSION=${PORTVERSION}
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
 #   3. upload the *-deps archive
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX} .m2
 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/yuri/:maven
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
 MVN_ARGS=	--offline
 .endif
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LOCALBASE}/bin/mvn ${MVN_ARGS} \
 		-fae install \
 		-Dmaven.test.skip=true \
 		-Duser.home=${WRKDIR} \
 		compile
 
 do-install:
 	# script
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/fzn-${PORTNAME}
 	# jar
 	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar
 	# MiniZinc config file
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 	${INSTALL_DATA} ${WRKSRC}/src/main/minizinc/org.jacop.msc ${STAGEDIR}${PREFIX}/share/minizinc/solvers
 	# jacop library
 	cd ${WRKSRC}/src/main/minizinc/org/jacop/minizinc && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/share/minizinc/jacop
 
 .include <bsd.port.mk>
diff --git a/misc/jbidwatcher/Makefile b/misc/jbidwatcher/Makefile
index 0ddac87940ac..438f6256cdcf 100644
--- a/misc/jbidwatcher/Makefile
+++ b/misc/jbidwatcher/Makefile
@@ -1,28 +1,28 @@
 PORTNAME=	jbidwatcher
 PORTVERSION=	2.5.6
-PORTREVISION=	4
+PORTREVISION=	5
 CATEGORIES=	misc java
 MASTER_SITES=	http://www.jbidwatcher.com/download/
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java-based application allowing you to monitor eBay auctions
 WWW=		https://www.jbidwatcher.com/
 
 DEPRECATED=	unmaintained, upstream website is gone, no users in the ports tree
 EXPIRATION_DATE=	2026-04-14
 
 USES=	java:ant,run tar:bzip2
 JAVA_VERSION=	8 11
 
 ALL_TARGET=	jar
 
 SUB_FILES=	jbidwatcher
 SUB_LIST+=	PORTVERSION=${PORTVERSION}
 PLIST_FILES=	%%JAVAJARDIR%%/JBidwatcher-${PORTVERSION}.jar \
 		bin/${PORTNAME}
 
 do-install:
 	@${INSTALL_DATA} ${WRKSRC}/JBidwatcher-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 .include <bsd.port.mk>
diff --git a/multimedia/kodi/Makefile b/multimedia/kodi/Makefile
index 3d7d270de742..c4c52d90541a 100644
--- a/multimedia/kodi/Makefile
+++ b/multimedia/kodi/Makefile
@@ -1,322 +1,322 @@
 PORTNAME=	kodi
 DISTVERSION=	22.0a2
-PORTREVISION=	5
+PORTREVISION=	6
 CATEGORIES=	multimedia java
 MASTER_SITES=	https://mirrors.kodi.tv/build-deps/sources/
 DISTFILES=	apache-groovy-binary-${GROOVY_VERSION}.zip \
 		commons-lang3-${COMMONS_LANG_VERSION}-bin.tar.gz \
 		commons-text-${COMMONS_TEXT_VERSION}-bin.tar.gz \
 		json-${NLOHMANN_JSON_VERSION}.tar.xz
 DIST_SUBDIR=	${PORTNAME}
 # do not forget to fix devel/kodi-platform when updating kodi
 
 PATCH_SITES=	https://github.com/xbmc/xbmc/commit/
 PATCHFILES=	03b192aac8f49f613dade58c5359ec0d0e35d92a.patch:-p1 \
 		620e4011cbf5b2bfe531bc37d916a90787e3ca2d.patch:-p1
 
 MAINTAINER=	yzrh@noema.org
 COMMENT=	Award winning media center application
 WWW=		https://kodi.tv/
 
 LICENSE=	GPLv2+
 
 ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	flatbuffers>0:devel/flatbuffers \
 		swig>0:devel/swig
 LIB_DEPENDS=	libaacs.so:multimedia/libaacs \
 		libass.so:multimedia/libass \
 		libavcodec.so:multimedia/ffmpeg \
 		libavfilter.so:multimedia/ffmpeg \
 		libavformat.so:multimedia/ffmpeg \
 		libavutil.so:multimedia/ffmpeg \
 		libcdio.so:sysutils/libcdio \
 		libcrossguid.so:devel/libcrossguid \
 		libcurl.so:ftp/curl \
 		libbdplus.so:multimedia/libbdplus \
 		libexiv2.so:graphics/exiv2 \
 		libexpat.so:textproc/expat2 \
 		libfmt.so:devel/libfmt \
 		libfreetype.so:print/freetype2 \
 		libfribidi.so:converters/fribidi \
 		libfstrcmp.so:devel/fstrcmp \
 		libgif.so:graphics/giflib \
 		libharfbuzz.so:print/harfbuzz \
 		liblzo2.so:archivers/lzo2 \
 		libpcre2-8.so:devel/pcre2 \
 		libpng.so:graphics/png \
 		libspdlog.so:devel/spdlog \
 		libswresample.so:multimedia/ffmpeg \
 		libswscale.so:multimedia/ffmpeg \
 		libtag.so:audio/taglib \
 		libtinyxml.so:textproc/tinyxml \
 		libtinyxml2.so:textproc/tinyxml2 \
 		libudfread.so:multimedia/libudfread \
 		libuuid.so:misc/libuuid
 RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}sqlite3>0:databases/py-sqlite3@${PY_FLAVOR}
 
 USES=		autoreconf:build cmake:noninja compiler:c++17-lang cpe \
 		desktop-file-utils gettext gmake gnome iconv java:build jpeg libtool \
 		pkgconfig python sqlite ssl
 USE_RC_SUBR=	kodi
 
 KODI_CODENAME=		Piers
 LIBDVDCSS_VERSION=	1.4.3-Next-Nexus-Alpha2-2
 LIBDVDNAV_VERSION=	6.1.1-Next-Nexus-Alpha2-2
 LIBDVDREAD_VERSION=	6.1.3-Next-Nexus-Alpha2-2
 GROOVY_VERSION=		4.0.26
 COMMONS_LANG_VERSION=	3.17.0
 COMMONS_TEXT_VERSION=	1.13.0
 # TODO: make it a new port
 NLOHMANN_JSON_VERSION=	3.12.0
 
 USE_GITHUB=	yes
 GH_TUPLE=	xbmc:xbmc:${DISTVERSION}-${KODI_CODENAME} \
 		xbmc:libdvdcss:${LIBDVDCSS_VERSION}:libdvdcss/tools/depends/target/libdvdcss/native \
 		xbmc:libdvdnav:${LIBDVDNAV_VERSION}:libdvdnav/tools/depends/target/libdvdnav/native \
 		xbmc:libdvdread:${LIBDVDREAD_VERSION}:libdvdread/tools/depends/target/libdvdread/native
 
 KODI_ARCH_aarch64=	aarch64
 KODI_ARCH_amd64=	x86_64
 KODI_ARCH_i386=		x86
 KODI_ARCH_armv7=	armv7
 KODI_ARCH_armv6=	armv6
 KODI_ARCH_powerpc64=	powerpc64
 KODI_ARCH_powerpc64le=	powerpc64le
 
 PLIST_SUB=	ARCH=${KODI_ARCH_${ARCH}}
 
 USE_LDCONFIG=	yes
 USE_GNOME=	libxml2
 JAVA_VERSION=	8 11
 CMAKE_ARGS=	-DGIT_VERSION="${DISTVERSION}-${KODI_CODENAME}" \
 		-DLIBDVDCSS_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdcss-${LIBDVDCSS_VERSION}_GH0.tar.gz" \
 		-DLIBDVDNAV_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdnav-${LIBDVDNAV_VERSION}_GH0.tar.gz" \
 		-DLIBDVDREAD_URL="${DISTDIR}/${PORTNAME}/xbmc-libdvdread-${LIBDVDREAD_VERSION}_GH0.tar.gz" \
 		-DNLOHMANN_JSON_URL="${DISTDIR}/${PORTNAME}/json-${NLOHMANN_JSON_VERSION}.tar.xz" \
 		-Dgroovy_SOURCE_DIR="${WRKSRC}/tools/depends/share/groovy" \
 		-Dapache-commons-lang_SOURCE_DIR="${WRKSRC}/tools/depends/share/java/lang" \
 		-Dapache-commons-text_SOURCE_DIR="${WRKSRC}/tools/depends/share/java/text" \
 		-DCROSSGUID_INCLUDE_DIR="${LOCALBASE}/include" \
 		-DCORE_PLATFORM_NAME:STRING="${KODI_PLATFORM}" \
 		-DCMAKE_VERBOSE_MAKEFILE=ON
 CMAKE_OFF=	ENABLE_INTERNAL_CROSSGUID
 CMAKE_ON=	ENABLE_INTERNAL_NLOHMANNJSON \
 		VERBOSE_FIND
 CONFIGURE_ENV=	_CPU_FEATURE="${CPU_FEATURE}"
 
 OPTIONS_SUB=		yes
 OPTIONS_DEFINE=		AIRPLAY AVAHI LIBBLURAY CEC DAV1D DBUS \
 			DVDCSS LCMS2 LIRC WEBSERVER MYSQL NFS DVD SMB TEST \
 			UDEV UPNP VAAPI VDPAU XSLT DOCS
 OPTIONS_DEFAULT=	LIBBLURAY CEC LCMS2 WEBSERVER DAV1D \
 			DVD UPNP VAAPI VDPAU XSLT GBM WAYLAND X11 GL
 OPTIONS_DEFAULT_amd64=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2
 OPTIONS_DEFAULT_i386=	SSE SSE2 SSE3
 OPTIONS_SINGLE=		RENDER
 OPTIONS_SINGLE_RENDER=	GL GLES
 OPTIONS_GROUP=		SOUND FEATURE PLATFORM
 OPTIONS_GROUP_SOUND=	ALSA PIPEWIRE PULSEAUDIO SNDIO
 OPTIONS_GROUP_FEATURE=	SSE SSE2 SSE3 SSSE3 SSE4_1 SSE4_2 AVX AVX2
 OPTIONS_GROUP_PLATFORM=	GBM WAYLAND X11
 OPTIONS_EXCLUDE_aarch64=FEATURE
 OPTIONS_EXCLUDE_armv7=	FEATURE
 OPTIONS_EXCLUDE_armv6=	FEATURE
 OPTIONS_EXCLUDE_powerpc64=	FEATURE
 OPTIONS_EXCLUDE_powerpc64le=	FEATURE
 
 PLATFORM_DESC=	Kodi platform
 FEATURE_DESC=	X86 CPU feature
 
 AIRPLAY_DESC=	AirPlay support
 CEC_DESC=	CEC adapter support
 DAV1D_DESC=	Use dav1d as AV1 decoder
 DVD_DESC=	DVD support
 UDEV_DESC=	Use libudev-devd
 XSLT_DESC=	Use libxslt
 
 RENDER_DESC=	Render system
 GL_DESC=	OpenGL
 GLES_DESC=	OpenGL ES
 
 GBM_DESC=	GBM support
 
 SSE2_DESC=	Use SSE2 optimized routines
 SSE3_DESC=	Use SSE3 optimized routines
 SSSE3_DESC=	Use SSSE3 optimized routines
 SSE4_1_DESC=	Use SSE4.1 optimized routines
 SSE4_2_DESC=	Use SSE4.2 optimized routines
 AVX_DESC=	Use AVX optimized routines
 AVX2_DESC=	Use AVX2 optimized routines
 
 AIRPLAY_LIB_DEPENDS=	libplist-2.0.so:devel/libplist \
 			libshairplay.so:audio/shairplay
 AIRPLAY_CMAKE_BOOL=	ENABLE_PLIST \
 			ENABLE_AIRTUNES
 
 AVAHI_LIB_DEPENDS=	libavahi-client.so:net/avahi-app
 AVAHI_CMAKE_BOOL=	ENABLE_AVAHI
 
 LIBBLURAY_LIB_DEPENDS=	libbluray.so:multimedia/libbluray
 LIBBLURAY_CMAKE_BOOL=	ENABLE_BLURAY
 
 CEC_LIB_DEPENDS=	libcec.so:multimedia/libcec \
 			libp8-platform.so:devel/p8-platform
 CEC_CMAKE_BOOL=		ENABLE_CEC
 
 DAV1D_LIB_DEPENDS=	libdav1d.so:multimedia/dav1d
 DAV1D_CMAKE_BOOL=	ENABLE_DAV1D
 
 DBUS_LIB_DEPENDS=	libdbus-1.so:devel/dbus
 DBUS_CMAKE_BOOL=	ENABLE_DBUS
 
 DVDCSS_CMAKE_BOOL=	ENABLE_DVDCSS
 
 LCMS2_LIB_DEPENDS=	liblcms2.so.2:graphics/lcms2
 LCMS2_CMAKE_BOOL=	ENABLE_LCMS2
 
 LIRC_LIB_DEPENDS=	liblirc_client.so:comms/lirc
 LIRC_CMAKE_BOOL=	ENABLE_LIRCCLIENT
 
 WEBSERVER_LIB_DEPENDS=	libmicrohttpd.so:www/libmicrohttpd
 WEBSERVER_CMAKE_BOOL=	ENABLE_MICROHTTPD
 
 NFS_LIB_DEPENDS=	libnfs.so:net/libnfs
 NFS_CMAKE_BOOL=		ENABLE_NFS
 
 DVD_CMAKE_BOOL=		ENABLE_OPTICAL
 
 SMB_USES=		samba:lib
 SMB_CMAKE_BOOL=		ENABLE_SMBCLIENT
 
 TEST_LIB_DEPENDS=	libgtest.so:devel/googletest
 TEST_CMAKE_BOOL=	ENABLE_TESTING
 
 UDEV_LIB_DEPENDS=	libudev.so:devel/libudev-devd
 UDEV_CMAKE_BOOL=	ENABLE_UDEV
 
 UPNP_CMAKE_BOOL=	ENABLE_UPNP
 
 VAAPI_LIB_DEPENDS=	libva.so:multimedia/libva
 VAAPI_CMAKE_BOOL=	ENABLE_VAAPI
 
 VDPAU_IMPLIES=		X11 GL
 VDPAU_LIB_DEPENDS=	libvdpau.so:multimedia/libvdpau
 VDPAU_CMAKE_BOOL=	ENABLE_VDPAU
 
 XSLT_LIB_DEPENDS=	libxslt.so:textproc/libxslt
 XSLT_CMAKE_BOOL=	ENABLE_XSLT
 
 GL_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gl"
 GL_USES=		gl
 GL_USE=			GL=gl
 
 GLES_CMAKE_ON=		-DAPP_RENDER_SYSTEM:STRING="gles"
 GLES_USES=		gl
 GLES_USE=		GL=glesv2
 
 MYSQL_USES=		mysql
 MYSQL_CMAKE_BOOL=	ENABLE_MYSQLCLIENT
 
 ALSA_LIB_DEPENDS=	libasound.so:audio/alsa-lib
 ALSA_CMAKE_BOOL=	ENABLE_ALSA
 
 PIPEWIRE_LIB_DEPENDS=	libpipewire-0.3.so:multimedia/pipewire
 PIPEWIRE_CMAKE_BOOL=	ENABLE_PIPEWIRE
 
 PULSEAUDIO_LIB_DEPENDS=	libpulse.so:audio/pulseaudio
 PULSEAUDIO_CMAKE_BOOL=	ENABLE_PULSEAUDIO
 
 SNDIO_LIB_DEPENDS=	libsndio.so:audio/sndio
 SNDIO_CMAKE_BOOL=	ENABLE_SNDIO
 
 SSE_VARS=		CPU_FEATURE+=SSE
 SSE2_VARS=		CPU_FEATURE+=SSE2
 SSE3_VARS=		CPU_FEATURE+=SSE3
 SSSE3_VARS=		CPU_FEATURE+=SSSE3
 SSE4_1_VARS=		CPU_FEATURE+=SSE4.1
 SSE4_2_VARS=		CPU_FEATURE+=SSE4.2
 AVX_VARS=		CPU_FEATURE+=AVX
 AVX2_VARS=		CPU_FEATURE+=AVX2
 
 GBM_IMPLIES=		UDEV
 GBM_VARS=		KODI_PLATFORM+=gbm
 GBM_USES=		gl
 GBM_USE=		GL=egl,gbm,glu
 GBM_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto
 GBM_LIB_DEPENDS=	libepoll-shim.so:devel/libepoll-shim \
 			libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput \
 			libdisplay-info.so:sysutils/libdisplay-info
 GBM_RUN_DEPENDS=	mesa-dri>0:graphics/mesa-dri
 
 WAYLAND_VARS=		KODI_PLATFORM+=wayland
 WAYLAND_CATEGORIES=	wayland
 WAYLAND_USES=		gl
 WAYLAND_USE=		GL=egl,glu
 WAYLAND_BUILD_DEPENDS=	evdev-proto>0:devel/evdev-proto \
 			wayland-protocols>0:graphics/wayland-protocols
 WAYLAND_LIB_DEPENDS=	libdrm.so:graphics/libdrm \
 			libxkbcommon.so:x11/libxkbcommon \
 			libinput.so:x11/libinput \
 			libwayland-client++.so:graphics/waylandpp
 
 X11_VARS=		KODI_PLATFORM+=x11
 X11_USES=		xorg gl
 X11_USE=		XORG=x11,xext,xrandr GL=egl,gbm,glu
 X11_LIB_DEPENDS=	libdrm.so:graphics/libdrm
 
 .include <bsd.port.options.mk>
 
 .if (!empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)) && !empty(PORT_OPTIONS:MGLES)
 BROKEN=	option GLES does not build with multiple PLATFORM
 .endif
 
 .if !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MWAYLAND) || !empty(PORT_OPTIONS:MGBM) && !empty(PORT_OPTIONS:MX11) || !empty(PORT_OPTIONS:MWAYLAND) && !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODICOMBINED="" \
 		KODIGBM="@comment " \
 		KODIWAYLAND="@comment " \
 		KODIX11="@comment "
 .else
 PLIST_SUB+=	KODICOMBINED="@comment "
 
 .if !empty(PORT_OPTIONS:MGBM)
 PLIST_SUB+=	KODIGBM=""
 .else
 PLIST_SUB+=	KODIGBM="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MWAYLAND)
 PLIST_SUB+=	KODIWAYLAND=""
 .else
 PLIST_SUB+=	KODIWAYLAND="@comment "
 .endif
 
 .if !empty(PORT_OPTIONS:MX11)
 PLIST_SUB+=	KODIX11=""
 .else
 PLIST_SUB+=	KODIX11="@comment "
 .endif
 .endif
 
 post-extract:
 	@${MKDIR} ${WRKSRC}/tools/depends/share
 	@${MV} ${WRKDIR}/groovy-${GROOVY_VERSION} ${WRKSRC}/tools/depends/share/groovy
 
 	@${MKDIR} ${WRKSRC}/tools/depends/share/java
 	@${MV} ${WRKDIR}/commons-lang3-${COMMONS_LANG_VERSION} ${WRKSRC}/tools/depends/share/java/lang
 	@${MV} ${WRKDIR}/commons-text-${COMMONS_TEXT_VERSION} ${WRKSRC}/tools/depends/share/java/text
 
 post-patch:
 	${REINPLACE_CMD} 's|/usr/share|${LOCALBASE}/share|' \
 		${WRKSRC}/xbmc/platform/linux/input/LibInputSettings.cpp
 
 post-install:
 	${INSTALL_MAN} ${WRKSRC}/docs/manpages/kodi.bin.1 ${STAGEDIR}${PREFIX}/share/man/man1
 	cd ${STAGEDIR}${PREFIX}/share/man/man1 && ${LN} -s kodi.bin.1.gz kodi.1.gz
 	cd ${STAGEDIR}${PREFIX}/bin && ${STRIP_CMD} kodi-TexturePacker
 	${FIND} ${STAGEDIR}${PREFIX}/lib/kodi -type f -name '*.so' -print0 | ${XARGS} -0 ${STRIP_CMD}
 	${RM} -r ${STAGEDIR}${PREFIX}/lib/firewalld
 
 .include <bsd.port.mk>
diff --git a/net/activemq/Makefile b/net/activemq/Makefile
index c245b5e73fc3..b65b3619a5f4 100644
--- a/net/activemq/Makefile
+++ b/net/activemq/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	activemq
 DISTVERSION=	6.2.0
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net java
 MASTER_SITES=	APACHE/${PORTNAME}/${DISTVERSION}
 DISTNAME=	apache-${PORTNAME}-${DISTVERSION}-bin
 
 MAINTAINER=	james@elstone.net
 COMMENT=	Messaging and Integration Patterns provider
 WWW=		https://activemq.apache.org
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 USES=		cpe java
 CPE_VENDOR=	apache
 JAVA_VERSION=	21 17
 USE_RC_SUBR=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 WRKSRC=		${WRKDIR}/apache-${PORTNAME}-${DISTVERSION}
 
 USERS=		${PORTNAME}
 GROUPS=		${PORTNAME}
 
 PORTDATA=	*
 PORTDOCS=	*
 PORTEXAMPLES=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 do-install:
 	${REINPLACE_CMD} -i '' -e 's|$${sys:activemq.data}/audit.log|$${sys:activemq.logs}/audit.log|g; \
 			s|$${sys:activemq.data}/activemq.log|$${sys:activemq.logs}/activemq.log|g' \
 		${WRKSRC}/conf/log4j2.properties
 	${MKDIR} ${STAGEDIR}${ETCDIR} \
 		 ${STAGEDIR}${DATADIR}/bin \
 		 ${STAGEDIR}/var/db/${PORTNAME}
 	cd ${WRKSRC}/conf && for f in *; do \
 		${INSTALL_DATA} ${WRKSRC}/conf/$$f ${STAGEDIR}${ETCDIR}/$$f.sample; \
 	done
 	${INSTALL_SCRIPT} ${WRKSRC}/bin/activemq* ${STAGEDIR}${DATADIR}/bin
 	${RLN} ${STAGEDIR}${DATADIR}/bin/activemq ${STAGEDIR}${PREFIX}/bin
 	${RLN} ${STAGEDIR}${DATADIR}/bin/activemq-diag ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/bin/activemq.jar ${WRKSRC}/bin/wrapper.jar \
 		${STAGEDIR}${DATADIR}/bin
 	${RLN} ${STAGEDIR}/var/db/activemq ${STAGEDIR}${DATADIR}/data
 	${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/conf
 	cd ${WRKSRC} && ${COPYTREE_SHARE} "lib webapps webapps-demo" ${STAGEDIR}${DATADIR}
 
 do-install-DOCS-on:
 	cd ${WRKSRC}/docs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/NOTICE ${WRKSRC}/README.txt ${STAGEDIR}${DOCSDIR}
 	${RLN} ${STAGEDIR}${DOCSDIR} ${STAGEDIR}${DATADIR}/docs
 
 do-install-EXAMPLES-on:
 	cd ${WRKSRC}/examples && ${COPYTREE_SHARE} . ${STAGEDIR}${EXAMPLESDIR}
 	${RLN} ${STAGEDIR}${EXAMPLESDIR} ${STAGEDIR}${DATADIR}/examples
 
 .include <bsd.port.mk>
diff --git a/net/seda/Makefile b/net/seda/Makefile
index e0240716de7d..f37f39aa9f59 100644
--- a/net/seda/Makefile
+++ b/net/seda/Makefile
@@ -1,50 +1,50 @@
 PORTNAME=	seda
 PORTVERSION=	3.0
-PORTREVISION=	6
+PORTREVISION=	7
 CATEGORIES=	net java
 MASTER_SITES=	SF
 DISTNAME=	${PORTNAME}-release-${VERSION_DATE}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Architecture for Highly Concurrent Server Applications
 WWW=		http://www.eecs.harvard.edu/~mdw/proj/seda/
 
 DEPRECATED=	old, no users in the ports tree, unmaintained, uses long deprecated code removed in jdk25
 EXPIRATION_DATE=	2026-06-26
 
 USES=		java:ant,run
 JAVA_VERSION=	8 11 17 21
 
 ALL_TARGET=	dist
 NO_ARCH=	yes
 
 OPTIONS_DEFINE=	DOCS
 
 JAVADOC_WRKSRC=	${WRKSRC}/build/javadoc
 WRKSRC=		${WRKDIR}/${DISTNAME}/${PORTNAME}
 
 VERSION_DATE=	20020712
 
 PORTDOCS=	*
 
 PLIST_FILES=	%%JAVAJARDIR%%/${PORTNAME:tl}.jar
 
 DOCS_ALL_TARGET=	javadoc
 
 pre-build:
 # use our build.xml
 	${CP} ${FILESDIR}/build.xml ${WRKSRC}
 
 do-install:
 # jar
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/dist/lib/${PORTNAME:tl}.jar \
 		${STAGEDIR}${JAVAJARDIR}/
 
 do-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 .for doc in gnutella-graph.gif index.html nbio.html profile.gif sandstorm.html sandstorm.jpg
 	${INSTALL_DATA} ${WRKSRC}/docs/${doc} ${STAGEDIR}${DOCSDIR}
 .endfor
 
 .include <bsd.port.mk>
diff --git a/net/spread-j/Makefile b/net/spread-j/Makefile
index de8a18d0e90d..5dbf83f07c1a 100644
--- a/net/spread-j/Makefile
+++ b/net/spread-j/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	spread
 PORTVERSION=	3.17.3
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	net java
 MASTER_SITES=	http://www.cnds.jhu.edu/download/noformdown/
 PKGNAMESUFFIX=	-j
 DISTNAME=	${PORTNAME}-src-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Java client library for the Spread Group Communication System
 WWW=		http://www.spread.org/
 
 BUILD_DEPENDS=	${ANT}:devel/apache-ant
 
 BROKEN_armv6=		fails to package: java/docs/*.html: No such file or directory
 BROKEN_armv7=		fails to package: java/docs/*.html: No such file or directory
 
 USES=		java
 JAVA_VERSION=	8 11
 
 PKGMESSAGE=	${WRKSRC}/../license.txt
 
 ANT?=		${LOCALBASE}/bin/ant
 ANT_PARAMS+=	-Dlib.dir=${STAGEDIR}${JAVAJARDIR} -Djavadoc.destdir=docs -Dversion=${PORTVERSION}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-src-${PORTVERSION}/java
 PLIST_SUB+=	PORTNAME="${PORTNAME}" PORTVERSION="${PORTVERSION}"
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 DOCS_VARS=	DOCS_ANT_TARGET=javadocs
 
 do-build:
 	(cd ${WRKSRC} && \
 		${SETENV} JAVA_HOME=${JAVA_HOME} ${ANT} jar ${DOCS_ANT_TARGET} ${ANT_PARAMS})
 
 do-install:
 	(cd ${WRKSRC} && ${ANT} install ${ANT_PARAMS})
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/java
 	${INSTALL_DATA} ${WRKSRC}/recThread.java ${STAGEDIR}${EXAMPLESDIR}/java
 	${INSTALL_DATA} ${WRKSRC}/Flooder.java ${STAGEDIR}${EXAMPLESDIR}/java
 	${INSTALL_DATA} ${WRKSRC}/User.java ${STAGEDIR}${EXAMPLESDIR}/java
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/java
 	${INSTALL_DATA} ${WRKSRC}/readme.txt ${STAGEDIR}${DOCSDIR}/java
 	${MKDIR} ${STAGEDIR}${DOCSDIR}/java/html/spread/class-use
 	${INSTALL_DATA} ${WRKSRC}/docs/*.html ${STAGEDIR}${DOCSDIR}/java/html
 	${INSTALL_DATA} ${WRKSRC}/docs/stylesheet.css ${STAGEDIR}${DOCSDIR}/java/html
 	${INSTALL_DATA} ${WRKSRC}/docs/spread/*.html ${STAGEDIR}${DOCSDIR}/java/html/spread
 	${INSTALL_DATA} ${WRKSRC}/docs/spread/class-use/*.html ${STAGEDIR}${DOCSDIR}/java/html/spread/class-use
 
 .include <bsd.port.mk>
diff --git a/sysutils/logstash7/Makefile b/sysutils/logstash7/Makefile
index 4cfefa5410db..c82a9dc6dc40 100644
--- a/sysutils/logstash7/Makefile
+++ b/sysutils/logstash7/Makefile
@@ -1,98 +1,98 @@
 PORTNAME=	logstash
 DISTVERSION=	7.17.29
 DISTVERSIONSUFFIX=	-darwin-x86_64
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://artifacts.elastic.co/downloads/logstash/ \
 		LOCAL/vvd/elastic
 PKGNAMESUFFIX=	7
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Server-side data ingestion and transformation tool
 WWW=		https://www.elastic.co/products/logstash
 
 LICENSE=	APACHE20
 
 DEPRECATED=	7.x reached EoL on 15 Jan 2026 - use sysutils/logstash8 or sysutils/logstash9*
 EXPIRATION_DATE=	2026-06-30
 
 ONLY_FOR_ARCHS=	aarch64 amd64
 
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		cpe java shebangfix
 CPE_VENDOR=	elastic
 JAVA_VERSION=	17 11 8
 USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	bin/*
 
 CONFLICTS=	${PORTNAME}8 ${PORTNAME}9*
 
 EXTRACT_AFTER_ARGS=	--exclude jdk.app \
 			--exclude *.bat \
 			--no-same-owner --no-same-permissions
 
 NO_BUILD=	yes
 PORTSCOUT=	limit:^7
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		LOGSTASH_HOME=${LOGSTASH_HOME} \
 		LOGUSER=${LOGUSER} \
 		LOGGROUP=${LOGGROUP}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 LOGUSER?=	${PORTNAME}
 LOGGROUP?=	${LOGUSER}
 .if ${LOGUSER} == ${PORTNAME}
 USERS=		${LOGUSER}
 .endif
 .if ${LOGGROUP} == ${PORTNAME}
 GROUPS=		${LOGGROUP}
 .endif
 
 LOGSTASH_CONF_FILES=		jvm.options log4j2.properties logstash.yml \
 				pipelines.yml startup.options
 LOGSTASH_HOME?=			${PREFIX}/${PORTNAME}
 LOGSTASH_JRUBY_BIN_FILES=	ast gem irb jgem jirb jirb_swing jruby \
 				jruby.bash jruby.sh jrubyc rake rdoc ri testrb
 LOGSTASH_JRUBY_SUBDIR=		vendor/jruby/bin
 
 post-patch:
 	${REINPLACE_CMD} 's|%%ETCDIR%%|${ETCDIR}|g' ${WRKSRC}/config/logstash.yml
 	${FIND} ${WRKSRC} -name '*.orig' -delete
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR}
 	${INSTALL_DATA} ${FILESDIR}/logstash.conf.sample ${STAGEDIR}${ETCDIR}
 .for x in ${LOGSTASH_CONF_FILES}
 	${INSTALL_DATA} ${WRKSRC}/config/${x} ${STAGEDIR}${ETCDIR}/${x}.sample
 .endfor
 	${RM} -rf ${WRKSRC}/config
 	(cd ${WRKSRC} && ${COPYTREE_SHARE} . ${STAGEDIR}${LOGSTASH_HOME})
 	${CHMOD} ${BINMODE} ${STAGEDIR}${LOGSTASH_HOME}/bin/* \
 		${LOGSTASH_JRUBY_BIN_FILES:S|^|${STAGEDIR}${LOGSTASH_HOME}/${LOGSTASH_JRUBY_SUBDIR}/|}
 	${FIND} ${STAGEDIR}${LOGSTASH_HOME}/vendor/bundle/jruby/2.5.0/gems \
 		${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/ruby/gems/shared/gems \
 		-type d -empty -delete
 	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${LOGSTASH_HOME}/config
 	${RM} -rf ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/jni
 	(cd ${WRKSRC}/vendor/jruby/lib/jni && \
 	 ${COPYTREE_SHARE} ${ARCH:S/amd64/x86_64/}-FreeBSD \
 	 ${STAGEDIR}${LOGSTASH_HOME}/vendor/jruby/lib/jni)
 
 post-install:
 	${ECHO} "@sample ${ETCDIR}/logstash.conf.sample" >> ${TMPPLIST}
 .for x in ${LOGSTASH_CONF_FILES}
 	${ECHO} "@sample ${ETCDIR}/${x}.sample" >> ${TMPPLIST}
 .endfor
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.5.0/build_info" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.5.0/cache" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.5.0/doc" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/bundle/jruby/2.5.0/extensions" >> ${TMPPLIST}
 	${ECHO} "@dir logstash/vendor/jruby/lib/ruby/gems/shared/cache" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/logstash -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir(logstash,logstash,) logstash/data" >> ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/sysutils/rundeck/Makefile b/sysutils/rundeck/Makefile
index 0f629bf140c8..a8bcb2994393 100644
--- a/sysutils/rundeck/Makefile
+++ b/sysutils/rundeck/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	rundeck
 DISTVERSION=	5.19.0
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONSUFFIX=	-20260202
 CATEGORIES=	sysutils java
 MASTER_SITES=	https://packagecloud.io/pagerduty/rundeck/packages/java/org.rundeck/${DISTNAME}.war/artifacts/${DISTNAME}.war/download?/
 EXTRACT_SUFX=	.war
 EXTRACT_ONLY=	#
 
 MAINTAINER=	xavier@groumpf.org
 COMMENT=	Web-console for dispatching commands and scripts to your nodes
 WWW=		https://www.rundeck.com/
 
 LICENSE=	APACHE20
 
 USES=		cpe java
 CPE_VENDOR=	pagerduty
 JAVA_VERSION=	11 17
 USE_RC_SUBR=	${PORTNAME}
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 SUB_FILES=	${RUNDECK_LOG4J}
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		RUNDECK_CONFIG_DIR=${RUNDECK_CONFIG_DIR} \
 		RUNDECK_GROUP=${RUNDECK_GROUP} \
 		RUNDECK_HOME=${RUNDECK_HOME} \
 		RUNDECK_LOG4J=${RUNDECK_LOG4J} \
 		RUNDECK_LOG_FILE=${RUNDECK_LOG_FILE} \
 		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
 		RUNDECK_USER=${RUNDECK_USER}
 
 RUNDECK_HOME=		${PREFIX}/${PORTNAME}
 RUNDECK_USER?=		${PORTNAME}
 RUNDECK_GROUP?=		${PORTNAME}
 RUNDECK_LOGDIR?=	/var/log/${PORTNAME}
 RUNDECK_LOG_FILE?=	${RUNDECK_LOGDIR}/${PORTNAME}.log
 RUNDECK_LOG4J=		log4j2.properties
 RUNDECK_CONFIG_DIR=	${RUNDECK_HOME}/server/config
 
 .if ${RUNDECK_USER} == ${PORTNAME}
 USERS=		${PORTNAME}
 .endif
 .if ${RUNDECK_GROUP} == ${PORTNAME}
 GROUPS=		${PORTNAME}
 .endif
 
 PLIST_SUB=	NAME=${PORTNAME}${EXTRACT_SUFX} \
 		RUNDECK_GROUP=${RUNDECK_GROUP} \
 		RUNDECK_HOME=${RUNDECK_HOME} \
 		RUNDECK_LOGDIR=${RUNDECK_LOGDIR} \
 		RUNDECK_USER=${RUNDECK_USER}
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR} \
 		 ${STAGEDIR}${RUNDECK_HOME}/server/lib \
 		 ${STAGEDIR}${RUNDECK_LOGDIR}
 	${INSTALL_DATA} ${DISTDIR}/${DISTNAME}${EXTRACT_SUFX} \
 		${STAGEDIR}${DATADIR}/${PORTNAME}${EXTRACT_SUFX}
 
 post-install:
 	${MKDIR} ${STAGEDIR}${RUNDECK_CONFIG_DIR}
 	${INSTALL_DATA} \
 		${WRKDIR}/${RUNDECK_LOG4J} \
 		${STAGEDIR}${RUNDECK_CONFIG_DIR}/${RUNDECK_LOG4J}
 
 .include <bsd.port.mk>
diff --git a/textproc/elasticsearch7/Makefile b/textproc/elasticsearch7/Makefile
index 8874244b054d..3f4c838001ad 100644
--- a/textproc/elasticsearch7/Makefile
+++ b/textproc/elasticsearch7/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	elasticsearch
 DISTVERSION=	7.17.29
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc java devel
 MASTER_SITES=	https://artifacts.elastic.co/downloads/${PORTNAME}/ \
 		LOCAL/vvd/elastic
 PKGNAMESUFFIX=	7
 DISTNAME=	${PORTNAME}-${DISTVERSION}-darwin-x86_64
 
 MAINTAINER=	elastic@FreeBSD.org
 COMMENT=	Full-text search engine for Java
 WWW=		https://www.elastic.co/
 
 LICENSE=	APACHE20
 
 DEPRECATED=	7.x reached EoL on 15 Jan 2026 - use textproc/elasticsearch8 or textproc/elasticsearch9*
 EXPIRATION_DATE=	2026-06-30
 
 BUILD_DEPENDS=	jna>0:devel/jna
 RUN_DEPENDS=	bash>0:shells/bash \
 		jna>0:devel/jna
 
 USES=		cpe java shebangfix
 JAVA_VERSION=	21 17 11 8
 USE_RC_SUBR=	${PORTNAME}
 
 SHEBANG_FILES=	bin/elasticsearch bin/elasticsearch-certgen \
 		bin/elasticsearch-certutil bin/elasticsearch-cli \
 		bin/elasticsearch-croneval bin/elasticsearch-env \
 		bin/elasticsearch-env-from-file bin/elasticsearch-keystore \
 		bin/elasticsearch-migrate bin/elasticsearch-node \
 		bin/elasticsearch-plugin bin/elasticsearch-saml-metadata \
 		bin/elasticsearch-setup-passwords bin/elasticsearch-shard \
 		bin/elasticsearch-sql-cli bin/elasticsearch-syskeygen \
 		bin/elasticsearch-users bin/x-pack-env bin/x-pack-security-env \
 		bin/x-pack-watcher-env
 
 CONFLICTS=	${PORTNAME}8 ${PORTNAME}9*
 
 # ML plugin not supported on FreeBSD
 EXTRACT_AFTER_ARGS=	--exclude jdk.app \
 			--exclude lib/jna-5.10.0.jar \
 			--exclude modules/x-pack/x-pack-ml \
 			--no-same-owner --no-same-permissions
 
 NO_ARCH=	yes
 NO_BUILD=	yes
 PORTSCOUT=	limit:^7
 SUB_FILES=	pkg-message
 SUB_LIST=	JAVA_HOME=${JAVA_HOME} \
 		SEARCHUSER=${SEARCHUSER} \
 		SEARCHGROUP=${SEARCHGROUP}
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${DISTVERSION}
 
 SEARCHUSER?=	${PORTNAME}
 SEARCHGROUP?=	${SEARCHUSER}
 .if ${SEARCHUSER} == ${PORTNAME}
 USERS=		${SEARCHUSER}
 .endif
 .if ${SEARCHGROUP} == ${PORTNAME}
 GROUPS=		${SEARCHGROUP}
 .endif
 
 PORTDOCS=	LICENSE.txt NOTICE.txt README.asciidoc
 
 OPTIONS_DEFINE=	DOCS
 
 CONFIG_FILES=	elasticsearch.yml jvm.options log4j2.properties \
 		role_mapping.yml roles.yml
 BINS=		elasticsearch elasticsearch-certgen elasticsearch-certutil \
 		elasticsearch-cli elasticsearch-croneval elasticsearch-env \
 		elasticsearch-env-from-file elasticsearch-keystore \
 		elasticsearch-migrate elasticsearch-node elasticsearch-plugin \
 		elasticsearch-saml-metadata elasticsearch-setup-passwords \
 		elasticsearch-shard elasticsearch-sql-cli \
 		elasticsearch-sql-cli-${DISTVERSION}.jar \
 		elasticsearch-syskeygen elasticsearch-users x-pack-env \
 		x-pack-security-env x-pack-watcher-env
 
 post-patch:
 	${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/bin/elasticsearch-env
 
 do-install:
 	${MKDIR} ${STAGEDIR}${ETCDIR} \
 		 ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin \
 		 ${STAGEDIR}${PREFIX}/lib/elasticsearch/plugins \
 		 ${STAGEDIR}${PREFIX}/libexec/elasticsearch
 .for f in ${CONFIG_FILES}
 	${INSTALL} ${WRKSRC}/config/${f} ${STAGEDIR}${ETCDIR}/${f}.sample
 .endfor
 	${INSTALL_SCRIPT} ${BINS:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/lib/elasticsearch/bin
 	(cd ${WRKSRC}/lib && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/ "-name *\.jar")
 	(cd ${WRKSRC}/modules && ${COPYTREE_SHARE} . ${STAGEDIR}${PREFIX}/lib/elasticsearch/modules/)
 	${INSTALL} -lrs ${STAGEDIR}${ETCDIR} ${STAGEDIR}${PREFIX}/lib/elasticsearch/config
 	${LN} -s ${LOCALBASE}/share/java/classes/jna.jar \
 		${STAGEDIR}${PREFIX}/lib/elasticsearch/lib/jna-0.0.0.jar
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
 
 post-install:
 	${ECHO} "@sample ${ETCDIR}/elasticsearch.yml.sample" >> ${TMPPLIST}
 	${ECHO} "@sample ${ETCDIR}/jvm.options.sample" >> ${TMPPLIST}
 	${ECHO} "@sample ${ETCDIR}/log4j2.properties.sample" >> ${TMPPLIST}
 	${ECHO} "@sample ${ETCDIR}/role_mapping.yml.sample" >> ${TMPPLIST}
 	${ECHO} "@sample ${ETCDIR}/roles.yml.sample" >> ${TMPPLIST}
 	${FIND} -s ${STAGEDIR}${PREFIX}/lib/elasticsearch -not -type d | ${SORT} | \
 		${SED} -e 's#^${STAGEDIR}${PREFIX}/##' >> ${TMPPLIST}
 	${ECHO} "@dir lib/elasticsearch/plugins" >> ${TMPPLIST}
 	${ECHO} "@dir libexec/elasticsearch" >> ${TMPPLIST}
 	${ECHO} "@dir(${SEARCHUSER},${SEARCHGROUP},0755) ${ETCDIR}" >> ${TMPPLIST}
 
 .include <bsd.port.mk>