5 files changed, 7 insertions, 53 deletions

diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile
index ae32625b5908..1072d7492c32 100644
--- a/java/openjdk17/Makefile
+++ b/java/openjdk17/Makefile
@@ -1,8 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
-DISTVERSION=	${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
 CATEGORIES=	java devel
-PORTREVISION=	2
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
 MAINTAINER=	java@FreeBSD.org
@@ -34,7 +33,7 @@ CPE_VENDOR=	oracle
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	battleblow
-GH_PROJECT=	jdk17
+GH_PROJECT=	jdk17u
 
 NO_CCACHE=	yes
 
@@ -58,8 +57,8 @@ NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	17
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	0
-JDK_BUILD_NUMBER=	35
+JDK_PATCH_VERSION=	1
+JDK_BUILD_NUMBER=	12
 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
@@ -166,8 +165,6 @@ post-patch:
 		-e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \
 		-e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \
 		${WRKSRC}/make/autoconf/libraries.m4
-	${MV} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.inline.hpp \
-		${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/bytes_bsd_ppc.hpp
 
 do-install:
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
diff --git a/java/openjdk17/distinfo b/java/openjdk17/distinfo
index 74063d6d6290..1977a8232dc0 100644
--- a/java/openjdk17/distinfo
+++ b/java/openjdk17/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1632003856
-SHA256 (battleblow-jdk17-jdk-17+35-1_GH0.tar.gz) = 7a4b9e8408de588ae19dbdf6ba0292ff672de77a4af4b42e31f271bacd796e72
-SIZE (battleblow-jdk17-jdk-17+35-1_GH0.tar.gz) = 104691774
+TIMESTAMP = 1635630441
+SHA256 (battleblow-jdk17u-jdk-17.0.1+12-1_GH0.tar.gz) = d57fc4f2127926e1079d119dbc779725b6f8a6099baeab3553955c23f565db85
+SIZE (battleblow-jdk17u-jdk-17.0.1+12-1_GH0.tar.gz) = 104757777
diff --git a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
index 11eaa6868f3e..65f66318255d 100644
--- a/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
+++ b/java/openjdk17/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
@@ -1,14 +1,5 @@
 --- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig	2021-09-18 15:30:22.109237000 -0700
 +++ make/modules/java.desktop/lib/Awt2dLibraries.gmk	2021-09-18 15:31:02.024314000 -0700
-@@ -435,7 +435,7 @@
- 
- ifeq ($(USE_EXTERNAL_HARFBUZZ), true)
-    LIBFONTMANAGER_EXTRA_SRC =
--   BUILD_LIBFONTMANAGER_FONTLIB += $(LIBHARFBUZZ_LIBS)
-+   BUILD_LIBFONTMANAGER_FONTLIB += $(HARFBUZZ_LIBS)
- else
-    LIBFONTMANAGER_EXTRA_SRC = libharfbuzz
- 
 @@ -530,7 +530,7 @@
      LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \
      LDFLAGS_aix := -Wl$(COMMA)-berok, \
diff --git a/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp
index 870868e7690e..402f0f475bc3 100644
--- a/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp
+++ b/java/openjdk17/files/patch-src_hotspot_os_bsd_os__bsd.cpp
@@ -1,13 +1,5 @@
 --- src/hotspot/os/bsd/os_bsd.cpp.orig	2021-09-29 21:25:10 UTC
 +++ src/hotspot/os/bsd/os_bsd.cpp
-@@ -58,6 +58,7 @@
- #include "runtime/thread.inline.hpp"
- #include "runtime/threadCritical.hpp"
- #include "runtime/timer.hpp"
-+#include "runtime/vm_version.hpp"
- #include "services/attachListener.hpp"
- #include "services/memTracker.hpp"
- #include "services/runtimeService.hpp"
 @@ -361,7 +361,7 @@
      #elif defined(__NetBSD__)
        #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib"
diff --git a/java/openjdk17/files/patch-src_hotspot_share_adlc_formsopt.cpp b/java/openjdk17/files/patch-src_hotspot_share_adlc_formsopt.cpp
deleted file mode 100644
index 99ad5c17d8b8..000000000000
--- a/java/openjdk17/files/patch-src_hotspot_share_adlc_formsopt.cpp
+++ /dev/null
@@ -1,26 +0,0 @@
-https://github.com/battleblow/jdk17/pull/1
-
---- src/hotspot/share/adlc/formsopt.cpp.orig	2021-07-23 23:38:59 UTC
-+++ src/hotspot/share/adlc/formsopt.cpp
-@@ -436,15 +436,20 @@ void AllocClass::output(FILE *fp) {       // Write inf
- //==============================Frame Handling=================================
- //------------------------------FrameForm--------------------------------------
- FrameForm::FrameForm() {
-+  _sync_stack_slots = NULL;
-+  _inline_cache_reg = NULL;
-+  _interpreter_frame_pointer_reg = NULL;
-+  _cisc_spilling_operand_name = NULL;
-   _frame_pointer = NULL;
-   _c_frame_pointer = NULL;
-   _alignment = NULL;
-+  _return_addr_loc = false;
-+  _c_return_addr_loc = false;
-   _return_addr = NULL;
-   _c_return_addr = NULL;
-   _varargs_C_out_slots_killed = NULL;
-   _return_value = NULL;
-   _c_return_value = NULL;
--  _interpreter_frame_pointer_reg = NULL;
- }
- 
- FrameForm::~FrameForm() {