CVS commit: pkgsrc/lang

["Tobias Nygren" <tnn%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   tnn
Date:           Wed May 25 20:00:56 UTC 2022

Modified Files:
        pkgsrc/lang/openjdk11: bootstrap.mk
        pkgsrc/lang/openjdk17: bootstrap.mk

Log Message:
openjdk{11,17}: match earmv[67]hf


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/lang/openjdk11/bootstrap.mk
cvs rdiff -u -r1.6 -r1.7 pkgsrc/lang/openjdk17/bootstrap.mk

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/lang/openjdk11/bootstrap.mk
diff -u pkgsrc/lang/openjdk11/bootstrap.mk:1.7 pkgsrc/lang/openjdk11/bootstrap.mk:1.8
--- pkgsrc/lang/openjdk11/bootstrap.mk:1.7      Wed May 25 19:53:26 2022
+++ pkgsrc/lang/openjdk11/bootstrap.mk  Wed May 25 20:00:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.7 2022/05/25 19:53:26 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.8 2022/05/25 20:00:56 tnn Exp $
 
 .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 080000
 PKG_FAIL_REASON+=              "Only supports NetBSD >= 8"
@@ -35,7 +35,7 @@ EXTRACT_ONLY+=                        ${BOOT.nb9-aarch64}
 ONLY_FOR_PLATFORM+=            NetBSD-*-earmv[67]hf
 BOOT.nb8-earmv6hf=             bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz
 SITES.${BOOT.nb8-earmv6hf}=    ${MASTER_SITE_LOCAL:=openjdk11/}
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || make(distinfo)
 DISTFILES+=                    ${BOOT.nb8-earmv6hf}
 EXTRACT_ONLY+=                 ${BOOT.nb8-earmv6hf}
 .endif

Index: pkgsrc/lang/openjdk17/bootstrap.mk
diff -u pkgsrc/lang/openjdk17/bootstrap.mk:1.6 pkgsrc/lang/openjdk17/bootstrap.mk:1.7
--- pkgsrc/lang/openjdk17/bootstrap.mk:1.6      Wed May 25 19:41:49 2022
+++ pkgsrc/lang/openjdk17/bootstrap.mk  Wed May 25 20:00:56 2022
@@ -1,4 +1,4 @@
-# $NetBSD: bootstrap.mk,v 1.6 2022/05/25 19:41:49 tnn Exp $
+# $NetBSD: bootstrap.mk,v 1.7 2022/05/25 20:00:56 tnn Exp $
 
 .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090000
 PKG_FAIL_REASON+=              "Only supports NetBSD >= 9"
@@ -35,7 +35,7 @@ EXTRACT_ONLY+=                        ${BOOT.nb9-aarch64}
 ONLY_FOR_PLATFORM+=            NetBSD-*-earmv[67]hf
 BOOT.nb9-earmv6hf=             bootstrap-jdk-1.17.0.3.7-netbsd-9-earmv6hf-20220525.tar.xz
 SITES.${BOOT.nb9-earmv6hf}=    ${MASTER_SITE_LOCAL:=openjdk17/}
-.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv6hf) || make(distinfo)
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-earmv[67]hf) || make(distinfo)
 DISTFILES+=                    ${BOOT.nb9-earmv6hf}
 EXTRACT_ONLY+=                 ${BOOT.nb9-earmv6hf}
 .endif