aboutsummaryrefslogtreecommitdiff
path: root/java/javavmwrapper
diff options
context:
space:
mode:
authorJung-uk Kim <jkim@FreeBSD.org>2008-04-28 15:44:18 +0000
committerJung-uk Kim <jkim@FreeBSD.org>2008-04-28 15:44:18 +0000
commit13191cd6ce911d6dcef17d1f7e167754e5759ad5 (patch)
tree44941db58c8694730962d8091715aecfb50cb2f1 /java/javavmwrapper
parent569504b38de042fda6f54b1956b4932f9efac632 (diff)
downloadports-13191cd6ce911d6dcef17d1f7e167754e5759ad5.tar.gz
ports-13191cd6ce911d6dcef17d1f7e167754e5759ad5.zip
- Add support for 1.6 VMs.
- Fix reversed vendors (bsdjava <-> freebsd). - Update port version to 2.3.1. Reviewed by: glewis (maintainer)
Notes
Notes: svn path=/head/; revision=212174
Diffstat (limited to 'java/javavmwrapper')
-rw-r--r--java/javavmwrapper/Makefile2
-rw-r--r--java/javavmwrapper/src/javavmwrapper.sh17
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