6 files changed, 124 insertions, 9 deletions
diff --git a/java/openjdk21-jre/Makefile b/java/openjdk21-jre/Makefile
new file mode 100644
index 000000000000..75617c44a9a9
--- /dev/null
+++ b/java/openjdk21-jre/Makefile
@@ -0,0 +1,8 @@
+PKGNAMESUFFIX=	${JDK_MAJOR_VERSION}-jre
+
+COMMENT=	Java Runtime Environment ${JDK_MAJOR_VERSION}
+
+BUILD_JRE=	yes
+MASTERDIR=	${.CURDIR}/../openjdk21
+
+.include "${MASTERDIR}/Makefile"
diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile
index c8dccf841f5f..6162d28e0a8d 100644
--- a/java/openjdk21/Makefile
+++ b/java/openjdk21/Makefile
@@ -62,8 +62,8 @@ NOPRECIOUSMAKEVARS=	yes
 
 JDK_MAJOR_VERSION=	21
 JDK_MINOR_VERSION=	0
-JDK_PATCH_VERSION=	7
-JDK_BUILD_NUMBER=	6
+JDK_PATCH_VERSION=	8
+JDK_BUILD_NUMBER=	9
 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/openjdk21/distinfo b/java/openjdk21/distinfo
index b51a8b6b0d62..c9688d912b85 100644
--- a/java/openjdk21/distinfo
+++ b/java/openjdk21/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1745168967
-SHA256 (battleblow-jdk21u-jdk-21.0.7+6-1_GH0.tar.gz) = ea8634ed1f3bf8aa0df121fa399f4f56ccac135a14ac5c1db8dd3b378f493dfb
-SIZE (battleblow-jdk21u-jdk-21.0.7+6-1_GH0.tar.gz) = 113408248
+TIMESTAMP = 1753421114
+SHA256 (battleblow-jdk21u-jdk-21.0.8+9-1_GH0.tar.gz) = 9b56f542fd4192e420f12e9c34445a70a7de7733444c7eb505f6062d2dff6d83
+SIZE (battleblow-jdk21u-jdk-21.0.8+9-1_GH0.tar.gz) = 113861928
diff --git a/java/openjdk21/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c b/java/openjdk21/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c
new file mode 100644
index 000000000000..80ae4c90cdf7
--- /dev/null
+++ b/java/openjdk21/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/openjdk21/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk21/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
new file mode 100644
index 000000000000..421548d0f4a5
--- /dev/null
+++ b/java/openjdk21/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
@@ -0,0 +1,89 @@
+--- src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c.orig	2023-10-01 03:54:04 UTC
++++ src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c
+@@ -58,6 +58,7 @@
+ #include <unistd.h>
+ 
+ #ifdef __FreeBSD__
++#include <sys/user.h>
+ #include <vm/vm_param.h>
+ #endif
+ 
+@@ -177,23 +178,43 @@ Java_com_sun_management_internal_OperatingSystemImpl_g
+     }
+     return t_info.virtual_size;
+ #elif defined(__FreeBSD__)
+-    FILE *fp;
+-    unsigned long end, start;
+-    jlong total = 0;
++    int mib[4];
++    struct kinfo_vmentry *kve;
++    long total = 0;
++    size_t len = 0;
++    int error;
++    char *buf, *bp, *eb;
+ 
+-    if ((fp = fopen("/proc/curproc/map", "r")) == NULL) {
+-        throw_internal_error(env, "Unable to open /proc/curproc/map");
++    mib[0] = CTL_KERN;
++    mib[1] = KERN_PROC;
++    mib[2] = KERN_PROC_VMMAP;
++    mib[3] = getpid();
++    error = sysctl(mib, 4, NULL, &len, NULL, 0);
++    if (error) {
++        throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)");
+         return -1;
+     }
+-
+-    for (;;) {
+-       // Ignore everything except start and end entries
+-       if (fscanf(fp, "0x%lx 0x%lx %*[^\n]\n", &start, &end) != 2 || start > end)
+-           break;
+-       total += end - start;
++    len = len * 4 / 3;
++    buf = malloc(len);
++    if (buf == NULL) {
++        throw_internal_error(env, "Fail to allocate memory");
++        return -1;
+     }
+-
+-    fclose(fp);
++    error = sysctl(mib, 4, buf, &len, NULL, 0);
++    if (error) {
++        throw_internal_error(env, "Cannot sysctl(kern.proc.vvmap)");
++        return -1;
++    }
++    bp = buf;
++    eb = buf + len;
++    while (bp < eb) {
++        kve = (struct kinfo_vmentry *)(uintptr_t)bp;
++        if (kve->kve_structsize == 0)
++            break;
++        bp += kve->kve_structsize;
++        total += kve->kve_end - kve->kve_start;
++    }
++    free(buf);
+     return total;
+ #else /* _ALLBSD_SOURCE */
+     /*
+@@ -403,6 +424,21 @@ Java_com_sun_management_internal_OperatingSystemImpl_g
+     return nfiles;
+ #elif defined(__OpenBSD__)
+     return getdtablecount();
++#elif defined(__FreeBSD__)
++    int mib[4];
++    int error;
++    int nfds;
++    size_t len;
++
++    len = sizeof(nfds);
++    mib[0] = CTL_KERN;
++    mib[1] = KERN_PROC;
++    mib[2] = KERN_PROC_NFDS;
++    mib[3] = 0;
++
++    if (sysctl(mib, 4, &nfds, &len, NULL, 0) == -1)
++        return -1;
++    return nfds;
+ #else /* solaris/linux */
+     DIR *dirp;
+     struct dirent* dentp;
diff --git a/java/openjdk21/pkg-message b/java/openjdk21/pkg-message
index fcb6defe8dcd..811dcb1e3b58 100644
--- a/java/openjdk21/pkg-message
+++ b/java/openjdk21/pkg-message
@@ -1,17 +1,15 @@
 [
 { type: install
   message: <<EOM
-This OpenJDK implementation may require fdescfs(5) mounted on /dev/fd
-and procfs(5) mounted on /proc for some applications.
+This OpenJDK implementation may require procfs(5) mounted on /proc for some
+applications.
 
 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
 }