[Midnightbsd-cvs] mports [20216] trunk/Mk/extensions/java.mk: add java 8 linux support

[laffer1 at midnightbsd.org]

Revision: 20216
          http://svnweb.midnightbsd.org/mports/?rev=20216
Author:   laffer1
Date:     2015-09-12 10:21:04 -0400 (Sat, 12 Sep 2015)
Log Message:
-----------
add java 8 linux support

Modified Paths:
--------------
    trunk/Mk/extensions/java.mk

Modified: trunk/Mk/extensions/java.mk
===================================================================
--- trunk/Mk/extensions/java.mk	2015-09-12 02:58:24 UTC (rev 20215)
+++ trunk/Mk/extensions/java.mk	2015-09-12 14:21:04 UTC (rev 20216)
@@ -9,7 +9,7 @@
 
 .if !defined(_POSTMKINCLUDED) && !defined(Java_Pre_Include)
 
-Java_Pre_Include=				java.mk
+Java_Pre_Include=			java.mk
 Java_Include_MAINTAINER=	ports at MidnightBSD.org
 
 #-------------------------------------------------------------------------------
@@ -20,13 +20,13 @@
 #
 # JAVA_VERSION		List of space-separated suitable java versions for the
 #					port. An optional "+" allows you to specify a range of
-#					versions. (allowed values: 1.5[+] 1.6[+] 1.7[+])
+#					versions. (allowed values: 1.6[+] 1.7[+] 1.8[+])
 #
 # JAVA_OS			List of space-separated suitable JDK port operating systems
 #					for the port. (allowed values: native linux)
 #
 # JAVA_VENDOR		List of space-separated suitable JDK port vendors for the
-#					port. (allowed values: freebsd bsdjava sun openjdk)
+#					port. (allowed values: openjdk oracle freebsd bsdjava sun)
 #
 # JAVA_BUILD		When set, it means that the selected JDK port should be
 #					added to build dependencies for the port.
@@ -44,7 +44,7 @@
 #-------------------------------------------------------------------------------
 # Variables defined for the port:
 #
-# JAVA_PORT			The name of the JDK port. (e.g. 'java/jdk16')
+# JAVA_PORT			The name of the JDK port. (e.g. 'java/openjdk6')
 #
 # JAVA_PORT_VERSION	The version of the JDK port. (e.g. '1.6')
 #
@@ -59,19 +59,19 @@
 #								(e.g. 'FreeBSD Foundation')
 #
 # JAVA_HOME			Path to the installation directory of the JDK. (e.g.
-#					'/usr/local/jdk1.6.0')
+#					'/usr/local/openjdk6')
 #
 # JAVAC				Path to the Java compiler to use. (e.g.
-#					'/usr/local/jdk1.6.0/bin/javac' or '/usr/local/bin/javac')
+#					'/usr/local/openjdk6/bin/javac' or '/usr/local/bin/javac')
 #
 # JAR				Path to the JAR tool to use. (e.g.
-#					'/usr/local/jdk1.6.0/bin/jar' or '/usr/local/bin/fastjar')
+#					'/usr/local/openjdk6/bin/jar' or '/usr/local/bin/fastjar')
 #
 # APPLETVIEWER		Path to the appletviewer utility. (e.g.
-#					'/usr/local/linux-jdk1.6.0/bin/appletviewer')
+#					'/usr/local/linux-jdk1.7.0/bin/appletviewer')
 #
 # JAVA				Path to the java executable. Use this for executing Java
-#					programs. (e.g. '/usr/local/jdk1.6.0/bin/java')
+#					programs. (e.g. '/usr/local/openjdk6/bin/java')
 #
 # JAVADOC			Path to the javadoc utility program.
 #
@@ -148,10 +148,10 @@
 .		endif
 
 # The complete list of Java versions, os and vendors supported.
-__JAVA_VERSION_LIST=	1.5 1.6 1.7
+__JAVA_VERSION_LIST=	1.6 1.7 1.8
 _JAVA_VERSION_LIST=		${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/}
 _JAVA_OS_LIST=			native linux
-_JAVA_VENDOR_LIST=		freebsd bsdjava sun openjdk
+_JAVA_VENDOR_LIST=		freebsd bsdjava sun oracle openjdk
 
 # Set all meta-information about JDK ports:
 # port location, corresponding JAVA_HOME, JDK version, OS, vendor
@@ -169,11 +169,14 @@
 											VERSION=1.6.0	OS=linux	VENDOR=sun
 _JAVA_PORT_LINUX_SUN_JDK_1_7_INFO=			PORT=java/linux-sun-jdk17		HOME=${LOCALBASE}/linux-sun-jdk1.7.0 \
 											VERSION=1.7.0	OS=linux	VENDOR=sun
+_JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO=			PORT=java/linux-oracle-jdk18		HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \
+											VERSION=1.8.0	OS=linux	VENDOR=oracle
 # Verbose description for each VENDOR
 _JAVA_VENDOR_freebsd=		"FreeBSD Foundation"
 _JAVA_VENDOR_bsdjava=		"BSD Java Porting Team"
 _JAVA_VENDOR_openjdk=		"OpenJDK BSD Porting Team"
-_JAVA_VENDOR_sun=			Sun
+_JAVA_VENDOR_sun=		Sun
+_JAVA_VENDOR_oracle=		Oracle
 
 # Verbose description for each OS
 _JAVA_OS_native=	Native
@@ -197,6 +200,7 @@
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \
+					JAVA_PORT_LINUX_ORACLE_JDK_1_8 \
 					JAVA_PORT_LINUX_SUN_JDK_1_7 \
 					JAVA_PORT_LINUX_SUN_JDK_1_6
 _JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
@@ -281,7 +285,7 @@
 .		undef _JAVA_PORTS_INSTALLED
 .		undef _JAVA_PORTS_POSSIBLE
 .		if defined(JAVA_VERSION)
-_JAVA_VERSION=	${JAVA_VERSION:S/1.5/1.6/:S/1.5+/1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7/}
+_JAVA_VERSION=	${JAVA_VERSION:S/1.5/1.6+/:S/1.5+/1.6+/:S/1.6+/1.6 1.7+/:S/1.7+/1.7 1.8/:S/1.8+/1.8/}
 .		else
 _JAVA_VERSION=	${__JAVA_VERSION_LIST}
 .		endif