diff --git a/java/openjdk25/Makefile b/java/openjdk25/Makefile --- a/java/openjdk25/Makefile +++ b/java/openjdk25/Makefile @@ -1,7 +1,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_FULL_VERSION:S/.0.0//} -PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} MASTER_SITES= LOCAL/openjdk:boot @@ -133,8 +132,8 @@ JDK_MAJOR_VERSION= 25 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 1 -JDK_BUILD_NUMBER= 8 +JDK_PATCH_VERSION= 2 +JDK_BUILD_NUMBER= 10 BSD_JDK_VERSION= freebsd-1 JDK_FULL_VERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} diff --git a/java/openjdk25/distinfo b/java/openjdk25/distinfo --- a/java/openjdk25/distinfo +++ b/java/openjdk25/distinfo @@ -1,4 +1,4 @@ -TIMESTAMP = 1764336333 +TIMESTAMP = 1772104685 SHA256 (openjdk25-25.0.1+8.f.1.aarch64.tar.xz) = cb1d88e0e299a0c2347dbbaa17c3650403a28e8065076cf7898478646c473b2b SIZE (openjdk25-25.0.1+8.f.1.aarch64.tar.xz) = 189254412 SHA256 (openjdk25-25.0.1+8.f.1.ppc64.tar.xz) = ae3e9658208889233f374b172b06f10b36fb19061d830252384a5e98aebe7184 @@ -7,5 +7,5 @@ SIZE (openjdk25-25.0.1+8.f.1.ppc64le.tar.xz) = 188302548 SHA256 (openjdk25-25.0.1+8.f.1.x86_64.tar.xz) = 0449e5a9257d8eb7ed1518af1e4e9e546ee63e4bfaf21e1021e9ab45d2840f27 SIZE (openjdk25-25.0.1+8.f.1.x86_64.tar.xz) = 191262784 -SHA256 (freebsd-openjdk-jdk-25.0.1+8-freebsd-1_GH0.tar.gz) = 9984b61091295635b610497f9b334ff6654f466ecff018b74e123b5c1c3c5e99 -SIZE (freebsd-openjdk-jdk-25.0.1+8-freebsd-1_GH0.tar.gz) = 119483711 +SHA256 (freebsd-openjdk-jdk-25.0.2+10-freebsd-1_GH0.tar.gz) = eb8f34a8d0829c66c9eb4decb8b10fbe348a6e99f33fa786067af439f18472a5 +SIZE (freebsd-openjdk-jdk-25.0.2+10-freebsd-1_GH0.tar.gz) = 119535862 diff --git a/java/openjdk25/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk25/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp deleted file mode 100644 --- a/java/openjdk25/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 2025-10-30 14:38:45 UTC -+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp -@@ -179,7 +179,7 @@ intptr_t* os::fetch_bcp_from_context(const void* ucVoi - assert(ucVoid != nullptr, "invariant"); - const ucontext_t* uc = (const ucontext_t*)ucVoid; - assert(os::Posix::ucontext_is_interpreter(uc), "invariant"); -- return reinterpret_cast(uc->uc_mcontext.regs->gpr[14]); // R14_bcp -+ return reinterpret_cast(uc->uc_mcontext.mc_gpr[14]); // R14_bcp - } - - frame os::get_sender_for_C_frame(frame* fr) { diff --git a/java/openjdk25/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c b/java/openjdk25/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c deleted file mode 100644 --- a/java/openjdk25/files/patch-src_jdk.jdwp.agent_unix_native_libjdwp_exec__md.c +++ /dev/null @@ -1,20 +0,0 @@ ---- 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 - } -