From nobody Tue Oct 24 04:06:42 2023 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 4SDz5Z2F2rz4xS59; Tue, 24 Oct 2023 04:06:42 +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 4SDz5Z1q4fz3FjK; Tue, 24 Oct 2023 04:06:42 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1698120402; 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=Qle/jEluH6FU941cehmGni5/OVdK7e3HpAD+Qlo4SMM=; b=XcFqncLgwSMPBnmlXOCg1ZeettDSvdjtwMaRwMQGxq5NmndiOJ86CVXWoMt5UHocpa8Fue 4v31E1TFt6fezd9zNYGW4clbpG3FJDhe+0EbUaYnDTvLZuWC0Z4Iq9ihAHlewimn8BJ2ry gcWV+3Mc5mK1mRUjxlyWStlCWp041nLMsryQ6ZYWp75k+EOYJDNbz7MITtT2XvxrhG5+GD HC4f8bw3Hqd0bQ7uGQe+8f9ayrXOjk5AJpIeNjM2G2i7hO+eAL/d5KbD1COdd7tNH+3U/6 h4Oi2ZJEqrG+z8133UhxgW2qWKGj821lJR8EK4wy8qQ7Be9hg+i904NgMVzR0A== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1698120402; a=rsa-sha256; cv=none; b=he9/KnvqyzvEXesBXcz2p97kgJhsH4mBrnywEH+GpiyYO2V0+1b8FiunC77YSmETZs8rgs st+J1D5GfIlvPVgKcquyzlbd40NPyg6VDvQAEft6eGCS5f9u8A8fMWgxR8/0bl4uVbKRUC z+lTST1QIiNhHjYzjGrg8R572EkbKEFh1UwQvHG8t3PHuVFfplSV6lEh62j3j6A6cORdYe 9p7mkdHqG+QkdKW0BHkZLF9chLw39StzctD39nM/1Zt40IGo3i5TCza5LdoxaFhdExxQ8L XHkVgZzjCN956Ka5SqQY1d4AaB6ln76oEN7j53Mi55ezkvudG9FJ1CHXm7w+qg== 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=1698120402; 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=Qle/jEluH6FU941cehmGni5/OVdK7e3HpAD+Qlo4SMM=; b=mUJERBTt7eT7gO3UhJ5lnmVYfCs1a9xbZ5qAlx6uAR81+vAS5MZvRHlh419X/rBkocUs+P axbTpk32Dg/IDrPSj6UrJxigVuSezmMVLd10kjPMBd3t8ja6rKHnIAiUa4hwZtptut7cvD r2d5HBxXcxm8xlEtXqWqhhyqFV/LbmVk4l+OCQXiP0H9Tx/CSql7NFvsj0mpRQLwm7YL95 pXwLCO1ErNAQ/B829zi7ElHNBsLh2LkBdM8jQs9HHMsagODNkZwzZA5aZoyZsVDY+71ahd 7tQ+iI4vw5b+7dvNYcQdWT1VFqOSnBtotCPYTSRhAZMYn8pvKjwbg27DlxnZaA== 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 4SDz5Z0t3Wz16rQ; Tue, 24 Oct 2023 04:06:42 +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 39O46ghK039303; Tue, 24 Oct 2023 04:06:42 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 39O46gJQ039300; Tue, 24 Oct 2023 04:06:42 GMT (envelope-from git) Date: Tue, 24 Oct 2023 04:06:42 GMT Message-Id: <202310240406.39O46gJQ039300@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Greg Lewis Subject: git: 9cde18fd05f0 - main - Mk/bsd.java.mk: Add support for JDKs 19, 20, and 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: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: glewis X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 9cde18fd05f03f23cce0115e1cf46126372daab5 Auto-Submitted: auto-generated The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=9cde18fd05f03f23cce0115e1cf46126372daab5 commit 9cde18fd05f03f23cce0115e1cf46126372daab5 Author: Greg Lewis AuthorDate: 2023-10-24 04:05:47 +0000 Commit: Greg Lewis CommitDate: 2023-10-24 04:06:28 +0000 Mk/bsd.java.mk: Add support for JDKs 19, 20, and 21 PR: 273979 --- 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