From nobody Sat Apr 16 14:52:34 2022 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 B47DD5D56BC; Sat, 16 Apr 2022 14:52:35 +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 4KgblR3blfz3NPN; Sat, 16 Apr 2022 14:52:35 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650120755; 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=fvqbg3rSHZ1I/HLzunR1eVHYkC2GrTalrirm99eNQq0=; b=OfDE3gE2Sx3Ofk3p9w0pzo8s/vw0RkLEjQLZYNhnuoule+w4dD7vMqCmfhyVNzpKUQuVcu 0qZmd7U02rRn5ym7MpzNnNB0r5axsA//NRiKgi8PlJer5dYdXSMKJRqTbhOlPQWy8dY20x T1/fxovbd2gU0xbVe3qNHLxwcAjY9XHvYUvYd/3g9BP8C3tlUw8dWQUOzAIpdkylgHjtha KVe+wGeBOTYqIoZUxeSb6Y4gppq/LF2AgohkLBi8EHkaCR7quhv2AGGwoV7496B4b28Ieq n8nv7RXOFvxAblaJL152POBPak19Ud81zmNyZ6bX/WCd9CaAmX2YbqQLbXWwgQ== 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 F38553F11; Sat, 16 Apr 2022 14:52:34 +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 23GEqYLY058579; Sat, 16 Apr 2022 14:52:34 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 23GEqYsL058578; Sat, 16 Apr 2022 14:52:34 GMT (envelope-from git) Date: Sat, 16 Apr 2022 14:52:34 GMT Message-Id: <202204161452.23GEqYsL058578@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: aad15015e504 - main - Mk/bsd.java.mk: Add support for openjdk18 and 18[+] as a version 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: aad15015e50470c4bf40e788348354db7cb73d27 Auto-Submitted: auto-generated ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1650120755; 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=fvqbg3rSHZ1I/HLzunR1eVHYkC2GrTalrirm99eNQq0=; b=AtO4Mq7jpwtSpUqSRVgj1OeZs08edXfhDDBFmuJc06yqjjdQOMZ9klxGlIeitXDfh7UDuu NmxS0VasVLV3vQWFOVUKSumFW3KR1sx0d47oI86pT2IPfptBAXm3oYW74Vg0tTPHNMNvDK FHbSVulXxlNIzYxqZPYcT9FEFZ2HTHZi9Njh8RieHWNHN0zH0dNxlcE5RHxRyMF0SH/Yd6 Eqiroh1FSSAsYDWNeXyzm5RnUyGEWHINz1Qve3Y81gHPpS6TJTa+pH123nlXmOIti2BtiI v5i4XHnkazLPShwUCDVkVIK1yVSikkjxEylwNZMBv4W+79mMmV2W4FglWqFbmw== ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1650120755; a=rsa-sha256; cv=none; b=ffYJalganpCBKgEq1BmMU5rnknti6kKw797RukgMQXml5erOoNHIadi03zNtMXsIu1yFic EY8iZXY0xe/M++1vPdWjsRLkFS510QM8qIE317pek4YSCiGAm4293BAUwU26G8iQjNXeb1 V8L+Np3pnqqm6/TXUvnd7hDfdlJ2DCrUUwfpFGgSphOzKBI2hEUNLlQWh/Hk7Ylbgd2Wzq M0EiFoJoUzcyZ4GV5zrE/ysETIcPP237SMw3MweDadMIRH/fSVUMbFbAmAKaxUg2PazhL5 Cd7LXJPqtG2sGC8yg1Liko5umwqTtuWGUixk/cdNu4g08t31maMx5Tb3QR1UyQ== 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=aad15015e50470c4bf40e788348354db7cb73d27 commit aad15015e50470c4bf40e788348354db7cb73d27 Author: Greg Lewis AuthorDate: 2022-04-16 14:48:10 +0000 Commit: Greg Lewis CommitDate: 2022-04-16 14:52:19 +0000 Mk/bsd.java.mk: Add support for openjdk18 and 18[+] as a version --- 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 188d7714dbe4..f7eb3fe6192b 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[+] 17[+]) +# 14[+] 15[+] 16[+] 17[+] 18[+]) # # 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 17 +__JAVA_VERSION_LIST= 7 8 11 12 13 14 15 16 17 18 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle @@ -186,6 +186,8 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_16_INFO= PORT=java/openjdk16 HOME=${LOCALBASE}/ 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_NATIVE_OPENJDK_JDK_18_INFO= PORT=java/openjdk18 HOME=${LOCALBASE}/openjdk18 \ + VERSION=18 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 @@ -207,6 +209,7 @@ __JAVA_PORTS_ALL= \ JAVA_PORT_NATIVE_OPENJDK_JDK_14 \ JAVA_PORT_NATIVE_OPENJDK_JDK_15 \ JAVA_PORT_NATIVE_OPENJDK_JDK_16 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_18 \ JAVA_PORT_NATIVE_OPENJDK_JDK_7 \ JAVA_PORT_LINUX_ORACLE_JDK_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ @@ -282,7 +285,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 17+/:S/17+/17/} +_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 18+/:S/18+/18/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif