[Midnightbsd-cvs] mports [22930] trunk/Mk/extensions/java.mk: default to freebsd java binary for now until we can fix the openjdk 7 port.

[laffer1 at midnightbsd.org]

Revision: 22930
          http://svnweb.midnightbsd.org/mports/?rev=22930
Author:   laffer1
Date:     2017-10-08 12:23:44 -0400 (Sun, 08 Oct 2017)
Log Message:
-----------
default to freebsd java binary for now until we can fix the openjdk 7 port.

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

Modified: trunk/Mk/extensions/java.mk
===================================================================
--- trunk/Mk/extensions/java.mk	2017-10-08 16:15:27 UTC (rev 22929)
+++ trunk/Mk/extensions/java.mk	2017-10-08 16:23:44 UTC (rev 22930)
@@ -150,7 +150,7 @@
 # The complete list of Java versions, os and vendors supported.
 __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_OS_LIST=			native linux freebsd
 _JAVA_VENDOR_LIST=		freebsd bsdjava sun oracle openjdk
 
 # Set all meta-information about JDK ports:
@@ -157,8 +157,8 @@
 # port location, corresponding JAVA_HOME, JDK version, OS, vendor
 _JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_INFO=		PORT=java/openjdk7			HOME=${LOCALBASE}/openjdk7 \
 											VERSION=1.7.0	OS=native	VENDOR=openjdk
-_JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_BIN_INFO=	PORT/java/openjdk7-bin			HOME=${LOCALBASE}/openjdk7 \
-											VERSION=1.7.0	OS=native	VENDOR=openjdk
+_JAVA_PORT_FREEBSD_OPENJDK_JDK_1_7_INFO=	PORT=java/openjdk7-bin			HOME=${LOCALBASE}/openjdk7 \
+											VERSION=1.7.0	OS=freebsd	VENDOR=openjdk
 _JAVA_PORT_NATIVE_OPENJDK_JDK_1_6_INFO=		PORT=java/openjdk6			HOME=${LOCALBASE}/openjdk6 \
 											VERSION=1.6.0	OS=native	VENDOR=openjdk
 _JAVA_PORT_NATIVE_FREEBSD_JDK_1_6_INFO=		PORT=java/diablo-jdk16			HOME=${LOCALBASE}/diablo-jdk1.6.0 \
@@ -181,13 +181,14 @@
 # Verbose description for each OS
 _JAVA_OS_native=	Native
 _JAVA_OS_linux=		Linux
+_JAVA_OS_freebsd=	FreeBSD
 
 # Enforce preferred Java ports according to OS
 .		if (${ARCH} == "amd64") || (${ARCH} == "i386")
 .			if defined(PACKAGE_BUILDING) 
-_JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_OPENJDK_JDK_1_7
+_JAVA_PREFERRED_PORTS+= JAVA_PORT_FREEBSD_OPENJDK_JDK_1_7
 .			else
-_JAVA_PREFERRED_PORTS+=	 JAVA_PORT_NATIVE_OPENJDK_JDK_1_7
+_JAVA_PREFERRED_PORTS+=	 JAVA_PORT_FREEBSD_OPENJDK_JDK_1_7
 NOT_FOR_ARCHS=sparc64
 .			endif
 .		else
@@ -196,7 +197,7 @@
 
 # List all JDK ports
 __JAVA_PORTS_ALL=	JAVA_PORT_NATIVE_FREEBSD_JDK_1_6 \
-			JAVA_PORT_NATIVE_OPENJDK_JDK_1_7_BIN \
+			JAVA_PORT_FREEBSD_OPENJDK_JDK_1_7 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \
 					JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \
 					JAVA_PORT_NATIVE_BSDJAVA_JDK_1_6 \