Date: Thu, 10 Apr 2014 07:20:24 +0000 (UTC) From: Baptiste Daroussin <bapt@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r350782 - head/Mk Message-ID: <201404100720.s3A7KOYU093649@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: bapt Date: Thu Apr 10 07:20:23 2014 New Revision: 350782 URL: http://svnweb.freebsd.org/changeset/ports/350782 QAT: https://qat.redports.org/buildarchive/r350782/ Log: 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 Modified: head/Mk/bsd.java.mk Modified: head/Mk/bsd.java.mk ============================================================================== --- head/Mk/bsd.java.mk Thu Apr 10 07:17:17 2014 (r350781) +++ head/Mk/bsd.java.mk Thu Apr 10 07:20:23 2014 (r350782) @@ -25,7 +25,7 @@ Java_Include_MAINTAINER= glewis@FreeBSD. # # 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201404100720.s3A7KOYU093649>