aboutsummaryrefslogtreecommitdiff
path: root/java
diff options
context:
space:
mode:
Diffstat (limited to 'java')
-rw-r--r--java/apache-commons-codec/Makefile2
-rw-r--r--java/apache-commons-codec/distinfo6
-rw-r--r--java/dbvis/Makefile2
-rw-r--r--java/dbvis/distinfo6
-rw-r--r--java/openjdk17/files/patch-src_hotspot_cpu_aarch64_jniFastGetField__aarch64.cpp10
-rw-r--r--java/openjdk25/Makefile128
6 files changed, 94 insertions, 60 deletions
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/dbvis/Makefile b/java/dbvis/Makefile
index 73bbf7b8e33f..25fe9b2b3dd5 100644
--- a/java/dbvis/Makefile
+++ b/java/dbvis/Makefile
@@ -1,5 +1,5 @@
PORTNAME= dbvis
-DISTVERSION= 25.2.4
+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 68a777e8fd24..8474f254c693 100644
--- a/java/dbvis/distinfo
+++ b/java/dbvis/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1758333333
-SHA256 (dbvis_linux_25_2_4.tar.gz) = c4d3e2c4e051be562d2b1e06d885c3ab7928ec27dbfd54d5bec23810cee949d6
-SIZE (dbvis_linux_25_2_4.tar.gz) = 117122760
+TIMESTAMP = 1762345678
+SHA256 (dbvis_linux_25_2_5.tar.gz) = baab4843bc50bb079b8cf12d590a3a4c00586d6e9d688c8a9997f0f5d38781f0
+SIZE (dbvis_linux_25_2_5.tar.gz) = 116441834
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/openjdk25/Makefile b/java/openjdk25/Makefile
index 3c3e590bc437..7465f42df112 100644
--- a/java/openjdk25/Makefile
+++ b/java/openjdk25/Makefile
@@ -1,22 +1,24 @@
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= zip:archivers/zip \
- ${LOCALBASE}/include/cups/cups.h:print/cups \
+BUILD_DEPENDS= ${LOCALBASE}/include/cups/cups.h:print/cups \
bash:shells/bash \
- gsed:textproc/gsed
+ 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 \
@@ -24,18 +26,65 @@ LIB_DEPENDS= libasound.so:audio/alsa-lib \
libharfbuzz.so:print/harfbuzz \
liblcms2.so:graphics/lcms2 \
libpng.so:graphics/png
-RUN_DEPENDS= javavm:java/javavmwrapper \
- xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
+.endif
-USES= autoreconf:build compiler:features cpe gmake iconv jpeg pkgconfig xorg
-USE_XORG= x11 xext xi xrandr xrender xt xtst
+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
-NO_CCACHE= yes
+.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
@@ -46,16 +95,25 @@ MAKE_ENV= CLASSPATH="" \
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 defined(BUILD_JRE)
+.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
@@ -67,43 +125,9 @@ JDK_FULL_VERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_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
-GNU_CONFIGURE= yes
-CONFIGURE_TARGET=${JDK_ARCH}-portbld-${OPSYS:tl}${OSREL}
-CONFIGURE_ENV= ac_cv_path_SED=${LOCALBASE}/bin/gsed
-CONFIGURE_ARGS= --with-boot-jdk=${BOOTSTRAPJDKDIR} \
- --disable-ccache \
- --disable-javac-server \
- --with-alsa=${LOCALBASE} \
- --with-cups=${LOCALBASE} \
- --with-fontconfig=${LOCALBASE} \
- --with-freetype=system \
- --with-libjpeg=system \
- --with-giflib=system \
- --with-giflib-include=${LOCALBASE}/include \
- --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 \
- --x-libraries=${LOCALBASE}/lib \
- --with-version-string=${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} \
- --with-native-debug-symbols=none \
- --with-debug-level=release \
- --with-vendor-name="OpenJDK BSD Porting Team" \
- --with-vendor-url="https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/" \
- --with-vendor-bug-url="${JDK_BUG_URL}" \
- --with-vendor-vm-bug-url="${JDK_BUG_URL}"
-
+.ifnmake portclippy
JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION}
-
-.if defined(BUILD_JRE)
-ALL_TARGET= legacy-images
-.else
-ALL_TARGET= images
.endif
-JDK_BUILD_TYPE= release
.include <bsd.port.pre.mk>
@@ -129,15 +153,15 @@ CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE}
CONFIGURE_ARGS+= --disable-warnings-as-errors
.if ${COMPILER_TYPE} == gcc
-USE_GCC= yes
-CONFIGURE_ARGS+= --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
- --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \
- --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}"
+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
+MAKE_ENV+= USE_CLANG=true
EXTRA_CFLAGS+= -Wno-unused-but-set-parameter
-EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical
-EXTRA_CFLAGS+= -Wno-error=deprecated-non-prototype
+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
generated by cgit v1.2.3 (git 2.25.1) at 2025-11-06 12:56:34 +0000