svn commit: r308662 - in head/java/javavmwrapper: . src
Greg Lewis
glewis at FreeBSD.org
Tue Dec 11 05:37:55 UTC 2012
Author: glewis
Date: Tue Dec 11 05:37:54 2012
New Revision: 308662
URL: http://svnweb.freebsd.org/changeset/ports/308662
Log:
. 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.
Modified:
head/java/javavmwrapper/Makefile
head/java/javavmwrapper/src/javavmwrapper.sh
Modified: head/java/javavmwrapper/Makefile
==============================================================================
--- head/java/javavmwrapper/Makefile Tue Dec 11 05:11:45 2012 (r308661)
+++ head/java/javavmwrapper/Makefile Tue Dec 11 05:37:54 2012 (r308662)
@@ -5,7 +5,7 @@
PORTNAME= javavmwrapper
PORTVERSION= 2.4
-PORTREVISION= 2
+PORTREVISION= 3
CATEGORIES= java
MASTER_SITES= # none
DISTFILES= # none
Modified: head/java/javavmwrapper/src/javavmwrapper.sh
==============================================================================
--- head/java/javavmwrapper/src/javavmwrapper.sh Tue Dec 11 05:11:45 2012 (r308661)
+++ head/java/javavmwrapper/src/javavmwrapper.sh Tue Dec 11 05:37:54 2012 (r308662)
@@ -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
;;
More information about the svn-ports-all
mailing list