diff options
| author | jkim <jkim@FreeBSD.org> | 2008-04-28 23:44:18 +0800 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2008-04-28 23:44:18 +0800 |
| commit | c8b2630ccdc0f15f9fc659b568d8aa968a41dcda (patch) | |
| tree | d9223e576404d8c524826583e0f17abf1113df21 /java | |
| parent | 2e4f9aa1a92729cb7bffcf6788b169f48162db4d (diff) | |
| download | freebsd-ports-gnome-c8b2630ccdc0f15f9fc659b568d8aa968a41dcda.tar.gz freebsd-ports-gnome-c8b2630ccdc0f15f9fc659b568d8aa968a41dcda.tar.zst freebsd-ports-gnome-c8b2630ccdc0f15f9fc659b568d8aa968a41dcda.zip | |
- Add support for 1.6 VMs.
- Fix reversed vendors (bsdjava <-> freebsd).
- Update port version to 2.3.1.
Reviewed by: glewis (maintainer)
Diffstat (limited to 'java')
| -rw-r--r-- | java/javavmwrapper/Makefile | 2 | ||||
| -rw-r--r-- | java/javavmwrapper/src/javavmwrapper.sh | 17 |
2 files changed, 11 insertions, 8 deletions
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index 04781fe684c2..378282bf181a 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -8,7 +8,7 @@ # PORTNAME= javavmwrapper -PORTVERSION= 2.3 +PORTVERSION= 2.3.1 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index 4d9bb90d83dd..b3c43e6d0f6c 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -514,19 +514,22 @@ setJavaHome() { 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,10 +584,10 @@ setJavaHome() { _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 |