[Midnightbsd-cvs] mports [23277] trunk/java/javavmwrapper: update for newer java

[laffer1 at midnightbsd.org]

Revision: 23277
          http://svnweb.midnightbsd.org/mports/?rev=23277
Author:   laffer1
Date:     2018-04-30 08:57:25 -0400 (Mon, 30 Apr 2018)
Log Message:
-----------
update for newer java

Modified Paths:
--------------
    trunk/java/javavmwrapper/Makefile
    trunk/java/javavmwrapper/src/javavmwrapper.sh

Modified: trunk/java/javavmwrapper/Makefile
===================================================================
--- trunk/java/javavmwrapper/Makefile	2018-04-30 12:49:23 UTC (rev 23276)
+++ trunk/java/javavmwrapper/Makefile	2018-04-30 12:57:25 UTC (rev 23277)
@@ -3,7 +3,7 @@
 # This port is self contained in the src directory.
 
 PORTNAME=	javavmwrapper
-PORTVERSION=	2.4.0
+PORTVERSION=	2.6
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none

Modified: trunk/java/javavmwrapper/src/javavmwrapper.sh
===================================================================
--- trunk/java/javavmwrapper/src/javavmwrapper.sh	2018-04-30 12:49:23 UTC (rev 23276)
+++ trunk/java/javavmwrapper/src/javavmwrapper.sh	2018-04-30 12:57:25 UTC (rev 23277)
@@ -194,7 +194,7 @@
                         JAVAVM=
                         continue
                         ;;
-                    diablo-jdk*)
+                    linux-sun-jdk*|linux-oracle-jdk*)
                         case "${_VM}" in
                             open*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
@@ -207,9 +207,9 @@
                                 ;;
                         esac
                         ;;
-                    diablo-jre*|jdk*)
+                    linux-sun-jre*|linux-oracle-jre*)
                         case "${_VM}" in
-                            open*|diablo*)
+                            open*|linux-sun*|linux-oracle*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                                 continue
                                 ;;
@@ -220,32 +220,6 @@
                                 ;;
                         esac
                         ;;
-                    jre*|linux-sun-jdk*)
-                        case "${_VM}" in
-                            open*|diablo*|j*)
-                                _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
-                                continue
-                                ;;
-                            *)
-                                _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
-                                JAVAVM=
-                                continue
-                                ;;
-                        esac
-                        ;;
-                    linux-sun-jre*)
-                        case "${_VM}" in
-                            open*|diablo*|j*|linux-sun*)
-                                _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
-                                continue
-                                ;;
-                            *)
-                                _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
-                                JAVAVM=
-                                continue
-                                ;;
-                        esac
-                        ;;
                 esac
                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
             fi
@@ -527,18 +501,18 @@
         _JAVAVM_VERSION=
         for version in ${JAVA_VERSION}; do
             case "${version}" in
-                1.5)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6"
-                    ;;
-                1.5+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
-                    ;;
                 1.6+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8 1.9"
                     ;;
                 1.7+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8 1.9"
                     ;;
+                1.8+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8 1.9"
+                    ;;
+                1.9+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.9"
+                    ;;
                 *)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
                     ;;
@@ -571,7 +545,7 @@
         if [ -n "${JAVA_OS}" ]; then
             _JAVAVM_OS=
             case "${_JAVAVM_VM}" in
-                diablo*|j*|openjdk*)
+                openjdk*)
                     _JAVAVM_OS=native
                     ;;
                 linux*)
@@ -595,9 +569,12 @@
                 openjdk*)
                     _JAVAVM_VENDOR=openjdk
                     ;;
-                linux*)
+                linux-sun*)
                     _JAVAVM_VENDOR=sun
                     ;;
+                linux-oracle*)
+                    _JAVAVM_VENDOR=oracle
+                    ;;
             esac
             for _JAVAVM_REQUESTED_VENDOR in ${JAVA_VENDOR}; do
                 if [ "${_JAVAVM_VENDOR}" = "${_JAVAVM_REQUESTED_VENDOR}" ]; then