From 167b1fa7bcf2bb1244422fa1cbb1931f2a81f6cc Mon Sep 17 00:00:00 2001
From: Greg Lewis <glewis@FreeBSD.org>
Date: Tue, 11 Dec 2012 05:37:54 +0000
Subject: [PATCH] . 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.

---
 java/javavmwrapper/Makefile             |  2 +-
 java/javavmwrapper/src/javavmwrapper.sh | 11 ++++-------
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/java/javavmwrapper/Makefile b/java/javavmwrapper/Makefile
index 749aaeeb63fb..f2b822938aa5 100644
--- a/java/javavmwrapper/Makefile
+++ b/java/javavmwrapper/Makefile
@@ -5,7 +5,7 @@
 
 PORTNAME=	javavmwrapper
 PORTVERSION=	2.4
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java
 MASTER_SITES=	# none
 DISTFILES=	# none
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
                     ;;