From e6192a26ab4f30ca0d34f4911ea3804140d54f27 Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Fri, 22 May 2009 05:40:17 +0000
Subject: . Add support for openjdk6. . Sort vendor references.

---
 java/javavmwrapper/Makefile             |  2 +-
 java/javavmwrapper/src/javavm.1         |  5 +++--
 java/javavmwrapper/src/javavmwrapper.sh | 30 +++++++++++++++++++++++-------
 java/javavmwrapper/src/manvm.1          |  5 +++--
 4 files changed, 30 insertions(+), 12 deletions(-)

diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index 47be554d2a3b..813cc6811176 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -8,7 +8,7 @@
 #
 
 PORTNAME=	javavmwrapper
-PORTVERSION=	2.3.2
+PORTVERSION=	2.3.3
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none
diff --git a/java/javavmwrapper/src/javavm.1 b/java/javavmwrapper/src/javavm.1
index 33f5edd38702..375a9d15433d 100644
--- a/java/javavmwrapper/src/javavm.1
+++ b/java/javavmwrapper/src/javavm.1
@@ -99,10 +99,11 @@ 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 blackdown ,
 .Ql bsdjava ,
 .Ql freebsd ,
-.Ql blackdown ,
-.Ql ibm
+.Ql ibm ,
+.Ql openjdk
 and
 .Ql sun .
 .It Ev JAVA_VERSION
diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh
index cad6f7cbc4ab..aba6b4695afb 100644
--- a/java/javavmwrapper/src/javavmwrapper.sh
+++ b/java/javavmwrapper/src/javavmwrapper.sh
@@ -189,7 +189,7 @@ sortConfiguration () {
                         JAVAVM=
                         continue
                         ;;
-                    diablo-jre*|jdk*)
+                    diablo-jre*|openjdk*)
                         case "${_VM}" in
                             diablo*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
@@ -202,9 +202,22 @@ sortConfiguration () {
                                 ;;
                         esac
                         ;;
+                    jdk*)
+                        case "${_VM}" in
+                            diablo*|open*)
+                                _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
+                                continue
+                                ;;
+                            *)
+                                _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
+                                JAVAVM=
+                                continue
+                                ;;
+                        esac
+                        ;;
                     jre*|linux-sun-jdk*)
                         case "${_VM}" in
-                            diablo*|j*)
+                            diablo*|open*|j*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                                 continue
                                 ;;
@@ -217,7 +230,7 @@ sortConfiguration () {
                         ;;
                     linux-sun-jre*|linux-blackdown-jdk*)
                         case "${_VM}" in
-                            diablo*|j*|linux-sun*)
+                            diablo*|open*|j*|linux-sun*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                                 continue
                                 ;;
@@ -230,7 +243,7 @@ sortConfiguration () {
                         ;;
                     linux-blackdown-jre*|linux-ibm-jdk*)
                         case "${_VM}" in
-                            diablo*|j*|linux-sun*|linux-blackdown*)
+                            diablo*|open*|j*|linux-sun*|linux-blackdown*)
                                 _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
                                 continue
                                 ;;
@@ -588,18 +601,21 @@ setJavaHome() {
         if [ -n "${JAVA_VENDOR}" ]; then
             _JAVAVM_VENDOR=
             case "${_JAVAVM_VM}" in
+                linux-blackdown*)
+                    _JAVAVM_VENDOR=blackdown
+                    ;;
                 diablo*)
                     _JAVAVM_VENDOR=freebsd
                     ;;
                 j*)
                     _JAVAVM_VENDOR=bsdjava
                     ;;
-                linux-blackdown*)
-                    _JAVAVM_VENDOR=blackdown
-                    ;;
                 linux-ibm*)
                     _JAVAVM_VENDOR=ibm
                     ;;
+                openjdk*)
+                    _JAVAVM_VENDOR=openjdk
+                    ;;
                 linux-sun*)
                     _JAVAVM_VENDOR=sun
                     ;;
diff --git a/java/javavmwrapper/src/manvm.1 b/java/javavmwrapper/src/manvm.1
index c4a900cb83c9..73897314a9a7 100644
--- a/java/javavmwrapper/src/manvm.1
+++ b/java/javavmwrapper/src/manvm.1
@@ -86,10 +86,11 @@ 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 blackdown ,
 .Ql bsdjava ,
 .Ql freebsd ,
-.Ql blackdown ,
-.Ql ibm
+.Ql ibm ,
+.Ql openjdk
 and
 .Ql sun .
 .It Ev JAVA_VERSION
-- 
cgit v1.2.3