CVS commit: pkgsrc/lang/openjdk11

["Ryo ONODERA" <ryoon%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   ryoon
Date:           Sat Feb 25 18:06:47 UTC 2023

Modified Files:
        pkgsrc/lang/openjdk11: Makefile PLIST distinfo
        pkgsrc/lang/openjdk11/patches: patch-make_autoconf_lib-bundled.m4

Log Message:
openjdk11: Update to 1.11.0.18.10 and support nbsed for newer NetBSD

* Support newer NetBSD with OPSYS_VERSION like openjdk17


To generate a diff of this commit:
cvs rdiff -u -r1.48 -r1.49 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.12 -r1.13 pkgsrc/lang/openjdk11/PLIST
cvs rdiff -u -r1.35 -r1.36 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-bundled.m4

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/Makefile
diff -u pkgsrc/lang/openjdk11/Makefile:1.48 pkgsrc/lang/openjdk11/Makefile:1.49
--- pkgsrc/lang/openjdk11/Makefile:1.48 Sun Jan 29 21:16:59 2023
+++ pkgsrc/lang/openjdk11/Makefile      Sat Feb 25 18:06:47 2023
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.48 2023/01/29 21:16:59 ryoon Exp $
+# $NetBSD: Makefile,v 1.49 2023/02/25 18:06:47 ryoon Exp $
 
 DISTNAME=      jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
-PKGREVISION=   3
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        jdk11u
-GITHUB_TAG=    jdk-11.0.16+8-1
+GITHUB_TAG=    jdk-11.0.18+10-1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 HOMEPAGE=      https://openjdk.java.net/
@@ -75,8 +74,7 @@ CONFIGURE_ARGS+=      USER=pkgsrc
 # Avoid build errors when JAVA_HOME and CLASSPATH are defined by user.
 MAKE_ENV+=     JAVA_HOME=
 MAKE_ENV+=     CLASSPATH=
-.if !empty(MACHINE_PLATFORM:MNetBSD-9.99.8[1-9]-*) || \
-    !empty(MACHINE_PLATFORM:MNetBSD-9.99.9[0-9]-*)
+.if ${OPSYS} == "NetBSD" && ${OPSYS_VERSION} > 099980
 ALL_ENV+=      SED="sed -g"
 .endif
 

Index: pkgsrc/lang/openjdk11/PLIST
diff -u pkgsrc/lang/openjdk11/PLIST:1.12 pkgsrc/lang/openjdk11/PLIST:1.13
--- pkgsrc/lang/openjdk11/PLIST:1.12    Wed May 25 06:05:34 2022
+++ pkgsrc/lang/openjdk11/PLIST Sat Feb 25 18:06:47 2023
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.12 2022/05/25 06:05:34 tnn Exp $
+@comment $NetBSD: PLIST,v 1.13 2023/02/25 18:06:47 ryoon Exp $
 bin/openjdk11-jar
 bin/openjdk11-jarsigner
 bin/openjdk11-java
@@ -230,6 +230,7 @@ java/openjdk11/include/jvmti.h
 java/openjdk11/include/jvmticmlr.h
 java/openjdk11/include/netbsd/jawt_md.h
 java/openjdk11/include/netbsd/jni_md.h
+java/openjdk11/include/sizecalc.h
 java/openjdk11/jmods/java.base.jmod
 java/openjdk11/jmods/java.compiler.jmod
 java/openjdk11/jmods/java.datatransfer.jmod

Index: pkgsrc/lang/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.35 pkgsrc/lang/openjdk11/distinfo:1.36
--- pkgsrc/lang/openjdk11/distinfo:1.35 Mon Aug 15 12:23:05 2022
+++ pkgsrc/lang/openjdk11/distinfo      Sat Feb 25 18:06:47 2023
@@ -1,25 +1,16 @@
-$NetBSD: distinfo,v 1.35 2022/08/15 12:23:05 tnn Exp $
+$NetBSD: distinfo,v 1.36 2023/02/25 18:06:47 ryoon Exp $
 
-BLAKE2s (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = f93572f551f242344e5d6d5e46b9812e5b426772842b5fa06fea4422e327c871
-SHA512 (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = 
c4030c99e4c1bb209f0c1ca6c10665c3f4c906f9d7dc13b912c3fbb8031f3dbb6f8d2e5e966cbbc452c307ba5d6de816c0f000b5b7c5d4e3fe8511baf12aab49
-Size (bootstrap-jdk-1.11.0.15.10-netbsd-8-earmv6hf-20220525.tar.xz) = 92279544 bytes
 BLAKE2s (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = b57b09661581b7dc6e3700a777f030dfa2fef6f953533456686bfd0dde9157d0
 SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 6e61996f7e3c3492b0c878644db30d72021dc4096639992e53b4440d4e2e18cd92e5630ecd4600d1917a1e63a7c814b63f74f811a40588febfe19ad8d3208a9d
 Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = 105760636 bytes
-BLAKE2s (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = c54603eabe28bae659a2042cb3b69588840a57502e741c3de333ac70ea1dedc2
-SHA512 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 1bf5336e9bfeea9ecbcd347f2ea8dd3c9633df42cab13a09c7afaae94faa95b92d862dd97caf380a7037825c3324377240d5d0639b2e0b31a2d7a6316ed56359
-Size (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 96662264 bytes
-BLAKE2s (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 5aac0ec747ac714032dfcb4cc4f093ee3f9ddeb070301856727a8597cedd65cf
-SHA512 (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 735f47d7398a48f0963c5d629c6c319dfe22d84bacd45f84a34f4784433c8cf6bfe6b356363a4591f035bec4a32e2e38d0a9c6be361aa57e5f0170ad4e16a1ad
-Size (bootstrap-jdk-1.11.0.7.10-netbsd-9-aarch64-20200509.tar.xz) = 99673444 bytes
-BLAKE2s (jdk11u-jdk-11.0.16-8-1.tar.gz) = 335896a9a7c173f9e6d69b7e2bd2b98e773cfe5dc997bfb2ec367d13fe39be58
-SHA512 (jdk11u-jdk-11.0.16-8-1.tar.gz) = 33954a05fa8e2a2f0fb97db311569a6b6b9133450d143c78bf01fabee0435b245a9c2318b2c49b8b3023168ba171019e08d5dce5116b6b7c94dad8dd7d047b61
-Size (jdk11u-jdk-11.0.16-8-1.tar.gz) = 123280743 bytes
+BLAKE2s (jdk11u-jdk-11.0.18-10-1.tar.gz) = 9fe79e626bcd1a2a51e4c1c9cd8d1ba3817f94d66955525346e1e1a0c6d0f41c
+SHA512 (jdk11u-jdk-11.0.18-10-1.tar.gz) = 3fd125df7491108382bff105fd933eb833187d2795792fb92beab4f2706d834fb8c43918ca9c78f28d7e6a64d273ab8c6d91ee37b62b8739bf9bfa6076cb9d6c
+Size (jdk11u-jdk-11.0.18-10-1.tar.gz) = 123497196 bytes
 SHA1 (patch-make_autoconf_buildjdk-spec.gmk.in) = d0b600237853c17ecc2864604f0bd847ba6b0149
 SHA1 (patch-make_autoconf_flags-cflags.m4) = 3b37853298805e2ffb92d3babd700d0048f24d8d
 SHA1 (patch-make_autoconf_hotspot.m4) = 437c8b09114933cca22c4a847a90a415cd113e5a
 SHA1 (patch-make_autoconf_lib-alsa.m4) = 999fbf951363f6b49b22aad81537728f22d7c381
-SHA1 (patch-make_autoconf_lib-bundled.m4) = 8720c3f674955e8a51b2ab7dba80c36d34ba8594
+SHA1 (patch-make_autoconf_lib-bundled.m4) = 35a4cdb3c4c3e4893b583cc73a0a79fda6f487e0
 SHA1 (patch-make_autoconf_lib-freetype.m4) = 3dbdfea4011dc69593ab302626b9ec4dfc7a7d54
 SHA1 (patch-make_autoconf_lib-x11.m4) = f609a726f2d795f1d05cc933df587d3440c09b9f
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07

Index: pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-bundled.m4
diff -u pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-bundled.m4:1.1 pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-bundled.m4:1.2
--- pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-bundled.m4:1.1        Tue Oct  1 12:36:34 2019
+++ pkgsrc/lang/openjdk11/patches/patch-make_autoconf_lib-bundled.m4    Sat Feb 25 18:06:47 2023
@@ -1,12 +1,12 @@
-$NetBSD: patch-make_autoconf_lib-bundled.m4,v 1.1 2019/10/01 12:36:34 tnn Exp $
+$NetBSD: patch-make_autoconf_lib-bundled.m4,v 1.2 2023/02/25 18:06:47 ryoon Exp $
 
 Add rpath for zlib.
 
---- make/autoconf/lib-bundled.m4.orig  2019-09-19 12:22:38.000000000 +0000
+--- make/autoconf/lib-bundled.m4.orig  2022-11-02 17:11:52.144326338 +0000
 +++ make/autoconf/lib-bundled.m4
-@@ -257,7 +257,8 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
-   if test "x$USE_EXTERNAL_LIBZ" = "xfalse"; then
-     LIBZ_CFLAGS="$LIBZ_CFLAGS -I$TOPDIR/src/java.base/share/native/libzip/zlib"
+@@ -261,7 +261,8 @@ AC_DEFUN_ONCE([LIB_SETUP_ZLIB],
+         LIBZ_CFLAGS="$LIBZ_CFLAGS -DHAVE_UNISTD_H"
+     fi
    else
 -    LIBZ_LIBS="-lz"
 +    LIBZ_CFLAGS="-I@BUILDLINK_PREFIX.zlib@/include"