diff options
Diffstat (limited to 'java')
54 files changed, 465 insertions, 715 deletions
diff --git a/java/Makefile b/java/Makefile index 8bd76be6c979..e5c472c51030 100644 --- a/java/Makefile +++ b/java/Makefile @@ -90,6 +90,7 @@ SUBDIR += openjdk22 SUBDIR += openjdk23 SUBDIR += openjdk24 + SUBDIR += openjdk25 SUBDIR += openjdk8 SUBDIR += openjdk8-jre SUBDIR += openjfx14 diff --git a/java/apache-commons-codec/Makefile b/java/apache-commons-codec/Makefile index 83a0a10f7406..fbe70113414a 100644 --- a/java/apache-commons-codec/Makefile +++ b/java/apache-commons-codec/Makefile @@ -1,5 +1,5 @@ PORTNAME= commons-codec -PORTVERSION= 1.18.0 +PORTVERSION= 1.20.0 CATEGORIES= java converters MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-codec/distinfo b/java/apache-commons-codec/distinfo index c4dff7252fc7..df395216353b 100644 --- a/java/apache-commons-codec/distinfo +++ b/java/apache-commons-codec/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1743530240 -SHA256 (commons-codec-1.18.0-bin.tar.gz) = 7d59aecd46e1cfc77b5dee75edbe37233b70d46f90b6422feb5b505e0fc38267 -SIZE (commons-codec-1.18.0-bin.tar.gz) = 3270148 +TIMESTAMP = 1762420981 +SHA256 (commons-codec-1.20.0-bin.tar.gz) = a4feba2dd2a00e3e2ca5b2078e3a72eb2837cffb7522049c98d3e9d05c9b4600 +SIZE (commons-codec-1.20.0-bin.tar.gz) = 3617067 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/dbvis/Makefile b/java/dbvis/Makefile index 64d715d384f1..25fe9b2b3dd5 100644 --- a/java/dbvis/Makefile +++ b/java/dbvis/Makefile @@ -1,5 +1,5 @@ PORTNAME= dbvis -DISTVERSION= 25.2.3 +DISTVERSION= 25.2.5 CATEGORIES= java databases MASTER_SITES= https://www.dbvis.com/product_download/${PORTNAME}-${DISTVERSION}/media/ \ https://storage.googleapis.com/${PORTNAME}-download/product_download/${PORTNAME}-${DISTVERSION}/media/ diff --git a/java/dbvis/distinfo b/java/dbvis/distinfo index 1cf6c83cc1a5..8474f254c693 100644 --- a/java/dbvis/distinfo +++ b/java/dbvis/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757727757 -SHA256 (dbvis_linux_25_2_3.tar.gz) = c5b6e24b3977402fed938d3be17d1dbd94edf117b7f89183990bb6cd0f5b81f4 -SIZE (dbvis_linux_25_2_3.tar.gz) = 117141268 +TIMESTAMP = 1762345678 +SHA256 (dbvis_linux_25_2_5.tar.gz) = baab4843bc50bb079b8cf12d590a3a4c00586d6e9d688c8a9997f0f5d38781f0 +SIZE (dbvis_linux_25_2_5.tar.gz) = 116441834 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/intellij-ultimate/Makefile b/java/intellij-ultimate/Makefile index 8008967e37ff..1021222e28db 100644 --- a/java/intellij-ultimate/Makefile +++ b/java/intellij-ultimate/Makefile @@ -1,5 +1,5 @@ PORTNAME= intellij-ultimate -DISTVERSION= 2025.2.1 +DISTVERSION= 2025.2.3 CATEGORIES= java devel MASTER_SITES= https://download-cdn.jetbrains.com/idea/ DISTNAME= ideaIU-${DISTVERSION} @@ -29,7 +29,7 @@ NO_BUILD= yes SUB_FILES= idea idea.desktop pkg-message BUILD_TYPE= IU -BUILD_VERSION= 252.25557.131 +BUILD_VERSION= 252.26830.84 BUILD_MARKER= ${BUILD_TYPE}-${BUILD_VERSION} PLIST_SUB= BUILD_MARKER=${BUILD_MARKER} WRKSRC= ${WRKDIR}/idea-${BUILD_MARKER} diff --git a/java/intellij-ultimate/distinfo b/java/intellij-ultimate/distinfo index 1dd4a44fb888..a566433d5835 100644 --- a/java/intellij-ultimate/distinfo +++ b/java/intellij-ultimate/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757582286 -SHA256 (jetbrains/ideaIU-2025.2.1.tar.gz) = ac36d03153894f393fb65c05f57be4722c2a2374d03b7374b37baf856705d5fd -SIZE (jetbrains/ideaIU-2025.2.1.tar.gz) = 1777088273 +TIMESTAMP = 1759740930 +SHA256 (jetbrains/ideaIU-2025.2.3.tar.gz) = 4a54ae8a17d6427f07d2450324132f59391279c6b1094de02f73e408deb5a23c +SIZE (jetbrains/ideaIU-2025.2.3.tar.gz) = 1775170440 diff --git a/java/intellij-ultimate/pkg-plist b/java/intellij-ultimate/pkg-plist index c184510b7c5f..2b7725050079 100644 --- a/java/intellij-ultimate/pkg-plist +++ b/java/intellij-ultimate/pkg-plist @@ -64,6 +64,7 @@ share/applications/idea.desktop %%DATADIR%%/lib/modules/intellij.idea.customization.base.jar %%DATADIR%%/lib/modules/intellij.idea.ultimate.customizationTrial.jar %%DATADIR%%/lib/modules/intellij.libraries.ai.grazie.spell.gec.engine.local.jar +%%DATADIR%%/lib/modules/intellij.libraries.coil.jar %%DATADIR%%/lib/modules/intellij.libraries.compose.foundation.desktop.jar %%DATADIR%%/lib/modules/intellij.libraries.grpc.jar %%DATADIR%%/lib/modules/intellij.libraries.grpc.netty.shaded.jar @@ -142,7 +143,6 @@ share/applications/idea.desktop %%DATADIR%%/lib/modules/intellij.platform.registry.cloud.jar %%DATADIR%%/lib/modules/intellij.platform.rpc.backend.jar %%DATADIR%%/lib/modules/intellij.platform.scopes.backend.jar -%%DATADIR%%/lib/modules/intellij.platform.scopes.jar %%DATADIR%%/lib/modules/intellij.platform.searchEverywhere.backend.jar %%DATADIR%%/lib/modules/intellij.platform.searchEverywhere.frontend.jar %%DATADIR%%/lib/modules/intellij.platform.searchEverywhere.jar @@ -151,7 +151,8 @@ share/applications/idea.desktop %%DATADIR%%/lib/modules/intellij.platform.tasks.impl.jar %%DATADIR%%/lib/modules/intellij.platform.tasks.jar %%DATADIR%%/lib/modules/intellij.platform.tips.jar -%%DATADIR%%/lib/modules/intellij.platform.trialPromotion.jar +%%DATADIR%%/lib/modules/intellij.platform.trialPromotion.common.jar +%%DATADIR%%/lib/modules/intellij.platform.trialPromotion.idesWithFreeTier.jar %%DATADIR%%/lib/modules/intellij.platform.vcs.dvcs.impl.jar %%DATADIR%%/lib/modules/intellij.platform.vcs.dvcs.impl.shared.jar %%DATADIR%%/lib/modules/intellij.platform.vcs.impl.backend.jar @@ -262,7 +263,8 @@ share/applications/idea.desktop %%DATADIR%%/plugins/Kotlin/bin/lldb/renderers/lldb_formatters/lldb_group_value.py %%DATADIR%%/plugins/Kotlin/bin/lldb/renderers/lldb_formatters/lldb_qt.py %%DATADIR%%/plugins/Kotlin/bin/lldb/renderers/lldb_formatters/lldb_qt_init.py -%%DATADIR%%/plugins/Kotlin/bin/macos/LLDBFrontend +%%DATADIR%%/plugins/Kotlin/bin/macos/aarch64/LLDBFrontend +%%DATADIR%%/plugins/Kotlin/bin/macos/x64/LLDBFrontend %%DATADIR%%/plugins/Kotlin/bin/windows/LLDBFrontend.exe %%DATADIR%%/plugins/Kotlin/kotlinc.ide/META-INF/MANIFEST.MF %%DATADIR%%/plugins/Kotlin/kotlinc.ide/bin/kapt @@ -1001,10 +1003,11 @@ share/applications/idea.desktop %%DATADIR%%/plugins/javascript-plugin/helpers/protractor-intellij/lib/protractor-intellij-tree.js %%DATADIR%%/plugins/javascript-plugin/helpers/protractor-intellij/lib/protractor-intellij-util.js %%DATADIR%%/plugins/javascript-plugin/helpers/vitest-intellij/node_modules/vitest-intellij-reporter-safe.js +%%DATADIR%%/plugins/javascript-plugin/helpers/vitest-intellij/vitest-intellij-file-path-resolver.js %%DATADIR%%/plugins/javascript-plugin/helpers/vitest-intellij/vitest-intellij-reporter.js %%DATADIR%%/plugins/javascript-plugin/helpers/vitest-intellij/vitest-intellij-util.js -%%DATADIR%%/plugins/javascript-plugin/js/js-predefined-d6986cc7102b-b598e85cdad2.ijx -%%DATADIR%%/plugins/javascript-plugin/js/js-predefined-d6986cc7102b-b598e85cdad2.txt +%%DATADIR%%/plugins/javascript-plugin/js/js-predefined-d6986cc7102b-3aa1da707db6.ijx +%%DATADIR%%/plugins/javascript-plugin/js/js-predefined-d6986cc7102b-3aa1da707db6.txt %%DATADIR%%/plugins/javascript-plugin/jsLanguageServicesImpl/external/!HowToUpdateBundledTypeScript.md %%DATADIR%%/plugins/javascript-plugin/jsLanguageServicesImpl/external/_tsserver.js %%DATADIR%%/plugins/javascript-plugin/jsLanguageServicesImpl/external/_typingsInstaller.js @@ -1747,8 +1750,7 @@ share/applications/idea.desktop %%DATADIR%%/plugins/mcpserver/lib/io.github.smiley4.schema.kenerator.core.jar %%DATADIR%%/plugins/mcpserver/lib/io.github.smiley4.schema.kenerator.jsonschema.jar %%DATADIR%%/plugins/mcpserver/lib/io.github.smiley4.schema.kenerator.serialization.jar -%%DATADIR%%/plugins/mcpserver/lib/io.ktor.utils.jar -%%DATADIR%%/plugins/mcpserver/lib/ktor-server-cio.jar +%%DATADIR%%/plugins/mcpserver/lib/ktor-server-cio-internal.jar %%DATADIR%%/plugins/mcpserver/lib/mcpserver-frontend.jar %%DATADIR%%/plugins/mcpserver/lib/mcpserver.jar %%DATADIR%%/plugins/micronaut/lib/micronaut-gradle-tooling.jar 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/jta/Makefile b/java/jta/Makefile index df012488b3b2..7613e0a24886 100644 --- a/java/jta/Makefile +++ b/java/jta/Makefile @@ -14,6 +14,9 @@ LICENSE_NAME= jta LICENSE_TEXT= See the license LICENSE_PERMS= dist-mirror pkg-mirror auto-accept +DEPRECATED= manual download, no users in the ports tree, newer version is at https://github.com/jakartaee/transactions +EXPIRATION_DATE= 2026-01-17 + USES= java zip NO_BUILD= yes diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index a5d9e29dc2aa..1548c2e3fa6b 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -1,7 +1,6 @@ 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} @@ -40,6 +39,8 @@ GH_PROJECT= jdk11u 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" \ @@ -49,6 +50,7 @@ MAKE_ENV= LANG="C" \ CC=${CC} \ CXX=${CXX} \ CPP=${CPP} \ + LOG=cmdlines \ MAKEFLAGS="" JDK_OSARCH= bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/} @@ -64,8 +66,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 11 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 27 -JDK_BUILD_NUMBER= 6 +JDK_PATCH_VERSION= 29 +JDK_BUILD_NUMBER= 7 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 @@ -102,6 +104,7 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --with-giflib-include=${LOCALBASE}/include \ --with-giflib-lib=${LOCALBASE}/lib \ --with-libpng=system \ + --with-num-cores=${MAKE_JOBS_NUMBER} \ --with-zlib=system \ --with-lcms=system \ --x-includes=${LOCALBASE}/include \ @@ -125,6 +128,11 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> +# portsfallout.com shows flapping builds on 13.5 and 14.2 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1403000 +MAKE_JOBS_UNSAFE= yes +.endif + .if !${PORT_OPTIONS:MCUPS} MASTER_SITES+= https://codeload.github.com/OpenPrinting/cups/tar.gz/v${CUPS_INC_VER}?dummy=/:cups .endif diff --git a/java/openjdk11/distinfo b/java/openjdk11/distinfo index b91fc199405c..cda9fbcc835b 100644 --- a/java/openjdk11/distinfo +++ b/java/openjdk11/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1745123589 +TIMESTAMP = 1762095114 SHA256 (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 7095b2977bb728ded5566a5c802866062840d6541fd027836865949a407c3682 SIZE (OpenPrinting-cups-v2.4.2_GH0.tar.gz) = 8173207 -SHA256 (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 64afcb0ad19c6a03591757d906355d0f263f8a529dea5654ba518e9399f13b1f -SIZE (battleblow-jdk11u-jdk-11.0.27+6-1_GH0.tar.gz) = 116708083 +SHA256 (battleblow-jdk11u-jdk-11.0.29+7-1_GH0.tar.gz) = ed1fed0a7d6571e5bff9a07272872258451643ba6741c002a8f58bdfd8fc9803 +SIZE (battleblow-jdk11u-jdk-11.0.29+7-1_GH0.tar.gz) = 116785204 diff --git a/java/openjdk11/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk11/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c deleted file mode 100644 index 4983d68853d1..000000000000 --- a/java/openjdk11/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 2025-04-19 23:57:10 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 - -@@ -261,23 +262,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 */ - /* -@@ -487,6 +508,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 dirent64* dentp; diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 1af63a2554c8..b28a2c3a2475 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -1,7 +1,6 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 3 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -40,7 +39,7 @@ GH_PROJECT= jdk17u 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-jobs=N +# 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" \ @@ -50,6 +49,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/} @@ -65,8 +65,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 17 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 16 -JDK_BUILD_NUMBER= 8 +JDK_PATCH_VERSION= 17 +JDK_BUILD_NUMBER= 10 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 @@ -91,8 +91,8 @@ CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \ --with-giflib-include=${LOCALBASE}/include \ --with-giflib-lib=${LOCALBASE}/lib \ --with-harfbuzz=system \ - --with-jobs=${MAKE_JOBS_NUMBER} \ --with-libpng=system \ + --with-num-cores=${MAKE_JOBS_NUMBER} \ --with-zlib=system \ --with-lcms=system \ --x-includes=${LOCALBASE}/include \ @@ -117,8 +117,8 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> # portsfallout.com shows flapping builds on 13.5 and 14.2 -.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1403000 -MAKE_JOBS_UNSAFE= yes +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1500000 +MAKE_JOBS_NUMBER_LIMIT= 3 .endif BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk17 ${LOCALBASE}/bootstrap-openjdk17 diff --git a/java/openjdk17/distinfo b/java/openjdk17/distinfo index 46fec0c5d7c9..3dd968836649 100644 --- a/java/openjdk17/distinfo +++ b/java/openjdk17/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1753420206 -SHA256 (battleblow-jdk17u-jdk-17.0.16+8-1_GH0.tar.gz) = 037d6ddb613ebe58a6bde1919312cce978a74f7cdc6e5f5990933e24dabbc2e2 -SIZE (battleblow-jdk17u-jdk-17.0.16+8-1_GH0.tar.gz) = 107976153 +TIMESTAMP = 1762108077 +SHA256 (battleblow-jdk17u-jdk-17.0.17+10-1_GH0.tar.gz) = 99bd33ce8cc618576e8693b9af1bb48059cb5011286009d46a0fabd2d8d36ba8 +SIZE (battleblow-jdk17u-jdk-17.0.17+10-1_GH0.tar.gz) = 108082578 diff --git a/java/openjdk17/files/patch-src_hotspot_cpu_aarch64_jniFastGetField__aarch64.cpp b/java/openjdk17/files/patch-src_hotspot_cpu_aarch64_jniFastGetField__aarch64.cpp new file mode 100644 index 000000000000..9a0b26e3aa04 --- /dev/null +++ b/java/openjdk17/files/patch-src_hotspot_cpu_aarch64_jniFastGetField__aarch64.cpp @@ -0,0 +1,10 @@ +--- src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp ++++ src/hotspot/cpu/aarch64/jniFastGetField_aarch64.cpp +@@ -31,6 +31,7 @@ + #include "prims/jniFastGetField.hpp" + #include "prims/jvm_misc.hpp" + #include "prims/jvmtiExport.hpp" ++#include "runtime/thread.inline.hpp" + #include "runtime/safepoint.hpp" + #include "runtime/threadWXSetters.inline.hpp" + diff --git a/java/openjdk17/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk17/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c deleted file mode 100644 index 1131ff26e268..000000000000 --- a/java/openjdk17/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c +++ /dev/null @@ -1,91 +0,0 @@ ---- src/jdk.management/unix/native/libmanagement_ext/OperatingSystemImpl.c.orig 2025-04-19 18:17:03 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 - -@@ -178,23 +179,45 @@ 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; -+ /* if (kve->kve_type != KVME_TYPE_VNODE) -+ continue;*/ -+ total += kve->kve_end - kve->kve_start; -+ } -+ free(buf); - return total; - #else /* _ALLBSD_SOURCE */ - /* -@@ -404,6 +427,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/openjdk18/Makefile b/java/openjdk18/Makefile index 2ef6fa17ed08..dd4472d93df9 100644 --- a/java/openjdk18/Makefile +++ b/java/openjdk18/Makefile @@ -1,7 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -39,7 +39,9 @@ GH_PROJECT= jdk18u NO_CCACHE= yes -_MAKE_JOBS= # +# 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" \ CLASSPATH="" \ @@ -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/} @@ -90,6 +93,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 \ @@ -113,6 +117,11 @@ JDK_BUILD_TYPE= release .include <bsd.port.pre.mk> +# portsfallout.com shows flapping builds on 13.5 and 14.2 +.if ${OPSYS} == FreeBSD && ${OSVERSION} < 1403000 +MAKE_JOBS_UNSAFE= yes +.endif + BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk18 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH:Mpowerpc64*} BOOTSTRAP_JDKS+= ${LOCALBASE}/bootstrap-openjdk17 diff --git a/java/openjdk19/Makefile b/java/openjdk19/Makefile index 73c086d5d5ed..dd583587c4dc 100644 --- a/java/openjdk19/Makefile +++ b/java/openjdk19/Makefile @@ -1,7 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -39,6 +39,8 @@ GH_PROJECT= jdk19u 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/openjdk20/Makefile b/java/openjdk20/Makefile index a4035e25e6bf..db35c3b66711 100644 --- a/java/openjdk20/Makefile +++ b/java/openjdk20/Makefile @@ -1,7 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} @@ -39,6 +39,8 @@ GH_PROJECT= jdk20u 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/openjdk21/Makefile b/java/openjdk21/Makefile index 6162d28e0a8d..e0105a14bfb3 100644 --- a/java/openjdk21/Makefile +++ b/java/openjdk21/Makefile @@ -38,6 +38,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 +49,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/} @@ -62,8 +65,8 @@ NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 21 JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 8 -JDK_BUILD_NUMBER= 9 +JDK_PATCH_VERSION= 9 +JDK_BUILD_NUMBER= 10 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 @@ -88,6 +91,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/openjdk21/distinfo b/java/openjdk21/distinfo index c9688d912b85..80e42f997bb5 100644 --- a/java/openjdk21/distinfo +++ b/java/openjdk21/distinfo @@ -1,3 +1,3 @@ -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 +TIMESTAMP = 1762111711 +SHA256 (battleblow-jdk21u-jdk-21.0.9+10-1_GH0.tar.gz) = 07f8277f53844ab7aa45b9ce7aad081a90be4492e5120e80b7c37dd2e16e133a +SIZE (battleblow-jdk21u-jdk-21.0.9+10-1_GH0.tar.gz) = 113912901 diff --git a/java/openjdk21/files/patch-make_autoconf_help.m4 b/java/openjdk21/files/patch-make_autoconf_help.m4 deleted file mode 100644 index 6581b3fef247..000000000000 --- a/java/openjdk21/files/patch-make_autoconf_help.m4 +++ /dev/null @@ -1,11 +0,0 @@ ---- make/autoconf/help.m4.orig 2025-05-24 21:54:30 UTC -+++ make/autoconf/help.m4 -@@ -269,7 +269,7 @@ AC_DEFUN_ONCE([HELP_PRINT_SUMMARY_AND_WARNINGS], - fi - fi - if test "x$CONFIGURE_COMMAND_LINE" != x; then -- printf "using configure arguments '$CONFIGURE_COMMAND_LINE'.\n" -+ printf "using configure arguments '%s'.\n" "$CONFIGURE_COMMAND_LINE" - else - printf "using default settings.\n" - fi 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 deleted file mode 100644 index 80ae4c90cdf7..000000000000 --- a/java/openjdk21/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 - } - 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 deleted file mode 100644 index 421548d0f4a5..000000000000 --- a/java/openjdk21/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/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-make_autoconf_flags-cflags.m4 b/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 index 5156c18515da..81bc372519f5 100644 --- a/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 +++ b/java/openjdk24/files/patch-make_autoconf_flags-cflags.m4 @@ -1,13 +1,12 @@ ---- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 UTC +--- make/autoconf/flags-cflags.m4.orig 2025-09-16 10:24:48 UTC +++ make/autoconf/flags-cflags.m4 -@@ -770,6 +770,10 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], - # for all archs except arm and ppc, prevent gcc to omit frame pointer - $1_CFLAGS_CPU_JDK="${$1_CFLAGS_CPU_JDK} -fno-omit-frame-pointer" +@@ -780,6 +780,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], + # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. + $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10" fi -+ elif test "x$OPENJDK_TARGET_OS_ENV" = xbsd.freebsd; then -+ if test "x$FLAGS_CPU" = xppc64; then -+ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" -+ fi ++ if test "x$FLAGS_CPU" = xppc64; then ++ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" ++ fi fi - - elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then + if test "x$OPENJDK_TARGET_OS" = xaix; then + $1_CFLAGS_CPU="-mcpu=pwr8" 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; diff --git a/java/openjdk25/Makefile b/java/openjdk25/Makefile new file mode 100644 index 000000000000..7465f42df112 --- /dev/null +++ b/java/openjdk25/Makefile @@ -0,0 +1,212 @@ +PORTNAME= openjdk +DISTVERSIONPREFIX= jdk- +DISTVERSION= ${JDK_FULL_VERSION:S/.0.0//} +CATEGORIES= java devel +PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} + +MAINTAINER= java@FreeBSD.org +COMMENT= Java Development Kit ${JDK_MAJOR_VERSION} + +WWW= https://openjdk.java.net/projects/jdk/25/ + +LICENSE= GPLv2 + +ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le + +BUILD_DEPENDS= ${LOCALBASE}/include/cups/cups.h:print/cups \ + bash:shells/bash \ + gsed:textproc/gsed \ + zip:archivers/zip + +.if ${FLAVORS:U} != headless +LIB_DEPENDS= libasound.so:audio/alsa-lib \ + libfontconfig.so:x11-fonts/fontconfig \ + libfreetype.so:print/freetype2 \ + libgif.so:graphics/giflib \ + libharfbuzz.so:print/harfbuzz \ + liblcms2.so:graphics/lcms2 \ + libpng.so:graphics/png +.endif + +RUN_DEPENDS= javavm:java/javavmwrapper +.if ${FLAVORS:U} != headless +RUN_DEPENDS+= xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype +.endif + +FLAVORS= jdk jre headless +FLAVOR?= ${BUILD_JRE:?jre:${FLAVORS:[1]}} + +headless_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-headless +jre_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre + +USES= autoreconf:build compiler:features cpe gmake iconv pkgconfig +.if ${FLAVORS:U} != headless +USES+= jpeg xorg +.endif + +CPE_VENDOR= oracle + +USE_GITHUB= yes +GH_ACCOUNT= freebsd + +.if ${FLAVORS:U} != headless +USE_XORG= x11 xext xi xrandr xrender xt xtst +.endif + +GNU_CONFIGURE= yes +CONFIGURE_ARGS= --disable-ccache \ + --disable-javac-server \ + --with-alsa=${LOCALBASE} \ + --with-boot-jdk=${BOOTSTRAPJDKDIR} \ + --with-cups=${LOCALBASE} \ + --with-debug-level=release \ + --with-fontconfig=${LOCALBASE} \ + --with-freetype=system \ + --with-giflib-include=${LOCALBASE}/include \ + --with-giflib-lib=${LOCALBASE}/lib \ + --with-giflib=system \ + --with-harfbuzz=system \ + --with-lcms=system \ + --with-libjpeg=system \ + --with-libpng=system \ + --with-native-debug-symbols=none \ + --with-num-cores=${MAKE_JOBS_NUMBER} \ + --with-vendor-bug-url="${JDK_BUG_URL}" \ + --with-vendor-name="OpenJDK BSD Porting Team" \ + --with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \ + --with-vendor-vm-bug-url="${JDK_BUG_URL}" \ + --with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \ + --with-zlib=system \ + --x-includes=${LOCALBASE}/include \ + --x-libraries=${LOCALBASE}/lib +CONFIGURE_ENV= ac_cv_path_SED=${LOCALBASE}/bin/gsed +CONFIGURE_TARGET= ${JDK_ARCH}-portbld-${OPSYS:tl}${OSREL} + +.if ${FLAVOR:U} == headless +CONFIGURE_ARGS+= --enable-headless-only +.endif + +# 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="" + +.if ${FLAVOR:U} == jre +ALL_TARGET= legacy-images +.else +ALL_TARGET= images +.endif +JDK_BUILD_TYPE= release + +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} +.if ${FLAVOR:U} == jre +BUILD_JRE= true +JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre +.else +JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk +.endif +INSTALLDIR= ${PREFIX}/${PKGBASE} + +NO_CCACHE= yes +NOPRECIOUSMAKEVARS= yes + +JDK_MAJOR_VERSION= 25 +JDK_MINOR_VERSION= 0 +JDK_PATCH_VERSION= 0 +JDK_BUILD_NUMBER= 36 +BSD_JDK_VERSION= freebsd-1 +JDK_FULL_VERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} + +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 + +.ifnmake portclippy +JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} +.endif + +.include <bsd.port.pre.mk> + +BOOTSTRAP_JDKS= ${LOCALBASE}/openjdk25 ${LOCALBASE}/openjdk24 + +# do we have valid native jdk installed? +.for BJDK in ${BOOTSTRAP_JDKS} +. if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac) +BOOTSTRAPJDKDIR= ${BJDK} +. endif +.endfor + +# if no valid jdk found, set dependency +.if !defined(BOOTSTRAPJDKDIR) +BOOTSTRAPJDKDIR?= ${LOCALBASE}/openjdk24 +BUILD_DEPENDS+= ${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk24 +.endif + +JDK_BUILD_JVM= server + +MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} +CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} +CONFIGURE_ARGS+= --disable-warnings-as-errors + +.if ${COMPILER_TYPE} == gcc +USE_GCC= yes +CONFIGURE_ARGS+= --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ + --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ + --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" +.else +MAKE_ENV+= USE_CLANG=true +EXTRA_CFLAGS+= -Wno-unused-but-set-parameter +EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical \ + -Wno-error=deprecated-non-prototype +CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}" +CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}" +.endif + +.if ${ARCH} == aarch64 +CONFIGURE_ARGS+= --disable-dtrace +.endif + +.if empty(ICONV_LIB) +ICONV_CFLAGS= -DLIBICONV_PLUG +.else +ICONV_CFLAGS= -I${LOCALBASE}/include +ICONV_LDFLAGS= -L${LOCALBASE}/lib +ICONV_LIBS= ${ICONV_LIB} +.endif + +post-patch: + @${RM} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/thread_bsd_ppc.cpp + @${MV} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/thread_bsd_ppc.hpp \ + ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/javaThread_bsd_ppc.hpp + + @${FIND} ${WRKSRC} -name '*.orig' -delete + @${CHMOD} 755 ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/configure \ + ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp + @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ + -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ + -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ + ${WRKSRC}/make/autoconf/libraries.m4 + +post-build: +.if defined(OPENJDK_SYMLINK_CACERTS) + @${RM} ${JDK_IMAGEDIR}/lib/security/cacerts + @${LN} -sf ${OPENJDK_SYMLINK_CACERTS} ${JDK_IMAGEDIR}/lib/security/cacerts +.endif + +do-install: + @${MKDIR} ${STAGEDIR}${INSTALLDIR} + @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} + @cd ${STAGEDIR}${INSTALLDIR} && \ + ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; + @${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper + @${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ + ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} + +.include <bsd.port.post.mk> diff --git a/java/openjdk25/distinfo b/java/openjdk25/distinfo new file mode 100644 index 000000000000..94633f751513 --- /dev/null +++ b/java/openjdk25/distinfo @@ -0,0 +1,3 @@ +TIMESTAMP = 1761395132 +SHA256 (freebsd-openjdk-jdk-25+36-freebsd-1_GH0.tar.gz) = 3bd387e9c63a6610977cf7785b2887b154fdd9f7a9cf62a80809c1fd1b2eaebf +SIZE (freebsd-openjdk-jdk-25+36-freebsd-1_GH0.tar.gz) = 119485554 diff --git a/java/openjdk25/files/patch-configure b/java/openjdk25/files/patch-configure new file mode 100644 index 000000000000..4c97fddabcd2 --- /dev/null +++ b/java/openjdk25/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig 2025-10-24 11:51:54 UTC ++++ configure +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!%%LOCALBASE%%/bin/bash + # + # Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +@@ -36,4 +36,4 @@ fi + # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c. + # This trick is needed to get autoconf to co-operate properly. + # The ${-:+-$-} construction passes on bash options. +-bash ${-:+-$-} -c ". \"${this_script_dir}/make/autoconf/configure\"" "${this_script_dir}/configure" CHECKME "${this_script_dir}" "$@" ++%%LOCALBASE%%/bin/bash ${-:+-$-} -c ". \"${this_script_dir}/make/autoconf/configure\"" "${this_script_dir}/configure" CHECKME "${this_script_dir}" "$@" diff --git a/java/openjdk25/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk25/files/patch-make_autoconf_flags-cflags.m4 new file mode 100644 index 000000000000..81bc372519f5 --- /dev/null +++ b/java/openjdk25/files/patch-make_autoconf_flags-cflags.m4 @@ -0,0 +1,12 @@ +--- make/autoconf/flags-cflags.m4.orig 2025-09-16 10:24:48 UTC ++++ make/autoconf/flags-cflags.m4 +@@ -780,6 +780,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], + # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. + $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10" + fi ++ if test "x$FLAGS_CPU" = xppc64; then ++ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" ++ fi + fi + if test "x$OPENJDK_TARGET_OS" = xaix; then + $1_CFLAGS_CPU="-mcpu=pwr8" diff --git a/java/openjdk25/files/patch-make_autoconf_libraries.m4 b/java/openjdk25/files/patch-make_autoconf_libraries.m4 new file mode 100644 index 000000000000..9c86f7093ac7 --- /dev/null +++ b/java/openjdk25/files/patch-make_autoconf_libraries.m4 @@ -0,0 +1,15 @@ +--- make/autoconf/libraries.m4.orig 2025-10-24 12:39:13 UTC ++++ make/autoconf/libraries.m4 +@@ -212,9 +212,9 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], + ICONV_LDFLAGS="-L/usr/local/lib" + ICONV_LIBS=-liconv + elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then +- ICONV_CFLAGS=-DLIBICONV_PLUG +- ICONV_LDFLAGS= +- ICONV_LIBS= ++ ICONV_CFLAGS=%%ICONV_CFLAGS%% ++ ICONV_LDFLAGS=%%ICONV_LDFLAGS%% ++ ICONV_LIBS=%%ICONV_LIBS%% + else + ICONV_CFLAGS= + ICONV_LDFLAGS= 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 new file mode 100644 index 000000000000..6710b9fea9e3 --- /dev/null +++ b/java/openjdk25/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp @@ -0,0 +1,11 @@ +--- 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<intptr_t*>(uc->uc_mcontext.regs->gpr[14]); // R14_bcp ++ return reinterpret_cast<intptr_t*>(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_hotspot_os_bsd_os__bsd.cpp b/java/openjdk25/files/patch-src_hotspot_os_bsd_os__bsd.cpp new file mode 100644 index 000000000000..402f0f475bc3 --- /dev/null +++ b/java/openjdk25/files/patch-src_hotspot_os_bsd_os__bsd.cpp @@ -0,0 +1,11 @@ +--- src/hotspot/os/bsd/os_bsd.cpp.orig 2021-09-29 21:25:10 UTC ++++ src/hotspot/os/bsd/os_bsd.cpp +@@ -361,7 +361,7 @@ + #elif defined(__NetBSD__) + #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib" + #else +- #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib" ++ #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib" + #endif + #else + #define DEFAULT_LIBPATH OVERRIDE_LIBPATH diff --git a/java/openjdk17/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 index 80ae4c90cdf7..80ae4c90cdf7 100644 --- a/java/openjdk17/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 diff --git a/java/openjdk25/pkg-descr b/java/openjdk25/pkg-descr new file mode 100644 index 000000000000..a6701ff6ef33 --- /dev/null +++ b/java/openjdk25/pkg-descr @@ -0,0 +1 @@ +An open-source implementation of the Java Platform, Standard Edition. diff --git a/java/openjdk25/pkg-message b/java/openjdk25/pkg-message new file mode 100644 index 000000000000..c072654ad070 --- /dev/null +++ b/java/openjdk25/pkg-message @@ -0,0 +1,15 @@ +[ +{ type: install + message: <<EOM +This OpenJDK implementation may require procfs(5) mounted on /proc. + +If you have not done it yet, please do the following: + + mount -t procfs proc /proc + +To make it permanent, you need the following lines in /etc/fstab: + + proc /proc procfs rw 0 0 +EOM +} +] diff --git a/java/openjdk8/Makefile b/java/openjdk8/Makefile index 85c0ae16a984..eaa3251c70f2 100644 --- a/java/openjdk8/Makefile +++ b/java/openjdk8/Makefile @@ -53,7 +53,7 @@ INSTALLDIR= ${PREFIX}/${PKGBASE} NOPRECIOUSMAKEVARS= yes JDK_MAJOR_VERSION= 8 -JDK_UPDATE_VERSION= 462 +JDK_UPDATE_VERSION= 472 JDK_BUILD_NUMBER= 08 BSD_JDK_VERSION= 1 JTREG_VERSION= 4.1 diff --git a/java/openjdk8/distinfo b/java/openjdk8/distinfo index 87c0b9931cf8..8d6a0c8321a7 100644 --- a/java/openjdk8/distinfo +++ b/java/openjdk8/distinfo @@ -1,5 +1,5 @@ -TIMESTAMP = 1753419636 +TIMESTAMP = 1762059364 SHA256 (jtreg4.1-b08.tar.gz) = a9fbfac903313c12687e60978c4688c20189cdf873560125917d6ad53d55b30c SIZE (jtreg4.1-b08.tar.gz) = 683425 -SHA256 (battleblow-jdk8u-8.462.08.1-jdk8u462-b08.1_GH0.tar.gz) = ef956bdbeff27383434418f34d7af67e9f81a54e04bc6351b52616515de1054c -SIZE (battleblow-jdk8u-8.462.08.1-jdk8u462-b08.1_GH0.tar.gz) = 93417092 +SHA256 (battleblow-jdk8u-8.472.08.1-jdk8u472-b08.1_GH0.tar.gz) = a39ab04eed5289ff6934b87f5d981e6f005358cf22b2869a35dff77200c2707a +SIZE (battleblow-jdk8u-8.472.08.1-jdk8u472-b08.1_GH0.tar.gz) = 93406190 diff --git a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c b/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c deleted file mode 100644 index c542431a3ca3..000000000000 --- a/java/openjdk8/files/patch-jdk_src_solaris_native_sun_management_OperatingSystemImpl.c +++ /dev/null @@ -1,90 +0,0 @@ ---- jdk/src/solaris/native/sun/management/OperatingSystemImpl.c.orig 2025-04-19 16:48:54 UTC -+++ jdk/src/solaris/native/sun/management/OperatingSystemImpl.c -@@ -57,6 +57,7 @@ - #include <stdlib.h> - #include <unistd.h> - #ifdef __FreeBSD__ -+#include <sys/user.h> - #include <vm/vm_param.h> - #endif - -@@ -266,23 +267,45 @@ Java_sun_management_OperatingSystemImpl_getCommittedVi - } - 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 */ - /* -@@ -486,6 +509,21 @@ Java_sun_management_OperatingSystemImpl_getOpenFileDes - 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 dbuf; diff --git a/java/wildfly/Makefile b/java/wildfly/Makefile index 9aaf495b062d..4ef8e51b040b 100644 --- a/java/wildfly/Makefile +++ b/java/wildfly/Makefile @@ -1,5 +1,5 @@ PORTNAME= wildfly -DISTVERSION= 37.0.1 +DISTVERSION= 38.0.0 CATEGORIES= java www MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${WILDFLY_VERSION}/ DISTNAME= wildfly-${WILDFLY_VERSION} diff --git a/java/wildfly/distinfo b/java/wildfly/distinfo index c10a353f8699..b2f8358365b6 100644 --- a/java/wildfly/distinfo +++ b/java/wildfly/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1757773594 -SHA256 (wildfly-37.0.1.Final.tar.gz) = d89d844112709c970b243884c3c3a2ba569e1ba43e590d70b236a1405c27cb82 -SIZE (wildfly-37.0.1.Final.tar.gz) = 257459781 +TIMESTAMP = 1760696662 +SHA256 (wildfly-38.0.0.Final.tar.gz) = f6dddf4338a6cf872e057dccefbf88285d34a090262eb9b664ce79b13a56c2d0 +SIZE (wildfly-38.0.0.Final.tar.gz) = 257691723 |