From nobody Sat Mar 29 13:43:37 2025 X-Original-To: dev-commits-ports-main@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 4ZPzBK45T1z5rSh9; Sat, 29 Mar 2025 13:43:37 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4ZPzBK2b5Cz3HCR; Sat, 29 Mar 2025 13:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1743255817; 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=q5IbgfCiRUh1nwTUl9ORcIKSlRlrr+b786Zj6hXeC3o=; b=pTtsmi0855zcfy7jurW4G59sTkXLpfClPibsoghhG05BTAfyUssJL6Jjfsr05Vd5OCSaJD p/EnuF/jiYFXi73SgzmdOPc/GIjLOFGiOI9FYEkYbTgiL1CV+VuJrnQsOwAhAHBpRxtTJp BYE0u1ZkMtS0pyfkulAk/uHjc4ZXOmvFjGlRpB2nCIJiHZntrNTAuM+45TBsA2LUTZMYwm kpqqy1lYzZotGLz5hVnU8u6jWRChu0CrSkWQ2LlAGsQudQ2sMqiWGVtRy6XYft7MNvLyEu +OIRHphZLhP8R2Hi1M9YVaCkk/k0M12UysElAEPdSByzBikLNpptRlNNofxP2A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1743255817; a=rsa-sha256; cv=none; b=OIPZor5VBYbcmcqnpBLrgWZCaVqxQigQQJs/3/4ppsMvO0+z5doP5S8ODIf47MGvAzAgd6 bRGG/cVoWk1SO4AImAHfq/wsgwel5ovuVqJkNp9JtVUVI9j5L3G5U5qtZkoJpybBC57jIJ SoUB1GqHio3AnnPC6OWlkvIHOcWwKuaigvKs7nBpSi+j2Tg1NAmAzAEKDBien4Xm+pnaVU 87BqsP/PYC30TfYsYotJDEk3AC9Tx7WC9M+jK5bW5jEyuWmk1EHy3LBfM0jmmyqBOjJ845 DagRohmbw3ziWhxxWK1yrTg61ZGqore1IkiNIpzDoFwvm/9OY7Cq/jh27OP+Kw== 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=1743255817; 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=q5IbgfCiRUh1nwTUl9ORcIKSlRlrr+b786Zj6hXeC3o=; b=RIaevzDPcU/1RCzbzJTInHBfKhRuZoRcYKYYus5aAEtl4KibvC6HY6ivJ7VP2I80lYI5Ah XMoy2PmVQIjbyOMS0qbJkPAfKKMicRCr2nggdlaQ5ZhTJCmo8eHYp1EIGb+wpIC4yrO4cM 1pi3QweaZrmGX99IiY6ntdG3iTmAN1i/axGf4+WoQ2300DKTCekuklxDPK9jv/xmUNwUoN 3mhfruJqQqZHbb3Y4nMkMyRGkZF5cdYNf3LnF3hGFPXDLnn0SKTF81YhB0TxLIOhUaOLKD R3fsWuaffNs1XaYwlBl28VQ5hXCF0DQ2AOb3Dd7XjaDxwCupIxSDur1CoQQBqA== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4ZPzBK26qKzX26; Sat, 29 Mar 2025 13:43:37 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 52TDhbJg017644; Sat, 29 Mar 2025 13:43:37 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 52TDhbeA017641; Sat, 29 Mar 2025 13:43:37 GMT (envelope-from git) Date: Sat, 29 Mar 2025 13:43:37 GMT Message-Id: <202503291343.52TDhbeA017641@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: e9a357530049 - main - Mk/Uses/java.mk: Update for new java/openjdk24 List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: e9a35753004908993e6af60031c0008c049596cf Auto-Submitted: auto-generated The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=e9a35753004908993e6af60031c0008c049596cf commit e9a35753004908993e6af60031c0008c049596cf Author: Joseph Mingrone AuthorDate: 2025-03-29 13:38:53 +0000 Commit: Joseph Mingrone CommitDate: 2025-03-29 13:41:48 +0000 Mk/Uses/java.mk: Update for new java/openjdk24 Reported by: vvd Sponsored by: The FreeBSD Foundation --- Mk/Uses/java.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Mk/Uses/java.mk b/Mk/Uses/java.mk index 78debf0affcc..6927aaa4160e 100644 --- a/Mk/Uses/java.mk +++ b/Mk/Uses/java.mk @@ -30,7 +30,7 @@ # JAVA_VERSION List of space-separated suitable java versions for the # port. An optional "+" allows you to specify a range of # versions. (allowed values: 8[+] 11[+] 17[+] 18[+] 19[+] -# 20[+] 21[+] 22[+] 23[+]) +# 20[+] 21[+] 22[+] 23[+] 24[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -201,7 +201,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 8 11 17 18 19 20 21 22 23 +__JAVA_VERSION_LIST= 8 11 17 18 19 20 21 22 23 24 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle @@ -226,6 +226,8 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_22_INFO= PORT=java/openjdk22 HOME=${LOCALBASE}/ VERSION=22 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_23_INFO= PORT=java/openjdk23 HOME=${LOCALBASE}/openjdk23 \ VERSION=23 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_23_INFO= PORT=java/openjdk24 HOME=${LOCALBASE}/openjdk24 \ + VERSION=24 OS=native VENDOR=openjdk _JAVA_PORT_LINUX_ORACLE_JDK_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \ VERSION=8 OS=linux VENDOR=oracle @@ -248,6 +250,7 @@ __JAVA_PORTS_ALL= \ JAVA_PORT_NATIVE_OPENJDK_JDK_21 \ JAVA_PORT_NATIVE_OPENJDK_JDK_22 \ JAVA_PORT_NATIVE_OPENJDK_JDK_23 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_24 \ JAVA_PORT_LINUX_ORACLE_JDK_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \ @@ -311,7 +314,7 @@ check-makevars:: . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23/} +_JAVA_VERSION= ${JAVA_VERSION:S/^8+/8 11+/:S/^11+/11 17+/:S/^17+/17 18+/:S/^18+/18 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21 22+/:S/^22+/22 23+/:S/^23+/23 24+/:S/^24+/24/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif