CVS commit: pkgsrc/lang

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

Module Name:    pkgsrc
Committed By:   tnn
Date:           Sat May 14 12:02:56 UTC 2022

Modified Files:
        pkgsrc/lang/openjdk11: Makefile distinfo
        pkgsrc/lang/openjdk17: Makefile distinfo
Removed Files:
        pkgsrc/lang/openjdk11/patches:
            patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c
            patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c
            patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h
        pkgsrc/lang/openjdk17/patches:
            patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c
            patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c
            patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h

Log Message:
openjdk*: remove broken patches that used misspelled __NetBSD_Version__

These were for NetBSD < 8. But since broken #ifdefs did not cause a compile
error we have been using compatibility waitid(2) code where we shouldn't.
Bump PKGREVISIONs.


To generate a diff of this commit:
cvs rdiff -u -r1.43 -r1.44 pkgsrc/lang/openjdk11/Makefile
cvs rdiff -u -r1.30 -r1.31 pkgsrc/lang/openjdk11/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/openjdk11/patches/patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c \
    pkgsrc/lang/openjdk11/patches/patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c \
    pkgsrc/lang/openjdk11/patches/patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/openjdk17/Makefile \
    pkgsrc/lang/openjdk17/distinfo
cvs rdiff -u -r1.1 -r0 \
    pkgsrc/lang/openjdk17/patches/patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c \
    pkgsrc/lang/openjdk17/patches/patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c \
    pkgsrc/lang/openjdk17/patches/patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h

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.43 pkgsrc/lang/openjdk11/Makefile:1.44
--- pkgsrc/lang/openjdk11/Makefile:1.43 Fri May 13 23:51:38 2022
+++ pkgsrc/lang/openjdk11/Makefile      Sat May 14 12:02:56 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.43 2022/05/13 23:51:38 tnn Exp $
+# $NetBSD: Makefile,v 1.44 2022/05/14 12:02:56 tnn Exp $
 
 DISTNAME=      jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        jdk11u

Index: pkgsrc/lang/openjdk11/distinfo
diff -u pkgsrc/lang/openjdk11/distinfo:1.30 pkgsrc/lang/openjdk11/distinfo:1.31
--- pkgsrc/lang/openjdk11/distinfo:1.30 Tue May 10 14:33:49 2022
+++ pkgsrc/lang/openjdk11/distinfo      Sat May 14 12:02:56 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2022/05/10 14:33:49 ryoon Exp $
+$NetBSD: distinfo,v 1.31 2022/05/14 12:02:56 tnn Exp $
 
 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
@@ -28,8 +28,5 @@ SHA1 (patch-src_hotspot_os_bsd_os__bsd.c
 SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a
 SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2
 SHA1 (patch-src_hotspot_share_libadt_dict.cpp) = a5c62973f563742d4ccc7db341b33366d14e2a01
-SHA1 (patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c) = fbc0aa6656292535fb38344fee7178b6f625f58a
-SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c) = 39c7afb3c36fa9557d2a660c4b4068b5684c552f
-SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h) = 121357cb76b4a96c06cc2bf670579e0b27f66fc1
 SHA1 (patch-src_java.desktop_share_native_libfontmanager_harfbuzz_hb-blob.cc) = 6635bba71373f65107f5324f68de41d1320bcad8
 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b

Index: pkgsrc/lang/openjdk17/Makefile
diff -u pkgsrc/lang/openjdk17/Makefile:1.1 pkgsrc/lang/openjdk17/Makefile:1.2
--- pkgsrc/lang/openjdk17/Makefile:1.1  Fri May 13 14:24:19 2022
+++ pkgsrc/lang/openjdk17/Makefile      Sat May 14 12:02:56 2022
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.1 2022/05/13 14:24:19 ryoon Exp $
+# $NetBSD: Makefile,v 1.2 2022/05/14 12:02:56 tnn Exp $
 
 DISTNAME=      jdk17u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=       openjdk17-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
+PKGREVISION=   1
 CATEGORIES=    lang
 MASTER_SITES=  ${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT=        jdk17u
Index: pkgsrc/lang/openjdk17/distinfo
diff -u pkgsrc/lang/openjdk17/distinfo:1.1 pkgsrc/lang/openjdk17/distinfo:1.2
--- pkgsrc/lang/openjdk17/distinfo:1.1  Fri May 13 14:24:19 2022
+++ pkgsrc/lang/openjdk17/distinfo      Sat May 14 12:02:56 2022
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2022/05/13 14:24:19 ryoon Exp $
+$NetBSD: distinfo,v 1.2 2022/05/14 12:02:56 tnn Exp $
 
 BLAKE2s (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = afd8e5dcbfa3d8fe397e97f713d24a1437936dcffbe79f3f0c3e9bfb58bce36d
 SHA512 (bootstrap-jdk-1.17.0.2.8-netbsd-10-amd64-20220401.tar.xz) = f9ddd27ac0ccf77eb72e2c1fe5a06c6431a74b4feeea495233cba058dd8346f215861c59b5228e33729dccdc7f557a29e881123d8592f0cc304536fd5cc3609a
@@ -24,9 +24,6 @@ SHA1 (patch-src_hotspot_os_bsd_os__bsd.c
 SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = b70e14728e426a9f79c2c1ee735849fb53dfc1bd
 SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = a58d5eb59181d68d46272e15d47b94c6790ed00a
 SHA1 (patch-src_hotspot_os_posix_signals__posix.cpp) = 05486d931f294066e0cc04a389ce6cb038bb1b6d
-SHA1 (patch-src_java.base_bsd_native_libjava_ProcessHandleImpl__bsd.c) = 8c6f9cab9dca7bfab9e2e8f95059f702e1ce8a81
-SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.c) = 39c7afb3c36fa9557d2a660c4b4068b5684c552f
-SHA1 (patch-src_java.base_unix_native_libjava_ProcessHandleImpl__unix.h) = 121357cb76b4a96c06cc2bf670579e0b27f66fc1
 SHA1 (patch-src_java.base_unix_native_libnio_ch_Net.c) = 2bdb089f7d4f708fb750793b7e0bfa7796fb1694
 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = d7bd8839ecd84459fbd3e7d14ac0e2f48b8b4032
 SHA1 (patch-src_jdk.jdwp.agent_share_native_libdt__socket_socketTransport.c) = c06b49fbc9d34cb839f3bd7821779c79b763a629