From owner-svn-ports-head@freebsd.org Sat Apr 11 17:10:04 2020 Return-Path: Delivered-To: svn-ports-head@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 30B162BDAD8; Sat, 11 Apr 2020 17:10:04 +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 4901bJ06qKz3MyT; Sat, 11 Apr 2020 17:10:04 +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 F2DE01B5EA; Sat, 11 Apr 2020 17:10:03 +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 03BHA39c017618; Sat, 11 Apr 2020 17:10:03 GMT (envelope-from glewis@FreeBSD.org) Received: (from glewis@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 03BHA3w1017616; Sat, 11 Apr 2020 17:10:03 GMT (envelope-from glewis@FreeBSD.org) Message-Id: <202004111710.03BHA3w1017616@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: glewis set sender to glewis@FreeBSD.org using -f From: Greg Lewis Date: Sat, 11 Apr 2020 17:10:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r531437 - head/Mk X-SVN-Group: ports-head X-SVN-Commit-Author: glewis X-SVN-Commit-Paths: head/Mk X-SVN-Commit-Revision: 531437 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.29 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sat, 11 Apr 2020 17:10:04 -0000 Author: glewis Date: Sat Apr 11 17:10:03 2020 New Revision: 531437 URL: https://svnweb.freebsd.org/changeset/ports/531437 Log: Allow users to specify a default Java version in the standard way PR: 244942 Submitted by: Tommy P Modified: head/Mk/bsd.default-versions.mk head/Mk/bsd.java.mk Modified: head/Mk/bsd.default-versions.mk ============================================================================== --- head/Mk/bsd.default-versions.mk Sat Apr 11 16:56:05 2020 (r531436) +++ head/Mk/bsd.default-versions.mk Sat Apr 11 17:10:03 2020 (r531437) @@ -51,6 +51,8 @@ GCC_DEFAULT?= 9 .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 Modified: head/Mk/bsd.java.mk ============================================================================== --- head/Mk/bsd.java.mk Sat Apr 11 16:56:05 2020 (r531436) +++ head/Mk/bsd.java.mk Sat Apr 11 17:10:03 2020 (r531437) @@ -203,6 +203,7 @@ __JAVA_PORTS_ALL= \ 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 @@ -456,6 +457,7 @@ java-debug: @${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}"