From nobody Fri Dec 27 10:37:48 2024 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 4YKMQP2nZrz5jY7q; Fri, 27 Dec 2024 10:37:49 +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 "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4YKMQP0KxYz45Bv; Fri, 27 Dec 2024 10:37:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735295869; 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=sB/P3YtN899Lbaeh9OoWWsJ7UqdOHT5WWbnf8xhP0m4=; b=e643lzsUyU2eNHO40P6ClRWi4b2OxwbSmbuQPmKbssE29RQIwad4SnpXK604KHFDsf8tn5 B8u071JcatU9jmF4UrV3US0yasBjzrK61D9RKdrL9MJshn27flUybtM2sN3IYqOqvNCdV+ hDQYsufeU0U0gdHXvYL0SWO6vGh0gpvt0n+TU0zAuC82MNne79yQPN7OhqTZ7wqbiMITeL oeqEGhorZH52Kcyz1R5YkdFXqPgNC+ta7HNZ+MKZ4E60M/8Z8uL0PyXBiDNEqqVm76poND ZP+8WqZtW+o9XQNdj6oaFsyAeocJ9BFJK9QAW4k2WeIFjbn8mCiQzCGw7QSzwA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1735295869; 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=sB/P3YtN899Lbaeh9OoWWsJ7UqdOHT5WWbnf8xhP0m4=; b=lbPYHjJI3s75vUFi4pFQC2XDq5QRLsfWARGxSOeCxqrz8iC9pRepXjOZ8pQQvkkH/XkFc1 LkvSIV+sDDM+hQJJeiNMDGttal2kGbB44FYzxu6Fif8zCj3vVI0j2vPdP4lkgye2U1y/jg oxiluNRPvZ+9BwVq7KD+ykp//UeYi0OMP1jCHwycP/n0skZCUZ9+oruMmYgQ8saI2Cfu81 Cu+OK7Ghi+VXyT/+NuiocqBr+77ubVDRbzSTkCk1uGJZzwN8UAXUt+KMvc9UYStYbndQKX xEkoy6GRh6eXZ7JXc6KYaHR2pAlsPZ15o7n+MhiXxRvBAbE/YaAc+og55Z9OSg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1735295869; a=rsa-sha256; cv=none; b=nMoC8a2CMRS9IqH1tYFbTgA2jRHUIRWQ/BkQ6lSg5IjvuUerSQg17kAbW19JPUL9HFYxp+ j0NOMurT47WzW2d9/Q9VZH51xG5/yOtOmDr7catzc+8MIa99cxv9jfn7vtkNE8NT2h/a22 aPuHbNObL/IVVRFrWM9WwWSE2bCoMkS1zLsBayuxd6xNnuML/+Wjy6Ku2xM+9yRPgf4HG9 NVV72x3itrx/Hvn2tU/QRg4zQwWNuadC5O6eoLLsXobeiskawEWSI+Ybto/zjgJtJXQttn 6Ldktn0xA964C3lv9i5JrvdNVfH1jGWebAsZr3dz0Ep/MpqlVVvF8RmeKfsRPQ== 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 4YKMQN743zzbbm; Fri, 27 Dec 2024 10:37:48 +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 4BRAbmwQ005921; Fri, 27 Dec 2024 10:37:48 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4BRAbmYx005918; Fri, 27 Dec 2024 10:37:48 GMT (envelope-from git) Date: Fri, 27 Dec 2024 10:37:48 GMT Message-Id: <202412271037.4BRAbmYx005918@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Muhammad Moinur Rahman Subject: git: 494efd70eca2 - main - Mk/bsd.java.mk: Hook openjdk22 into java system 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: bofh X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 494efd70eca284fe87800f84955dc81ea4648400 Auto-Submitted: auto-generated The branch main has been updated by bofh: URL: https://cgit.FreeBSD.org/ports/commit/?id=494efd70eca284fe87800f84955dc81ea4648400 commit 494efd70eca284fe87800f84955dc81ea4648400 Author: Muhammad Moinur Rahman AuthorDate: 2024-12-25 13:22:29 +0000 Commit: Muhammad Moinur Rahman CommitDate: 2024-12-27 10:37:10 +0000 Mk/bsd.java.mk: Hook openjdk22 into java system PR: 283600 Approved by: java, glewis --- Mk/bsd.default-versions.mk | 2 +- Mk/bsd.java.mk | 9 ++++++--- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/Mk/bsd.default-versions.mk b/Mk/bsd.default-versions.mk index c55c940b2426..d94468485761 100644 --- a/Mk/bsd.default-versions.mk +++ b/Mk/bsd.default-versions.mk @@ -73,7 +73,7 @@ GUILE_DEFAULT?= 2.2 # Format: version[-flavor] # Examples: 6-nox11, 7 IMAGEMAGICK_DEFAULT?= 7 -# Possible values: 8, 11, 17, 18, 19, 20, 21 +# Possible values: 8, 11, 17, 18, 19, 20, 21, 22 JAVA_DEFAULT?= 8 # Possible values: 3.4.0, 3.99 . if (defined(WANT_LAZARUS_DEVEL) && !empty(WANT_LAZARUS_DEVEL)) || ${ARCH:Maarch64} diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 91ea9516c846..c0725d80f9f0 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -23,7 +23,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: 8[+] 11[+] 17[+] 18[+] 19[+] -# 20[+] 21[+]) +# 20[+] 21[+] 22[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -160,7 +160,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 +__JAVA_VERSION_LIST= 8 11 17 18 19 20 21 22 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle @@ -181,6 +181,8 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_20_INFO= PORT=java/openjdk20 HOME=${LOCALBASE}/ 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_NATIVE_OPENJDK_JDK_22_INFO= PORT=java/openjdk22 HOME=${LOCALBASE}/openjdk22 \ + VERSION=22 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 @@ -201,6 +203,7 @@ __JAVA_PORTS_ALL= \ JAVA_PORT_NATIVE_OPENJDK_JDK_19 \ JAVA_PORT_NATIVE_OPENJDK_JDK_20 \ JAVA_PORT_NATIVE_OPENJDK_JDK_21 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_22 \ JAVA_PORT_LINUX_ORACLE_JDK_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \ @@ -275,7 +278,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 19+/:S/^19+/19 20+/:S/^20+/20 21+/:S/^21+/21/} +_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/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif