openjdk*: make NetBSD 7 bootstrap binaries valid for all future releases

Also drop support for NetBSD 6 and older.

2 files changed, 6 insertions, 46 deletions

diff --git a/lang/openjdk8/bootstrap.mk b/lang/openjdk8/bootstrap.mk
index be6ce49c1ad..54c5a8e8afb 100644
--- a/lang/openjdk8/bootstrap.mk
+++ b/lang/openjdk8/bootstrap.mk
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.14 2019/09/22 15:05:06 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.15 2019/09/22 15:16:26 tnn Exp $
 #
 # This file contains a map of available binary bootstrap toolchains
 # and which kit to use for each supported platform.
@@ -29,10 +29,6 @@ ONLY_FOR_PLATFORM+=	NetBSD-*-aarch64
 ONLY_FOR_PLATFORM+=	DragonFly-[34].*-* SunOS-*-* FreeBSD-10.*-x86_64
 ONLY_FOR_PLATFORM+=	Linux-*-x86_64
 
-BOOT.nb5-i386=		bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz
-BOOT.nb5-amd64=		bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz
-BOOT.nb6-i386=		bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz
-BOOT.nb6-amd64=		bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz
 BOOT.nb7-i386=		bootstrap-jdk-1.7.76-netbsd-7-i386-20150301.tar.xz
 BOOT.nb7-amd64=		bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz
 BOOT.nb7-sparc64=	bootstrap-jdk-1.7.76-netbsd-7-sparc64-20150301.tar.xz
@@ -44,42 +40,22 @@ BOOT.fbsd10-amd64=	bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz
 BOOT.dfly3.6-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.6-amd64-20140719.tar.bz2
 BOOT.dfly3.8-amd64=	bootstrap-jdk7u60-bin-dragonfly-3.8-amd64-20140719.tar.bz2
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-i386) || make(distinfo)
-DISTFILES+=		${BOOT.nb5-i386}
-EXTRACT_ONLY+=		${BOOT.nb5-i386}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-5.[0-8]*-x86_64) || make(distinfo)
-DISTFILES+=		${BOOT.nb5-amd64}
-EXTRACT_ONLY+=		${BOOT.nb5-amd64}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-i386) || make(distinfo)
-DISTFILES+=		${BOOT.nb6-i386}
-EXTRACT_ONLY+=		${BOOT.nb6-i386}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-6.[0-8]*-x86_64) || make(distinfo)
-DISTFILES+=		${BOOT.nb6-amd64}
-EXTRACT_ONLY+=		${BOOT.nb6-amd64}
-.endif
-
-.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-i386) || !empty(MACHINE_PLATFORM:MNetBSD-[7-9].*-i386) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo)
 DISTFILES+=		${BOOT.nb7-i386}
 EXTRACT_ONLY+=		${BOOT.nb7-i386}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-6.99*-x86_64) || !empty(MACHINE_PLATFORM:MNetBSD-[7-9].*-x86_64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
 DISTFILES+=		${BOOT.nb7-amd64}
 EXTRACT_ONLY+=		${BOOT.nb7-amd64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-[7-9].*-sparc64) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-sparc64) || make(distinfo)
 DISTFILES+=		${BOOT.nb7-sparc64}
 EXTRACT_ONLY+=		${BOOT.nb7-sparc64}
 .endif
 
-.if !empty(MACHINE_PLATFORM:MNetBSD-[7-9].*-earmv[67]hf) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || make(distinfo)
 DISTFILES+=		${BOOT.nb7-earmv6hf}
 EXTRACT_ONLY+=		${BOOT.nb7-earmv6hf}
 .endif
diff --git a/lang/openjdk8/distinfo b/lang/openjdk8/distinfo
index a81b1277406..62e802e9ca3 100644
--- a/lang/openjdk8/distinfo
+++ b/lang/openjdk8/distinfo
@@ -1,25 +1,9 @@
-$NetBSD: distinfo,v 1.72 2019/07/25 19:12:55 tnn Exp $
+$NetBSD: distinfo,v 1.73 2019/09/22 15:16:26 tnn Exp $
 
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 7408f52d3bbe35c2b14bbd3215cbf60f1335d334
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 24f1577b5fc86d137f070aedb4610c8c89e45815
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 6ed928cc68503c27edd6f3a90f94e1e762192d41997b12903e37071f4fcd34f5579fa970e59c240928eaae60729300fbfdb02a5ec1136bc757ee24f1ee554af4
 Size (openjdk7/bootstrap-jdk-1.7.76-freebsd-10-amd64-20150301.tar.xz) = 26404752 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 358c533580700065fd5c3c5c99ce3fd087589c00
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 96e74f40360f0d4c1272bf5f37cf8869b718a5ee
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 10b80dd953e68c958732ccb56464ee95d8727a95fd7e930a988355348eb3ee47b27350225b28bcc3ec1480a2297c193675150c70bf2ee1820b118f48cdcf67b2
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-amd64-20150301.tar.xz) = 26580632 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 2cd7df823723e67531d268286e31168d3eed01a9
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = af4e195a1da1be15df30808fe9b10f684146a3ea
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = eec0b48e62e29d526911b71079627e3b3a0057e78d1a0195072bac432e4e772f29f9dcc39d6ce972ec56c4b48ec103833779d5b50dae8164303174540f360c1d
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-5-i386-20150301.tar.xz) = 26857692 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = a1b568394a76bfdd164042ea40e67caa94dd489d
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 7f50618a4a14ec218e886e88e76ad682b6b7fb57
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 80b6585edd8be9e2b384a99532290c0054de7022760a8be8756b0555ea8d88c80709bb0162d48593d76b338be04d246008a14f780051fb460f59f85d76b314ab
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-amd64-20150301.tar.xz) = 26716528 bytes
-SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 4ef9bc133ce3fb328f1a6334561806759f6a840d
-RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 04c158993165acf63015ca931cf3d37a47513d74
-SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 94a4901ce78cff5439495f80ccd0eb0c2a53358dac8d614c7cf6ec46b452ca3d0b956f45490aef7fcd21b558fe1981a1c7611e801bc1506ff48e1b26b1e00de9
-Size (openjdk7/bootstrap-jdk-1.7.76-netbsd-6-i386-20150301.tar.xz) = 26972860 bytes
 SHA1 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e56a0334417146a4db8c23938a0c19ada3e3847d
 RMD160 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = e9a88901ed05bec37c63f235cc7c4b09aaaf1ba3
 SHA512 (openjdk7/bootstrap-jdk-1.7.76-netbsd-7-amd64-20150301.tar.xz) = 664d1f987af6b7271a5c6553a606beae09de3e77cea44ae8dd9327f78ac07afc9d81335ee342bd564617a3e54982d2ec75a827dcfc1ab4a2c54a041dd571f4fb