aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/apache-commons-lang3/Makefile2
-rw-r--r--java/apache-commons-lang3/distinfo6
-rw-r--r--java/apache-commons-logging/Makefile19
-rw-r--r--java/icedtea-web/Makefile2
-rw-r--r--java/java3d/Makefile25
-rw-r--r--java/java3d/files/patch-freebsd8
-rw-r--r--java/openjdk21/Makefile5
-rw-r--r--java/openjdk22/Makefile4
-rw-r--r--java/openjdk23/Makefile14
-rw-r--r--java/openjdk23/distinfo6
-rw-r--r--java/openjdk23/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp44
-rw-r--r--java/openjdk23/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c89
-rw-r--r--java/openjdk24/Makefile12
-rw-r--r--java/openjdk24/distinfo6
-rw-r--r--java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c89
15 files changed, 69 insertions, 262 deletions
diff --git a/java/apache-commons-lang3/Makefile b/java/apache-commons-lang3/Makefile
index c1de09382f20..ea5c7c3365a6 100644
--- a/java/apache-commons-lang3/Makefile
+++ b/java/apache-commons-lang3/Makefile
@@ -1,5 +1,5 @@
PORTNAME= commons-lang3
-PORTVERSION= 3.17.0
+PORTVERSION= 3.19.0
CATEGORIES= java devel
MASTER_SITES= APACHE_COMMONS_BINARIES/lang
PKGNAMEPREFIX= apache-
diff --git a/java/apache-commons-lang3/distinfo b/java/apache-commons-lang3/distinfo
index ebffd6f800e1..6fd59ec747ef 100644
--- a/java/apache-commons-lang3/distinfo
+++ b/java/apache-commons-lang3/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1731006452
-SHA256 (commons-lang3-3.17.0-bin.tar.gz) = 08b93712bed7f48725d93c44d70c71e7e661af390f22f0f3e6ba61e3af3cea36
-SIZE (commons-lang3-3.17.0-bin.tar.gz) = 9772415
+TIMESTAMP = 1758843772
+SHA256 (commons-lang3-3.19.0-bin.tar.gz) = 062a46647eb3eacd8628f49d814e140a306120cfa8d1c07dfd0c974492c8003a
+SIZE (commons-lang3-3.19.0-bin.tar.gz) = 10366523
diff --git a/java/apache-commons-logging/Makefile b/java/apache-commons-logging/Makefile
index 3ed1106b8be9..1050f090e52d 100644
--- a/java/apache-commons-logging/Makefile
+++ b/java/apache-commons-logging/Makefile
@@ -1,5 +1,6 @@
PORTNAME= commons-logging
DISTVERSION= 1.3.5
+PORTREVISION= 1
CATEGORIES= java devel
MASTER_SITES= APACHE_COMMONS_BINARIES
PKGNAMEPREFIX= apache-
@@ -10,9 +11,15 @@ COMMENT= Generic logging wrapper library
WWW= https://commons.apache.org/proper/commons-logging/
LICENSE= APACHE20
+LICENSE_FILE= ${WRKSRC}/LICENSE.txt
USES= java
+EXTRACT_AFTER_ARGS= --exclude ._* \
+ --exclude .DS_Store \
+ --exclude ${PORTNAME}-${DISTVERSION}-*.jar \
+ --no-same-owner --no-same-permissions
+
NO_ARCH= yes
NO_BUILD= yes
@@ -20,15 +27,19 @@ WRKSRC= ${WRKDIR}/${PORTNAME}-${DISTVERSION}
JARFILE= ${PORTNAME}-${DISTVERSION}.jar
-PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \
- %%JAVAJARDIR%%/${JARFILE}
+PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}.jar \
+ ${JAVAJARDIR}/${JARFILE}
PORTDOCS= *
OPTIONS_DEFINE= DOCS
do-install:
${INSTALL_DATA} ${WRKSRC}/${JARFILE} ${STAGEDIR}${JAVAJARDIR}
- ${LN} -sf ${JARFILE} ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
- (cd ${WRKSRC}/apidocs && ${COPYTREE_SHARE} . ${STAGEDIR}${DOCSDIR})
+ ${RLN} ${STAGEDIR}${JAVAJARDIR}/${JARFILE} \
+ ${STAGEDIR}${JAVAJARDIR}/${PORTNAME}.jar
+
+do-install-DOCS-on:
+ (cd ${WRKSRC} && ${COPYTREE_SHARE} apidocs ${STAGEDIR}${DOCSDIR} && \
+ ${INSTALL_DATA} NOTICE.txt RELEASE-NOTES.txt ${STAGEDIR}${DOCSDIR})
.include <bsd.port.mk>
diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile
index 2e0794d89210..f399f03d3d2c 100644
--- a/java/icedtea-web/Makefile
+++ b/java/icedtea-web/Makefile
@@ -1,7 +1,7 @@
PORTNAME= icedtea-web
PORTVERSION= 1.8.8
DISTVERSIONPREFIX= icedtea-web-
-PORTREVISION= 28
+PORTREVISION= 29
CATEGORIES= java www
MAINTAINER= java@FreeBSD.org
diff --git a/java/java3d/Makefile b/java/java3d/Makefile
index a917ead6a2a3..8875e3748e5e 100644
--- a/java/java3d/Makefile
+++ b/java/java3d/Makefile
@@ -1,6 +1,6 @@
PORTNAME= java3d
PORTVERSION= 1.5.2
-PORTREVISION= 9
+PORTREVISION= 11
CATEGORIES= java graphics games devel
MASTER_SITES= https://sites.google.com/site/daemonwizard/
@@ -18,9 +18,8 @@ BROKEN_armv7= fails to compile: build.xml: Compile failed; see the compiler err
USES= compiler:c11 gl java:ant,run tar:bzip2 xorg
JAVA_VERSION= 8
USE_GL= gl
-USE_XORG= xt
+USE_XORG= x11 xext xt
JAVA_VENDOR= openjdk
-LLD_UNSAFE= yes
NO_SHLIB_REQUIRES_GLOB= libjawt.so libjvm.so
PLIST_SUB+= JAVA_HOME=${JAVA_HOME:S/^${PREFIX}\///} ARCH=${ARCH}
@@ -37,18 +36,20 @@ post-patch:
${WRKSRC}/j3d-core/src/native/ogl/build-freebsd.xml
do-build:
- cd ${WRKSRC}/vecmath && ${SETENV} ${MAKE_ENV} ${ANT} dist
+ cd ${WRKSRC}/vecmath && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${ANT} dist
cd ${WRKSRC}/j3d-core \
- && ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \
- -Dis${OPSYS}=yes \
- -Dports.localbase=${LOCALBASE} \
- jar-opt
+ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${ANT} \
+ -Dbuild.type=fcs \
+ -Dis${OPSYS}=yes \
+ -Dports.localbase=${LOCALBASE} \
+ jar-opt
post-build-DOCS-on:
cd ${WRKSRC}/j3d-core \
- && ${SETENV} ${MAKE_ENV} ${ANT} -Dbuild.type=fcs \
- -Dis${OPSYS}=yes \
- docs-public
+ && ${SETENVI} ${WRK_ENV} ${MAKE_ENV} ${ANT} \
+ -Dbuild.type=fcs \
+ -Dis${OPSYS}=yes \
+ docs-public
do-install:
@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/ext
@@ -58,7 +59,7 @@ do-install:
${WRKSRC}/j3d-core/build/default/opt/lib/ext/j3dutils.jar \
${STAGEDIR}${JAVA_HOME}/jre/lib/ext
@${MKDIR} ${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
- ${INSTALL} \
+ ${INSTALL_LIB} \
${WRKSRC}/j3d-core/build/default/opt/native/libj3dcore-ogl.so \
${STAGEDIR}${JAVA_HOME}/jre/lib/${ARCH}
diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd
index e11a2df2c13c..7e5635a72e8e 100644
--- a/java/java3d/files/patch-freebsd
+++ b/java/java3d/files/patch-freebsd
@@ -130,8 +130,8 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
+ </exec>
+
+ <!-- Create the library file-->
-+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
-+ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -G -z defs -L${ports.localbase}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/>
++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
++ <arg line="DrawingSurfaceObjectAWT.o Canvas3D.o GraphicsContext3D.o NativeScreenInfo.o NativeConfigTemplate3D.o MasterControl.o GeometryArrayRetained.o Attributes.o CgShaderProgram.o GLSLShaderProgram.o Lights.o -shared -z defs -L${ports.localbase}/lib -lGL -lX11 -lXext -lm -lc -L${java.home}/lib/${os.arch} -ljawt -L${java.home}/lib/${os.arch}/server -ljvm -o libj3dcore-ogl.so"/>
+ </exec>
+
+ </target>
@@ -143,8 +143,8 @@ diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/s
+ </exec>
+
+ <!-- Create the wrapper library -->
-+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="ld">
-+ <arg line="CgWrapper.o -G -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc">
++ <arg line="CgWrapper.o -shared -z defs -L/usr/X11R6/lib64 -ldl -lCg -lCgGL -lpthread -lGL -lX11 -lXext -lm -lnsl -lc -o libj3dcore-ogl-cg.so"/>
+ </exec>
+
+ </target>
diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile
index 6162d28e0a8d..be96b112ab09 100644
--- a/java/openjdk21/Makefile
+++ b/java/openjdk21/Makefile
@@ -1,6 +1,7 @@
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}
@@ -38,6 +39,8 @@ GH_PROJECT= jdk21u
NO_CCACHE= 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= LANG="C" \
LC_ALL="C" \
@@ -47,6 +50,7 @@ MAKE_ENV= LANG="C" \
CC=${CC} \
CXX=${CXX} \
CPP=${CPP} \
+ LOG=cmdlines \
MAKEFLAGS=""
JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
@@ -88,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/openjdk22/Makefile b/java/openjdk22/Makefile
index d81cbb146655..b15cef1d678e 100644
--- a/java/openjdk22/Makefile
+++ b/java/openjdk22/Makefile
@@ -39,6 +39,8 @@ GH_PROJECT= jdk22u
NO_CCACHE= 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= LANG="C" \
LC_ALL="C" \
@@ -48,6 +50,7 @@ MAKE_ENV= LANG="C" \
CC=${CC} \
CXX=${CXX} \
CPP=${CPP} \
+ LOG=cmdlines \
MAKEFLAGS=""
JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
@@ -89,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/Makefile b/java/openjdk23/Makefile
index 009beccc3d76..fc20c675bde0 100644
--- a/java/openjdk23/Makefile
+++ b/java/openjdk23/Makefile
@@ -3,7 +3,6 @@ DISTVERSIONPREFIX= jdk-
DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
CATEGORIES= java devel
PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION}
-PORTREVISION= 2
MAINTAINER= java@FreeBSD.org
COMMENT= Java Development Kit ${JDK_MAJOR_VERSION}
@@ -40,15 +39,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 +69,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 +88,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.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk23/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
deleted file mode 100644
index 421548d0f4a5..000000000000
--- a/java/openjdk23/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- 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/openjdk24/Makefile b/java/openjdk24/Makefile
index 454ef1d87149..3b2e0110d69e 100644
--- a/java/openjdk24/Makefile
+++ b/java/openjdk24/Makefile
@@ -1,6 +1,7 @@
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}
@@ -35,17 +36,19 @@ CPE_VENDOR= oracle
USE_GITHUB= yes
GH_ACCOUNT= freebsd
GH_PROJECT= openjdk
-GH_TAGNAME= jdk-24.0.2-ga-freebsd-1
+GH_TAGNAME= jdk-24.0.2-ga-freebsd-2
NO_CCACHE= 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=""
-MAKE_JOBS_UNSAFE= yes
-
JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
JDK_OSARCH= bsd-${JDK_ARCH}
JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
@@ -62,7 +65,7 @@ JDK_MAJOR_VERSION= 24
JDK_MINOR_VERSION= 0
JDK_PATCH_VERSION= 2
JDK_BUILD_NUMBER= 12
-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
@@ -82,6 +85,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/openjdk24/distinfo b/java/openjdk24/distinfo
index 869ee42cffd6..d0f99f6fd72b 100644
--- a/java/openjdk24/distinfo
+++ b/java/openjdk24/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1752740904
-SHA256 (freebsd-openjdk-jdk-24.0.2+12-1-jdk-24.0.2-ga-freebsd-1_GH0.tar.gz) = 2d8ae839763932bbc5d85f1a129a0ec9c972af59b40eb2b3e7bacb238a67f132
-SIZE (freebsd-openjdk-jdk-24.0.2+12-1-jdk-24.0.2-ga-freebsd-1_GH0.tar.gz) = 120897722
+TIMESTAMP = 1756894463
+SHA256 (freebsd-openjdk-jdk-24.0.2+12-2-jdk-24.0.2-ga-freebsd-2_GH0.tar.gz) = 707a120215130b7d82a344f19ec801efaa70edaad38d6417fd1a47a6da58c395
+SIZE (freebsd-openjdk-jdk-24.0.2+12-2-jdk-24.0.2-ga-freebsd-2_GH0.tar.gz) = 120881959
diff --git a/java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
deleted file mode 100644
index 421548d0f4a5..000000000000
--- a/java/openjdk24/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c
+++ /dev/null
@@ -1,89 +0,0 @@
---- 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;
generated by cgit v1.2.3 (git 2.25.1) at 2025-10-03 14:43:56 +0000