Received: by mail.netbsd.org (Postfix, from userid 605) id 89692856B4; Tue, 20 Jun 2017 11:59:21 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 18EDC84D99 for ; Tue, 20 Jun 2017 11:59:21 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id mpcU9bJ-sC2r for ; Tue, 20 Jun 2017 11:59:20 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 7CAC984CDA for ; Tue, 20 Jun 2017 11:59:20 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 780A2FAE8; Tue, 20 Jun 2017 11:59:20 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1497959960223440" MIME-Version: 1.0 Date: Tue, 20 Jun 2017 11:59:20 +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: <20170620115920.780A2FAE8@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: pkgsrc-changes.NetBSD.org Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1497959960223440 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: jperkin Date: Tue Jun 20 11:59:20 UTC 2017 Modified Files: pkgsrc/mk: java-vm.mk Log Message: Default to oracle-jdk8 on newer Darwin/x86_64. To generate a diff of this commit: cvs rdiff -u -r1.109 -r1.110 pkgsrc/mk/java-vm.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1497959960223440 Content-Disposition: inline Content-Length: 964 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.109 pkgsrc/mk/java-vm.mk:1.110 --- pkgsrc/mk/java-vm.mk:1.109 Wed May 10 14:04:31 2017 +++ pkgsrc/mk/java-vm.mk Tue Jun 20 11:59:20 2017 @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.109 2017/05/10 14:04:31 ryoon Exp $ +# $NetBSD: java-vm.mk,v 1.110 2017/06/20 11:59:20 jperkin Exp $ # # This Makefile fragment handles Java dependencies and make variables, # and is meant to be included by packages that require Java either at @@ -103,7 +103,8 @@ _PKG_JVM_DEFAULT?= openjdk8 . elif !empty(MACHINE_PLATFORM:MNetBSD-[1234].*-i386) _PKG_JVM_DEFAULT?= sun-jdk6 . elif !empty(MACHINE_PLATFORM:MLinux-*-i[3456]86) || \ - !empty(MACHINE_PLATFORM:MLinux-*-x86_64) + !empty(MACHINE_PLATFORM:MLinux-*-x86_64) || \ + !empty(MACHINE_PLATFORM:MDarwin-1[2-9]*-x86_64) _PKG_JVM_DEFAULT?= oracle-jdk8 . elif !empty(MACHINE_PLATFORM:MDarwin-*-*) _PKG_JVM_DEFAULT?= sun-jdk6 --_----------=_1497959960223440--