svn commit: r531437 - head/Mk

[Greg Lewis]

Author: glewis
Date: Sat Apr 11 17:10:03 2020
New Revision: 531437
URL: https://svnweb.freebsd.org/changeset/ports/531437

Log:
  Allow users to specify a default Java version in the standard way
  
  PR:		244942
  Submitted by:	Tommy P <tommyhp2 at gmail.com>

Modified:
  head/Mk/bsd.default-versions.mk
  head/Mk/bsd.java.mk

Modified: head/Mk/bsd.default-versions.mk
==============================================================================
--- head/Mk/bsd.default-versions.mk	Sat Apr 11 16:56:05 2020	(r531436)
+++ head/Mk/bsd.default-versions.mk	Sat Apr 11 17:10:03 2020	(r531437)
@@ -51,6 +51,8 @@ GCC_DEFAULT?=		9
 .endif
 # Possible values: 7, 8, 9, agpl
 GHOSTSCRIPT_DEFAULT?=	agpl
+# Allowed values: 7 8 11 12 13
+JAVA_DEFAULT?=8
 # Possible values: 0.6, 0.7, 1.0, 1.1
 JULIA_DEFAULT?=		1.0
 # Possible values: 2.0.6

Modified: head/Mk/bsd.java.mk
==============================================================================
--- head/Mk/bsd.java.mk	Sat Apr 11 16:56:05 2020	(r531436)
+++ head/Mk/bsd.java.mk	Sat Apr 11 17:10:03 2020	(r531437)
@@ -203,6 +203,7 @@ __JAVA_PORTS_ALL=	\
 					JAVA_PORT_NATIVE_OPENJDK_JDK_7  \
 					JAVA_PORT_LINUX_ORACLE_JDK_8
 _JAVA_PORTS_ALL=	${JAVA_PREFERRED_PORTS} \
+			JAVA_PORT_NATIVE_OPENJDK_JDK_${JAVA_DEFAULT} \
 					${__JAVA_PORTS_ALL}
 
 # Set the name of the file that indicates that a JDK is indeed installed, as a
@@ -456,6 +457,7 @@ java-debug:
 	@${ECHO_CMD} "JAVA_BUILD=                     ${JAVA_BUILD}"
 	@${ECHO_CMD} "JAVA_RUN=                       ${JAVA_RUN}"
 	@${ECHO_CMD} "JAVA_EXTRACT=                   ${JAVA_EXTRACT}"
+	@${ECHO_CMD} "JAVA_DEFAULT=                   ${JAVA_DEFAULT}"
 	@${ECHO_CMD}
 	@${ECHO_CMD} "# JDK port dependency selection process:"
 	@${ECHO_CMD} "_JAVA_PORTS_POSSIBLE=           ${_JAVA_PORTS_POSSIBLE}"