pkgsrc-Changes archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

CVS commit: pkgsrc/lang/openjdk21

Module Name:    pkgsrc
Committed By:   tnn
Date:           Thu Dec  7 16:26:37 UTC 2023

Modified Files:
        pkgsrc/lang/openjdk21: Makefile PLIST bootstrap.mk distinfo

Log Message:
openjdk21: regen + gpg sign bootstrap. Enable for i386 and aarch64. Bump.


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/openjdk21/Makefile \
    pkgsrc/lang/openjdk21/distinfo
cvs rdiff -u -r1.3 -r1.4 pkgsrc/lang/openjdk21/PLIST
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/openjdk21/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/openjdk21/Makefile
diff -u pkgsrc/lang/openjdk21/Makefile:1.2 pkgsrc/lang/openjdk21/Makefile:1.3
--- pkgsrc/lang/openjdk21/Makefile:1.2  Wed Dec  6 12:51:24 2023
+++ pkgsrc/lang/openjdk21/Makefile      Thu Dec  7 16:26:37 2023
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2023/12/06 12:51:24 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2023/12/07 16:26:37 tnn Exp $
 
 DISTNAME=      jdk21u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk21-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
@@ -6,6 +6,7 @@ CATEGORIES=     lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        jdk21u
 GITHUB_TAG=    jdk-21.0.1+12-1
+PKGREVISION=   1
 
 MAINTAINER=    ryoon%NetBSD.org@localhost
 HOMEPAGE=      https://openjdk.java.net/
Index: pkgsrc/lang/openjdk21/distinfo
diff -u pkgsrc/lang/openjdk21/distinfo:1.2 pkgsrc/lang/openjdk21/distinfo:1.3
--- pkgsrc/lang/openjdk21/distinfo:1.2  Mon Dec  4 01:08:16 2023
+++ pkgsrc/lang/openjdk21/distinfo      Thu Dec  7 16:26:37 2023
@@ -1,8 +1,14 @@
-$NetBSD: distinfo,v 1.2 2023/12/04 01:08:16 tnn Exp $
+$NetBSD: distinfo,v 1.3 2023/12/07 16:26:37 tnn Exp $
 
-BLAKE2s (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231119.tar.xz) = 47d3cc141e09afd2cd743db75d74e619efa133828d279ec24948e709a95a6d58
-SHA512 (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231119.tar.xz) = 297f85ed4d12f7c87472181f814de927d2b4311aa917d00bcbf666b793b30dc72a08ae3cc6e4b95882e33dade127bed6b34f06399aeed8dfd5cf82800b6fec29
-Size (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231119.tar.xz) = 465546556 bytes
+BLAKE2s (bootstrap-jdk-1.21.0.1.12-netbsd-9-aarch64-20231207.tar.xz) = a4e3fae37a90bcf53a842b94529aa46d5702785e0db27b2bcad0c692012f7953
+SHA512 (bootstrap-jdk-1.21.0.1.12-netbsd-9-aarch64-20231207.tar.xz) = 78563a04627e9cac7da620f4a888b6ad5ab4906cae4738ed4049495a7a07501a740af43557541e06c204503a581ac1be1f250195b3ba7fa882cdbfd09689e9bb
+Size (bootstrap-jdk-1.21.0.1.12-netbsd-9-aarch64-20231207.tar.xz) = 112924460 bytes
+BLAKE2s (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231207.tar.xz) = 017a9d787a34faa997d72ac69bcafd9c8ab72354e3a1b751d1cb5d376b364f72
+SHA512 (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231207.tar.xz) = 7ec4208363f44a378674a2b87687ab7facb60bf73118ebd4bec35f7912f073365b36efc4c4b3c034bc448139cb81106e18d6d3b1db45f4ab086ce1ed72bc21bf
+Size (bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231207.tar.xz) = 113417260 bytes
+BLAKE2s (bootstrap-jdk-1.21.0.1.12-netbsd-9-i386-20231207.tar.xz) = 6df557871e6795552305b28d778bcf8724b06e981ec72b35d2e5406cf1f25591
+SHA512 (bootstrap-jdk-1.21.0.1.12-netbsd-9-i386-20231207.tar.xz) = 15d1e8c3b9e440eb446857c42528d5d409baa6b173742930ec5dfe55ba1501e49af789ea75c8cc78eba6b977d7be2b2b4854d9657d75095c55d3941370ff7b94
+Size (bootstrap-jdk-1.21.0.1.12-netbsd-9-i386-20231207.tar.xz) = 111820092 bytes
 BLAKE2s (jdk21u-jdk-21.0.1-12-1.tar.gz) = c3abe0e4b514aa4a6d1fe884693255ff151c052d9e3b87cdf60803f2fc2c89f0
 SHA512 (jdk21u-jdk-21.0.1-12-1.tar.gz) = 5b81a5aea60714ebd58ce1557ea976ef8e287a042d5972297f2a937667b8b0307362669d6d9a102e397d04f78df0e31c50f6de16956eeecee5d3996f05284ee5
 Size (jdk21u-jdk-21.0.1-12-1.tar.gz) = 112374315 bytes

Index: pkgsrc/lang/openjdk21/PLIST
diff -u pkgsrc/lang/openjdk21/PLIST:1.3 pkgsrc/lang/openjdk21/PLIST:1.4
--- pkgsrc/lang/openjdk21/PLIST:1.3     Wed Dec  6 17:53:00 2023
+++ pkgsrc/lang/openjdk21/PLIST Thu Dec  7 16:26:37 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2023/12/06 17:53:00 tnn Exp $
+@comment $NetBSD: PLIST,v 1.4 2023/12/07 16:26:37 tnn Exp $
 bin/openjdk21-jar
 bin/openjdk21-jarsigner
 bin/openjdk21-java
@@ -219,9 +219,9 @@ java/openjdk21/jmods/jdk.internal.ed.jmo
 java/openjdk21/jmods/jdk.internal.jvmstat.jmod
 java/openjdk21/jmods/jdk.internal.le.jmod
 java/openjdk21/jmods/jdk.internal.opt.jmod
-java/openjdk21/jmods/jdk.internal.vm.ci.jmod
-java/openjdk21/jmods/jdk.internal.vm.compiler.jmod
-java/openjdk21/jmods/jdk.internal.vm.compiler.management.jmod
+${PLIST.jvmci}java/openjdk21/jmods/jdk.internal.vm.ci.jmod
+${PLIST.internal_vm_compiler}java/openjdk21/jmods/jdk.internal.vm.compiler.jmod
+${PLIST.internal_vm_compiler}java/openjdk21/jmods/jdk.internal.vm.compiler.management.jmod
 java/openjdk21/jmods/jdk.jartool.jmod
 java/openjdk21/jmods/jdk.javadoc.jmod
 java/openjdk21/jmods/jdk.jcmd.jmod
@@ -387,15 +387,15 @@ java/openjdk21/legal/jdk.internal.opt/AD
 java/openjdk21/legal/jdk.internal.opt/ASSEMBLY_EXCEPTION
 java/openjdk21/legal/jdk.internal.opt/LICENSE
 java/openjdk21/legal/jdk.internal.opt/jopt-simple.md
-java/openjdk21/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
-java/openjdk21/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
-java/openjdk21/legal/jdk.internal.vm.ci/LICENSE
-java/openjdk21/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
-java/openjdk21/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
-java/openjdk21/legal/jdk.internal.vm.compiler.management/LICENSE
-java/openjdk21/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
-java/openjdk21/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
-java/openjdk21/legal/jdk.internal.vm.compiler/LICENSE
+${PLIST.jvmci}java/openjdk21/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
+${PLIST.jvmci}java/openjdk21/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
+${PLIST.jvmci}java/openjdk21/legal/jdk.internal.vm.ci/LICENSE
+${PLIST.internal_vm_compiler}java/openjdk21/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
+${PLIST.internal_vm_compiler}java/openjdk21/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
+${PLIST.internal_vm_compiler}java/openjdk21/legal/jdk.internal.vm.compiler.management/LICENSE
+${PLIST.internal_vm_compiler}java/openjdk21/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
+${PLIST.internal_vm_compiler}java/openjdk21/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
+${PLIST.internal_vm_compiler}java/openjdk21/legal/jdk.internal.vm.compiler/LICENSE
 java/openjdk21/legal/jdk.jartool/ADDITIONAL_LICENSE_INFO
 java/openjdk21/legal/jdk.jartool/ASSEMBLY_EXCEPTION
 java/openjdk21/legal/jdk.jartool/LICENSE

Index: pkgsrc/lang/openjdk21/bootstrap.mk
diff -u pkgsrc/lang/openjdk21/bootstrap.mk:1.1 pkgsrc/lang/openjdk21/bootstrap.mk:1.2
--- pkgsrc/lang/openjdk21/bootstrap.mk:1.1      Wed Nov 22 14:06:50 2023
+++ pkgsrc/lang/openjdk21/bootstrap.mk  Thu Dec  7 16:26:37 2023
@@ -1,36 +1,36 @@
-# $NetBSD: bootstrap.mk,v 1.1 2023/11/22 14:06:50 ryoon Exp $
+# $NetBSD: bootstrap.mk,v 1.2 2023/12/07 16:26:37 tnn Exp $
 
 .if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} < 090000
 PKG_FAIL_REASON+=              "Only supports NetBSD >= 9"
 .endif
 
-#.if (!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) ||!empty(MACHINE_PLATFORM:MNetBSD-*-*earm*)) && ${OPSYS_VERSION} < 099983
-#PKG_FAIL_REASON+=             "PR 55248: please update to NetBSD >= 9.99.83 to use this package"
-#.endif
+.if (!empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || !empty(MACHINE_PLATFORM:MNetBSD-*-*earm*)) && ${OPSYS_VERSION} < 099983
+PKG_FAIL_REASON+=              "PR 55248: please update to NetBSD >= 9.99.83 to use this package"
+.endif
 
-#ONLY_FOR_PLATFORM+=           NetBSD-*-i386
-#BOOT.nb9-i386=                        bootstrap-jdk-1.21.0.1.12-netbsd-9-i386-20231118.tar.xz
-#SITES.${BOOT.nb9-i386}=               ${MASTER_SITE_LOCAL:=openjdk21/}
-#.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo)
-#DISTFILES+=                   ${BOOT.nb9-i386}
-#EXTRACT_ONLY+=                        ${BOOT.nb9-i386}
-#.endif
+ONLY_FOR_PLATFORM+=            NetBSD-*-i386
+BOOT.nb9-i386=                 bootstrap-jdk-1.21.0.1.12-netbsd-9-i386-20231207.tar.xz
+SITES.${BOOT.nb9-i386}=                ${MASTER_SITE_LOCAL:=openjdk21/}
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-i386) || make(distinfo)
+DISTFILES+=                    ${BOOT.nb9-i386}
+EXTRACT_ONLY+=                 ${BOOT.nb9-i386}
+.endif
 
 ONLY_FOR_PLATFORM+=            NetBSD-*-x86_64
-BOOT.nb9-amd64=                        bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231119.tar.xz
+BOOT.nb9-amd64=                        bootstrap-jdk-1.21.0.1.12-netbsd-9-amd64-20231207.tar.xz
 SITES.${BOOT.nb9-amd64}=       ${MASTER_SITE_LOCAL:=openjdk21/}
 .if !empty(MACHINE_PLATFORM:MNetBSD-*-x86_64) || make(distinfo)
 DISTFILES+=                    ${BOOT.nb9-amd64}
 EXTRACT_ONLY+=                 ${BOOT.nb9-amd64}
 .endif
 
-#ONLY_FOR_PLATFORM+=           NetBSD-*-aarch64
-#BOOT.nb9-aarch64=             bootstrap-jdk-1.17.0.3.7-netbsd-9-aarch64-20220516.tar.xz
-#SITES.${BOOT.nb9-aarch64}=    ${MASTER_SITE_LOCAL:=openjdk21/}
-#.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo)
-#DISTFILES+=                   ${BOOT.nb9-aarch64}
-#EXTRACT_ONLY+=                        ${BOOT.nb9-aarch64}
-#.endif
+ONLY_FOR_PLATFORM+=            NetBSD-*-aarch64
+BOOT.nb9-aarch64=              bootstrap-jdk-1.21.0.1.12-netbsd-9-aarch64-20231207.tar.xz
+SITES.${BOOT.nb9-aarch64}=     ${MASTER_SITE_LOCAL:=openjdk21/}
+.if !empty(MACHINE_PLATFORM:MNetBSD-*-aarch64) || make(distinfo)
+DISTFILES+=                    ${BOOT.nb9-aarch64}
+EXTRACT_ONLY+=                 ${BOOT.nb9-aarch64}
+.endif
 
 #ONLY_FOR_PLATFORM+=           NetBSD-*-earmv[67]hf
 #BOOT.nb9-earmv6hf=            bootstrap-jdk-1.17.0.3.7-netbsd-9-earmv6hf-20220525.tar.xz
Home | Main Index | Thread Index | Old Index