svn commit: r351127 - in head/java/javavmwrapper: . src

[Greg Lewis]

Author: glewis
Date: Sat Apr 12 19:43:17 2014
New Revision: 351127
URL: http://svnweb.freebsd.org/changeset/ports/351127
QAT: https://qat.redports.org/buildarchive/r351127/

Log:
  . Update internal fallback logic, including:
    . Remove support for diablo* and j* ports.
    . Add support for linux-oracle* ports.
    . Remove support for Java version 1.5.
    . Add support for Java version 1.8.
    . Add support for Oracle as a vendor.
  . Bump PORTVERSION.
  . Remove CONFLICTS for ports that no longer exist.

Modified:
  head/java/javavmwrapper/Makefile
  head/java/javavmwrapper/src/javavmwrapper.sh

Modified: head/java/javavmwrapper/Makefile
==============================================================================
--- head/java/javavmwrapper/Makefile	Sat Apr 12 19:39:56 2014	(r351126)
+++ head/java/javavmwrapper/Makefile	Sat Apr 12 19:43:17 2014	(r351127)
@@ -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 at FreeBSD.org
 COMMENT=	Wrapper script for various Java Virtual Machines
 
-CONFLICTS=	kaffe-1.* kaffe-devel-1.*
-
 NO_BUILD=	yes
 NO_WRKSUBDIR=	yes
 

Modified: head/java/javavmwrapper/src/javavmwrapper.sh
==============================================================================
--- head/java/javavmwrapper/src/javavmwrapper.sh	Sat Apr 12 19:39:56 2014	(r351126)
+++ head/java/javavmwrapper/src/javavmwrapper.sh	Sat Apr 12 19:43:17 2014	(r351127)
@@ -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