@@ -159,7 +159,7 @@ . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 1.6 1.7 1.8 1.9 +__JAVA_VERSION_LIST= 1.6 1.7 1.8 1.9 11.0 12.0 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle sun @@ -172,6 +172,10 @@ VERSION=1.7.0 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_1_8_INFO= PORT=java/openjdk8 HOME=${LOCALBASE}/openjdk8 \ VERSION=1.8.0 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_11_0_INFO= PORT=java/openjdk11 HOME=${LOCALBASE}/openjdk11 \ + VERSION=11.0.0 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_12_0_INFO= PORT=java/openjdk12 HOME=${LOCALBASE}/openjdk12 \ + VERSION=12.0.0 OS=native VENDOR=openjdk _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 _JAVA_PORT_LINUX_ORACLE_JDK_1_9_INFO= PORT=java/linux-oracle-jdk9 HOME=${LOCALBASE}/linux-oracle-jdk9 \ @@ -187,7 +191,9 @@ _JAVA_OS_linux= Linux # List all JDK ports in order of preference -__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \ +__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_12_0 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_11_0 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \ JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \ JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \ JAVA_PORT_LINUX_ORACLE_JDK_1_8 \ @@ -264,7 +270,7 @@ . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 1.9+/:S/1.9+/1.9/} +_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.6 1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 1.9+/:S/1.9+/1.9 11.0+/:S/11.0+/11.0 12.0+/:S/12.0+/12.0/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif @@ -282,7 +288,7 @@ . for A_JAVA_PORT in ${_JAVA_PORTS_ALL} A_JAVA_PORT_INFO:= ${A_JAVA_PORT:S/^/\${_/:S/$/_INFO}/} A_JAVA_PORT_HOME= ${A_JAVA_PORT_INFO:MHOME=*:S,HOME=,,} -A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:C/VERSION=([0-9])\.([0-9])(.*)/\1.\2/} +A_JAVA_PORT_VERSION= ${A_JAVA_PORT_INFO:MVERSION=*:C/VERSION=([0-9]+)\.([0-9])(.*)/\1.\2/} A_JAVA_PORT_OS= ${A_JAVA_PORT_INFO:MOS=*:S,OS=,,} A_JAVA_PORT_VENDOR= ${A_JAVA_PORT_INFO:MVENDOR=*:S,VENDOR=,,} .if !defined(_JAVA_PORTS_INSTALLED) && exists(${A_JAVA_PORT_HOME}/${_JDK_FILE})