diff options
| author | Greg Lewis <glewis@FreeBSD.org> | 2014-04-12 19:43:17 +0000 |
|---|---|---|
| committer | Greg Lewis <glewis@FreeBSD.org> | 2014-04-12 19:43:17 +0000 |
| commit | b947f3bb267596f439ea0806513b787cf6a2bb57 (patch) | |
| tree | 01edcc98eccf9d4d3f2e4c938c1051a5392a44ef /java/javavmwrapper | |
| parent | 406ae1d7e228ac6633ce3f4e33631f132bd740d6 (diff) | |
| download | ports-b947f3bb267596f439ea0806513b787cf6a2bb57.tar.gz ports-b947f3bb267596f439ea0806513b787cf6a2bb57.zip | |
Notes
Diffstat (limited to 'java/javavmwrapper')
| -rw-r--r-- | java/javavmwrapper/Makefile | 5 | ||||
| -rw-r--r-- | java/javavmwrapper/src/javavmwrapper.sh | 52 |
2 files changed, 14 insertions, 43 deletions
diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile index fc4ef860f800..bc7ae8a05c01 100644 --- a/java/javavmwrapper/Makefile +++ b/java/javavmwrapper/Makefile @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= javavmwrapper -PORTVERSION= 2.4 -PORTREVISION= 3 +PORTVERSION= 2.5 CATEGORIES= java MASTER_SITES= # none DISTFILES= # none @@ -11,8 +10,6 @@ DISTFILES= # none MAINTAINER= glewis@FreeBSD.org COMMENT= Wrapper script for various Java Virtual Machines -CONFLICTS= kaffe-1.* kaffe-devel-1.* - NO_BUILD= yes NO_WRKSUBDIR= yes diff --git a/java/javavmwrapper/src/javavmwrapper.sh b/java/javavmwrapper/src/javavmwrapper.sh index efb9dd467db1..e7490d377cd2 100644 --- a/java/javavmwrapper/src/javavmwrapper.sh +++ b/java/javavmwrapper/src/javavmwrapper.sh @@ -193,7 +193,7 @@ sortConfiguration () { JAVAVM= continue ;; - diablo-jdk*) + linux-sun-jdk*|linux-oracle-jdk*) case "${_VM}" in open*) _JAVAVMS="${_JAVAVMS}:${_JAVAVM}" @@ -206,35 +206,9 @@ sortConfiguration () { ;; esac ;; - diablo-jre*|jdk*) + linux-sun-jre*|linux-oracle-jre*) case "${_VM}" in - open*|diablo*) - _JAVAVMS="${_JAVAVMS}:${_JAVAVM}" - continue - ;; - *) - _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}" - JAVAVM= - continue - ;; - esac - ;; - jre*|linux-sun-jdk*) - case "${_VM}" in - open*|diablo*|j*) - _JAVAVMS="${_JAVAVMS}:${_JAVAVM}" - continue - ;; - *) - _JAVAVMS="${_JAVAVMS}:${JAVAVM}:${_JAVAVM}" - JAVAVM= - continue - ;; - esac - ;; - linux-sun-jre*) - case "${_VM}" in - open*|diablo*|j*|linux-sun*) + open*|linux-sun*|linux-oracle*) _JAVAVMS="${_JAVAVMS}:${_JAVAVM}" continue ;; @@ -526,17 +500,14 @@ 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.6 1.7" - ;; 1.6+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.6 1.7 1.8" ;; 1.7+) - _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7" + _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.7 1.8" + ;; + 1.8+) + _JAVAVM_VERSION="${_JAVAVM_VERSION} 1.8" ;; *) _JAVAVM_VERSION="${_JAVAVM_VERSION} ${version}" @@ -570,7 +541,7 @@ setJavaHome() { if [ -n "${JAVA_OS}" ]; then _JAVAVM_OS= case "${_JAVAVM_VM}" in - diablo*|j*|openjdk*) + openjdk*) _JAVAVM_OS=native ;; linux*) @@ -594,9 +565,12 @@ setJavaHome() { openjdk*) _JAVAVM_VENDOR=openjdk ;; - linux*) + linux-sun*) _JAVAVM_VENDOR=sun ;; + linux-oracle*) + _JAVAVM_VENDOR=oracle + ;; esac for _JAVAVM_REQUESTED_VENDOR in ${JAVA_VENDOR}; do if [ "${_JAVAVM_VENDOR}" = "${_JAVAVM_REQUESTED_VENDOR}" ]; then |