diff --git a/cad/digital/Makefile b/cad/digital/Makefile
index a79b9107e2c9..66757437c6ff 100644
--- a/cad/digital/Makefile
+++ b/cad/digital/Makefile
@@ -1,88 +1,88 @@
 PORTNAME=	digital
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.31
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	cad java
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Digital logic designer and circuit simulator
 WWW=		https://github.com/hneemann/Digital
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	maven>0:devel/maven
+BUILD_DEPENDS=	maven38>0:devel/maven38
 
 USES=		desktop-file-utils java
 JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=76025, tid=0x000000000006e359 guarantee(val < (1U << nbits)) failed: Field too big for insn
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hneemann
 GH_PROJECT=	Digital
 
 
 NO_ARCH=	yes
 
 # 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
 
 MAKE_ENV=	JAVA_HOME=${JAVA_HOME} \
 		MAVEN_HOME=/usr/local/share/java/apache-maven-3.8 # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283883
 
 .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
 
 ICON_SIZES=	32 48 64 128
 ICON_NAME=	digital-logic-designer
 
 PLIST_FILES=	bin/${PORTNAME} \
 		${JAVAJARDIR}/Digital.jar \
 		${ICON_SIZES:C/(.*)/share\/icons\/hicolor\/\1x\1\/apps\/${ICON_NAME}.png/} \
 		share/icons/hicolor/scalable/apps/${ICON_NAME}.svg \
 		share/applications/${PORTNAME}.desktop
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LOCALBASE}/bin/mvn ${MVN_ARGS} \
 		-fae install \
 		-Dmaven.test.skip=true \
 		-Duser.home=${WRKDIR} \
 		-P no-git-rev -Dgit.commit.id.describe=${DISTVERSIONFULL} \
 		package
 do-install:
 	# install jar
 	${INSTALL_DATA} ${WRKSRC}/target/Digital.jar ${STAGEDIR}${JAVAJARDIR}
 	# install shell wrapper
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "${JAVA} -jar ${JAVAJARDIR}/Digital.jar \""$$"@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	# install desktop file
 	${SED} -e '\
 		s|<EXEC_LOCATION>|${PREFIX}/bin/${PORTNAME}| ; \
 		s|<ICON_LOCATION>|${ICON_NAME}|' \
 		< ${WRKSRC}/distribution/linux/desktop.template \
 		> ${STAGEDIR}${PREFIX}/share/applications/${PORTNAME}.desktop
 	# install icons
 .for SZ in ${ICON_SIZES}
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps
 	${INSTALL_DATA} ${WRKSRC}/src/main/resources/icons/icon${SZ}.png ${STAGEDIR}${PREFIX}/share/icons/hicolor/${SZ}x${SZ}/apps/${ICON_NAME}.png
 .endfor
 	${MKDIR} ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps
 	${INSTALL_DATA} ${WRKSRC}/src/main/svg/icon.svg ${STAGEDIR}${PREFIX}/share/icons/hicolor/scalable/apps/${ICON_NAME}.svg
 
 .include <bsd.port.mk>
diff --git a/games/jinput/Makefile b/games/jinput/Makefile
index c245a2aa3873..599b7811f88a 100644
--- a/games/jinput/Makefile
+++ b/games/jinput/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	jinput
 DISTVERSION=	2.0.10
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	games java
 
 MAINTAINER=	voidanix@420blaze.it
 COMMENT=	Java Game Controller API
 WWW=		https://github.com/jinput/jinput
 
 LICENSE=	BSD2CLAUSE
 
 BUILD_DEPENDS=	${JAVAJARDIR}/jutils/jutils.jar:games/jutils \
-		maven>0:devel/maven
+		maven38>0:devel/maven38
 RUN_DEPENDS=	${JAVAJARDIR}/jutils/jutils.jar:games/jutils
 
 USES=		java
 # Using a fork because of maven dependencies
 USE_GITLAB=	yes
 GL_ACCOUNT=	voidanix
 GL_TAGNAME=	bf22dd975bbba31f01895332255b63df376894e6
 
 PLIST_DIRS=	${JAVAJARDIR}/${PORTNAME}
 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
 
 MAVEN_ARGS=	-Dmaven.antrun.skip -Dmaven.javadoc.skip -Dmaven.source.skip -Dmaven.test.skip -DskipTests -DskipITs
 MAVEN_REPO=	-Dmaven.repo.local=${WRKSRC}/repository
 
 pre-build:
 	${CP} ${JAVAJARDIR}/jutils/jutils.jar ${WRKSRC}/repository/net/java/jutils/jutils/1/jutils-1.jar
 	${SED} -i -e '/example/d; s|<arg>-Werror</arg>||' ${WRKSRC}/pom.xml
 	# 1) example/ReadAllEvents.java:[5,28] cannot find symbol ...
 	# 2) [ERROR] warnings found and -Werror specified ...
 
 do-build:
 	cd ${WRKSRC}; \
 		${SETENV} mvn -P windows,linux,osx,wintab ${MAVEN_REPO} ${MAVEN_ARGS} --offline package
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/uberjar/target/${PORTNAME}-${PORTVERSION}-SNAPSHOT.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
 
 .include <bsd.port.mk>
diff --git a/games/jutils/Makefile b/games/jutils/Makefile
index aa5eb05c963e..69d90332e97e 100644
--- a/games/jutils/Makefile
+++ b/games/jutils/Makefile
@@ -1,36 +1,36 @@
 PORTNAME=	jutils
 PORTVERSION=	1.0.1
-PORTREVISION=	3
+PORTREVISION=	4
 PORTEPOCH=	1
 CATEGORIES=	games java
 
 MAINTAINER=	voidanix@420blaze.it
 COMMENT=	Common utilities for Java Game Technology Group projects
 WWW=		https://github.com/jinput/jutils
 
 LICENSE=	BSD2CLAUSE
 
-BUILD_DEPENDS=	maven>0:devel/maven
+BUILD_DEPENDS=	maven38>0:devel/maven38
 
 USES=		java
 # Using a fork because of maven dependencies
 USE_GITLAB=	yes
 GL_ACCOUNT=	voidanix
 GL_TAGNAME=	f950e23e42081308b4be3b0fc4b57d4dbab70dac
 
 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
 PLIST_DIRS=	${JAVAJARDIR}/${PORTNAME}
 
 MAVEN_ARGS=	-Dmaven.antrun.skip -Dmaven.javadoc.skip -Dmaven.source.skip -Dmaven.test.skip -DskipTests -DskipITs
 MAVEN_REPO=	-Dmaven.repo.local=${WRKSRC}/repository
 
 do-build:
 	cd ${WRKSRC}; \
 		${SETENV} mvn ${MAVEN_REPO} ${MAVEN_ARGS} --offline package
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}
 	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-${PORTVERSION}-SNAPSHOT.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}/${PORTNAME}.jar
 
 .include <bsd.port.mk>
diff --git a/games/lizzie/Makefile b/games/lizzie/Makefile
index 59041bfce982..0669c194e1ea 100644
--- a/games/lizzie/Makefile
+++ b/games/lizzie/Makefile
@@ -1,66 +1,66 @@
 PORTNAME=	lizzie
 DISTVERSION=	0.6-105
-PORTREVISION=	5
+PORTREVISION=	6
 DISTVERSIONSUFFIX=	-gd0e7040
 CATEGORIES=	games java
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Leela Zero Interface: GUI for the Go game
 WWW=		https://github.com/featurecat/lizzie
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	maven>0:devel/maven
+BUILD_DEPENDS=	maven38>0:devel/maven38
 RUN_DEPENDS=	leelaz:games/leela-zero
 
 USES=		java
 USE_GITHUB=	yes
 GH_ACCOUNT=	featurecat
 JAVA_VERSION=	8 # because of Bug 292662 - games/lizzie: does not build with jdk11+
 
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 
 NO_ARCH=	yes
 
 # 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
 
 DESKTOP_ENTRIES=	"SGF Editor (Go)" "A GUI for Leela-Zero" "" "${PORTNAME}" "Game;" ""
 
 PLIST_FILES=	bin/${PORTNAME} \
 		${JAVAJARDIR}/lizzie-${PORTVERSION:R}-shaded.jar
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LOCALBASE}/bin/mvn ${MVN_ARGS} \
 		-fae install \
 		-Dmaven.test.skip=true \
 		-Duser.home=${WRKDIR} \
 		package
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-${PORTVERSION:R}-shaded.jar ${STAGEDIR}${JAVAJARDIR}
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "mkdir -p ~/.local/share/lizzie &&"; \
 	  echo "cd ~/.local/share/lizzie && ${JAVA} -jar ${JAVAJARDIR}/${PORTNAME}-${PORTVERSION:R}-shaded.jar \""$$"@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>
diff --git a/math/jacop/Makefile b/math/jacop/Makefile
index 75b625d29e6a..eae94edef795 100644
--- a/math/jacop/Makefile
+++ b/math/jacop/Makefile
@@ -1,70 +1,70 @@
 PORTNAME=	jacop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.8.0
-PORTREVISION=	3
+PORTREVISION=	4
 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
+BUILD_DEPENDS=	maven38>0:devel/maven38
 
 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/math/jts/Makefile b/math/jts/Makefile
index 9d983d5c81c4..0f5e45e46826 100644
--- a/math/jts/Makefile
+++ b/math/jts/Makefile
@@ -1,99 +1,99 @@
 PORTNAME=	jts
 DISTVERSION=	1.18.1
-PORTREVISION=	2
+PORTREVISION=	3
 DISTVERSIONPREFIX=	jts-
 CATEGORIES=	math databases java
 
 MAINTAINER=	mfechner@FreeBSD.org
 COMMENT=	JTS Topology Suite
 WWW=		https://github.com/locationtech/jts
 
 LICENSE=	EPL
 #LICENSE_COMB=	dual
 
-BUILD_DEPENDS=	maven>0:devel/maven
+BUILD_DEPENDS=	maven38>0:devel/maven38
 
 USES=		java
 JAVA_VERSION=	11+
 USE_GITHUB=	yes
 GH_ACCOUNT=	locationtech
 
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 
 NO_ARCH=	yes
 
 VER=		${PORTVERSION:tl}
 JARFILES=	core/target/jts-core app/target/jts-app io/common/target/jts-io-common lab/target/jts-lab
 JARDOCFILES=	io/common/target/jts-io-common core/target/jts-core lab/target/jts-lab
 PLIST_SUB=	VERSION=${VER}
 
 PORTDOCS=	*
 
 OPTIONS_DEFINE=	DOCS
 
 # to rebuild the deps archive:
 #   1. set DEV_UPDATE_MODE=yes
 #   2. make makesum build
 #   3. upload the *-deps using: make pushToGH
 #   4. set DEV_UPDATE_MODE=no
 #   5. make clean makesum
 
 DEV_UPDATE_MODE=	no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 pre-build:
 	mkdir -p ${WRKDIR}/.m2
 	cd ${WRKDIR}/.m2 && rm -Rf .git
 	cd ${WRKDIR}/.m2 && git init
 	cd ${WRKDIR}/.m2 && git remote add origin git@github.com:mfechner/freebsd-math-jts-deps.git
 	cd ${WRKDIR}/.m2 && git fetch
 	cd ${WRKDIR}/.m2 && rm -Rf repository
 	cd ${WRKDIR}/.m2 && git checkout master
 	cd ${WRKDIR}/.m2 && rm -Rf repository
 
 post-build:
 	@${ECHO} "(!!!) Please upload the maven repo using: make pushToGH"
 .else
 GH_TUPLE=	mfechner:freebsd-math-jts-deps:${VER}:m2
 MASTER_SITES+=  LOCAL/mfechner/:maven
 MVN_ARGS=	--offline
 
 # Move the download deps to correct destination
 post-patch:
 	@${MV} ${WRKDIR}/freebsd-math-jts-deps-${VER} ${WRKDIR}/.m2
 .endif
 
 #-Dmaven.repo.local=${WRKDIR}/freebsd-math-jts-deps-${VER}/
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LOCALBASE}/bin/mvn ${MVN_ARGS} \
 		-fae clean install \
 		-Dmaven.test.skip=true \
 		-Duser.home=${WRKDIR}
 
 do-install:
 .for jar in ${JARFILES}
 	@${INSTALL_DATA} ${WRKSRC}/modules/${jar}-${VER}.jar	\
 		${STAGEDIR}${JAVALIBDIR}/
 .endfor
 	${RLN} ${STAGEDIR}${JAVALIBDIR}/jts-core-${VER}.jar ${STAGEDIR}${JAVALIBDIR}/jts-core.jar
 
 do-install-DOCS-on:
 .for jar in ${JARDOCFILES}
 	@${INSTALL_DATA} ${WRKSRC}/modules/${jar}-${VER}-javadoc.jar	\
 		${STAGEDIR}${JAVALIBDIR}/
 .endfor
 
 # Make sure you build the port before (not in poudriere, make build) with DEV_UPDATE_MODE=yes
 # before you execute this target
 pushToGH:
 	@cd ${WRKDIR}/.m2
 	cd ${WRKDIR}/.m2 && git add .
 	cd ${WRKDIR}/.m2 && git status
 	cd ${WRKDIR}/.m2 && git commit -m "Update deps for version ${VER}."
 	read -p "Continue to push new version ${VER} to GH" dummy
 	cd ${WRKDIR}/.m2 && git push -u origin master
 	cd ${WRKDIR}/.m2 && git tag -f ${VER}
 	cd ${WRKDIR}/.m2 && git push --tags -f
 
 .include <bsd.port.mk>
diff --git a/net-im/jicofo/Makefile b/net-im/jicofo/Makefile
index b093720d415c..f3f59878481d 100644
--- a/net-im/jicofo/Makefile
+++ b/net-im/jicofo/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	jicofo
 DISTVERSION=	1.0-1169
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	net-im java
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	Server side focus component used in Jitsi Meet conferences
 WWW=		https://github.com/jitsi/jicofo/
 
 LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
 
-BUILD_DEPENDS=	maven>0:devel/maven
+BUILD_DEPENDS=	maven38>0:devel/maven38
 
 USES=		java
 USE_GITHUB=	yes
 GH_ACCOUNT=	jitsi
 GH_TAGNAME=	d8333e9
 JAVA_VERSION=	17
 
 USE_RC_SUBR=	${PORTNAME}
 SUB_FILES+=	pkg-message
 SUB_LIST+=	JAVA=${JAVA}
 ETCDIR=		${PREFIX}/etc/jitsi/jicofo
 
 USERS=		${PORTNAME} jitsi
 GROUPS=		${USERS}
 
 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/acm/:maven
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
 MAVEN_ARGS=	--offline
 .endif
 
 MAVEN_ARGS+=	-DskipTests -Dassembly.skipAssembly=false
 MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/m2
 
 do-build:
 	cd ${WRKSRC}; \
 		${SETENV} JAVA_VERSION=${JAVA_VERSION} mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	cd ${WRKSRC}/lib \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/lib/{} \;
 
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}.conf.sample \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.conf.sample
 	${INSTALL_DATA} ${WRKSRC}/jicofo/target/${PORTNAME}-1.1-SNAPSHOT-jar-with-dependencies.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 
 .include <bsd.port.mk>
diff --git a/net-im/jitsi-videobridge/Makefile b/net-im/jitsi-videobridge/Makefile
index 3d8af6a77d1a..c19e8c264b68 100644
--- a/net-im/jitsi-videobridge/Makefile
+++ b/net-im/jitsi-videobridge/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	jitsi
 DISTVERSION=	2.3-272
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	net-im java
 PKGNAMESUFFIX=	-videobridge
 
 MAINTAINER=	acm@FreeBSD.org
 COMMENT=	WebRTC compatible video router or SFU
 WWW=		https://jitsi.org/jitsi-videobridge
 
 LICENSE=	APACHE20
 
 ONLY_FOR_ARCHS=	i386 amd64 powerpc64 powerpc64le
 
-BUILD_DEPENDS=	maven>0:devel/maven
+BUILD_DEPENDS=	maven38>0:devel/maven38
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USES=		java
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 GH_TAGNAME=	0360d04
 JAVA_VERSION=	17
 
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}${PKGNAMESUFFIX}-${PORTVERSION}
 USE_RC_SUBR=	${PORTNAME}${PKGNAMESUFFIX}
 
 SUB_FILES+=	pkg-message
 SUB_LIST+=	JAVA=${JAVA}
 ETCDIR=		${PREFIX}/etc/jitsi/videobridge
 
 USERS=		jvb ${PORTNAME}
 GROUPS=		${USERS}
 
 DEV_UPDATE_MODE=	no
 
 .if (${DEV_UPDATE_MODE} == "yes")
 post-build:
 	@cd ${WRKDIR} && ${TAR} czf ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX} m2
 	@${ECHO} "(!!!) Please upload the maven deps archive: ${DISTDIR}/${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/acm/:maven
 DISTFILES+=	${PORTNAME}${PKGNAMESUFFIX}-${DISTVERSION}-deps${EXTRACT_SUFX}:maven
 MAVEN_ARGS=	--offline
 .endif
 
 MAVEN_ARGS+=	-PbuildFatJar -DskipTests -Dassembly.skipAssembly=false
 MAVEN_REPO=	-Dmaven.repo.local=${WRKDIR}/m2
 
 do-build:
 	cd ${WRKSRC}; \
 		${SETENV} JAVA_VERSION=${JAVA_VERSION} mvn ${MAVEN_REPO} ${MAVEN_ARGS} package
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	cd ${WRKSRC}/jvb/lib \
 		&& ${FIND} . -type f -exec ${INSTALL_DATA} {} ${STAGEDIR}${DATADIR}/lib/{} \;
 	${INSTALL_DATA} ${FILESDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}${PKGNAMESUFFIX}.conf.sample
 	${INSTALL_DATA} ${FILESDIR}/sip-communicator.properties.sample \
 		${STAGEDIR}${ETCDIR}/sip-communicator.properties.sample
 	${INSTALL_DATA} ${WRKSRC}/jvb/target/${PORTNAME}${PKGNAMESUFFIX}-2.3-SNAPSHOT-jar-with-dependencies.jar \
 		${STAGEDIR}${JAVAJARDIR}/${PORTNAME}${PKGNAMESUFFIX}.jar
 
 .include <bsd.port.mk>
diff --git a/net-im/openfire/Makefile b/net-im/openfire/Makefile
index 8fa2df514a6f..5ee00fd6fad7 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -1,108 +1,109 @@
 PORTNAME=	openfire
 DISTVERSIONPREFIX=	v
 DISTVERSION=	5.0.4
+PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 
 MAINTAINER=	nikita@druba.su
 COMMENT=	Enterprise instant messaging server
 WWW=		https://www.igniterealtime.org/projects/openfire/index.jsp
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cpe java
 CPE_VENDOR=	igniterealtime
 USE_GITHUB=	yes
 GH_ACCOUNT=	igniterealtime
 GH_PROJECT=	Openfire
 
 USE_RC_SUBR=	${PORTNAME}
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	JAVA_VERSION=${JAVA_PORT_VERSION}
 
 INSTALL_WRKSRC=	${WRKSRC}/distribution/target/distribution-base
 VARLOG=		/var/log/${PORTNAME}
 VARDB=		/var/db/${PORTNAME}
 USERS=		${PORTNAME}
 GROUPS=		${USERS}
 PLIST_SUB=	VARDB=${VARDB} \
 		VARLOG=${VARLOG}
 
 OPTIONS_DEFINE=		DOCS TEST
 OPTIONS_DEFAULT=	MAVEN_LOCAL OPENJDK17
 OPTIONS_SINGLE=		JAVA MAVEN
 OPTIONS_SINGLE_JAVA=	OPENJDK17 OPENJDK21 OPENJDK25
 OPTIONS_SINGLE_MAVEN=	MAVEN_LOCAL MAVEN_ONLINE
 
 MAVEN_DESC=		Source of Maven build plugins
 MAVEN_LOCAL_DESC=	Use prefetch plugins from FreeBSD repository and fixed mvn version
 MAVEN_ONLINE_DESC=	Download last plugins during build process (into ~/.m2) and use system mvn version
 OPENJDK17_DESC=		Use OpenJDK 17
 OPENJDK21_DESC=		Use OpenJDK 21
 OPENJDK25_DESC=		Use OpenJDK 25 (EXPERIMENTAL)
 
-MAVEN_LOCAL_BUILD_DEPENDS=	maven>=3.8<3.9:devel/maven
+MAVEN_LOCAL_BUILD_DEPENDS=	maven38>0:devel/maven38
 MAVEN_LOCAL_GH_TUPLE=		n1dr00:openfire-deps:${DISTVERSION}:maven
 MAVEN_LOCAL_VARS=		MVN_OPTS+="-o -Dmaven.repo.local=${WRKDIR}/openfire-deps-${DISTVERSION}" \
 				MAVEN_HOME="${JAVASHAREDIR}/apache-maven-3.8"
-MAVEN_ONLINE_BUILD_DEPENDS=	maven>0:devel/maven
+MAVEN_ONLINE_BUILD_DEPENDS=	maven38>0:devel/maven38
 MAVEN_ONLINE_VARS=		MVN_OPTS+="-U"
 
 OPENJDK17_VARS=			JAVA_VERSION=17
 OPENJDK21_VARS=			JAVA_VERSION=21
 OPENJDK25_EXTRA_PATCHES=	${PATCHDIR}/extrapatch-xmppserver_src_main_java_org_jivesoftware_database_JNDIDataSourceProvider.java
 OPENJDK25_VARS=			JAVA_VERSION=25
 
 TEST_VARS=		MVN_OPTS+="-DskipTests=false"
 TEST_VARS_OFF=		MVN_OPTS+="-DskipTests=true"
 
 MVN=		mvn
 MVN_TARGET=	package
 
 do-build:
 	@(cd ${WRKSRC} && \
 		JAVA_VERSION=${JAVA_PORT_VERSION} ${MAVEN_HOME:DMAVEN_HOME=${MAVEN_HOME}} \
 			${MVN} ${MVN_OPTS} ${MVN_TARGET})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib \
 		  ${STAGEDIR}${ETCDIR}/archive \
 		  ${STAGEDIR}${VARDB} \
 		  ${STAGEDIR}${VARLOG}
 
 	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar log4j2.xml ${STAGEDIR}${DATADIR}/lib)
 	(cd ${INSTALL_WRKSRC}/resources && \
 		${FIND} . \! -path ./security\* \! -path ./nativeAuth\* | \
 			${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} \
 				${STAGEDIR}${DATADIR}/resources)
 	(cd ${INSTALL_WRKSRC}/plugins && ${COPYTREE_SHARE} admin ${STAGEDIR}${DATADIR}/plugins)
 
 	${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/conf
 	${RLN} ${STAGEDIR}${ETCDIR} ${STAGEDIR}${DATADIR}/resources/security
 	${RLN} ${STAGEDIR}${VARDB}  ${STAGEDIR}${DATADIR}/embedded-db
 	${RLN} ${STAGEDIR}${VARLOG} ${STAGEDIR}${DATADIR}/logs
 
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/${PORTNAME}.xml \
 		${STAGEDIR}${ETCDIR}/${PORTNAME}.xml.sample
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/security.xml \
 		${STAGEDIR}${ETCDIR}/security.xml.sample
 	${INSTALL_DATA} ${INSTALL_WRKSRC}/conf/crowd.properties \
 		${STAGEDIR}${ETCDIR}/crowd.properties.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/client.truststore \
 		${STAGEDIR}${ETCDIR}/client.truststore.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/truststore \
 		${STAGEDIR}${ETCDIR}/truststore.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/keystore \
 		${STAGEDIR}${ETCDIR}/keystore.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/java.security \
 		${STAGEDIR}${ETCDIR}/java.security.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/archive/readme.txt \
 		${STAGEDIR}${ETCDIR}/archive/readme.txt
 
 do-install-DOCS-on:
 	(cd ${INSTALL_WRKSRC}/documentation && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
 
 .include <bsd.port.mk>
diff --git a/science/cdk/Makefile b/science/cdk/Makefile
index 091996b136aa..b4bc5cc6f9d5 100644
--- a/science/cdk/Makefile
+++ b/science/cdk/Makefile
@@ -1,57 +1,57 @@
 PORTNAME=	cdk
 DISTVERSIONPREFIX=	cdk-
 DISTVERSION=	2.7.1
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	science java
 PKGNAMESUFFIX=	-chemistry
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Chemistry Development Kit
 WWW=		https://cdk.github.io/
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	maven>0:devel/maven
+BUILD_DEPENDS=	maven38>0:devel/maven38
 
 USES=		java
 USE_GITHUB=	yes
 JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=68892, tid=0x000000000002b995 guarantee(val < (1U << nbits)) failed: Field too big for insn
 
 MAKE_ENV+=      JAVA_HOME=${JAVA_HOME}
 
 NO_ARCH=	yes
 
 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar
 
 # 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 deps archive: ${DISTDIR}/${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}"
 .else
 MASTER_SITES+=	LOCAL/yuri/:deps
 DISTFILES+=	${PORTNAME}-${DISTVERSION}-deps${EXTRACT_SUFX}:deps
 MVN_ARGS=	--offline
 .endif
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LOCALBASE}/bin/mvn ${MVN_ARGS} \
 		-fae \
 		-Dmaven.test.skip=true \
 		-Duser.home=${WRKDIR} \
 		install
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/bundle/target/${PORTNAME}-${PORTVERSION}.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}.jar
 
 .include <bsd.port.mk>
diff --git a/science/opsin/Makefile b/science/opsin/Makefile
index d32b7c76ceda..e6109206f173 100644
--- a/science/opsin/Makefile
+++ b/science/opsin/Makefile
@@ -1,64 +1,64 @@
 PORTNAME=	opsin
 DISTVERSION=	3.0.20190223
-PORTREVISION=	3
+PORTREVISION=	4
 CATEGORIES=	science java
 MASTER_SITES=	https://bitbucket.org/${BB_ACCOUNT}/${PORTNAME}/get/${BB_COMMIT}${EXTRACT_SUFX}?dummy=/:src
 DISTFILES=	${PORTNAME}-${DISTVERSION}${EXTRACT_SUFX}:src
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Open Parser for Systematic IUPAC Nomenclature of chemical names
 WWW=		https://bitbucket.org/dan2097/opsin/src/default/
 
 LICENSE=	MIT
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-BUILD_DEPENDS=	maven>0:devel/maven
+BUILD_DEPENDS=	maven38>0:devel/maven38
 
 USES=		java
 
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
 
 NO_ARCH=	yes
 
 BB_ACCOUNT=	dan2097
 BB_COMMIT=	9b25f7546b67
 
 WRKSRC=		${WRKDIR}/${BB_ACCOUNT}-${PORTNAME}-${BB_COMMIT}
 SUB_FILES=	${PORTNAME}
 SUB_LIST=	JAVA=${JAVA} PORTNAME=${PORTNAME} PORTVERSION=${PORTVERSION}
 
 PLIST_FILES=	bin/${PORTNAME} \
 		${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}-jar-with-dependencies.jar
 
 # 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} \
 		package assembly:assembly
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-*-jar-with-dependencies.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}-jar-with-dependencies.jar
 
 .include <bsd.port.mk>
diff --git a/sysutils/jvmtop/Makefile b/sysutils/jvmtop/Makefile
index 1c810f6eaa54..9a5825da9aed 100644
--- a/sysutils/jvmtop/Makefile
+++ b/sysutils/jvmtop/Makefile
@@ -1,44 +1,44 @@
 PORTNAME=	jvmtop
 DISTVERSION=	0.8.0-27
-PORTREVISION=	3
+PORTREVISION=	4
 DISTVERSIONSUFFIX=	-g5693965
 CATEGORIES=	sysutils java
 MASTER_SITES=	SF/bsdsrc/jvmtop:source2
 DISTFILES=	jvmtop-maven-repository-${BUILD}.tar.gz:source2
 
 MAINTAINER=	jgh@FreeBSD.org
 COMMENT=	Lightweight console application to monitor running jvms
 WWW=		https://github.com/patric-r/jvmtop
 
 LICENSE=	GPLv2
 
-BUILD_DEPENDS=	maven>0:devel/maven
+BUILD_DEPENDS=	maven38>0:devel/maven38
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 USES=		java
 
 NO_ARCH=	yes
 
 PLIST_FILES=	${JAVAJARDIR}/${PORTNAME}.jar \
 		bin/${PORTNAME}
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 SUB_FILES=	${PORTNAME}.sh
 BUILD=	0.9.0
 
 GH_ACCOUNT=	patric-r
 USE_GITHUB=	yes
 JAVA_VERSION=	8
 
 post-extract:
 	@${TAR} -xf ${DISTDIR}/jvmtop-maven-repository-${BUILD}.tar.gz -C ${WRKSRC}
 
 do-build:
 	cd ${WRKSRC} && JAVA_HOME=${JAVA_HOME} ${LOCALBASE}/bin/mvn -o -Dmaven.repo.local=.m2/repository ${INSTALL}
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${JAVAJARDIR}
 	${INSTALL_DATA} ${WRKSRC}/target/${PORTNAME}-${BUILD}-SNAPSHOT.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME}.sh ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 
 .include <bsd.port.mk>