--- Mk/bsd.default-versions.mk.ori 2020-03-18 22:44:36.600149000 -0700 +++ Mk/bsd.default-versions.mk 2020-03-18 22:45:04.084215000 -0700 @@ -51,6 +51,8 @@ .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 --- Mk/bsd.java.mk.ori 2020-03-18 22:44:42.328657000 -0700 +++ Mk/bsd.java.mk 2020-03-23 19:01:26.681654000 -0700 @@ -199,6 +199,7 @@ 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 @@ -452,6 +453,7 @@ @${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}"