diff --git a/biology/cytoscape/Makefile b/biology/cytoscape/Makefile
index 3fe7a4436c2a..506c29817e4e 100644
--- a/biology/cytoscape/Makefile
+++ b/biology/cytoscape/Makefile
@@ -1,61 +1,64 @@
 PORTNAME=	cytoscape
 DISTVERSION=	3.6.1
 CATEGORIES=	biology java
 MASTER_SITES=	LOCAL/yuri/:maven \
 		http://people.freebsd.org/~yuri/:maven
 DISTFILES=	FreeBSD-${PORTNAME}-${PORTVERSION}-maven-repository.tar.gz:maven
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Software to visualize molecular interaction networks, gene expression
 WWW=		https://www.cytoscape.org
 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/api/LICENSE
 
 BROKEN_armv6=	build runs out of memory
 BROKEN_armv7=	build runs out of memory
 BROKEN_i386=	runs out of memory: Failed to create assembly: Error creating assembly archive windows: Problem creating zip: Execution exception: Java heap space
 
 BUILD_DEPENDS=	maven363>0:devel/maven363 \
 		bash:shells/bash
 RUN_DEPENDS=	bash:shells/bash
 
 USES=		java shebangfix
 SHEBANG_FILES=	gui-distribution/assembly/src/main/bin/cytoscape.sh
 USE_GITHUB=	yes
 GH_TUPLE=	${PORTNAME}:${PORTNAME}-parent:${DISTVERSION}:p/parent \
 		${PORTNAME}:${PORTNAME}-api:${DISTVERSION}:a/api \
 		${PORTNAME}:${PORTNAME}-impl:${DISTVERSION}:i/impl \
 		${PORTNAME}:${PORTNAME}-support:${DISTVERSION}:s/support \
 		${PORTNAME}:${PORTNAME}-gui-distribution:${DISTVERSION}:g/gui-distribution \
 		${PORTNAME}:${PORTNAME}-app-template:${DISTVERSION}:d/app-developer
 JAVA_VERSION=	8 # Needs JAXB which is in included in jdk8 but not in jdk11+.
+
+MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
+
 NO_ARCH=	yes
 
 USER_WRKDIR=	~/.${PORTNAME}
 
 do-build:
 	@cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} \
 		${LOCALBASE}/bin/mvn --offline \
 		-fae install \
 		-Dmaven.test.skip=true \
 		-Duser.home=${WRKDIR}
 
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} gui-distribution ${STAGEDIR}${DATADIR}
 	# shouldn't be needed, but the executable bit sometimes isn't set
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/gui-distribution/assembly/target/cytoscape/cytoscape.sh
 	@${CHMOD} +x ${STAGEDIR}${DATADIR}/gui-distribution/assembly/target/cytoscape/framework/bin/karaf
 	# create a shell executable calling the real command
 	@(echo "#!/bin/sh"; \
 	  echo ""; \
 	  echo "cd ${DATADIR} && JAVA_HOME=${JAVA_HOME} ./gui-distribution/assembly/target/cytoscape/cytoscape.sh \"$@\"" \
 	) > ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	@${CHMOD} +x ${STAGEDIR}${PREFIX}/bin/${PORTNAME}
 	# redirect user data to /tmp until they fix the location so that it would write under $HOME
 	@${RM} -r ${STAGEDIR}${DATADIR}/gui-distribution/assembly/target/cytoscape/framework/instances
 	@cd ${STAGEDIR}${DATADIR}/gui-distribution/assembly/target/cytoscape/framework && ${LN} -s /tmp instances
 	# use the automatic plist: a few hundred files are under DATADIR
 	@${SETENV} ${CO_ENV} ${SH} ${SCRIPTSDIR}/check-stagedir.sh makeplist | ${GREP} -v ^\/ | ${SED} -e 's|%%DATADIR%%|share/${PORTNAME}|' > ${TMPPLIST}
 
 .include <bsd.port.mk>
diff --git a/cad/digital/Makefile b/cad/digital/Makefile
index dd8b15511961..9f8979b088d9 100644
--- a/cad/digital/Makefile
+++ b/cad/digital/Makefile
@@ -1,86 +1,87 @@
 PORTNAME=	digital
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.31
 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
 
 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=	MAVEN_HOME=/usr/local/share/java/apache-maven-3.8 # workaround for https://bugs.freebsd.org/bugzilla/show_bug.cgi?id=283883
+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/lizzie/Makefile b/games/lizzie/Makefile
index 9595a72adb69..404bc66979b4 100644
--- a/games/lizzie/Makefile
+++ b/games/lizzie/Makefile
@@ -1,64 +1,66 @@
 PORTNAME=	lizzie
 DISTVERSION=	0.6-105
 PORTREVISION=	3
 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
 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 e721b75b6893..fd3977e58634 100644
--- a/math/jacop/Makefile
+++ b/math/jacop/Makefile
@@ -1,67 +1,69 @@
 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=	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/math/jts/Makefile b/math/jts/Makefile
index e8204f77e97c..3a4b5a500adb 100644
--- a/math/jts/Makefile
+++ b/math/jts/Makefile
@@ -1,96 +1,98 @@
 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=	maven>0:devel/maven
 
 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/science/cdk/Makefile b/science/cdk/Makefile
index 28b3256a1f7a..3d6f0447be2a 100644
--- a/science/cdk/Makefile
+++ b/science/cdk/Makefile
@@ -1,54 +1,56 @@
 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=	maven>0:devel/maven
 
 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 b9c6e1f5da9d..c98ba8814dba 100644
--- a/science/opsin/Makefile
+++ b/science/opsin/Makefile
@@ -1,62 +1,64 @@
 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=	maven>0:devel/maven
 
 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/security/owasp-dependency-check/Makefile b/security/owasp-dependency-check/Makefile
index 2bbf67b3aaac..708f1d44ac43 100644
--- a/security/owasp-dependency-check/Makefile
+++ b/security/owasp-dependency-check/Makefile
@@ -1,49 +1,51 @@
 # 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=	2
 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
 DEPRECATED=	This port is 9 major versions and almost 8 years behind on upstream. No maintainer. No users in the ports tree. Does not compile with jdk11+.
 EXPIRATION_DATE=	2026-02-28
 
 BUILD_DEPENDS=	maven>0:devel/maven
 
 USES=		java
 USE_GITHUB=	yes
 GH_ACCOUNT=	jeremylong
 GH_PROJECT=	DependencyCheck
 JAVA_VERSION=	8
 
+MAKE_ENV+=	JAVA_HOME=${JAVA_HOME}
+
 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>