5 files changed, 37 insertions, 56 deletions
diff --git a/java/openjdk23/Makefile b/java/openjdk23/Makefile
index 5706851ce9df..84ae99fa5f33 100644
--- a/java/openjdk23/Makefile
+++ b/java/openjdk23/Makefile
@@ -1,9 +1,9 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
-PORTREVISION=	1
 
 MAINTAINER=	java@FreeBSD.org
 COMMENT=	Java Development Kit ${JDK_MAJOR_VERSION}
@@ -11,6 +11,9 @@ WWW=		https://openjdk.java.net/projects/jdk/23/
 
 LICENSE=	GPLv2
 
+DEPRECATED=	No longer supported by upstream
+EXPIRATION_DATE=	2026-05-12
+
 ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 
 # On FreeBSD 14 and 15 the i386 build fails with a segfault in java during the
@@ -40,15 +43,19 @@ USE_XORG=	x11 xext xi xrandr xrender xt xtst
 CPE_VENDOR=	oracle
 
 USE_GITHUB=	yes
-GH_ACCOUNT=	battleblow
-GH_PROJECT=	jdk23u
+GH_ACCOUNT=	freebsd
+GH_PROJECT=	openjdk
+GH_TAGNAME=	jdk-23.0.2+7-freebsd-2
 
 NO_CCACHE=	yes
 
-MAKE_JOBS_UNSAFE=	yes
+# Suppress passing -j to do-build target via Mk/bsd.port.mk
+# In the JDK build the number of parallel jobs is passed in via configure --with-num-cores=N
+_MAKE_JOBS=	#
 MAKE_ENV=	CLASSPATH="" \
 		JAVA_HOME="" \
 		LD_LIBRARY_PATH="" \
+		LOG=cmdlines \
 		MAKEFLAGS=""
 
 JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
@@ -66,7 +73,7 @@ JDK_MAJOR_VERSION=	23
 JDK_MINOR_VERSION=	0
 JDK_PATCH_VERSION=	2
 JDK_BUILD_NUMBER=	7
-BSD_JDK_VERSION=	1
+BSD_JDK_VERSION=	2
 
 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
 
@@ -85,6 +92,7 @@ CONFIGURE_ARGS=	--with-boot-jdk=${BOOTSTRAPJDKDIR} \
 		--with-giflib-lib=${LOCALBASE}/lib \
 		--with-harfbuzz=system \
 		--with-libpng=system \
+		--with-num-cores=${MAKE_JOBS_NUMBER} \
 		--with-zlib=system \
 		--with-lcms=system \
 		--x-includes=${LOCALBASE}/include \
diff --git a/java/openjdk23/distinfo b/java/openjdk23/distinfo
index c4503618142a..110eeb899a39 100644
--- a/java/openjdk23/distinfo
+++ b/java/openjdk23/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1739592718
-SHA256 (battleblow-jdk23u-jdk-23.0.2+7-1_GH0.tar.gz) = 092147404af068e85dbd1535f36da32c9a2077708154f69ba3a94ba64fa2aaba
-SIZE (battleblow-jdk23u-jdk-23.0.2+7-1_GH0.tar.gz) = 117326728
+TIMESTAMP = 1756989931
+SHA256 (freebsd-openjdk-jdk-23.0.2+7-2-jdk-23.0.2+7-freebsd-2_GH0.tar.gz) = ec011f440f6e3f0eff1b67811a3a9fc5094be772f30519af2bfb914abaa6d666
+SIZE (freebsd-openjdk-jdk-23.0.2+7-2-jdk-23.0.2+7-freebsd-2_GH0.tar.gz) = 117311366
diff --git a/java/openjdk23/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk23/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp
deleted file mode 100644
index dda6fd26cce0..000000000000
--- a/java/openjdk23/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp
+++ /dev/null
@@ -1,44 +0,0 @@
---- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig	2024-04-11 22:23:08 UTC
-+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp
-@@ -61,6 +61,7 @@
- # include <sys/types.h>
- # include <sys/mman.h>
- # include <pthread.h>
-+# include <pthread_np.h>
- # include <signal.h>
- # include <errno.h>
- # include <dlfcn.h>
-@@ -432,6 +433,33 @@ size_t os::Posix::default_stack_size(os::ThreadType th
-   // Default stack size (compiler thread needs larger stack).
-   size_t s = (thr_type == os::compiler_thread ? 4 * M : 1024 * K);
-   return s;
-+}
-+
-+void os::current_stack_base_and_size(address* base, size_t* size) {
-+  address bottom;
-+  pthread_attr_t attr;
-+
-+  int rslt = pthread_attr_init(&attr);
-+
-+  // JVM needs to know exact stack location, abort if it fails  
-+  if (rslt != 0)
-+    fatal("pthread_attr_init failed with error = %d", rslt);
-+
-+  rslt = pthread_attr_get_np(pthread_self(), &attr);
-+
-+  if (rslt != 0)
-+    fatal("pthread_attr_get_np failed with error = %d", rslt);
-+
-+  if (pthread_attr_getstackaddr(&attr, (void **)&bottom) != 0 ||
-+      pthread_attr_getstacksize(&attr, size) != 0) {
-+    fatal("Can not locate current stack attributes!");
-+  }
-+
-+  *base = bottom + *size;
-+
-+  pthread_attr_destroy(&attr);
-+  assert(os::current_stack_pointer() >= bottom &&
-+         os::current_stack_pointer() < *base, "just checking");
- }
- 
- /////////////////////////////////////////////////////////////////////////////
diff --git a/java/openjdk23/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c b/java/openjdk23/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c
new file mode 100644
index 000000000000..80ae4c90cdf7
--- /dev/null
+++ b/java/openjdk23/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c
@@ -0,0 +1,20 @@
+--- src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c.orig	2025-06-27 12:18:08 UTC
++++ src/jdk.jdwp.agent/unix/native/libjdwp/exec_md.c
+@@ -70,6 +70,9 @@ closeDescriptors(void)
+ int
+ closeDescriptors(void)
+ {
++#if defined(__FreeBSD__)
++    closefrom(STDERR_FILENO + 1);
++#else
+     DIR *dp;
+     struct dirent *dirp;
+     /* leave out standard input/output/error descriptors */
+@@ -114,6 +117,7 @@ closeDescriptors(void)
+ 
+     (void)closedir(dp);
+ 
++#endif
+     return 1; // success
+ }
+ 
diff --git a/java/openjdk23/pkg-message b/java/openjdk23/pkg-message
index 2ea3d87d89c8..c072654ad070 100644
--- a/java/openjdk23/pkg-message
+++ b/java/openjdk23/pkg-message
@@ -1,17 +1,14 @@
 [
 { type: install
   message: <<EOM
-This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
-procfs(5) mounted on /proc.
+This OpenJDK implementation may require procfs(5) mounted on /proc.
 
 If you have not done it yet, please do the following:
 
-	mount -t fdescfs fdesc /dev/fd
 	mount -t procfs proc /proc
 
 To make it permanent, you need the following lines in /etc/fstab:
 
-	fdesc	/dev/fd		fdescfs		rw	0	0
 	proc	/proc		procfs		rw	0	0
 EOM
 }