. Add support for openjdk6.

. Sort vendor references.
This commit is contained in:
Greg Lewis 2009-05-22 05:40:17 +00:00
parent 8a2a77d59c
commit e6192a26ab
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=234380
4 changed files with 30 additions and 12 deletions

View file

@ -8,7 +8,7 @@
#
PORTNAME= javavmwrapper
PORTVERSION= 2.3.2
PORTVERSION= 2.3.3
CATEGORIES= java
MASTER_SITES= # none
DISTFILES= # none

View file

@ -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

View file

@ -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
;;

View file

@ -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