Received: by mail.netbsd.org (Postfix, from userid 605) id 21C5E84D6B; Fri, 2 Dec 2022 10:57:52 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 5005984D54 for ; Fri, 2 Dec 2022 10:57:51 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id 0XdJcEZm24EE for ; Fri, 2 Dec 2022 10:57:50 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 953A584D2D for ; Fri, 2 Dec 2022 10:57:50 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 89FCCFA90; Fri, 2 Dec 2022 10:57:50 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1669978670122060" MIME-Version: 1.0 Date: Fri, 2 Dec 2022 10:57:50 +0000 From: "Jonathan Perkin" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: jperkin@netbsd.org X-Mailer: log_accum Message-Id: <20221202105750.89FCCFA90@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1669978670122060 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Fri Dec 2 10:57:50 UTC 2022 Modified Files: pkgsrc/mk: java-vm.mk Log Message: mk: Switch Darwin/Linux default to oracle-jdk17. To generate a diff of this commit: cvs rdiff -u -r1.131 -r1.132 pkgsrc/mk/java-vm.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1669978670122060 Content-Disposition: inline Content-Length: 1224 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/mk/java-vm.mk diff -u pkgsrc/mk/java-vm.mk:1.131 pkgsrc/mk/java-vm.mk:1.132 --- pkgsrc/mk/java-vm.mk:1.131 Fri Dec 2 10:53:40 2022 +++ pkgsrc/mk/java-vm.mk Fri Dec 2 10:57:50 2022 @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.131 2022/12/02 10:53:40 jperkin Exp $ +# $NetBSD: java-vm.mk,v 1.132 2022/12/02 10:57:50 jperkin Exp $ # # This Makefile fragment provides a Java VM, either at build-time or at # run-time, depending on the package's needs. @@ -120,9 +120,12 @@ _PKG_JVM_DEFAULT?= openjdk11 !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) _PKG_JVM_DEFAULT?= openjdk17 -. elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ - !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \ - !empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64) +. elif ${MACHINE_PLATFORM:MLinux-*-aarch64} || \ + ${MACHINE_PLATFORM:MLinux-*-x86_64} || \ + ${MACHINE_PLATFORM:MDarwin-*-aarch64} || \ + ${MACHINE_PLATFORM:MDarwin-*-x86_64} +_PKG_JVM_DEFAULT?= oracle-jdk17 +. elif ${MACHINE_PLATFORM:MLinux-*-i[3456]86} _PKG_JVM_DEFAULT?= oracle-jdk8 . elif !empty(MACHINE_PLATFORM:MSunOS-5.11-i386) _PKG_JVM_DEFAULT?= openjdk8 --_----------=_1669978670122060--