From owner-svn-ports-all@FreeBSD.ORG  Tue Dec 11 05:37:55 2012
Return-Path: <owner-svn-ports-all@FreeBSD.ORG>
Delivered-To: svn-ports-all@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org [69.147.83.52])
 by hub.freebsd.org (Postfix) with ESMTP id B05942B9;
 Tue, 11 Dec 2012 05:37:55 +0000 (UTC)
 (envelope-from glewis@FreeBSD.org)
Received: from svn.freebsd.org (svn.freebsd.org
 [IPv6:2001:1900:2254:2068::e6a:0])
 by mx1.freebsd.org (Postfix) with ESMTP id 7B1608FC0C;
 Tue, 11 Dec 2012 05:37:55 +0000 (UTC)
Received: from svn.freebsd.org (localhost [127.0.0.1])
 by svn.freebsd.org (8.14.5/8.14.5) with ESMTP id qBB5btmE008649;
 Tue, 11 Dec 2012 05:37:55 GMT (envelope-from glewis@svn.freebsd.org)
Received: (from glewis@localhost)
 by svn.freebsd.org (8.14.5/8.14.5/Submit) id qBB5btro008647;
 Tue, 11 Dec 2012 05:37:55 GMT (envelope-from glewis@svn.freebsd.org)
Message-Id: <201212110537.qBB5btro008647@svn.freebsd.org>
From: Greg Lewis <glewis@FreeBSD.org>
Date: Tue, 11 Dec 2012 05:37:55 +0000 (UTC)
To: ports-committers@freebsd.org, svn-ports-all@freebsd.org,
 svn-ports-head@freebsd.org
Subject: svn commit: r308662 - in head/java/javavmwrapper: . src
X-SVN-Group: ports-head
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit
X-BeenThere: svn-ports-all@freebsd.org
X-Mailman-Version: 2.1.14
Precedence: list
List-Id: SVN commit messages for the ports tree <svn-ports-all.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/svn-ports-all>
List-Post: <mailto:svn-ports-all@freebsd.org>
List-Help: <mailto:svn-ports-all-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/svn-ports-all>,
 <mailto:svn-ports-all-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Tue, 11 Dec 2012 05:37:55 -0000

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
                     ;;