git: 9ab5b8b06626 - main - databases/cassandra[34]: allow building with JAVA_DEFAULT=21

The branch main has been updated by ronald:

URL: https://cgit.FreeBSD.org/ports/commit/?id=9ab5b8b06626e2533d27a6bc704a14af4f7de8f7

commit 9ab5b8b06626e2533d27a6bc704a14af4f7de8f7
Author:     Ronald Klop <ronald@FreeBSD.org>
AuthorDate: 2026-02-08 20:06:29 +0000
Commit:     Ronald Klop <ronald@FreeBSD.org>
CommitDate: 2026-02-09 11:45:30 +0000

    databases/cassandra[34]: allow building with JAVA_DEFAULT=21
    
    - ant needs to have JAVA_HOME set to the defined JAVA_VERSION
    
    Reason:
    when apache-ant pulls in openjdk21 as run dependency it will try
    to use it if JAVA_HOME is not set. This gives the error:
    "Java 15 has removed Nashorn, you must provide an engine for running
    JavaScript yourself. GraalVM JavaScript currently is the preferred
    option.", as cassandra needs an older Java version.
    
    These ports have USES=ant, but override do-build and fetch. That is
    why some special handling is needed.
    
    PR:     272855
    PR:     293050
    Approved-by:    Angelo Polo (maintainer)
---
 databases/cassandra3/Makefile |  4 ++--
 databases/cassandra4/Makefile | 10 ++++++----
 2 files changed, 8 insertions(+), 6 deletions(-)

diff --git a/databases/cassandra3/Makefile b/databases/cassandra3/Makefile
index a42c169c0081..3355d79cda87 100644
--- a/databases/cassandra3/Makefile
+++ b/databases/cassandra3/Makefile
@@ -85,10 +85,10 @@ do-build:
 	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
 
 do-build-DOCS-on:
-	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
+	cd ${WRKSRC} && ${MAKE_ENV} ANT_OPTS="${ANT_OPTS_LOCAL}" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} -Dpycmd=${PYTHON_CMD} freebsd-stage-doc
 
 do-build-DOCS-off:
-	@cd ${WRKSRC} && ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} freebsd-stage
+	cd ${WRKSRC} && ${MAKE_ENV} ANT_OPTS="${ANT_OPTS} -Xmx512m" ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} freebsd-stage
 
 post-build:
 .for f in ${SCRIPT_FILES}
diff --git a/databases/cassandra4/Makefile b/databases/cassandra4/Makefile
index 87a7571814eb..0e6b58d787b1 100644
--- a/databases/cassandra4/Makefile
+++ b/databases/cassandra4/Makefile
@@ -19,7 +19,8 @@ WWW=		https://cassandra.apache.org/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
-FETCH_DEPENDS=	ant:devel/apache-ant
+FETCH_DEPENDS=	${JAVA}:${JAVA_PORT} \
+		ant:devel/apache-ant
 RUN_DEPENDS=	snappyjava>=0:archivers/snappy-java \
 		netty>0:java/netty
 
@@ -34,6 +35,7 @@ CONFLICTS=	cassandra3
 JAVA_VERSION=	8 11
 JAVA_VENDOR=	openjdk
 
+FETCH_ENV+=	JAVA_HOME=${JAVA_HOME}
 SUB_LIST=	JAVA_HOME=${JAVA_HOME}
 
 USERS=		cassandra
@@ -91,7 +93,7 @@ pre-fetch:
 	${MKDIR} ${WRKSRC}/src/java
 	${CP} ${FILESDIR}/maven/build.* ${WRKSRC}
 	${CP} ${FILESDIR}/maven/build-* ${WRKSRC}/.build
-	cd ${WRKSRC} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} resolver-dist-lib
+	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:' \
@@ -108,10 +110,10 @@ do-build:
 	@${DO_NADA} # Do nothing: Prevent USE_ANT from running a default build target.
 
 do-build-DOCS-on:
-	cd ${WRKSRC} && ${SETENV} 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
+	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} && ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} freebsd-stage
+	cd ${WRKSRC} && ${MAKE_ENV} ${ANT} -Dmaven.repo.local=${REPO_DIR} -Dlocal.repository=${REPO_DIR} ${USEJDK11} freebsd-stage
 
 post-build:
 .for f in ${SCRIPT_FILES}