Received: by mail.netbsd.org (Postfix, from userid 605) id 89C7884D71; Tue, 22 Jun 2021 12:02:25 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id C216084D4D for ; Tue, 22 Jun 2021 12:02:24 +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 TxqMD_IFdAyF for ; Tue, 22 Jun 2021 12:02:24 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id 1F79E84D4C for ; Tue, 22 Jun 2021 12:02:24 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 13D6EFA95; Tue, 22 Jun 2021 12:02:24 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1624363344118370" MIME-Version: 1.0 Date: Tue, 22 Jun 2021 12:02:24 +0000 From: "Nia Alarie" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Reply-To: nia@netbsd.org X-Mailer: log_accum Message-Id: <20210622120224.13D6EFA95@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1624363344118370 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: nia Date: Tue Jun 22 12:02:24 UTC 2021 Modified Files: pkgsrc/mk: java-vm.mk Log Message: future proof version patterns To generate a diff of this commit: cvs rdiff -u -r1.124 -r1.125 pkgsrc/mk/java-vm.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1624363344118370 Content-Disposition: inline Content-Length: 1364 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.124 pkgsrc/mk/java-vm.mk:1.125 --- pkgsrc/mk/java-vm.mk:1.124 Tue Jun 22 11:51:30 2021 +++ pkgsrc/mk/java-vm.mk Tue Jun 22 12:02:23 2021 @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.124 2021/06/22 11:51:30 nia Exp $ +# $NetBSD: java-vm.mk,v 1.125 2021/06/22 12:02:23 nia Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -108,12 +108,12 @@ _PKG_JVM_DEFAULT= ${PKG_JVM_DEFAULT} (!empty(MACHINE_PLATFORM:MNetBSD-9.*-aarch64) && \ empty(MACHINE_PLATFORM:MNetBSD-9.99.*-aarch64)) _PKG_JVM_DEFAULT?= openjdk8 -. elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-i386) || \ - !empty(MACHINE_PLATFORM:MNetBSD-[789].*-x86_64) || \ +. elif !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || \ + !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || \ !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) _PKG_JVM_DEFAULT?= openjdk11 -. elif !empty(MACHINE_PLATFORM:MNetBSD-[789].*-sparc64) || \ - !empty(MACHINE_PLATFORM:MNetBSD-[789].*-earmv[67]hf) +. elif !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || \ + !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) _PKG_JVM_DEFAULT?= openjdk8 . elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \ --_----------=_1624363344118370--