openjdk11: update to 11.0.5 GA and delete patches accepted by upstream

4 files changed, 16 insertions, 41 deletions

diff --git a/lang/openjdk11/Makefile b/lang/openjdk11/Makefile
index a729c56a74b..3fa933d9f91 100644
--- a/lang/openjdk11/Makefile
+++ b/lang/openjdk11/Makefile
@@ -1,12 +1,11 @@
-# $NetBSD: Makefile,v 1.3 2019/10/14 07:58:50 tnn Exp $
+# $NetBSD: Makefile,v 1.4 2019/11/03 00:37:28 tnn Exp $
 
 DISTNAME=	openjdk-jdk11u-${GITHUB_TAG:C/\+/-/}
 PKGNAME=	openjdk11-1.${GITHUB_TAG:C/\+/./:C/jdk-([.0-9]+).*/\1/}
 CATEGORIES=	lang
 MASTER_SITES=	${MASTER_SITE_GITHUB:=battleblow/}
 GITHUB_PROJECT= openjdk-jdk11u
-GITHUB_TAG=     jdk-11.0.5+8-1
-PKGREVISION=	1
+GITHUB_TAG=     jdk-11.0.5+10-1
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
 HOMEPAGE=	http://openjdk.java.net/
@@ -141,7 +140,7 @@ ${WRKDIR}/cacerts.out:
 		${PREFIX}/sbin/mozilla-rootcerts extract
 	for cert in ${WRKDIR}/cacerts/*.pem; do				\
 		${INFO_MSG} "Importing $$cert" &&			\
-		 ${SETENV} ${CONFIGURE_ENV} LC_ALL=C	\
+		 ${SETENV} ${CONFIGURE_ENV} LC_ALL=C			\
 		  ${ALT_BOOTDIR}/bin/keytool				\
 		  -noprompt						\
 		  -importcert						\
diff --git a/lang/openjdk11/distinfo b/lang/openjdk11/distinfo
index 879a1ca504a..866afa1845c 100644
--- a/lang/openjdk11/distinfo
+++ b/lang/openjdk11/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.2 2019/10/03 16:57:20 tnn Exp $
+$NetBSD: distinfo,v 1.3 2019/11/03 00:37:28 tnn Exp $
 
 SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = d76599619b8bea879b8202b3efc38a82335d2e8c
 RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-amd64-20190928.tar.xz) = a1b998e4e7edfb73ec35b0cc94895d9af16a8cd8
@@ -8,10 +8,14 @@ SHA1 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = 0ab80546e192cff4
 RMD160 (bootstrap-jdk-1.11.0.5.8-netbsd-7-i386-20190928.tar.xz) = ec41da372ab1f927295a207a65a2a5f940760339
 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
-SHA1 (openjdk-jdk11u-jdk-11.0.5-8-1.tar.gz) = a504adfdb0f63994831b45c15b40dc62c266b910
-RMD160 (openjdk-jdk11u-jdk-11.0.5-8-1.tar.gz) = 375b579a76fac1bf8af13b19f8968c5be13835e3
-SHA512 (openjdk-jdk11u-jdk-11.0.5-8-1.tar.gz) = 62009410d337e0da5b6f008659c401aa856346efdd57d179c081f7971881b289b075074738f1cd1a9085defebdfba8941fabdf7b6b75e226213503df9a065b4b
-Size (openjdk-jdk11u-jdk-11.0.5-8-1.tar.gz) = 117115267 bytes
+SHA1 (jtreg-4.2-b14.tar.gz) = d6e930448fa9e753214c1f3f39cadba269dc710a
+RMD160 (jtreg-4.2-b14.tar.gz) = 57471f85bbc8c91536f8ce8ac1e73eb010f1e50c
+SHA512 (jtreg-4.2-b14.tar.gz) = 6652b6448e94fe5a0989cf92b7ecb6edfea62f3f465b36830b172b0f0c4260958a7eb8fc655bd43194cc11d6706c00821959a493101cc7580f7bda937aed530b
+Size (jtreg-4.2-b14.tar.gz) = 7238477 bytes
+SHA1 (openjdk-jdk11u-jdk-11.0.5-10-1.tar.gz) = edf8539ca16cf8ad6f8ed5a7e00ca77513c0c1ec
+RMD160 (openjdk-jdk11u-jdk-11.0.5-10-1.tar.gz) = ecd9f94df1a2e316f8b439f65a01263a62867c1e
+SHA512 (openjdk-jdk11u-jdk-11.0.5-10-1.tar.gz) = 17980060c076838bf961f03db91f5230d11c40fc0a23ec560e1cd49505a776c15240cf897a68842e4f0013a510d814207f14a6dd26666080b812551acd626277
+Size (openjdk-jdk11u-jdk-11.0.5-10-1.tar.gz) = 116849965 bytes
 SHA1 (patch-make_autoconf_basics.m4) = 5a8d3cd229f73eef34fb3860dfae1a813ec39ab5
 SHA1 (patch-make_autoconf_flags-cflags.m4) = 7ec010eb62a1e4f057b7886caf0d0efaae4b6b63
 SHA1 (patch-make_autoconf_jdk-options.m4) = d0d9fbaf29cc521fa4b62b1ea2616dc8f3b07618
@@ -22,11 +26,10 @@ SHA1 (patch-make_common_NativeCompilation.gmk) = fc97a952ba87efb450f59e87f19fb4c
 SHA1 (patch-make_data_fontconfig_bsd.fontconfig.properties) = 9fd9f6ef4af0eece0b4ca0acbb44331566f17e07
 SHA1 (patch-make_lib_Awt2dLibraries.gmk) = ab77cfd0f07425b694688ffa98c2c661d1ac017d
 SHA1 (patch-src_hotspot_os_bsd_os__bsd.cpp) = ee20027e4323ebf63874cedd9e4549ebb702d335
-SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 93a7098cb13adf5d28b16c123a390e5e13d626bf
+SHA1 (patch-src_hotspot_os_bsd_os__perf__bsd.cpp) = 7bb57f82f3a93adc1970ed4215148fc02ecbcd5a
 SHA1 (patch-src_hotspot_os_posix_os__posix.cpp) = e70e8c1e59f0be184a7a1d6e9d11ac7b934ce4b2
 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.base_unix_native_libjsig_jsig.c) = 82e3a8bad9ca18478cad85ada8544712ff117459
 SHA1 (patch-src_java.desktop_unix_native_common_awt_fontpath.c) = c27a058dbcc836fa5a9f979f193284a706a7c50b
-SHA1 (patch-src_jdk.management_bsd_native_libmanagement__ext_UnixOperatingSystem.c) = 1478dabc215ba70ea83c5f6d9fd789856e96fa45
diff --git a/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__perf__bsd.cpp b/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__perf__bsd.cpp
index fb4523b3b1a..8e560a2e2a6 100644
--- a/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__perf__bsd.cpp
+++ b/lang/openjdk11/patches/patch-src_hotspot_os_bsd_os__perf__bsd.cpp
@@ -1,21 +1,10 @@
-$NetBSD: patch-src_hotspot_os_bsd_os__perf__bsd.cpp,v 1.1 2019/10/01 12:36:34 tnn Exp $
+$NetBSD: patch-src_hotspot_os_bsd_os__perf__bsd.cpp,v 1.2 2019/11/03 00:37:28 tnn Exp $
 
-sys/user.h was removed from NetBSD.
 KERN_PROC_PATHNAME is available from NetBSD>=7.99.23
 
---- src/hotspot/os/bsd/os_perf_bsd.cpp.orig	2019-09-19 12:22:38.000000000 +0000
+--- src/hotspot/os/bsd/os_perf_bsd.cpp.orig	2019-10-16 18:31:09.000000000 +0000
 +++ src/hotspot/os/bsd/os_perf_bsd.cpp
-@@ -34,7 +34,9 @@
-   #include <mach/mach.h>
-   #include <mach/task_info.h>
- #else
-+#ifndef __NetBSD__
-   #include <sys/user.h>
-+#endif
-   #include <sys/sched.h>
-   #include <sys/resource.h>
-   #define NET_RT_IFLIST2 NET_RT_IFLIST
-@@ -857,6 +859,9 @@ int SystemProcessInterface::SystemProces
+@@ -859,6 +859,9 @@ int SystemProcessInterface::SystemProces
  
    for (int i = 0; i < pid_count; i++) {
      // Executable path
diff --git a/lang/openjdk11/patches/patch-src_jdk.management_bsd_native_libmanagement__ext_UnixOperatingSystem.c b/lang/openjdk11/patches/patch-src_jdk.management_bsd_native_libmanagement__ext_UnixOperatingSystem.c
deleted file mode 100644
index d402f2c3323..00000000000
--- a/lang/openjdk11/patches/patch-src_jdk.management_bsd_native_libmanagement__ext_UnixOperatingSystem.c
+++ /dev/null
@@ -1,16 +0,0 @@
-$NetBSD: patch-src_jdk.management_bsd_native_libmanagement__ext_UnixOperatingSystem.c,v 1.1 2019/10/01 12:36:34 tnn Exp $
-
-sys/user.h was removed from NetBSD.
-
---- src/jdk.management/bsd/native/libmanagement_ext/UnixOperatingSystem.c.orig	2019-09-19 12:22:38.000000000 +0000
-+++ src/jdk.management/bsd/native/libmanagement_ext/UnixOperatingSystem.c
-@@ -29,7 +29,9 @@
- #include <sys/types.h>
- #include <sys/sysctl.h>
- #include <sys/time.h>
-+#ifndef __NetBSD__
- #include <sys/user.h>
-+#endif
- #include <unistd.h>
- 
- #include "jvm.h"