diff --git a/cad/digital/Makefile b/cad/digital/Makefile
index 618d7f998164..af0015e2e0a7 100644
--- a/cad/digital/Makefile
+++ b/cad/digital/Makefile
@@ -1,85 +1,85 @@
 PORTNAME=	digital
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.29
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USES=		desktop-file-utils
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	hneemann
 GH_PROJECT=	Digital
 
 USE_JAVA=	yes
 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
 
 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
 
 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/devel/spark/Makefile b/devel/spark/Makefile
index b2d3c0ef773f..9f7b121df55d 100644
--- a/devel/spark/Makefile
+++ b/devel/spark/Makefile
@@ -1,86 +1,86 @@
 PORTNAME=	spark
 PORTVERSION=	3.3.0
 CATEGORIES=	devel java
 MASTER_SITES=	https://archive.apache.org/dist/${PORTNAME}/${PORTNAME}-${PORTVERSION}/ \
 		LOCAL/se/distfiles/:deps \
 		https://people.freebsd.org/~se/distfiles/: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
 
 BUILD_DEPENDS=	${LOCALBASE}/lib/libsnappyjava.so:archivers/snappy-java \
 		bash:shells/bash \
-		mvn:devel/maven
+		maven>0:devel/maven
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		cpe python shebangfix
 CPE_VENDOR=	apache
 USE_JAVA=	yes
 
 USE_RC_SUBR=	spark_master spark_worker
 SHEBANG_FILES=	bin/sparkR
 
 MAKE_ENV+=	JAVA_HOME=${JAVA_HOME} \
 		MAVEN_OPTS="-Xmx2g -XX:ReservedCodeCacheSize=2g"
 
 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} == "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
 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/games/coronapoker/Makefile b/games/coronapoker/Makefile
index d9b1a9aef6e0..196b1a3c0ef6 100644
--- a/games/coronapoker/Makefile
+++ b/games/coronapoker/Makefile
@@ -1,58 +1,58 @@
 PORTNAME=	coronapoker
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.33
 CATEGORIES=	games java
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Texas Holdem poker game
 WWW=		https://tonikelope.github.io/coronapoker/
 
 LICENSE=	GPLv3
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_JAVA=	11+
 USE_GITHUB=	yes
 GH_ACCOUNT=	tonikelope
 
 NO_ARCH=	yes
 
 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 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} \
 		JAVA_HOME=${JAVA_HOME} ${LOCALBASE}/bin/mvn ${MVN_ARGS} \
 		-fae install \
 		-Dmaven.test.skip=true \
 		-Duser.home=${WRKDIR} \
 		package
 
 do-install:
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${INSTALL_DATA} ${WRKSRC}/target/CoronaPoker-FINAL-*-jar-with-dependencies.jar ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}-${PORTVERSION}-jar-with-dependencies.jar
 
 .include <bsd.port.mk>
diff --git a/games/jinput/Makefile b/games/jinput/Makefile
index 6099f0fda88d..91d6db9484ec 100644
--- a/games/jinput/Makefile
+++ b/games/jinput/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	jinput
 DISTVERSION=	2.0.10
 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 \
-		mvn:devel/maven
+		maven>0:devel/maven
 RUN_DEPENDS=	${JAVAJARDIR}/jutils/jutils.jar:games/jutils
 
 # Using a fork because of maven dependencies
 USE_GITLAB=	yes
 GL_ACCOUNT=	voidanix
 GL_TAGNAME=	bf22dd975bbba31f01895332255b63df376894e6
 
 USE_JAVA=	8+
 
 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' ${WRKSRC}/pom.xml # example/ReadAllEvents.java:[5,28] cannot find symbol ...
 
 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 4adfcb2541d1..2ebe654f2774 100644
--- a/games/jutils/Makefile
+++ b/games/jutils/Makefile
@@ -1,37 +1,37 @@
 PORTNAME=	jutils
 PORTVERSION=	1.0.1
 PORTREVISION=	1
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 # Using a fork because of maven dependencies
 USE_GITLAB=	yes
 GL_ACCOUNT=	voidanix
 GL_TAGNAME=	f950e23e42081308b4be3b0fc4b57d4dbab70dac
 
 USE_JAVA=	8+
 
 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 40b3dc0b7975..f263467b4f52 100644
--- a/games/lizzie/Makefile
+++ b/games/lizzie/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	lizzie
 DISTVERSION=	0.6-105
 PORTREVISION=	2
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 RUN_DEPENDS=	leelaz:games/leela-zero
 
 USE_JAVA=	yes
 USE_GITHUB=	yes
 GH_ACCOUNT=	featurecat
 
 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/java/eclipse/Makefile b/java/eclipse/Makefile
index 08468874044e..fd276415a85e 100644
--- a/java/eclipse/Makefile
+++ b/java/eclipse/Makefile
@@ -1,95 +1,95 @@
 PORTNAME=	eclipse
 PORTVERSION=	4.24
 PORTREVISION=	2
 CATEGORIES=	java devel
 
 # Tag's Timestamp on eclipse-platform/eclipse.platform.releng.aggregator github.com
 ECLIPSE_TAG=	R4_24
 ECLIPSE_TSTAMP=	20220616-0004
 
 DIST_SUBDIR=	${PORTNAME}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Eclipse IDE 2022-06
 WWW=		https://www.eclipse.org/
 
 LICENSE=	EPL
 
 ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
 
 BUILD_DEPENDS=	git:devel/git@lite \
-		${LOCALBASE}/share/java/apache-maven-3.8/bin/mvn:devel/maven \
+		maven>0:devel/maven \
 		zip:archivers/zip
 LIB_DEPENDS=	libsecret-1.so:security/libsecret \
 		libwebkit2gtk-4.0.so:www/webkit2-gtk3
 
 PORTSCOUT=	ignore:1
 
 USES=		compiler:c++11-lang gmake pkgconfig gnome
 USE_GNOME=	gtk30
 
 USE_GITHUB=	yes
 GH_TUPLE=	eclipse-platform:eclipse.platform.releng.aggregator:${ECLIPSE_TAG} \
 		eclipse-jdt:eclipse.jdt:${ECLIPSE_TAG}:a/eclipse.jdt \
 		eclipse-jdt:eclipse.jdt.core:${ECLIPSE_TAG}:b/eclipse.jdt.core \
 		eclipse-jdt:eclipse.jdt.core.binaries:${ECLIPSE_TAG}:c/eclipse.jdt.core.binaries \
 		eclipse-jdt:eclipse.jdt.debug:${ECLIPSE_TAG}:d/eclipse.jdt.debug \
 		eclipse-jdt:eclipse.jdt.ui:${ECLIPSE_TAG}:e/eclipse.jdt.ui \
 		eclipse-pde:eclipse.pde:${ECLIPSE_TAG}:f/eclipse.pde \
 		eclipse-platform:eclipse.platform:${ECLIPSE_TAG}:g/eclipse.platform \
 		eclipse-platform:eclipse.platform.common:${ECLIPSE_TAG}:h/eclipse.platform.common \
 		eclipse-platform:eclipse.platform.debug:${ECLIPSE_TAG}:i/eclipse.platform.debug \
 		eclipse-platform:eclipse.platform.releng:${ECLIPSE_TAG}:j/eclipse.platform.releng \
 		eclipse-platform:eclipse.platform.resources:${ECLIPSE_TAG}:k/eclipse.platform.resources \
 		eclipse-platform:eclipse.platform.runtime:fd42b6e331:l/eclipse.platform.runtime \
 		eclipse-platform:eclipse.platform.swt:${ECLIPSE_TAG}:m/eclipse.platform.swt \
 		eclipse-platform:eclipse.platform.swt.binaries:${ECLIPSE_TAG}:n/eclipse.platform.swt.binaries \
 		eclipse-platform:eclipse.platform.team:${ECLIPSE_TAG}:o/eclipse.platform.team \
 		eclipse-platform:eclipse.platform.text:${ECLIPSE_TAG}:p/eclipse.platform.text \
 		eclipse-platform:eclipse.platform.ua:${ECLIPSE_TAG}:q/eclipse.platform.ua \
 		eclipse-platform:eclipse.platform.ui:${ECLIPSE_TAG}:r/eclipse.platform.ui \
 		eclipse-platform:eclipse.platform.ui.tools:${ECLIPSE_TAG}:s/eclipse.platform.ui.tools \
 		eclipse-equinox:equinox.binaries:${ECLIPSE_TAG}:t/rt.equinox.binaries \
 		eclipse-equinox:equinox.bundles:${ECLIPSE_TAG}:u/rt.equinox.bundles \
 		eclipse-equinox:equinox.framework:${ECLIPSE_TAG}:v/rt.equinox.framework \
 		eclipse-equinox:p2:${ECLIPSE_TAG}:w/rt.equinox.p2 \
 		daemonblade:eclipse-maven-repo:${PORTVERSION}:x
 
 USE_JAVA=	11+
 
 DESKTOP_ENTRIES="Eclipse" \
 		"${COMMENT}" \
 		"${PORTNAME}" \
 		"${PORTNAME}" \
 		"Development;IDE;Java;" \
 		"false"
 
 SUB_FILES=	${PORTNAME}
 
 MAVEN_ENV=	MAVEN_OPTS=-Xmx1024m CC=${CC} CFLAGS="${CFLAGS}" JAVA_HOME=${JAVA_HOME} HOME=${WRKDIR}/githome
 MAVEN_ECLIPSE=	-Dmaven.repo.local=${WRKDIR}/eclipse-maven-repo-${PORTVERSION} \
 		-Dnative=gtk.freebsd.${ARCH} \
 		-DforceContextQualifier=v${ECLIPSE_TSTAMP}
 
 ECLIPSE_RESULT=	eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products/org.eclipse.sdk.ide-freebsd.gtk.${ARCH}.tar.gz
 
 .include <bsd.port.pre.mk>
 
 .if ${COMPILER_TYPE} == clang && ${COMPILER_VERSION} >= 150
 CFLAGS+=	-Wno-deprecated-non-prototype
 .endif
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn --offline ${MAVEN_ECLIPSE} -DskipTests clean verify
 
 do-install:
 	${MKDIR} ${STAGEDIR}${DATADIR}
 	${TAR} -x --directory ${STAGEDIR}${DATADIR}/.. --file ${WRKSRC}/${ECLIPSE_RESULT}
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 
 # generate dynamic plist, to cater for different ARCHS
 post-install:
 	cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST}
 	cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d | ${SED} -e 's,^,@dir ,' >> ${TMPPLIST}
 
 .include <bsd.port.post.mk>
diff --git a/math/jacop/Makefile b/math/jacop/Makefile
index 8faab286f37e..e929b7afe0e1 100644
--- a/math/jacop/Makefile
+++ b/math/jacop/Makefile
@@ -1,67 +1,67 @@
 PORTNAME=	jacop
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.8.0
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_JAVA=	yes
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	radsz
 
 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 3ecefa11eef9..1180165672a8 100644
--- a/math/jts/Makefile
+++ b/math/jts/Makefile
@@ -1,96 +1,96 @@
 PORTNAME=	jts
 DISTVERSION=	1.18.1
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	locationtech
 
 USE_JAVA=	yes
 JAVA_VERSION=	11+
 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 cbac1e552972..d42515081dcf 100644
--- a/net-im/jicofo/Makefile
+++ b/net-im/jicofo/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	jicofo
 DISTVERSION=	1.0-1062
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jitsi
 GH_TAGNAME=	258eb98
 USE_JAVA=	yes
 JAVA_VERSION=	11
 
 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 \
 		LOCAL/grembo/: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 a9cf43affc03..99d422dbcfcc 100644
--- a/net-im/jitsi-videobridge/Makefile
+++ b/net-im/jitsi-videobridge/Makefile
@@ -1,65 +1,65 @@
 PORTNAME=	jitsi
 DISTVERSION=	2.3-67
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 RUN_DEPENDS=	${LOCALBASE}/bin/bash:shells/bash
 
 USE_GITHUB=	yes
 GH_PROJECT=	${PORTNAME}${PKGNAMESUFFIX}
 GH_TAGNAME=	b2d4229
 USE_JAVA=	yes
 JAVA_VERSION=	11
 
 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 \
 		LOCAL/grembo/: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 10e483909a34..07cb94968f20 100644
--- a/net-im/openfire/Makefile
+++ b/net-im/openfire/Makefile
@@ -1,110 +1,110 @@
 PORTNAME=	openfire
 DISTVERSIONPREFIX=	v
 DISTVERSION=	4.7.5
 PORTEPOCH=	1
 CATEGORIES=	net-im java
 
 MASTER_SITES=	LOCAL/fernape:maven
 
 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
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USES=		cpe
 CPE_VENDOR=	igniterealtime
 USE_GITHUB=	YES
 GH_ACCOUNT=	igniterealtime
 GH_PROJECT=	Openfire
 USE_JAVA=	yes
 JAVA_VERSION=	8+
 
 USE_RC_SUBR=	${PORTNAME}
 NO_ARCH=	yes
 SUB_FILES+=	pkg-message
 
 INSTALL_WRKSRC=	${WRKSRC}/distribution/target/distribution-base/
 DATADIR=	${JAVASHAREDIR}/${PORTNAME}
 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
 OPTIONS_SINGLE=		MAVEN
 OPTIONS_SINGLE_MAVEN=	MAVEN_LOCAL MAVEN_ONLINE
 
 MAVEN_DESC=		Source of Maven build plugins
 MAVEN_LOCAL_DESC=	Use prefetch plugins from FreeBSD repository
 MAVEN_ONLINE_DESC=	Download last plugins during build process and store them into ~/.m2
 
 MAVEN_LOCAL_DISTFILES=	FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
 
 MVN=		mvn
 MVN_TARGET=	package
 
 .include <bsd.port.options.mk>
 
 .if ${PORT_OPTIONS:MTEST}
 MVN_OPTS=	-DskipTests=false
 .else
 MVN_OPTS=	-DskipTests=true
 .endif
 
 .if ${PORT_OPTIONS:MMAVEN_LOCAL}
 MVN_OPTS+=	-o -Dmaven.repo.local=${WRKDIR}/m2
 .endif
 
 .if ${PORT_OPTIONS:MMAVEN_ONLINE}
 MVN_OPTS+=	-U
 .endif
 
 do-build:
 	${ECHO_CMD} "cd ${WRKSRC} && ${MVN} ${MVN_OPTS} ${MVN_TARGET}"
 	@(cd ${WRKSRC} && ${MVN} ${MVN_OPTS} ${MVN_TARGET})
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${DATADIR}/lib
 	@${MKDIR} ${STAGEDIR}${ETCDIR}
 	@${MKDIR} ${STAGEDIR}${VARDB}
 	@${MKDIR} ${STAGEDIR}${VARLOG}
 
 	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 *.jar ${STAGEDIR}${DATADIR}/lib)
 	(cd ${INSTALL_WRKSRC}/lib && ${INSTALL} -m 744 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/admin && ${FIND} . \
 	| ${CPIO} -pvdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DATADIR}/plugins/admin)
 
 	${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/conf
 	${LN} -sf ${ETCDIR} ${STAGEDIR}${DATADIR}/resources/security
 	${LN} -sf ${VARDB} ${STAGEDIR}${DATADIR}/embedded-db
 	${LN} -sf ${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/truststore \
 		${STAGEDIR}${ETCDIR}/truststore.sample
 	${INSTALL} -m 600 ${INSTALL_WRKSRC}/resources/security/keystore \
 		${STAGEDIR}${ETCDIR}/keystore.sample
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	(cd ${INSTALL_WRKSRC}/documentation && ${FIND} . \
 	| ${CPIO} -pdmu -R ${SHAREOWN}:${SHAREGRP} ${STAGEDIR}${DOCSDIR} > /dev/null 2>&1 )
 
 .include <bsd.port.mk>
diff --git a/science/cdk/Makefile b/science/cdk/Makefile
index d74af3a1c372..7f50d7305970 100644
--- a/science/cdk/Makefile
+++ b/science/cdk/Makefile
@@ -1,55 +1,55 @@
 PORTNAME=	cdk
 DISTVERSIONPREFIX=	cdk-
 DISTVERSION=	2.7.1
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_JAVA=	yes
 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
 
 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 70a08be7aab8..9e774205bb84 100644
--- a/science/opsin/Makefile
+++ b/science/opsin/Makefile
@@ -1,63 +1,63 @@
 PORTNAME=	opsin
 DISTVERSION=	3.0.20190223
 PORTREVISION=	1
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_JAVA=	yes
 JAVA_VERSION=	17 # Java 8 fails on aarch64: Internal Error (assembler_aarch64.hpp:237), pid=29730, tid=0x000000000002d236 guarantee(val < (1U << nbits)) failed: Field too big for insn
 
 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/security/owasp-dependency-check/Makefile b/security/owasp-dependency-check/Makefile
index 0573d6cf24fb..230d638f3d6a 100644
--- a/security/owasp-dependency-check/Makefile
+++ b/security/owasp-dependency-check/Makefile
@@ -1,46 +1,46 @@
 # Note to committers:
 # With each version update, a new maven repository must be created and distributed
 # so build is repeatable and cluster-safe.
 
 PORTNAME=	owasp-dependency-check
 PORTVERSION=	3.1.1
 DISTVERSIONPREFIX=	v
 PORTREVISION=	1
 CATEGORIES=	security java
 MASTER_SITES=	LOCAL/pi/:source2
 DISTFILES+=	owasp-dependency-check-${PORTVERSION}-maven-repository.tar.gz:source2
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Detects publicly disclosed vulnerabilities in project dependencies
 WWW=		https://jeremylong.github.io/DependencyCheck \
 		https://www.owasp.org/index.php/OWASP_Dependency_Check \
 		https://jeremylong.github.io/DependencyCheck/dependency-check-cli/
 
 LICENSE=	APACHE20
 
-BUILD_DEPENDS=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	jeremylong
 GH_PROJECT=	DependencyCheck
 USE_JAVA=	yes
 
 NO_ARCH=	yes
 SUB_FILES=	owasp-dependency-check
 SUB_LIST=	PORTVERSION=${PORTVERSION}
 
 PLIST_DIRS=	/var/cache/owasp-dependency-check
 PLIST_FILES=	bin/owasp-dependency-check \
 		${JAVAJARDIR}/owasp-dependency-check-${PORTVERSION}-jar-with-dependencies.jar
 
 do-build:
 	cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} ${LOCALBASE}/bin/mvn \
 		--batch-mode -Dmaven.repo.local=${WRKDIR}/repository -DskipTests --offline package
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/dependency-check-cli/target/dependency-check-${PORTVERSION}-jar-with-dependencies.jar \
 		${STAGEDIR}${JAVAJARDIR}/owasp-dependency-check-${PORTVERSION}-jar-with-dependencies.jar
 	${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin
 	${MKDIR} ${STAGEDIR}/var/cache/owasp-dependency-check
 
 .include <bsd.port.mk>
diff --git a/sysutils/apache-mesos/Makefile b/sysutils/apache-mesos/Makefile
index 11b160c271c3..7baaedcfa043 100644
--- a/sysutils/apache-mesos/Makefile
+++ b/sysutils/apache-mesos/Makefile
@@ -1,115 +1,115 @@
 PORTNAME=	mesos
 PORTVERSION=	1.11.0
 PORTREVISION=	16
 CATEGORIES=	sysutils
 MASTER_SITES=	APACHE/mesos/${PORTVERSION}:mesos
 PKGNAMEPREFIX=	apache-
 DISTFILES=	${PORTNAME}-${PORTVERSION}${EXTRACT_SUFX}:mesos
 DIST_SUBDIR=	${PKGNAMEPREFIX}${PORTNAME}
 
 MAINTAINER=	james.wright@digital-chaos.com
 COMMENT=	Cluster manager providing resource isolation and sharing
 WWW=		https://mesos.apache.org/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 BROKEN=		fails to build, configure: error: Cannot find the ELFIO headers
 
 BUILD_DEPENDS=	boost-libs>0:devel/boost-libs \
 		elfio>0:devel/elfio \
 		http-parser>0:www/http-parser \
 		leveldb>0:databases/leveldb \
 		picojson>0:devel/picojson \
 		protobuf>0:devel/protobuf \
 		rapidjson>0:devel/rapidjson \
 		libzookeeper>0:devel/libzookeeper
 LIB_DEPENDS=	libapr-1.so:devel/apr1 \
 		libcurl.so:ftp/curl \
 		libgpr.so:devel/grpc \
 		libglog.so:devel/glog \
 		libhttp_parser.so:www/http-parser \
 		libev.so:devel/libev \
 		libleveldb.so:databases/leveldb \
 		libprotobuf.so:devel/protobuf \
 		libsasl2.so:security/cyrus-sasl2 \
 		libzookeeper_mt.so:devel/libzookeeper
 .if ${WITH_SUBVERSION_VER:U} == LTS
 LIB_DEPENDS+=	libsvn_delta-1.so:devel/subversion-lts
 LIB_DEPENDS+=	libsvn_subr-1.so:devel/subversion-lts
 .else
 LIB_DEPENDS+=	libsvn_delta-1.so:devel/subversion
 LIB_DEPENDS+=	libsvn_subr-1.so:devel/subversion
 .endif
 
 USES=		cpe gmake libarchive libtool python:run shebangfix
 CPE_VENDOR=	apache
 USE_LDCONFIG=	yes
 SHEBANG_FILES=	src/cli/mesos-cat \
 		src/cli/mesos-ps \
 		src/cli/mesos-scp \
 		src/cli/mesos-tail
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java \
 		--disable-python \
 		--disable-werror \
 		--with-apr=${LOCALBASE} \
 		--with-boost=${LOCALBASE} \
 		--with-elfio=${LOCALBASE} \
 		--with-glog=${LOCALBASE} \
 		--with-grpc=${LOCALBASE} \
 		--with-http_parser=${LOCALBASE} \
 		--with-leveldb=${LOCALBASE} \
 		--with-libarchive=${LOCALBASE} \
 		--with-libev=${LOCALBASE} \
 		--with-protobuf=${LOCALBASE} \
 		--with-picojson=${LOCALBASE} \
 		--with-rapidjson=${LOCALBASE} \
 		--with-sasl=${LOCALBASE} \
 		--with-svn=${LOCALBASE} \
 		--with-zookeeper=${LOCALBASE}
 
 INSTALL_TARGET=	install-strip
 
 OPTIONS_DEFINE=	DEPLOY JAVA
 OPTIONS_SUB=	yes
 
 DEPLOY_DESC=	Install deploy scripts
 JAVA_DESC=	Enable Java bindings
 
 JAVA_CONFIGURE_ENABLE=	java
 JAVA_USE=		java=yes
-JAVA_BUILD_DEPENDS=	mvn:devel/maven
-JAVA_FETCH_DEPENDS=	mvn:devel/maven
+JAVA_BUILD_DEPENDS=	maven>0:devel/maven
+JAVA_FETCH_DEPENDS=	maven>0:devel/maven
 JAVA_CONFIGURE_ENV=	PROTOBUF_JAR="${MAVEN_REPO}/com/google/protobuf/protobuf-java/${PROTOBUF_VERSION}/protobuf-java-${PROTOBUF_VERSION}.jar"
 JAVA_MAKE_ENV=		MAVEN_OPTS="${MAVEN_OPTS}"
 JAVA_EXTRA_PATCHES=	${PATCHDIR}/extra-patch-src_java_mesos.pom.in
 
 # REVIEW: Can we figure out the current Protobuf version in ports instead of hardcoding???
 PROTOBUF_VERSION=	3.14.0
 
 MAVEN_CMD=		mvn
 MAVEN_REPO=		${WRKDIR}/mesos-maven-deps-${PORTVERSION}
 MAVEN_OPTS=		-Dmaven.repo.local=${MAVEN_REPO}
 MAVEN_ENV=		PROTOBUF_VERSION="${PROTOBUF_VERSION}" MAVEN_OPTS="${MAVEN_OPTS}"
 MAVEN_POM=		${FILESDIR}/maven-deps.pom
 
 DEV_BUILD_MODE=		no
 
 .if (${DEV_BUILD_MODE} == "yes")
 # Fetch Maven build dependencies upfront into local Maven Repo
 # Needs to be after extract (as WRKDIR gets wiped) but before Configure
 post-extract-JAVA-on:
 	@${SETENV} ${MAVEN_ENV} \
 	${MAVEN_CMD} -f ${MAVEN_POM} dependency:go-offline
 .else
 MASTER_SITES+=	https://github.com/Digital-Chaos/mesos-maven-deps/archive/${DISTVERSION}/:maven
 DISTFILES+=	mesos-maven-deps-${DISTVERSION}${EXTRACT_SUFX}:maven
 .endif
 
 # Replace Protobuf version in src/java/mesos.pom.in
 do-patch-JAVA-on:
 	@${REINPLACE_CMD} -e 's|@PROTOBUF_VERSION@|${PROTOBUF_VERSION}|g' ${WRKSRC}/src/java/mesos.pom.in
 
 .include <bsd.port.mk>
diff --git a/sysutils/jvmtop/Makefile b/sysutils/jvmtop/Makefile
index 10847d329aba..a8fb961230fa 100644
--- a/sysutils/jvmtop/Makefile
+++ b/sysutils/jvmtop/Makefile
@@ -1,42 +1,42 @@
 PORTNAME=	jvmtop
 DISTVERSION=	0.8.0-27
 PORTREVISION=	1
 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=	mvn:devel/maven
+BUILD_DEPENDS=	maven>0:devel/maven
 
 EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 USE_JAVA=	yes
 
 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
 
 post-extract:
 	@${TAR} -xf ${DISTDIR}/jvmtop-maven-repository-${BUILD}.tar.gz -C ${WRKSRC}
 
 do-build:
 	cd ${WRKSRC} && ${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>