Support for newer Java versions

* Switch the internal fallback logic (which is only run when the ports
  system is absent) to use modern Java versioning (e.g. 9 rather than 1.9)
* Add in support for specifying 10+, 11+ and 12+ as requested versions.
* Bump version to 2.7

Notes:

* The fallback logic doesn't support the idea of a default version the way
  bsd.java.mk does.  This was already the case.
* The sorting of VMs in the configuration file doesn't numerically sort
  versions 10 and higher correctly yet.  This will be addressed shortly.
* Manual pages need updating.
* The fallback logic is only used if bsd.java.mk is absent.  This should
  be a no-op if it is present.

PR:		223304

2 files changed, 33 insertions, 12 deletions

diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index 175254e7286a..e4d946b1416a 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	javavmwrapper
-PORTVERSION=	2.6
+PORTVERSION=	2.7
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh
index a60d8e5f09f4..140d9b5976ac 100644
--- a/java/javavmwrapper/src/javavmwrapper.sh
+++ b/java/javavmwrapper/src/javavmwrapper.sh
@@ -500,24 +500,45 @@ setJavaHome() {
         _JAVAVM_VERSION=
         for version in ${JAVA_VERSION}; do
             case "${version}" in
-                1.6+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 1.9"
+                *6+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 6 7 8 9 10 11 12"
                     ;;
-                1.7+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 1.9"
+                *7+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 7 8 9 10 11 12"
                     ;;
-                1.8+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 1.9"
+                *8+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 8 9 10 11 12"
                     ;;
-                1.9+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.9"
+                *9+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 9 10 11 12"
+                    ;;
+                10+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 10 11 12"
+                    ;;
+                11+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 11 12"
+                    ;;
+                12+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 12"
+                    ;;
+                1.6)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 6"
+                    ;;
+                1.7)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 7"
+                    ;;
+                1.8)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 8"
+                    ;;
+                1.9)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 9"
                     ;;
                 *)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
                     ;;
             esac
         done
-        JAVA_VERSION=`echo "${_JAVAVM_VERSION}" | sort | uniq`
+        JAVA_VERSION=`echo "${_JAVAVM_VERSION}" | sort -n | uniq`
     fi
 
     # Finally try to run one of the ${_JAVAVM_VMS}
@@ -528,8 +549,8 @@ setJavaHome() {
         # Respect JAVA_VERSION
         if [ -n "${JAVA_VERSION}" ]; then
             _JAVAVM_VERSION=`echo ${_JAVAVM_VM} | \
-                sed -e 's|^[^0-9]*\([0-9]\)\.\([0-9]\)\.[0-9]$|\1.\2|' \
-                    -e 's|^[^0-9]*\([0-9]\)$|1.\1|'`
+                sed -e 's|^[^0-9]*\([0-9]\)\.\([0-9]\)\.[0-9]$|\2|' \
+                    -e 's|^[^0-9]*\([0-9][0-9]*\)$|\1|'`
             for _JAVAVM_REQUESTED_VERSION in ${JAVA_VERSION}; do
                 if [ "${_JAVAVM_VERSION}" = "${_JAVAVM_REQUESTED_VERSION}" ]; then
                     _JAVAVM_VERSION=