Update manual pages

* Update currently supported version specifiers.
* Update currently supported vendors.
* Bump minor version.

This is mostly based on the patch in PR 223304.

PR:		223304
Submitted by:	Tommy P <tommyhp2@gmail.com>

3 files changed, 51 insertions, 21 deletions

diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index e4d946b1416a..69f34c8589b9 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	javavmwrapper
-PORTVERSION=	2.7
+PORTVERSION=	2.7.1
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1
index 01725a9d2649..eb366c0d8cef 100644
--- a/java/javavmwrapper/src/javavm.1
+++ b/java/javavmwrapper/src/javavm.1
@@ -100,9 +100,8 @@ A space delimited list of Java VM vendors.
 The selected Java VM must have been released by one of the vendors in the list.
 .Pp
 Currently allowed vendors are
-.Ql bsdjava ,
-.Ql freebsd ,
-.Ql openjdk
+.Ql openjdk ,
+.Ql oracle ,
 and
 .Ql sun .
 .It Ev JAVA_VERSION
@@ -113,13 +112,29 @@ 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.5 ,
-.Ql 1.5+ ,
 .Ql 1.6 ,
 .Ql 1.6+ ,
-.Ql 1.7
+.Ql 1.7 ,
+.Ql 1.7+ ,
+.Ql 1.8 ,
+.Ql 1.8+ ,
+.Ql 1.9 ,
+.Ql 1.9+ ,
+.Ql 6 ,
+.Ql 6+ ,
+.Ql 7 ,
+.Ql 7+ ,
+.Ql 8 ,
+.Ql 8+ ,
+.Ql 9 ,
+.Ql 9+ ,
+.Ql 10 ,
+.Ql 10+ ,
+.Ql 11 ,
+.Ql 11+ ,
+.Ql 12 ,
 and
-.Ql 1.7+ .
+.Ql 12+ .
 .It Ev JAVAVM_OPTS
 The contents of this environment variable will be passed to the invoked
 Java VM as options.
@@ -179,16 +194,16 @@ Execute the most up to date and
 .Dq native
 Java VM registered with
 .Nm .
-.It Ev JAVA_VERSION=1.5+ Pa %%LOCALBASE%%/bin/javac MyClass.java
+.It Ev JAVA_VERSION=8+ Pa %%LOCALBASE%%/bin/javac MyClass.java
 Compile MyClass.java with a registered Java VM's javac that is at least
-version 1.5.
+version 8.
 .It Ev JAVA_OS=native Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
 Execute MyApp with the most up to date native Java VM that is registered
 with
 .Nm .
 This is necessary if MyApp uses JNI, for instance.
-.It Ev JAVA_VERSION="1.5 1.7" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
-Execute MyApp with either a Java VM that is either version 1.5 or version 1.7.
+.It Ev JAVA_VERSION="6 8" Pa %%LOCALBASE%%/bin/java Fl jar Pa MyApp.jar
+Execute MyApp with either a Java VM that is either version 6 or version 8.
 .It Ev JAVAVM_DRYRUN=yes Pa %%LOCALBASE%%/bin/java
 Don't invoke the Java VM, but print out information about what would have
 been done.
diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1
index 11e789ac5ac1..8ee1022f0b1c 100644
--- a/java/javavmwrapper/src/manvm.1
+++ b/java/javavmwrapper/src/manvm.1
@@ -87,9 +87,8 @@ The on-line manual pages to be displayed must come from a Java VM that has
 been released by one of the vendors in the list.
 .Pp
 Currently allowed vendors are
-.Ql bsdjava ,
-.Ql freebsd ,
-.Ql openjdk
+.Ql openjdk ,
+.Ql oracle ,
 and
 .Ql sun .
 .It Ev JAVA_VERSION
@@ -101,13 +100,29 @@ 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.5 ,
-.Ql 1.5+ ,
 .Ql 1.6 ,
 .Ql 1.6+ ,
-.Ql 1.7
+.Ql 1.7 ,
+.Ql 1.7+ ,
+.Ql 1.8 ,
+.Ql 1.8+ ,
+.Ql 1.9 ,
+.Ql 1.9+ ,
+.Ql 6 ,
+.Ql 6+ ,
+.Ql 7 ,
+.Ql 7+ ,
+.Ql 8 ,
+.Ql 8+ ,
+.Ql 9 ,
+.Ql 9+ ,
+.Ql 10 ,
+.Ql 10+ ,
+.Ql 11 ,
+.Ql 11+ ,
+.Ql 12 ,
 and
-.Ql 1.7+ .
+.Ql 12+ .
 .It Ev JAVAVM_OPTS
 The contents of this environment variable will be passed to the invoked
 .Nm man
@@ -125,10 +140,10 @@ programme of the the most up to date and
 .Dq native
 Java VM registered with
 .Nm javavm .
-.It Ev JAVA_VERSION=1.5 Pa %%LOCALBASE%%/bin/manvm javac
+.It Ev JAVA_VERSION=8 Pa %%LOCALBASE%%/bin/manvm javac
 Display the on-line manual page for the
 .Nm javac
-programme for a Java VM which is version 1.5.
+programme for a Java VM which is version 8.
 .El
 .Sh SEE ALSO
 .Xr javavm 1 ,