From nobody Sun Feb 04 22:51:46 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 4TSlBC0XSTz5907l; Sun, 4 Feb 2024 22:51:47 +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 4TSlBC00mwz4Xnl; Sun, 4 Feb 2024 22:51:47 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707087107; 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=XTDW5//TfH7BeGR7m3Qve3lqeAb3U89HA53sGZFTtY0=; b=UxehOB+QRnNEHxCWFtWbuDHtv83yCPMgAdDTT1Xo9DPdt30drrsvpuMjdj0nhxtvxEpCLj +1kMCT4Fo8y74JdpJ3kS90TB/9tKQE7OOgd3FhnRaWTJwcF8GXG5UnH2cjX6AvLgFiayBE xwukXsPHmqL8lXiObZQnlGuKaiOIpbEsHYF9w4W/3fZ9PuHWih+hEhs34H5wjV1TZ5ZXR8 8Bpq9xLnTQ1Do51HZj/jn4tWE2D4cSCQuSafEXdnKBAwcpVsbLm0vfTz91doj4nfbC8Jlw 25GlQSrmaoxGVxgKavrZYewb8bLBmWkzBlocj+kCg21EcQGfNal8bv/cL4azlQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1707087107; 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=XTDW5//TfH7BeGR7m3Qve3lqeAb3U89HA53sGZFTtY0=; b=afBal2olfv1WoHgvAp9FEGtTo8vLxWQF36vmjYU6Xu8M2zgHJFIlQ71CYcoVm69pP0A0oG XZq7snOmWeoSeLFi9tyCmYEvhDwTg4LnBlHgPA/MKzPCDAeThPTiLmvUyfFVRbEqnhezcG ZLmHyBOPl6nRJQ64Rlk1+SofYlAaaVonUujuUKENGY9s7e7cC4U6ylS1UGqwXtusIO+vhx A/RjZWfeFLzYQerL1BnNLFBj+VRvI8R0rBkeQpd6USHoNAv4Cj0lqrHi+UpAlEHtE4dyM8 tu6QFpXGnHl5GASpymj4zCzedeTqREB5QeCt8ZQwwkC7nQmE1wyJr/m4RLa2/Q== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1707087107; a=rsa-sha256; cv=none; b=P7NO7IKhx4k8VmclKBjG7RpEld3DWjyOzcahUfY63kilOFqyD0Z/o7AZoUkF3aBN9+uac/ qAaOKbJ1yLSjZdObu+gk3ves1CtcmbVE64O0qdYI9kGDaly8ZxlUJJfwSj4RaU/uip4WWn dGJOUNpVO7wSShLEJvcL2EATAJyBxWQzlO17sZ3lbXi3ZFmAaX8SpnNaGt1aiJ2V7KXvvr zHuahqXSmEcVyq3PGWiYio1K3aE7QD8ND7S6dbOS0cnfsEh7Hr2PAI0uY3BGRLj6/EvCIV W6HIPaYh2RaJKnGCQ2kymp0FZ9d2M/EqWSNUc+gPDbdtuIqxOgfLMSw/arw+4g== 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 4TSlBB6B1WzGDp; Sun, 4 Feb 2024 22:51:46 +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 414MpkZs084293; Sun, 4 Feb 2024 22:51:46 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 414MpkuL084290; Sun, 4 Feb 2024 22:51:46 GMT (envelope-from git) Date: Sun, 4 Feb 2024 22:51:46 GMT Message-Id: <202402042251.414MpkuL084290@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: da470f174766 - main - java/javavmwrapper: Match currently supported versions 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: da470f17476607ce3d66e45b5fca341d6b8fa11a Auto-Submitted: auto-generated The branch main has been updated by glewis: URL: https://cgit.FreeBSD.org/ports/commit/?id=da470f17476607ce3d66e45b5fca341d6b8fa11a commit da470f17476607ce3d66e45b5fca341d6b8fa11a Author: Greg Lewis AuthorDate: 2024-02-04 22:45:36 +0000 Commit: Greg Lewis CommitDate: 2024-02-04 22:51:31 +0000 java/javavmwrapper: Match currently supported versions --- java/javavmwrapper/Makefile | 3 +-- java/javavmwrapper/src/javavm.1 | 30 +++++---------------- java/javavmwrapper/src/javavmwrapper.sh | 46 ++++++++------------------------- java/javavmwrapper/src/manvm.1 | 30 +++++---------------- 4 files changed, 26 insertions(+), 83 deletions(-) diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index 952b26c2004b..1e7a616276eb 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -1,6 +1,5 @@ PORTNAME= javavmwrapper -PORTVERSION= 2.7.9 -PORTREVISION= 1 +PORTVERSION= 2.7.10 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1 index fe5552ccf379..1ab76380895a 100644 --- a/java/javavmwrapper/src/javavm.1 +++ b/java/javavmwrapper/src/javavm.1 @@ -110,37 +110,21 @@ to a version, any Java VM with a version greater than or equal to the given version will be used. .Pp Currently allowed versions are -.Ql 1.7 , -.Ql 1.7+ , -.Ql 1.8 , -.Ql 1.8+ , -.Ql 1.9 , -.Ql 1.9+ , -.Ql 7 , -.Ql 7+ , .Ql 8 , .Ql 8+ , -.Ql 9 , -.Ql 9+ , -.Ql 10 , -.Ql 10+ , .Ql 11 , .Ql 11+ , -.Ql 12 , -.Ql 12+ , -.Ql 13 , -.Ql 13+ , -.Ql 14 , -.Ql 14+ , -.Ql 15 , -.Ql 15+ , -.Ql 16 , -.Ql 16+ , .Ql 17 , .Ql 17+ , .Ql 18 , +.Ql 18+ , +.Ql 19 , +.Ql 19+ , +.Ql 20 , +.Ql 20+ , +.Ql 21 , and -.Ql 18+ . +.Ql 21+ . .It Ev JAVAVM_OPTS The contents of this environment variable will be passed to the invoked Java VM as options. diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index 573e6a5243af..dce2cf38a194 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -503,50 +503,26 @@ setJavaHome() { _JAVAVM_VERSION= for version in ${JAVA_VERSION}; do case "${version}" in - *7+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12 13 14 15 16 17 18" - ;; - *8+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12 13 14 15 16 17 18" - ;; - *9+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12 13 14 15 16 17 18" - ;; - 10+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12 13 14 15 16 17 18" + 8+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 11 17 18 19 20 21" ;; 11+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12 13 14 15 16 17 18" - ;; - 12+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 12 13 14 15 16 17 18" - ;; - 13+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 13 14 15 16 17 18" - ;; - 14+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 14 15 16 17 18" - ;; - 15+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 15 16 17 18" - ;; - 16+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 16 17 18" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 17 18 19 20 21" ;; 17+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 17 18" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 17 18 19 20 21" ;; 18+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 18" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 18 19 20 21" ;; - 1.7) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 7" + 19+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 19 20 21" ;; - 1.8) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 8" + 20+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 20 21" ;; - 1.9) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 9" + 21+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 21" ;; *) _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}" diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1 index a76e9f46e23d..ebda3a5a6aff 100644 --- a/java/javavmwrapper/src/manvm.1 +++ b/java/javavmwrapper/src/manvm.1 @@ -98,37 +98,21 @@ to a version, the on-line manual pages from any Java VM with a version greater than or equal to the given version will be used. .Pp Currently allowed versions are -.Ql 1.7 , -.Ql 1.7+ , -.Ql 1.8 , -.Ql 1.8+ , -.Ql 1.9 , -.Ql 1.9+ , -.Ql 7 , -.Ql 7+ , .Ql 8 , .Ql 8+ , -.Ql 9 , -.Ql 9+ , -.Ql 10 , -.Ql 10+ , .Ql 11 , .Ql 11+ , -.Ql 12 , -.Ql 12+ , -.Ql 13 , -.Ql 13+ , -.Ql 14 , -.Ql 14+ , -.Ql 15 , -.Ql 15+ , -.Ql 16 , -.Ql 16+ , .Ql 17 , .Ql 17+ , .Ql 18 , +.Ql 18+ , +.Ql 19 , +.Ql 19+ , +.Ql 20 , +.Ql 20+ , +.Ql 21 , and -.Ql 18+ . +.Ql 21+ . .It Ev JAVAVM_OPTS The contents of this environment variable will be passed to the invoked .Nm man