git: da470f174766 - main - java/javavmwrapper: Match currently supported versions
- Go to: [ bottom of page ] [ top of archives ] [ this month ]
Date: Sun, 04 Feb 2024 22:51:46 UTC
The branch main has been updated by glewis:
URL: https://cgit.FreeBSD.org/ports/commit/?id=da470f17476607ce3d66e45b5fca341d6b8fa11a
commit da470f17476607ce3d66e45b5fca341d6b8fa11a
Author: Greg Lewis <glewis@FreeBSD.org>
AuthorDate: 2024-02-04 22:45:36 +0000
Commit: Greg Lewis <glewis@FreeBSD.org>
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