diff options
| author | glewis <glewis@FreeBSD.org> | 2012-12-11 13:37:54 +0800 |
|---|---|---|
| committer | glewis <glewis@FreeBSD.org> | 2012-12-11 13:37:54 +0800 |
| commit | e7413cc7b5b08e2ab0b72e567dba4563d730a1d5 (patch) | |
| tree | d9e8c30f658cfb12324abdf0c9854ace5b449184 /java/javavmwrapper/src | |
| parent | ffa312a13de93ecc977065f6304d59c3cb5028e4 (diff) | |
| download | freebsd-ports-gnome-e7413cc7b5b08e2ab0b72e567dba4563d730a1d5.tar.gz freebsd-ports-gnome-e7413cc7b5b08e2ab0b72e567dba4563d730a1d5.tar.zst freebsd-ports-gnome-e7413cc7b5b08e2ab0b72e567dba4563d730a1d5.zip | |
. Cope with legacy versions "1.5" (expands to 1.6) and "1.5+" (expands to
1.6 1.7).
. Remove freebsd and bsdjava as valid vendors.
Diffstat (limited to 'java/javavmwrapper/src')
| -rw-r--r-- | java/javavmwrapper/src/javavmwrapper.sh | 11 |
1 files changed, 4 insertions, 7 deletions
diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index 87313c2543d6..efb9dd467db1 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -526,8 +526,11 @@ setJavaHome() { _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.5 1.6 1.7" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7" ;; 1.6+) _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7" @@ -588,12 +591,6 @@ setJavaHome() { if [ -n "${JAVA_VENDOR}" ]; then _JAVAVM_VENDOR= case "${_JAVAVM_VM}" in - diablo*) - _JAVAVM_VENDOR=freebsd - ;; - j*) - _JAVAVM_VENDOR=bsdjava - ;; openjdk*) _JAVAVM_VENDOR=openjdk ;; |