[Midnightbsd-cvs] mports: javavmwrapper.sh: add java 1.6 support fix vm vendor.

[laffer1 at midnightbsd.org]

Log Message:
-----------
add java 1.6 support

fix vm vendor.

Modified Files:
--------------
    mports/java/javavmwrapper/src:
        javavmwrapper.sh (r1.1 -> r1.2)

-------------- next part --------------
Index: javavmwrapper.sh
===================================================================
RCS file: /home/cvs/mports/java/javavmwrapper/src/javavmwrapper.sh,v
retrieving revision 1.1
retrieving revision 1.2
diff -L java/javavmwrapper/src/javavmwrapper.sh -L java/javavmwrapper/src/javavmwrapper.sh -u -r1.1 -r1.2
--- java/javavmwrapper/src/javavmwrapper.sh
+++ java/javavmwrapper/src/javavmwrapper.sh
@@ -25,9 +25,10 @@
 # Greg Lewis
 # ----------------------------------------------------------------------------
 #
+# $MidnightBSD$
 # $FreeBSD: ports/java/javavmwrapper/src/javavmwrapper.sh,v 1.19 2006/06/12 16:57:29 glewis Exp $
 #
-# MAINTAINER=java at FreeBSD.org
+# MAINTAINER=ports at MidnightBSD.org
 
 _JAVAVM_SAVE_PATH=${PATH}
 export PATH=/bin:/sbin:/usr/bin:/usr/sbin
@@ -514,19 +515,22 @@
         for version in ${JAVA_VERSION}; do
             case "${version}" in
                 1.1+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.1 1.2 1.3 1.4 1.5"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.1 1.2 1.3 1.4 1.5 1.6"
                     ;;
                 1.2+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.2 1.3 1.4 1.5"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.2 1.3 1.4 1.5 1.6"
                     ;;
                 1.3+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.3 1.4 1.5"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.3 1.4 1.5 1.6"
                     ;;
                 1.4+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.4 1.5"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.4 1.5 1.6"
                     ;;
                 1.5+)
-                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.5"
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.5 1.6"
+                    ;;
+                1.6+)
+                    _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6"
                     ;;
                 *)
                     _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}"
@@ -581,17 +585,14 @@
             _JAVAVM_VENDOR=
             case "${_JAVAVM_VM}" in
                 diablo*)
-                    _JAVAVM_VENDOR=bsdjava
+                    _JAVAVM_VENDOR=freebsd
                     ;;
                 j*)
-                    _JAVAVM_VENDOR=freebsd
+                    _JAVAVM_VENDOR=bsdjava
                     ;;
                 linux-blackdown*)
                     _JAVAVM_VENDOR=blackdown
                     ;;
-                linux-ibm*)
-                    _JAVAVM_VENDOR=ibm
-                    ;;
                 linux-sun*)
                     _JAVAVM_VENDOR=sun
                     ;;