From nobody Wed Nov 24 06:51:14 2021 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 5AA501889495; Wed, 24 Nov 2021 06:51:15 +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 4HzWr251G5z4r3v; Wed, 24 Nov 2021 06:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) 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 66BCB25618; Wed, 24 Nov 2021 06:51:14 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 1AO6pEVW046403; Wed, 24 Nov 2021 06:51:14 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 1AO6pExn046402; Wed, 24 Nov 2021 06:51:14 GMT (envelope-from git) Date: Wed, 24 Nov 2021 06:51:14 GMT Message-Id: <202111240651.1AO6pExn046402@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: f10d7de2125b - main - Mk/bsd.java.mk: Add support for openjdk17 and 17[+] as a version 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@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: f10d7de2125b711fb628c6a29e42b7f8246d43a5 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1637736674; 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=oXwNEQ1BYDBF1UisDAzPI9mVlut+il59p0NWn8qrttA=; b=qKvL0fbolAOAcloMdVOFrUQKp/bBnU8/OVg+dmkD2/8TOb+7+ZRiGcP1VIIN/vTCry04Mx +mh0TIg8ZAzOrJkJdJbTRjk8EIqLgQN9uB4ojMZDBhls4ygx00e7UejnxHED9GZC1jVTYo q1Sr4alK8YwGTASxLR4uAW+K/KCyKx3THKgf7Ea1Ai2x6vV9/lZJ3WF7TJNg2S0brxuxtT IH9hdC1f7KQ9KAr8M0SAcjZk4Uauhzb1a39R7s9CT92P2AOUJf6xWk0m5/dlxMfwIxNzg9 LyiZbaauYyOdHZYhLnv/o2U0nz9S8JDxSUvEwuCom9qrmh6LkDN69IXaOUs3Fw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1637736674; a=rsa-sha256; cv=none; b=H2Lg7yfJyOEgbW/wVN3uLDmNdCXHobWR8Ar3MOQ2oXSM6PdNrhwt1Q8GJBaknp8KUqVt8u +1HiYI16Wmkh8UdO64Hpij6AmG3qm4p2RDJJJpGI9//YT5Xl8QH4RVsw2S0I79pc3KTCNO 1B3zLYMLU1rPPovkB98xqk6dXeg3HnV/D92j3Lq2TmgSt9EpNlLpS2WSz43RW624lfueog rDIHHOJ36n7Ps6Hm5uoZkCPyYKD8Bzi2z7Di09opYypPVG0usDydDj31kpv/nmCgUjJZ10 l/JtJmpI4QP+tyF18kChq9APoBsWSjqsmzi/F3LzxGlx5n4abfRbVqzypeS43w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=f10d7de2125b711fb628c6a29e42b7f8246d43a5 commit f10d7de2125b711fb628c6a29e42b7f8246d43a5 Author: Greg Lewis AuthorDate: 2021-11-24 06:49:41 +0000 Commit: Greg Lewis CommitDate: 2021-11-24 06:49:41 +0000 Mk/bsd.java.mk: Add support for openjdk17 and 17[+] as a version PR: 259167 Reported by: cedric@precidata.com --- Mk/bsd.java.mk | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index b558be790db5..188d7714dbe4 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -24,7 +24,7 @@ Java_Include_MAINTAINER= java@FreeBSD.org # JAVA_VERSION List of space-separated suitable java versions for the # port. An optional "+" allows you to specify a range of # versions. (allowed values: 7[+] 8[+] 11[+] 12[+] 13[+] -# 14[+] 15[+] 16[+]) +# 14[+] 15[+] 16[+] 17[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -161,7 +161,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 7 8 11 12 13 14 15 16 +__JAVA_VERSION_LIST= 7 8 11 12 13 14 15 16 17 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle @@ -184,6 +184,8 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_15_INFO= PORT=java/openjdk15 HOME=${LOCALBASE}/ VERSION=15 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_16_INFO= PORT=java/openjdk16 HOME=${LOCALBASE}/openjdk16 \ VERSION=16 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_17_INFO= PORT=java/openjdk17 HOME=${LOCALBASE}/openjdk17 \ + VERSION=17 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 @@ -199,6 +201,7 @@ _JAVA_OS_linux= Linux __JAVA_PORTS_ALL= \ JAVA_PORT_NATIVE_OPENJDK_JDK_8 \ JAVA_PORT_NATIVE_OPENJDK_JDK_11 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_17 \ JAVA_PORT_NATIVE_OPENJDK_JDK_12 \ JAVA_PORT_NATIVE_OPENJDK_JDK_13 \ JAVA_PORT_NATIVE_OPENJDK_JDK_14 \ @@ -279,7 +282,7 @@ JAVA_RUN= jre . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13 14+/:S/14+/14 15+/:S/15+/15 16+/:S/16+/16/} +_JAVA_VERSION= ${JAVA_VERSION:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.7/7/:S/1.8/8/:S/7+/7 8+/:S/8+/8 11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13 14+/:S/14+/14 15+/:S/15+/15 16+/:S/16+/16 17+/:S/17+/17/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif