Update to 11.0.4+11.2

5 files changed, 24 insertions, 24 deletions

diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index 20861a1bf56d..428903696e76 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -3,7 +3,6 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION=	2
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -57,7 +56,7 @@ JDK_MAJOR_VERSION=	11
 JDK_MINOR_VERSION=	0
 JDK_PATCH_VERSION=	4
 JDK_BUILD_NUMBER=	11
-BSD_JDK_VERSION=	1
+BSD_JDK_VERSION=	2
 
 GNU_CONFIGURE=	yes
 CONFIGURE_ENV=	CC=${CC} \
diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo
index d793f4467556..64fe3b2cc8b0 100644
--- a/java/openjdk11/distinfo
+++ b/java/openjdk11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1563553365
-SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.4+11-1_GH0.tar.gz) = eed0b1dc30d16e14ef470186c9fe21c36e02da95f2657754b8402e84b803965c
-SIZE (battleblow-openjdk-jdk11u-jdk-11.0.4+11-1_GH0.tar.gz) = 116997649
+TIMESTAMP = 1565662004
+SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 15fdeeea8d716620ab78a44e66edf88eeb7707a9b7b389304f2ba6fd39d5fa36
+SIZE (battleblow-openjdk-jdk11u-jdk-11.0.4+11-2_GH0.tar.gz) = 117004198
diff --git a/java/openjdk11/files/patch-make_autoconf_libraries.m4 b/java/openjdk11/files/patch-make_autoconf_libraries.m4
index 11f8769f67c6..0911464a6522 100644
--- a/java/openjdk11/files/patch-make_autoconf_libraries.m4
+++ b/java/openjdk11/files/patch-make_autoconf_libraries.m4
@@ -1,15 +1,15 @@
---- make/autoconf/libraries.m4.orig	2019-03-28 16:54:58.823145000 -0700
-+++ make/autoconf/libraries.m4	2019-03-28 16:55:45.533206000 -0700
-@@ -186,9 +186,9 @@
+--- make/autoconf/libraries.m4~	2019-08-12 19:10:36.292217000 -0700
++++ make/autoconf/libraries.m4	2019-08-12 19:18:15.523606000 -0700
+@@ -188,9 +188,9 @@
        ICONV_LDFLAGS="-L/usr/local/lib"
        ICONV_LIBS=-liconv
-     else
--      ICONV_CFLAGS=
+     elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then
+-      ICONV_CFLAGS=-DLIBICONV_PLUG
 -      ICONV_LDFLAGS=
 -      ICONV_LIBS=
 +      ICONV_CFLAGS=%%ICONV_CFLAGS%%
 +      ICONV_LDFLAGS=%%ICONV_LDFLAGS%%
 +      ICONV_LIBS=%%ICONV_LIBS%%
-     fi
-   else
-     ICONV_CFLAGS=
+     else
+       ICONV_CFLAGS=
+       ICONV_LDFLAGS=
diff --git a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp
deleted file mode 100644
index 0eeb4da71971..000000000000
--- a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig
-+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp
-@@ -133,7 +133,7 @@
- }
- 
- static unsigned long ucontext_get_trap(const ucontext_t * uc) {
--  return uc->uc_mcontext.regs->trap;
-+  return uc->uc_mcontext.mc_exc;
- }
- 
- ExtendedPC os::fetch_frame_from_context(const void* ucVoid,
diff --git a/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp
new file mode 100644
index 000000000000..701059058259
--- /dev/null
+++ b/java/openjdk11/files/patch-src_hotspot_os__cpu_bsd__x86_os__bsd__x86.cpp
@@ -0,0 +1,12 @@
+--- src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
++++ src/hotspot/os_cpu/bsd_x86/os_bsd_x86.cpp
+@@ -510,6 +510,9 @@ JVM_handle_bsd_signal(int sig,
+     // Handle ALL stack overflow variations here
+     if (sig == SIGSEGV || sig == SIGBUS) {
+       address addr = (address) info->si_addr;
++#ifdef __FreeBSD__
++      addr = align_down(addr, os::vm_page_size());
++#endif
+ 
+       // check if fault address is within thread stack
+       if (thread->on_local_stack(addr)) {