diff options
| author | bapt <bapt@FreeBSD.org> | 2014-04-10 15:20:23 +0800 |
|---|---|---|
| committer | bapt <bapt@FreeBSD.org> | 2014-04-10 15:20:23 +0800 |
| commit | 7f4601984e123176c3c6ae7f79fe279b576d8f7d (patch) | |
| tree | c52c94c340a8ac9c5a73e0d658475bf9b423018d | |
| parent | 02734176ea4bda011bb8b5c31571fa46787935d4 (diff) | |
| download | freebsd-ports-gnome-7f4601984e123176c3c6ae7f79fe279b576d8f7d.tar.gz freebsd-ports-gnome-7f4601984e123176c3c6ae7f79fe279b576d8f7d.tar.zst freebsd-ports-gnome-7f4601984e123176c3c6ae7f79fe279b576d8f7d.zip | |
Add support for OpenJDK 1.8
Add support for Oracle JDK 1.8
Remove support for Sun JDK 1.6 (EOLed)
Remove support for USE_JAVA=1.5
| -rw-r--r-- | Mk/bsd.java.mk | 22 |
1 files changed, 13 insertions, 9 deletions
diff --git a/Mk/bsd.java.mk b/Mk/bsd.java.mk index 5bb6556186ad..4c4f577e1fa3 100644 --- a/Mk/bsd.java.mk +++ b/Mk/bsd.java.mk @@ -25,7 +25,7 @@ Java_Include_MAINTAINER= glewis@FreeBSD.org hq@FreeBSD.org # # JAVA_VERSION List of space-separated suitable java versions for the # port. An optional "+" allows you to specify a range of -# versions. (allowed values: 1.5[+] 1.6[+] 1.7[+]) +# versions. (allowed values: 1.6[+] 1.7[+] 1.8[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -156,25 +156,28 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 1.5 1.6 1.7 +__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_VENDOR_LIST= sun openjdk +_JAVA_VENDOR_LIST= sun openjdk oracle # Set all meta-information about JDK ports: # port location, corresponding JAVA_HOME, JDK version, OS, vendor +_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_1_7_INFO= PORT=java/openjdk7 HOME=${LOCALBASE}/openjdk7 \ VERSION=1.7.0 OS=native 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_LINUX_SUN_JDK_1_6_INFO= PORT=java/linux-sun-jdk16 HOME=${LOCALBASE}/linux-sun-jdk1.6.0 \ - VERSION=1.6.0 OS=linux VENDOR=sun _JAVA_PORT_LINUX_SUN_JDK_1_7_INFO= PORT=java/linux-sun-jdk17 HOME=${LOCALBASE}/linux-sun-jdk1.7.0 \ VERSION=1.7.0 OS=linux VENDOR=sun +_JAVA_PORT_LINUX_ORACLE_JDK_1_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-sun-jdk1.8.0 \ + VERSION=1.7.0 OS=linux VENDOR=oracle # Verbose description for each VENDOR _JAVA_VENDOR_openjdk= "OpenJDK BSD Porting Team" _JAVA_VENDOR_sun= Sun +_JAVA_VENDOR_oracle= Oracle # Verbose description for each OS _JAVA_OS_native= Native @@ -184,10 +187,11 @@ _JAVA_OS_linux= Linux _JAVA_PREFERRED_PORTS+= JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 # List all JDK ports -__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \ +__JAVA_PORTS_ALL= JAVA_PORT_NATIVE_OPENJDK_JDK_1_8 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_1_7 \ JAVA_PORT_NATIVE_OPENJDK_JDK_1_6 \ - JAVA_PORT_LINUX_SUN_JDK_1_7 \ - JAVA_PORT_LINUX_SUN_JDK_1_6 + JAVA_PORT_LINUX_ORACLE_JDK_1_8 \ + JAVA_PORT_LINUX_SUN_JDK_1_7 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ ${_JAVA_PREFERRED_PORTS} \ ${__JAVA_PORTS_ALL} @@ -269,7 +273,7 @@ JAVA_RUN= jre . 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/} +_JAVA_VERSION= ${JAVA_VERSION: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 |