From nobody Mon Feb 9 11:45:45 2026 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4f8jZ22khpz6RJhX for ; Mon, 09 Feb 2026 11:45:46 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R13" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4f8jZ173zrz3bPB for ; Mon, 09 Feb 2026 11:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770637546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tA5ivZDYjwkyZELZCPx47mvY+V90aESqAHPxBUbsnBU=; b=YqhUjnVGJvQr6Z2BeoVyemHTXif2xpfYcaPsOdlbzOTxxeXfZuZ6GCpg3fklHj7NrEJeqr 1W/tgIRKkNB/2+sBmd6BEzwgLRcsDONZJ6+W66saHs2u8janUXp+dOgwOFOdzPxiBB7pdO kc3tfmJp1v71JqMuctnm2GKrl9o2SPA69Q4c1+9g4mHvMNDaxtzFQDYJf1wuJh9kMMwMSO exM/ItXch/WWZYn6xWSixMYkr9u4+qFCjMRsFud4MdAiLkauLPJyr9EXYG3mHpatQ7fcZH HTyAQB4S9mTrpYQh1Hr/52945jDlY/EJCn6VitgyNwVOGJO8TH87qrD2omh7zQ== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1770637546; a=rsa-sha256; cv=none; b=GtgQFD7nG9TaUhU/YIs6e5MD4Kq3liyfKY+MyPyX1FGq1Yp+NKzaQjHC3RFEVVy6CzdeEX kIY0sOyRcnBK9Et6JxkVDQznkhDm5vcIJKGoRWNkVKRJ0vL2wWLc8T2quIQvbYbO6NgwkF v0tDg8P8vHxEjLcmEmv539ThSPvRHA0k14Pwe3h4rgUuCoblzCtgKVaMSNDjp8VRVr5iDC /oYLi0AYEwmxjI+B8tIHMcaOvsNxvztCkXv7r0hh0Qa6O3vtiH9QrjnlTFp9m2jkwn6xYI c0GAFa54NlvLEXyrImsB2GiQrHXo7T6tHlzoAKOK9dGvNnHyG0zvA8mfqcTBjQ== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1770637546; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=tA5ivZDYjwkyZELZCPx47mvY+V90aESqAHPxBUbsnBU=; b=qD+bcy2uK4GMBTlNTMuUQfGkBB1xnfKJ0ptYZ1oOYqZFdOPYTyR4qIQnuNQaQgoEO12jc5 43EJcU7ZETq1cTlBDzjgpp6J5TGeH+38qWmMKv9MGRt+CMGFRIoV2wjhKFrn1h4pkULKnI F4UM2Q1nUDJCi1XTjU+RpczpLIRgnmZIgnaPX4fpuqK5GhEodNcnzWPrMFQTGUKcOZIxEd KJZ2NOdfmoFaKZ8lvakHPHhX+Z84NTsbfEzIAWy8PlQWogLk9WqhxCnybIUu8nPokeJsny Sc98TnRrzx2bAEJh8D4WKf2fUkvAI/IaCtCo/BL4fdcT5Ca47SX3MPDKOmVj4w== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) by mxrelay.nyi.freebsd.org (Postfix) with ESMTP id 4f8jZ15rN3zWg6 for ; Mon, 09 Feb 2026 11:45:45 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from git (uid 1279) (envelope-from git@FreeBSD.org) id 30498 by gitrepo.freebsd.org (DragonFly Mail Agent v0.13+ on gitrepo.freebsd.org); Mon, 09 Feb 2026 11:45:45 +0000 To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Ronald Klop Subject: git: 9ab5b8b06626 - main - databases/cassandra[34]: allow building with JAVA_DEFAULT=21 List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: ronald X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9ab5b8b06626e2533d27a6bc704a14af4f7de8f7 Auto-Submitted: auto-generated Date: Mon, 09 Feb 2026 11:45:45 +0000 Message-Id: <6989c8e9.30498.229173eb@gitrepo.freebsd.org> The branch main has been updated by ronald: URL: https://cgit.FreeBSD.org/ports/commit/?id=9ab5b8b06626e2533d27a6bc704a14af4f7de8f7 commit 9ab5b8b06626e2533d27a6bc704a14af4f7de8f7 Author: Ronald Klop AuthorDate: 2026-02-08 20:06:29 +0000 Commit: Ronald Klop 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}