From nobody Thu Nov 16 12:17:07 2023 X-Original-To: dev-commits-ports-branches@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 4SWJtq3zFLz50b4X; Thu, 16 Nov 2023 12:17:07 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4SWJtq3XRvz4ZDQ; Thu, 16 Nov 2023 12:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700137027; 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=KQ0nj0Hfgc1dtz63qzMCala8TZDZwMapcLfRG66RcIQ=; b=IXOeFgG3GmLhujlr2xGIhM3bQeAL8PnLylw8zNGALruPr1b04We3y19F5AfQXb8ebg719K rGFpXPfsMtKHjKoFU4UVKGp0hHoVaJZAMQ2TlMKaVsQ1LTmddmGbJ/FyyJ+E47n7t6I/iU qVplfXRDqH0R5+s7CzyhSvBp0KxKYeUJC++o7ucHsmXdZ3Fv8BJCtphtIayUeGBNlXKThr qXNjuTyyYcI1bLCMKZwc5A/30X7yRFzbFcar0NbKbcvvYhFywhBi2cqLwgR3GXPZHAOadr ZsrehDG56DT3GdtMemLkS7F141jIAPUpV7tebDtUo4fZs1EZJ1gc1PFvncO7rw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1700137027; 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=KQ0nj0Hfgc1dtz63qzMCala8TZDZwMapcLfRG66RcIQ=; b=TShfPaSUH1sEBaBsgZcGonJKnL7X5MSbIV067ESf5lAha2KaX9V+9b2hqiTK/ubpTS0hOP YbuzqTid+dgdrg3TXE9N0QF/oPph2XM/ReshQVHXV1cXh4Qm8HAJ/JAR+KNwL+Vug2coem qV1tx6YEJ4wYdR2OnAy7OoAKHg6BKmPR5YYCkxFHQ3Mc1WYiIy2vbLOS4h8QPgr0H/ymqQ 4+eer4IouIT4ldjjynfQ5BnNTYWKqUkUCyfx7KrKXIfxcHlhIKlJmbzKVcTRZnFW/wHx/O n7uQ6jgWsInpxDbjnaEXUulqH8E++nZQqKCiqIvX8MsbkeGKDpdHVLj8pLc/Pw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1700137027; a=rsa-sha256; cv=none; b=I2hMG04h3Xyqs+ZVuumYyX8APu6lstRsxXrKUoCQCRX7wBLQgnDrcVXh0JI6r2McnMENOo y1L/UZdgGSFF1CAjq0Rbbk2uOO/M89HalORRDt/asCwussGPgtqMj3CeQczlAbFdHPLvH9 ZOhFI1hcIuBM1TsT/p4LOSORNUIhRQzghZCkSUWdVxJwb7P2knFCvVrZzXxxJh/ZbOVS4p hJrV12/QdH6BodPgh0w3OXj3vF0jyY9VB/0UmksaNvhVNDIep8WLyfHOF/WQQAddPK+t+Q e58ed0a7h96s99qtKKcqDZf6ljR1F7eTWw5qHvyE/bIh3DhuXcD6WUyaq23TZA== 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 4SWJtq2dPmz10c8; Thu, 16 Nov 2023 12:17:07 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 3AGCH73H085909; Thu, 16 Nov 2023 12:17:07 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 3AGCH7x3085906; Thu, 16 Nov 2023 12:17:07 GMT (envelope-from git) Date: Thu, 16 Nov 2023 12:17:07 GMT Message-Id: <202311161217.3AGCH7x3085906@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Vladimir Druzenko Subject: git: 07cc5bacc314 - 2023Q4 - Mk/bsd.java.mk: Add support for JDKs 19, 20, and 21 List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q4 X-Git-Reftype: branch X-Git-Commit: 07cc5bacc3148177b6fe8c42d8f54c7d230566e3 Auto-Submitted: auto-generated The branch 2023Q4 has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=07cc5bacc3148177b6fe8c42d8f54c7d230566e3 commit 07cc5bacc3148177b6fe8c42d8f54c7d230566e3 Author: Greg Lewis AuthorDate: 2023-10-24 04:05:47 +0000 Commit: Vladimir Druzenko CommitDate: 2023-11-16 12:14:15 +0000 Mk/bsd.java.mk: Add support for JDKs 19, 20, and 21 PR: 273979 (cherry picked from commit 9cde18fd05f03f23cce0115e1cf46126372daab5) --- Mk/bsd.java.mk | 11 ++++++++++- 1 file changed, 10 insertions(+), 1 deletion(-) diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 78ecd65408ba..9a7362612c45 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -174,6 +174,12 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/ VERSION=17 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_18_INFO= PORT=java/openjdk18 HOME=${LOCALBASE}/openjdk18 \ VERSION=18 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_19_INFO= PORT=java/openjdk19 HOME=${LOCALBASE}/openjdk19 \ + VERSION=19 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_20_INFO= PORT=java/openjdk20 HOME=${LOCALBASE}/openjdk20 \ + VERSION=20 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_21_INFO= PORT=java/openjdk21 HOME=${LOCALBASE}/openjdk21 \ + VERSION=21 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 @@ -191,6 +197,9 @@ __JAVA_PORTS_ALL= \ JAVA_PORT_NATIVE_OPENJDK_JDK_11 \ JAVA_PORT_NATIVE_OPENJDK_JDK_17 \ JAVA_PORT_NATIVE_OPENJDK_JDK_18 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_19 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_20 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_21 \ JAVA_PORT_LINUX_ORACLE_JDK_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \ @@ -265,7 +274,7 @@ JAVA_RUN= jre . 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/} +_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/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif