Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id B31E984CFF for ; Sat, 18 Nov 2023 15:07:18 +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 vGiAP1-NLYE0 for ; Sat, 18 Nov 2023 15:07:18 +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 ECFBE84D3C for ; Sat, 18 Nov 2023 15:07:17 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id E0F07FA3D; Sat, 18 Nov 2023 15:07:17 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1700320037160960" MIME-Version: 1.0 Date: Sat, 18 Nov 2023 15:07:17 +0000 From: "David Brownlee" Subject: CVS commit: pkgsrc/mk To: pkgsrc-changes@NetBSD.org Approved: commit_and_comment Reply-To: abs@netbsd.org X-Mailer: log_accum Message-Id: <20231118150717.E0F07FA3D@cvs.NetBSD.org> This is a multi-part message in MIME format. --_----------=_1700320037160960 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: abs Date: Sat Nov 18 15:07:17 UTC 2023 Modified Files: pkgsrc/mk: java-vm.mk Log Message: Drop support for USE_JAVA2=9 Now all packages have been updated to their correct (11) requirement To generate a diff of this commit: cvs rdiff -u -r1.135 -r1.136 pkgsrc/mk/java-vm.mk Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_1700320037160960 Content-Disposition: inline Content-Length: 1403 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.135 pkgsrc/mk/java-vm.mk:1.136 --- pkgsrc/mk/java-vm.mk:1.135 Sat Nov 18 14:38:07 2023 +++ pkgsrc/mk/java-vm.mk Sat Nov 18 15:07:17 2023 @@ -1,4 +1,4 @@ -# $NetBSD: java-vm.mk,v 1.135 2023/11/18 14:38:07 abs Exp $ +# $NetBSD: java-vm.mk,v 1.136 2023/11/18 15:07:17 abs Exp $ # # This Makefile fragment provides a Java VM, either at build-time or at # run-time, depending on the package's needs. @@ -28,10 +28,10 @@ # # USE_JAVA2 # When the package needs a Java 2 implementation, this variable -# should be set to "yes". It can also be set to "1.4", "1.5", "6", "7", -# "8", "9", "11" and "17" require an even more recent implementation. +# should be set to "yes". It can also be set to "1.4", "1.5", "6", +# "7", "8", "11" and "17" require an even more recent implementation. # -# Possible values: yes no 1.4 1.5 6 7 8 9 11 17 +# Possible values: yes no 1.4 1.5 6 7 8 11 17 # Default value: no # # PKG_JVMS_ACCEPTED @@ -81,8 +81,7 @@ _PKG_JVMS.11= ${_PKG_JVMS.17} openjdk11 .else _PKG_JVMS.11= ${_PKG_JVMS.17} adoptopenjdk11-bin openjdk-bin openjdk11 .endif -_PKG_JVMS.9= ${_PKG_JVMS.11} -_PKG_JVMS.8= ${_PKG_JVMS.9} openjdk8 oracle-jdk8 +_PKG_JVMS.8= ${_PKG_JVMS.11} openjdk8 oracle-jdk8 _PKG_JVMS.7= ${_PKG_JVMS.8} sun-jdk7 _PKG_JVMS.6= ${_PKG_JVMS.7} jdk16 _PKG_JVMS.1.5= ${_PKG_JVMS.6} jdk15 --_----------=_1700320037160960--