[Midnightbsd-cvs] mports [23037] trunk/Mk/extensions/java.mk: prefer java 8

[laffer1 at midnightbsd.org]

Revision: 23037
          http://svnweb.midnightbsd.org/mports/?rev=23037
Author:   laffer1
Date:     2018-02-18 12:38:12 -0500 (Sun, 18 Feb 2018)
Log Message:
-----------
prefer java 8

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

Modified: trunk/Mk/extensions/java.mk
===================================================================
--- trunk/Mk/extensions/java.mk	2018-02-18 17:35:28 UTC (rev 23036)
+++ trunk/Mk/extensions/java.mk	2018-02-18 17:38:12 UTC (rev 23037)
@@ -186,11 +186,11 @@
 _JAVA_OS_freebsd=	FreeBSD
 
 # Enforce preferred Java ports according to OS
-.		if (${ARCH} == "amd64") || (${ARCH} == "i386")
+.		if (${ARCH} == "amd64")
 .			if defined(PACKAGE_BUILDING) 
-_JAVA_PREFERRED_PORTS+= JAVA_PORT_FREEBSD_OPENJDK_JDK_1_7
+_JAVA_PREFERRED_PORTS+= JAVA_PORT_FREEBSD_OPENJDK_JDK_1_8
 .			else
-_JAVA_PREFERRED_PORTS+=	 JAVA_PORT_FREEBSD_OPENJDK_JDK_1_7
+_JAVA_PREFERRED_PORTS+=	 JAVA_PORT_FREEBSD_OPENJDK_JDK_1_8
 NOT_FOR_ARCHS=sparc64
 .			endif
 .		else
@@ -199,8 +199,8 @@
 
 # List all JDK ports
 __JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \
+			JAVA_PORT_FREEBSD_OPENJDK_JDK_1_8 \
 			JAVA_PORT_FREEBSD_OPENJDK_JDK_1_7 \
-			JAVA_PORT_FREEBSD_OPENJDK_JDK_1_8 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \
@@ -289,7 +289,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 1.8/:S/1.8+/1.8/}
+_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