7 files changed, 5 insertions, 59 deletions

diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile
index e0bc675a7f6d..b9b462713825 100644
--- a/java/openjdk11/Makefile
+++ b/java/openjdk11/Makefile
@@ -60,8 +60,8 @@ NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	11
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	8
-JDK_BUILD_NUMBER=	10
+JDK_PATCH_VERSION=	9
+JDK_BUILD_NUMBER=	11
 BSD_JDK_VERSION=	1
 
 JDK_BUG_URL=	https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20
diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo
index 1af5860ec17b..b1f9722f70d0 100644
--- a/java/openjdk11/distinfo
+++ b/java/openjdk11/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1594855311
-SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.8+10-1_GH0.tar.gz) = e593ed3de0f3e4d0a5f8e569e197dbda7eb739100e2700d5c7198a101b937581
-SIZE (battleblow-openjdk-jdk11u-jdk-11.0.8+10-1_GH0.tar.gz) = 117767352
+TIMESTAMP = 1603421965
+SHA256 (battleblow-openjdk-jdk11u-jdk-11.0.9+11-1_GH0.tar.gz) = 56e713dfcebcd401bf57f80c47393a0225054913951f651c5f004bedf33e8b31
+SIZE (battleblow-openjdk-jdk11u-jdk-11.0.9+11-1_GH0.tar.gz) = 118255644
diff --git a/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.c b/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.c
deleted file mode 100644
index cf53ec78cdeb..000000000000
--- a/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.c
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/java.base/unix/native/libjava/childproc.c.orig	2020-07-15 18:00:08 UTC
-+++ src/java.base/unix/native/libjava/childproc.c
-@@ -33,6 +33,7 @@
- 
- #include "childproc.h"
- 
-+const char * const *parentPathv;
- 
- ssize_t
- restartableWrite(int fd, const void *buf, size_t count)
diff --git a/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.h b/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.h
deleted file mode 100644
index 48a5ecca3235..000000000000
--- a/java/openjdk11/files/patch-src_java.base_unix_native_libjava_childproc.h
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/java.base/unix/native/libjava/childproc.h.orig	2020-07-15 18:00:08 UTC
-+++ src/java.base/unix/native/libjava/childproc.h
-@@ -118,7 +118,7 @@ typedef struct _SpawnInfo {
-  * The cached and split version of the JDK's effective PATH.
-  * (We don't support putenv("PATH=...") in native code)
-  */
--const char * const *parentPathv;
-+extern const char * const *parentPathv;
- 
- ssize_t restartableWrite(int fd, const void *buf, size_t count);
- int restartableDup2(int fd_from, int fd_to);
diff --git a/java/openjdk11/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c b/java/openjdk11/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c
deleted file mode 100644
index 6228b1b6cca6..000000000000
--- a/java/openjdk11/files/patch-src_java.desktop_unix_native_libawt__xawt_xawt_XlibWrapper.c
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c.orig	2020-07-15 18:00:08 UTC
-+++ src/java.desktop/unix/native/libawt_xawt/xawt/XlibWrapper.c
-@@ -2183,7 +2183,7 @@ Java_sun_awt_X11_XlibWrapper_copyLongArray(JNIEnv *env
- JNIEXPORT jint JNICALL
- Java_sun_awt_X11_XlibWrapper_XSynchronize(JNIEnv *env, jclass clazz, jlong display, jboolean onoff)
- {
--    return (jint) XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False));
-+    return XSynchronize((Display*)jlong_to_ptr(display), (onoff == JNI_TRUE ? True : False));
- }
- 
- JNIEXPORT jboolean JNICALL
diff --git a/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.c b/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.c
deleted file mode 100644
index eca254caed05..000000000000
--- a/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.c
+++ /dev/null
@@ -1,12 +0,0 @@
---- src/java.security.jgss/share/native/libj2gss/NativeFunc.c.orig	2020-07-15 18:00:08 UTC
-+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.c
-@@ -27,6 +27,9 @@
- #include <stdlib.h>
- #include "NativeFunc.h"
- 
-+/* global GSS function table */
-+GSS_FUNCTION_TABLE_PTR ftab;
-+
- /* standard GSS method names (ordering is from mapfile) */
- static const char RELEASE_NAME[]                = "gss_release_name";
- static const char IMPORT_NAME[]                 = "gss_import_name";
diff --git a/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.h b/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.h
deleted file mode 100644
index 91c0ad5a25a4..000000000000
--- a/java/openjdk11/files/patch-src_java.security.jgss_share_native_libj2gss_NativeFunc.h
+++ /dev/null
@@ -1,10 +0,0 @@
---- src/java.security.jgss/share/native/libj2gss/NativeFunc.h.orig	2020-07-15 18:00:08 UTC
-+++ src/java.security.jgss/share/native/libj2gss/NativeFunc.h
-@@ -277,6 +277,6 @@ typedef struct GSS_FUNCTION_TABLE {
- typedef GSS_FUNCTION_TABLE *GSS_FUNCTION_TABLE_PTR;
- 
- /* global GSS function table */
--GSS_FUNCTION_TABLE_PTR ftab;
-+extern GSS_FUNCTION_TABLE_PTR ftab;
- 
- #endif