. 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 PORTNAME= javavmwrapper
PORTVERSION= 2.3.2 PORTVERSION= 2.3.3
CATEGORIES= java CATEGORIES= java
MASTER_SITES= # none MASTER_SITES= # none
DISTFILES= # 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. The selected Java VM must have been released by one of the vendors in the list.
.Pp .Pp
Currently allowed vendors are Currently allowed vendors are
.Ql blackdown ,
.Ql bsdjava , .Ql bsdjava ,
.Ql freebsd , .Ql freebsd ,
.Ql blackdown , .Ql ibm ,
.Ql ibm .Ql openjdk
and and
.Ql sun . .Ql sun .
.It Ev JAVA_VERSION .It Ev JAVA_VERSION

View file

@ -189,7 +189,7 @@ sortConfiguration () {
JAVAVM= JAVAVM=
continue continue
;; ;;
diablo-jre*|jdk*) diablo-jre*|openjdk*)
case "${_VM}" in case "${_VM}" in
diablo*) diablo*)
_JAVAVMS="${_JAVAVMS}:${_JAVAVM}" _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
@ -202,9 +202,22 @@ sortConfiguration () {
;; ;;
esac esac
;; ;;
jdk*)
case "${_VM}" in
diablo*|open*)
_JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
continue
;;
*)
_JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}"
JAVAVM=
continue
;;
esac
;;
jre*|linux-sun-jdk*) jre*|linux-sun-jdk*)
case "${_VM}" in case "${_VM}" in
diablo*|j*) diablo*|open*|j*)
_JAVAVMS="${_JAVAVMS}:${_JAVAVM}" _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
continue continue
;; ;;
@ -217,7 +230,7 @@ sortConfiguration () {
;; ;;
linux-sun-jre*|linux-blackdown-jdk*) linux-sun-jre*|linux-blackdown-jdk*)
case "${_VM}" in case "${_VM}" in
diablo*|j*|linux-sun*) diablo*|open*|j*|linux-sun*)
_JAVAVMS="${_JAVAVMS}:${_JAVAVM}" _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
continue continue
;; ;;
@ -230,7 +243,7 @@ sortConfiguration () {
;; ;;
linux-blackdown-jre*|linux-ibm-jdk*) linux-blackdown-jre*|linux-ibm-jdk*)
case "${_VM}" in case "${_VM}" in
diablo*|j*|linux-sun*|linux-blackdown*) diablo*|open*|j*|linux-sun*|linux-blackdown*)
_JAVAVMS="${_JAVAVMS}:${_JAVAVM}" _JAVAVMS="${_JAVAVMS}:${_JAVAVM}"
continue continue
;; ;;
@ -588,18 +601,21 @@ setJavaHome() {
if [ -n "${JAVA_VENDOR}" ]; then if [ -n "${JAVA_VENDOR}" ]; then
_JAVAVM_VENDOR= _JAVAVM_VENDOR=
case "${_JAVAVM_VM}" in case "${_JAVAVM_VM}" in
linux-blackdown*)
_JAVAVM_VENDOR=blackdown
;;
diablo*) diablo*)
_JAVAVM_VENDOR=freebsd _JAVAVM_VENDOR=freebsd
;; ;;
j*) j*)
_JAVAVM_VENDOR=bsdjava _JAVAVM_VENDOR=bsdjava
;; ;;
linux-blackdown*)
_JAVAVM_VENDOR=blackdown
;;
linux-ibm*) linux-ibm*)
_JAVAVM_VENDOR=ibm _JAVAVM_VENDOR=ibm
;; ;;
openjdk*)
_JAVAVM_VENDOR=openjdk
;;
linux-sun*) linux-sun*)
_JAVAVM_VENDOR=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. been released by one of the vendors in the list.
.Pp .Pp
Currently allowed vendors are Currently allowed vendors are
.Ql blackdown ,
.Ql bsdjava , .Ql bsdjava ,
.Ql freebsd , .Ql freebsd ,
.Ql blackdown , .Ql ibm ,
.Ql ibm .Ql openjdk
and and
.Ql sun . .Ql sun .
.It Ev JAVA_VERSION .It Ev JAVA_VERSION