From owner-svn-ports-all@freebsd.org Thu Oct 3 19:42:37 2019 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id C544113EABD; Thu, 3 Oct 2019 19:42:37 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) server-signature RSA-PSS (4096 bits) client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 46kk1T4kspz4dHm; Thu, 3 Oct 2019 19:42:37 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 85D4B190E1; Thu, 3 Oct 2019 19:42:37 +0000 (UTC) (envelope-from glewis@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id x93JgbX7036625; Thu, 3 Oct 2019 19:42:37 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id x93JgbmX036624; Thu, 3 Oct 2019 19:42:37 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <201910031942.x93JgbmX036624@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Thu, 3 Oct 2019 19:42:37 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r513732 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 513732 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 03 Oct 2019 19:42:37 -0000 Author: glewis Date: Thu Oct 3 19:42:37 2019 New Revision: 513732 URL: https://svnweb.freebsd.org/changeset/ports/513732 Log: Add 13, force 9/10 -> 11 * Remove comment references to 9 and 10 as possible version specifications. Note that 9 and 10 aren't actually removed as valid versions as there is one port with a reference (news/nzbhydra2). * Add 13 as a valid version. * Add configuration for openjdk13. * Modify the construction of _JAVA_VERSION to force 9 and 10 to 11. Sponsored by: The FreeBSD Foundation Modified: head/Mk/bsd.java.mk Modified: head/Mk/bsd.java.mk ============================================================================== --- head/Mk/bsd.java.mk Thu Oct 3 19:32:16 2019 (r513731) +++ head/Mk/bsd.java.mk Thu Oct 3 19:42:37 2019 (r513732) @@ -25,8 +25,7 @@ Java_Include_MAINTAINER= java@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: 7[+] 8[+] 9[+] 10[+] -# 11[+] 12[+]) +# versions. (allowed values: 7[+] 8[+] 11[+] 12[+] 13[+]) # # JAVA_OS List of space-separated suitable JDK port operating systems # for the port. (allowed values: native linux) @@ -163,7 +162,7 @@ SUB_LIST+= JAVA_OS="${JAVA_OS}" . endif # The complete list of Java versions, os and vendors supported. -__JAVA_VERSION_LIST= 6 7 8 9 10 11 12 +__JAVA_VERSION_LIST= 6 7 8 9 10 11 12 13 _JAVA_VERSION_LIST= ${__JAVA_VERSION_LIST} ${__JAVA_VERSION_LIST:S/$/+/} _JAVA_OS_LIST= native linux _JAVA_VENDOR_LIST= openjdk oracle @@ -178,6 +177,8 @@ _JAVA_PORT_NATIVE_OPENJDK_JDK_11_INFO= PORT=java/open VERSION=11 OS=native VENDOR=openjdk _JAVA_PORT_NATIVE_OPENJDK_JDK_12_INFO= PORT=java/openjdk12 HOME=${LOCALBASE}/openjdk12 \ VERSION=12 OS=native VENDOR=openjdk +_JAVA_PORT_NATIVE_OPENJDK_JDK_13_INFO= PORT=java/openjdk13 HOME=${LOCALBASE}/openjdk13 \ + VERSION=13 OS=native VENDOR=openjdk _JAVA_PORT_LINUX_ORACLE_JDK_8_INFO= PORT=java/linux-oracle-jdk18 HOME=${LOCALBASE}/linux-oracle-jdk1.8.0 \ VERSION=8 OS=linux VENDOR=oracle @@ -194,6 +195,7 @@ __JAVA_PORTS_ALL= \ JAVA_PORT_NATIVE_OPENJDK_JDK_8 \ JAVA_PORT_NATIVE_OPENJDK_JDK_11 \ JAVA_PORT_NATIVE_OPENJDK_JDK_12 \ + JAVA_PORT_NATIVE_OPENJDK_JDK_13 \ JAVA_PORT_NATIVE_OPENJDK_JDK_7 \ JAVA_PORT_LINUX_ORACLE_JDK_8 _JAVA_PORTS_ALL= ${JAVA_PREFERRED_PORTS} \ @@ -268,7 +270,7 @@ JAVA_RUN= jre . undef _JAVA_PORTS_INSTALLED . undef _JAVA_PORTS_POSSIBLE . if defined(JAVA_VERSION) -_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 1.9+/:S/1.9+/1.9 10+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/1.9/9/:S/6+/7+/:S/7+/7 8+/:S/8+/8 9+/:S/9+/9 10+/:S/10+/10 11+/:S/11+/11 12+/:S/12+/12/} +_JAVA_VERSION= ${JAVA_VERSION:S/1.6+/1.7+/:S/1.7+/1.7 1.8+/:S/1.8+/1.8 11+/:S/1.9+/11+/:S/1.6/7/:S/1.7/7/:S/1.8/8/:S/1.9/11/:S/9/11/:S/10/11/:S/6+/7+/:S/7+/7 8+/:S/8+/8 11+/:S/9+/11+/:S/10+/11+/:S/11+/11 12+/:S/12+/12 13+/:S/13+/13/} . else _JAVA_VERSION= ${__JAVA_VERSION_LIST} . endif