diff options
Diffstat (limited to 'java')
99 files changed, 529 insertions, 859 deletions
diff --git a/java/Makefile b/java/Makefile index a4a2e0fd6188..be255edd110d 100644 --- a/java/Makefile +++ b/java/Makefile @@ -84,7 +84,6 @@ SUBDIR += openjdk17-jre SUBDIR += openjdk21 SUBDIR += openjdk21-jre - SUBDIR += openjdk22 SUBDIR += openjdk23 SUBDIR += openjdk24 SUBDIR += openjdk25 diff --git a/java/apache-bcel/Makefile b/java/apache-bcel/Makefile index 5b0089271b89..0499bf833fb3 100644 --- a/java/apache-bcel/Makefile +++ b/java/apache-bcel/Makefile @@ -1,6 +1,6 @@ PORTNAME= bcel PORTVERSION= 6.4.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://archive.apache.org/dist/commons/${PORTNAME}/binaries/ PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-beanutils/Makefile b/java/apache-commons-beanutils/Makefile index 0294e93e4ffd..7ae8007f3b3c 100644 --- a/java/apache-commons-beanutils/Makefile +++ b/java/apache-commons-beanutils/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-beanutils PORTVERSION= 1.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_SOURCE PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-cli/Makefile b/java/apache-commons-cli/Makefile index 1962630dde4e..852f98c56086 100644 --- a/java/apache-commons-cli/Makefile +++ b/java/apache-commons-cli/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-cli DISTVERSION= 1.11.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-codec/Makefile b/java/apache-commons-codec/Makefile index ae13f4731c7d..fd0c201aae2e 100644 --- a/java/apache-commons-codec/Makefile +++ b/java/apache-commons-codec/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-codec PORTVERSION= 1.20.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java converters MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-collections/Makefile b/java/apache-commons-collections/Makefile index 6cf56f61c3b6..418fb814fc48 100644 --- a/java/apache-commons-collections/Makefile +++ b/java/apache-commons-collections/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-collections PORTVERSION= 3.2.2 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_SOURCE PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-collections4/Makefile b/java/apache-commons-collections4/Makefile index 145698f0e56f..157b25944c3b 100644 --- a/java/apache-commons-collections4/Makefile +++ b/java/apache-commons-collections4/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-collections4 DISTVERSION= 4.5.0-M3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_BINARIES MASTER_SITE_SUBDIR= collections diff --git a/java/apache-commons-dbcp/Makefile b/java/apache-commons-dbcp/Makefile index a1c9bc886360..ea629edae4c7 100644 --- a/java/apache-commons-dbcp/Makefile +++ b/java/apache-commons-dbcp/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-dbcp PORTVERSION= 2.12.0 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= java databases MASTER_SITES= https://archive.apache.org/dist/commons/dbcp/binaries/ PKGNAMEPREFIX= apache- @@ -15,7 +15,6 @@ LICENSE= APACHE20 RUN_DEPENDS= ${JAVALIBDIR}/commons-pool.jar:java/apache-commons-pool USES= java -JAVA_VERSION= 8 OPTIONS_DEFINE= DOCS diff --git a/java/apache-commons-httpclient/Makefile b/java/apache-commons-httpclient/Makefile index 4637201b4d11..8915ead0bca4 100644 --- a/java/apache-commons-httpclient/Makefile +++ b/java/apache-commons-httpclient/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-httpclient DISTVERSION= 3.1 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java www MASTER_SITES= APACHE/httpcomponents/${PORTNAME}/source PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-lang/Makefile b/java/apache-commons-lang/Makefile index b1148e7088b6..cc2a452ec4cb 100644 --- a/java/apache-commons-lang/Makefile +++ b/java/apache-commons-lang/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-lang PORTVERSION= 2.6 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_SOURCE PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-lang3/Makefile b/java/apache-commons-lang3/Makefile index 9ce9c7d62af3..e4a0b6f63d48 100644 --- a/java/apache-commons-lang3/Makefile +++ b/java/apache-commons-lang3/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-lang3 PORTVERSION= 3.19.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_BINARIES/lang PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-logging/Makefile b/java/apache-commons-logging/Makefile index c9a1722b214f..8813b3d12c65 100644 --- a/java/apache-commons-logging/Makefile +++ b/java/apache-commons-logging/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-logging DISTVERSION= 1.3.5 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= apache- diff --git a/java/apache-commons-pool/Makefile b/java/apache-commons-pool/Makefile index f5f1dd40998e..7a73bbd618e3 100644 --- a/java/apache-commons-pool/Makefile +++ b/java/apache-commons-pool/Makefile @@ -1,6 +1,6 @@ PORTNAME= commons-pool DISTVERSION= 2.13.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= APACHE_COMMONS_BINARIES PKGNAMEPREFIX= apache- diff --git a/java/aparapi/Makefile b/java/aparapi/Makefile index 0fe0629a747d..b99edb9cb2d0 100644 --- a/java/aparapi/Makefile +++ b/java/aparapi/Makefile @@ -1,6 +1,6 @@ PORTNAME= aparapi PORTVERSION= 1.0.0 -PORTREVISION= 4 +PORTREVISION= 5 DISTVERSIONSUFFIX= -SNAPSHOT CATEGORIES= java lang diff --git a/java/avis/Makefile b/java/avis/Makefile index e260f48fbeb5..340e0625f89b 100644 --- a/java/avis/Makefile +++ b/java/avis/Makefile @@ -1,6 +1,6 @@ PORTNAME= avis PORTVERSION= 1.2.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java net MASTER_SITES= SF/${PORTNAME}/Avis%20router/Release%20${PORTVERSION} DISTNAME= ${PORTNAME}-src-${PORTVERSION} diff --git a/java/berkeley-db/Makefile b/java/berkeley-db/Makefile index dccf43480112..d74afbe2d516 100644 --- a/java/berkeley-db/Makefile +++ b/java/berkeley-db/Makefile @@ -1,6 +1,6 @@ PORTNAME= je PORTVERSION= 7.5.11 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java databases MASTER_SITES= http://download.oracle.com/berkeley-db/ \ http://download-east.oracle.com/berkeley-db/ \ diff --git a/java/bluej/Makefile b/java/bluej/Makefile index f9052790fae9..686e1dce2801 100644 --- a/java/bluej/Makefile +++ b/java/bluej/Makefile @@ -1,6 +1,6 @@ PORTNAME= bluej PORTVERSION= 4.2.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java editors MASTER_SITES= http://www.bluej.org/download/files/ DISTNAME= BlueJ-generic-${PORTVERSION:S/.//g} diff --git a/java/bouncycastle/Makefile b/java/bouncycastle/Makefile index 3e4caa49d022..a4023df1c5d4 100644 --- a/java/bouncycastle/Makefile +++ b/java/bouncycastle/Makefile @@ -1,6 +1,6 @@ PORTNAME= bouncycastle DISTVERSION= 1.71 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java security MASTER_SITES= http://www.bouncycastle.org/download/ \ http://polydistortion.net/bc/download/ diff --git a/java/dbvis/Makefile b/java/dbvis/Makefile index 74e41c50c0dd..f42af9a13f3f 100644 --- a/java/dbvis/Makefile +++ b/java/dbvis/Makefile @@ -1,5 +1,6 @@ PORTNAME= dbvis DISTVERSION= 26.1 +PORTREVISION= 1 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/eclipse-cdt/Makefile b/java/eclipse-cdt/Makefile index 88b8805708cf..fa0b657c70bc 100644 --- a/java/eclipse-cdt/Makefile +++ b/java/eclipse-cdt/Makefile @@ -1,6 +1,6 @@ PORTNAME= cdt PORTVERSION= 9.0.1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= ECLIPSE/tools/${PORTNAME}/releases/9.0/sr1 \ ECLIPSE/releases/neon/201606221000:base diff --git a/java/eclipse-drjava/Makefile b/java/eclipse-drjava/Makefile index ba34f0eed227..3c32026f6761 100644 --- a/java/eclipse-drjava/Makefile +++ b/java/eclipse-drjava/Makefile @@ -1,6 +1,6 @@ PORTNAME= drjava PORTVERSION= 0.9.8 -PORTREVISION= 8 +PORTREVISION= 9 CATEGORIES= java devel MASTER_SITES= SF/${PORTNAME}/3.%20DrJava%20Eclipse%20Plug-in/${PORTNAME}-eclipse-${PORTVERSION} PKGNAMEPREFIX= eclipse- diff --git a/java/eclipse-ecj/Makefile b/java/eclipse-ecj/Makefile index 8c6c6a00078f..19db59d97b83 100644 --- a/java/eclipse-ecj/Makefile +++ b/java/eclipse-ecj/Makefile @@ -1,6 +1,6 @@ PORTNAME= ecj PORTVERSION= 4.4.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= http://download.eclipse.org/eclipse/downloads/drops4/R-${PORTVERSION}-${DROPDATE}/ PKGNAMEPREFIX= eclipse- diff --git a/java/eclipse-findbugs/Makefile b/java/eclipse-findbugs/Makefile index 6fa6381afb5e..b4271698e5f1 100644 --- a/java/eclipse-findbugs/Makefile +++ b/java/eclipse-findbugs/Makefile @@ -1,6 +1,6 @@ PORTNAME= findbugs DISTVERSION= 3.0.1.20150306-5afe4d1 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}%20eclipse%20plugin/3.0.1 PKGNAMEPREFIX= eclipse- diff --git a/java/eclipse-pydev/Makefile b/java/eclipse-pydev/Makefile index e9d2a11a6edb..a30de186cf88 100644 --- a/java/eclipse-pydev/Makefile +++ b/java/eclipse-pydev/Makefile @@ -1,6 +1,6 @@ PORTNAME= pydev PORTVERSION= 13.1.0 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel python MASTER_SITES= https://github.com/fabioz/Pydev/releases/download/${PORTNAME}_13_1_0/ PKGNAMEPREFIX= eclipse- diff --git a/java/eclipse-shelled/Makefile b/java/eclipse-shelled/Makefile index 12125222b0fd..0715c92e0d4e 100644 --- a/java/eclipse-shelled/Makefile +++ b/java/eclipse-shelled/Makefile @@ -1,6 +1,6 @@ PORTNAME= ShellEd PORTVERSION= 1.0.2a -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= java devel MASTER_SITES= SF/${PORTNAME:tl}/${PORTNAME:tl}/1.0.2 PKGNAMEPREFIX= eclipse- diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 87b7ae8b051b..8a2bc5676f27 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -1,5 +1,6 @@ PORTNAME= eclipse DISTVERSION= 4.39 +PORTREVISION= 1 CATEGORIES= java devel ECLIPSE_TAG= R${DISTVERSION:S|.|_|g} diff --git a/java/hamcrest/Makefile b/java/hamcrest/Makefile index b65b95c57a4d..14646242007f 100644 --- a/java/hamcrest/Makefile +++ b/java/hamcrest/Makefile @@ -1,6 +1,6 @@ PORTNAME= hamcrest PORTVERSION= 1.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://repo1.maven.org/maven2/org/${PORTNAME}/${PORTNAME}-all/${PORTVERSION}/ DISTFILES= ${PORTNAME}-all-${PORTVERSION}.jar ${PORTNAME}-all-${PORTVERSION}-sources.jar diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index 5434cf0a5c7a..d601f5e9d8c4 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= 34 +PORTREVISION= 35 CATEGORIES= java www MAINTAINER= java@FreeBSD.org diff --git a/java/intellij-ultimate/Makefile b/java/intellij-ultimate/Makefile index 985c417192b9..6a5cc66ba607 100644 --- a/java/intellij-ultimate/Makefile +++ b/java/intellij-ultimate/Makefile @@ -1,6 +1,6 @@ PORTNAME= intellij-ultimate DISTVERSION= 2025.3 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://download-cdn.jetbrains.com/idea/ DISTNAME= idea-${DISTVERSION} diff --git a/java/intellij/Makefile b/java/intellij/Makefile index d2e69abdd3d3..68bfae884842 100644 --- a/java/intellij/Makefile +++ b/java/intellij/Makefile @@ -3,7 +3,7 @@ PORTNAME= intellij PORTVERSION= 2020.2.3 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java devel MASTER_SITES= https://download-cf.jetbrains.com/idea/ DISTNAME= ideaIC-${PORTVERSION}-no-jbr diff --git a/java/jai/Makefile b/java/jai/Makefile index 328e11ab5eb6..e36e44a7dd69 100644 --- a/java/jai/Makefile +++ b/java/jai/Makefile @@ -1,6 +1,6 @@ PORTNAME= jai DISTVERSION= 1_1_3 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java graphics MASTER_SITES= http://download.java.net/media/${PORTNAME}/builds/release/${PORTVERSION:S/./_/g}/ DISTNAME= ${PORTNAME}-${DISTVERSION}-lib diff --git a/java/jakarta-oro/Makefile b/java/jakarta-oro/Makefile index a14c9271b0ef..9d33b028ebcd 100644 --- a/java/jakarta-oro/Makefile +++ b/java/jakarta-oro/Makefile @@ -1,6 +1,6 @@ PORTNAME= jakarta-oro PORTVERSION= 2.0.8 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java MASTER_SITES= http://archive.apache.org/dist/jakarta/oro/ diff --git a/java/jasmin/Makefile b/java/jasmin/Makefile index 9df2631e6003..ab9e4b38cbd8 100644 --- a/java/jasmin/Makefile +++ b/java/jasmin/Makefile @@ -1,6 +1,6 @@ PORTNAME= jasmin PORTVERSION= 2.4 -PORTREVISION= 3 +PORTREVISION= 4 PORTEPOCH= 1 CATEGORIES= java lang MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/${PORTNAME}-${PORTVERSION} @@ -11,7 +11,6 @@ WWW= https://jasmin.sourceforge.net/ USES= dos2unix java:ant,run zip DOS2UNIX_REGEX= .*\.(txt|xml|j|class|java|mf|css|bnf|html) -JAVA_VERSION= 8 ALL_TARGET= jasmin diff --git a/java/jasmin/files/patch-build.xml b/java/jasmin/files/patch-build.xml index f45934f2397f..a95205f6321c 100644 --- a/java/jasmin/files/patch-build.xml +++ b/java/jasmin/files/patch-build.xml @@ -1,6 +1,6 @@ ---- build.xml.orig Sat Mar 24 15:05:35 2007 -+++ build.xml Sat Mar 24 15:06:33 2007 -@@ -77,7 +77,7 @@ +--- build.xml.orig 2026-04-08 13:05:32 UTC ++++ build.xml +@@ -77,7 +77,7 @@ --> <tstamp/> <property name="Name" value="Jasmin"/> <property name="name" value="jasmin"/> @@ -9,3 +9,34 @@ <property name="year" value="2006"/> <echo message="----------- ${Name} ${version} [${year}] ------------"/> +@@ -161,7 +161,6 @@ --> + <!-- =================================================================== --> + <target name="compile-jasmin" depends="prepare-jasmin"> + <javac srcdir="${build.jasmin.src}" +- source="1.4" + destdir="${build.jasmin.dest}" + debug="${debug}" + deprecation="${deprecation}" +@@ -186,7 +185,6 @@ --> + <target name="compile-java_cup" depends="prepare-jasmin"> + <mkdir dir="${build.jasmin.dest}/java_cup"/> + <javac srcdir="${build.jasmin.src}/java_cup" +- source="1.4" + destdir="${build.jasmin.dest}/java_cup" + debug="${debug}" + deprecation="${deprecation}" +@@ -230,7 +228,6 @@ --> + sourcepath="${src.dir}" + destdir="${apidocs.dir}" + author="true" +- additionalparam="-source 1.4" + version="true" + use="true" + splitindex="true" +@@ -294,4 +291,4 @@ --> + </target> + </project> + +-<!-- End of file --> +\ No newline at end of file ++<!-- End of file --> diff --git a/java/java-cup/Makefile b/java/java-cup/Makefile index 2d3de5e69e19..7a8a1931f099 100644 --- a/java/java-cup/Makefile +++ b/java/java-cup/Makefile @@ -1,6 +1,6 @@ PORTNAME= cup PORTVERSION= 11b.20160615 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://www2.cs.tum.edu/projects/cup/releases/ PKGNAMEPREFIX= java- diff --git a/java/java-getopt/Makefile b/java/java-getopt/Makefile index 03d475a2319e..1ff5e8fc02c0 100644 --- a/java/java-getopt/Makefile +++ b/java/java-getopt/Makefile @@ -1,6 +1,6 @@ PORTNAME= java-getopt PORTVERSION= 1.0.14 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= http://www.urbanophile.com/arenn/hacking/getopt/ diff --git a/java/java-subversion/Makefile b/java/java-subversion/Makefile index 922d70bed078..b5521428cbea 100644 --- a/java/java-subversion/Makefile +++ b/java/java-subversion/Makefile @@ -8,8 +8,8 @@ WWW= https://subversion.apache.org/ USES= compiler java JAVA_OS= native -PORTREVISION_LATEST= 1 -PORTREVISION_LTS= 1 +PORTREVISION_LATEST= 2 +PORTREVISION_LTS= 2 SVN_BUILD_BINDINGS= yes diff --git a/java/java3d/Makefile b/java/java3d/Makefile index db46eed56356..3d9980c1fd57 100644 --- a/java/java3d/Makefile +++ b/java/java3d/Makefile @@ -1,6 +1,6 @@ PORTNAME= java3d PORTVERSION= 1.5.2 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= java graphics games devel MASTER_SITES= https://sites.google.com/site/daemonwizard/ diff --git a/java/java3d/files/patch-freebsd b/java/java3d/files/patch-freebsd deleted file mode 100644 index 7e5635a72e8e..000000000000 --- a/java/java3d/files/patch-freebsd +++ /dev/null @@ -1,176 +0,0 @@ -diff -ruN ../java3d-1.5.2/j3d-core/build.xml ./j3d-core/build.xml ---- ../java3d-1.5.2/j3d-core/build.xml 2008-05-24 08:31:19.000000000 +1200 -+++ ./j3d-core/build.xml 2009-07-12 13:20:26.000000000 +1200 -@@ -142,6 +142,16 @@ - <echo message="version_file = ${version_file}"/> - </target> - -+ <target name="setupFreeBSD" if="isFreeBSD"> -+ <property name="isUnix" value="true"/> -+ <property name="shell" value="/bin/sh"/> -+ <property name="wstype" value="x11"/> -+ <property name="platformname" value="freebsd-${os.arch}"/> -+ <property name="platform" value="freebsd"/> -+ <property name="install.bin" value="lib/${os.arch}"/> -+ <property name="ports.localbase" value="/usr/local"/> -+ </target> -+ - <target name="setupSolaris" if="isSolarisOnSparc"> - <property name="isUnix" value="true"/> - <property name="shell" value="/usr/bin/ksh"/> -@@ -232,7 +242,7 @@ - </target> - - <target name="setupPlatform" -- depends="init, setupBuildType, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl"> -+ depends="init, setupBuildType, setupFreeBSD, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl"> - <property name="build-debug-gen" location="${build}/${platform}/debug/gen"/> - <property name="build-opt-gen" location="${build}/${platform}/opt/gen"/> - <property name="docname" value="${build.relprefix}-${version_file}-doc"/> -diff -ruN ../java3d-1.5.2/j3d-core/src/classes/build.xml ./j3d-core/src/classes/build.xml ---- ../java3d-1.5.2/j3d-core/src/classes/build.xml 2008-02-29 09:17:18.000000000 +1300 -+++ ./j3d-core/src/classes/build.xml 2009-07-12 13:19:17.000000000 +1200 -@@ -95,6 +95,7 @@ - <javac srcdir="${src}/classes/share:${src}/classes/${wstype}:${jogl.pipeline.srcdir}:${core_utils_src}/classes/share:${build-opt-gen}/classes" destdir="${build}/${platform}/opt/classes" - source="1.5" - target="1.5" -+ fork="yes" memoryMaximumSize="128m" - debug="true" - debuglevel="lines,source" - deprecation="off" -@@ -318,7 +319,7 @@ - excludepackagenames="com.sun.j3d.utils.scenegraph.io.retained, - com.sun.j3d.exp.swing.impl, - com.sun.j3d.utils.scenegraph.io.state.*" -- maxmemory="128m" -+ maxmemory="256m" - destdir="${build}/${platform}/javadocs/docs-public" - bottom="${javadoc.bottom}" - windowtitle="${build.javadoc.name} ${version}"> -diff -ruN ../java3d-1.5.2/j3d-core/src/native/build.xml ./j3d-core/src/native/build.xml ---- ../java3d-1.5.2/j3d-core/src/native/build.xml 2008-02-29 09:17:58.000000000 +1300 -+++ ./j3d-core/src/native/build.xml 2009-07-12 13:19:17.000000000 +1200 -@@ -3,6 +3,19 @@ - <!-- Ant file for building native files --> - <project name="j3d-core native" default="compile-opt"> - -+ <target name="nativeSetup-debug-freebsd" if="isFreeBSD"> -+ <property name="bldFlag" value="-g -DDEBUG"/> -+ <property name="coreLibDependency" value="lib/${os.arch}/libj3dcore-ogl.so"/> -+ <property name="osNativeConfigTemplate3D" value="X11NativeConfigTemplate3D"/> -+ <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/> -+ </target> -+ <target name="nativeSetup-opt-freebsd" if="isFreeBSD"> -+ <property name="bldFlag" value="-O2"/> -+ <property name="coreLibDependency" value="lib/${os.arch}/libj3dcore-ogl.so"/> -+ <property name="osNativeConfigTemplate3D" value="X11NativeConfigTemplate3D"/> -+ <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/> -+ </target> -+ - <target name="nativeSetup-debug-solaris" if="isSolarisOnSparc"> - <property name="bldFlag" value="-g -DDEBUG"/> - <property name="coreLibDependency" value="lib/sparc/libj3dcore-ogl.so"/> -@@ -62,7 +75,7 @@ - <property name="osNativeScreenInfo" value="Win32NativeScreenInfo"/> - </target> - -- <target name="nativeSetup-debug" depends="nativeSetup-debug-solaris, nativeSetup-debug-solaris-x86, nativeSetup-debug-linux, nativeSetup-debug-linux-amd64, nativeSetup-debug-linux-ia64, nativeSetup-debug-linux-ppc, nativeSetup-debug-win32, nativeSetup-debug-winamd64"> -+ <target name="nativeSetup-debug" depends="nativeSetup-debug-freebsd, nativeSetup-debug-solaris, nativeSetup-debug-solaris-x86, nativeSetup-debug-linux, nativeSetup-debug-linux-amd64, nativeSetup-debug-linux-ia64, nativeSetup-debug-linux-ppc, nativeSetup-debug-win32, nativeSetup-debug-winamd64"> - <property name="bldType" value="debug"/> - <property name="javahCoreSrc" - location="${src}/classes/share/javax/media/j3d"/> -@@ -128,7 +141,7 @@ - <property name="osNativeScreenInfo" value="Win32NativeScreenInfo"/> - </target> - -- <target name="nativeSetup-opt" depends="nativeSetup-opt-solaris, nativeSetup-opt-solaris-x86, nativeSetup-opt-linux, nativeSetup-opt-linux-amd64, nativeSetup-opt-linux-ia64, nativeSetup-opt-linux-ppc, nativeSetup-opt-win32, nativeSetup-opt-winamd64"> -+ <target name="nativeSetup-opt" depends="nativeSetup-opt-freebsd, nativeSetup-opt-solaris, nativeSetup-opt-solaris-x86, nativeSetup-opt-linux, nativeSetup-opt-linux-amd64, nativeSetup-opt-linux-ia64, nativeSetup-opt-linux-ppc, nativeSetup-opt-win32, nativeSetup-opt-winamd64"> - <property name="bldType" value="opt"/> - <property name="javahCoreSrc" - location="${src}/classes/share/javax/media/j3d"/> -@@ -347,6 +360,7 @@ - <javah destdir="${javahCoreTarget}" force="yes"> - <classpath> - <pathelement path="${build}/${platform}/${bldType}/classes"/> -+ <pathelement path="${vecmath_home}/build/opt/lib/ext/vecmath.jar"/> - </classpath> - - <class name="javax.media.j3d.Background"/> -diff -ruN ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml ./j3d-core/src/native/ogl/build-freebsd.xml ---- ../java3d-1.5.2/j3d-core/src/native/ogl/build-freebsd.xml 1970-01-01 12:00:00.000000000 +1200 -+++ ./j3d-core/src/native/ogl/build-freebsd.xml 2009-07-12 13:21:41.000000000 +1200 -@@ -0,0 +1,74 @@ -+<?xml version="1.0"?> -+ -+<!-- Ant file for building native ogl renderer files for FreeBSD --> -+<project name="j3d-core native" default="compile"> -+ -+ <target name="init" depends="init-cg,init-nocg"> -+ <!-- Create the build directories for freebsd --> -+ <mkdir dir="${build}/${platform}/${bldType}/native/ogl/objs"/> -+ <mkdir dir="${build}/${platform}/${bldType}/lib/${os.arch}"/> -+ -+ <property name="oglsrc" location="${src}/native/ogl"/> -+ </target> -+ -+ <target name="init-cg" if="build.cg"> -+ <property name="cflags.cg" value="-DCOMPILE_CG_SHADERS=1"/> -+ </target> -+ -+ <target name="init-nocg" unless="build.cg"> -+ <property name="cflags.cg" value=""/> -+ </target> -+ -+ <target name="compile-ogl"> -+ <echo message="Executing native renderer build [${bldType}]"/> -+ -+ <!-- Compile the c source files--> -+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> -+ <arg line="-fPIC -I${oglsrc} -I${ports.localbase}/include -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/> -+ </exec> -+ -+ <!-- Create the library file--> -+ <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> -+ -+ <target name="compile-ogl-cg" if="build.cg"> -+ <!-- Compile the wrapper --> -+ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> -+ <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> -+ </exec> -+ -+ <!-- Create the wrapper library --> -+ <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> -+ -+ <target name="compile" depends="init,compile-ogl,compile-ogl-cg"> -+ -+ <!-- Copy the library file --> -+ <copy todir="${build}/${platform}/${bldType}/lib/${os.arch}"> -+ <fileset dir="${build}/${platform}/${bldType}/native/ogl/objs" -+ includes="libj3dcore-ogl*.so" -+ /> -+ </copy> -+ -+ </target> -+ -+ <target name="dist"> -+ <!-- Create the distribution directory --> -+ <mkdir dir="${dist}/${platform}/lib/${os.arch}"/> -+ -+ <!-- Copy the library files --> -+ <copy todir="${dist}/${platform}/lib/${os.arch}"> -+ <fileset dir="${build}/${platform}/opt/lib/${os.arch}" -+ includes="libj3dcore-ogl*.so" -+ /> -+ </copy> -+ -+ </target> -+ -+</project> diff --git a/java/java3d/files/patch-ImageComponentState.java b/java/java3d/files/patch-j3d-core-utils_src_classes_share_com_sun_j3d_utils_scenegraph_io_state_javax_media_j3d_ImageComponentState.java index 6eacc3fa0a09..9a230c2f8413 100644 --- a/java/java3d/files/patch-ImageComponentState.java +++ b/java/java3d/files/patch-j3d-core-utils_src_classes_share_com_sun_j3d_utils_scenegraph_io_state_javax_media_j3d_ImageComponentState.java @@ -1,7 +1,6 @@ -work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d ---- j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java.orig +--- j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java.orig 2007-02-09 17:20:35 UTC +++ j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/io/state/javax/media/j3d/ImageComponentState.java -@@ -61,10 +61,7 @@ import com.sun.j3d.utils.scenegraph.io.r +@@ -61,10 +61,7 @@ import java.awt.image.DataBuffer; import com.sun.j3d.utils.scenegraph.io.retained.SGIORuntimeException; import java.awt.color.ColorSpace; import java.awt.image.DataBuffer; @@ -13,7 +12,7 @@ work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/ public abstract class ImageComponentState extends NodeComponentState { -@@ -203,10 +200,9 @@ public abstract class ImageComponentStat +@@ -203,10 +200,9 @@ public abstract class ImageComponentState extends Node private void writeBufferedImageJpegCompression( DataOutput out, BufferedImage image ) throws IOException { ByteArrayOutputStream byteStream = new ByteArrayOutputStream(); @@ -27,7 +26,7 @@ work/java3d-1.5.2/j3d-core-utils/src/classes/share/com/sun/j3d/utils/scenegraph/ byte[] buffer = byteStream.toByteArray(); out.writeInt( buffer.length ); -@@ -261,11 +257,15 @@ public abstract class ImageComponentStat +@@ -261,11 +257,15 @@ public abstract class ImageComponentState extends Node byte[] buffer = new byte[ size ]; in.readFully( buffer ); ByteArrayInputStream byteStream = new ByteArrayInputStream( buffer ); diff --git a/java/java3d/files/patch-j3d-core_build.xml b/java/java3d/files/patch-j3d-core_build.xml new file mode 100644 index 000000000000..27cf7573bdb2 --- /dev/null +++ b/java/java3d/files/patch-j3d-core_build.xml @@ -0,0 +1,28 @@ +--- j3d-core/build.xml.orig 2008-05-23 20:31:19 UTC ++++ j3d-core/build.xml +@@ -142,6 +142,16 @@ + <echo message="version_file = ${version_file}"/> + </target> + ++ <target name="setupFreeBSD" if="isFreeBSD"> ++ <property name="isUnix" value="true"/> ++ <property name="shell" value="/bin/sh"/> ++ <property name="wstype" value="x11"/> ++ <property name="platformname" value="freebsd-${os.arch}"/> ++ <property name="platform" value="freebsd"/> ++ <property name="install.bin" value="lib/${os.arch}"/> ++ <property name="ports.localbase" value="/usr/local"/> ++ </target> ++ + <target name="setupSolaris" if="isSolarisOnSparc"> + <property name="isUnix" value="true"/> + <property name="shell" value="/usr/bin/ksh"/> +@@ -232,7 +242,7 @@ + </target> + + <target name="setupPlatform" +- depends="init, setupBuildType, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl"> ++ depends="init, setupBuildType, setupFreeBSD, setupSolaris, setupSolarisX86, setupLinux, setupLinuxAmd64, setupLinuxIA64, setupLinuxPPC, setupWindows, setupWindowsAmd64, setupMacOSX, setupJogl"> + <property name="build-debug-gen" location="${build}/${platform}/debug/gen"/> + <property name="build-opt-gen" location="${build}/${platform}/opt/gen"/> + <property name="docname" value="${build.relprefix}-${version_file}-doc"/> diff --git a/java/java3d/files/patch-j3d-core_src_classes_build.xml b/java/java3d/files/patch-j3d-core_src_classes_build.xml new file mode 100644 index 000000000000..7bfc8635f7e5 --- /dev/null +++ b/java/java3d/files/patch-j3d-core_src_classes_build.xml @@ -0,0 +1,19 @@ +--- j3d-core/src/classes/build.xml.orig 2008-02-28 20:17:18 UTC ++++ j3d-core/src/classes/build.xml +@@ -95,6 +95,7 @@ + <javac srcdir="${src}/classes/share:${src}/classes/${wstype}:${jogl.pipeline.srcdir}:${core_utils_src}/classes/share:${build-opt-gen}/classes" destdir="${build}/${platform}/opt/classes" + source="1.5" + target="1.5" ++ fork="yes" memoryMaximumSize="128m" + debug="true" + debuglevel="lines,source" + deprecation="off" +@@ -318,7 +319,7 @@ + excludepackagenames="com.sun.j3d.utils.scenegraph.io.retained, + com.sun.j3d.exp.swing.impl, + com.sun.j3d.utils.scenegraph.io.state.*" +- maxmemory="128m" ++ maxmemory="256m" + destdir="${build}/${platform}/javadocs/docs-public" + bottom="${javadoc.bottom}" + windowtitle="${build.javadoc.name} ${version}"> diff --git a/java/java3d/files/patch-j3d-core_src_native_build.xml b/java/java3d/files/patch-j3d-core_src_native_build.xml new file mode 100644 index 000000000000..905364d04866 --- /dev/null +++ b/java/java3d/files/patch-j3d-core_src_native_build.xml @@ -0,0 +1,48 @@ +--- j3d-core/src/native/build.xml.orig 2008-02-28 20:17:58 UTC ++++ j3d-core/src/native/build.xml +@@ -3,6 +3,19 @@ + <!-- Ant file for building native files --> + <project name="j3d-core native" default="compile-opt"> + ++ <target name="nativeSetup-debug-freebsd" if="isFreeBSD"> ++ <property name="bldFlag" value="-g -DDEBUG"/> ++ <property name="coreLibDependency" value="lib/${os.arch}/libj3dcore-ogl.so"/> ++ <property name="osNativeConfigTemplate3D" value="X11NativeConfigTemplate3D"/> ++ <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/> ++ </target> ++ <target name="nativeSetup-opt-freebsd" if="isFreeBSD"> ++ <property name="bldFlag" value="-O2"/> ++ <property name="coreLibDependency" value="lib/${os.arch}/libj3dcore-ogl.so"/> ++ <property name="osNativeConfigTemplate3D" value="X11NativeConfigTemplate3D"/> ++ <property name="osNativeScreenInfo" value="X11NativeScreenInfo"/> ++ </target> ++ + <target name="nativeSetup-debug-solaris" if="isSolarisOnSparc"> + <property name="bldFlag" value="-g -DDEBUG"/> + <property name="coreLibDependency" value="lib/sparc/libj3dcore-ogl.so"/> +@@ -62,7 +75,7 @@ + <property name="osNativeScreenInfo" value="Win32NativeScreenInfo"/> + </target> + +- <target name="nativeSetup-debug" depends="nativeSetup-debug-solaris, nativeSetup-debug-solaris-x86, nativeSetup-debug-linux, nativeSetup-debug-linux-amd64, nativeSetup-debug-linux-ia64, nativeSetup-debug-linux-ppc, nativeSetup-debug-win32, nativeSetup-debug-winamd64"> ++ <target name="nativeSetup-debug" depends="nativeSetup-debug-freebsd, nativeSetup-debug-solaris, nativeSetup-debug-solaris-x86, nativeSetup-debug-linux, nativeSetup-debug-linux-amd64, nativeSetup-debug-linux-ia64, nativeSetup-debug-linux-ppc, nativeSetup-debug-win32, nativeSetup-debug-winamd64"> + <property name="bldType" value="debug"/> + <property name="javahCoreSrc" + location="${src}/classes/share/javax/media/j3d"/> +@@ -128,7 +141,7 @@ + <property name="osNativeScreenInfo" value="Win32NativeScreenInfo"/> + </target> + +- <target name="nativeSetup-opt" depends="nativeSetup-opt-solaris, nativeSetup-opt-solaris-x86, nativeSetup-opt-linux, nativeSetup-opt-linux-amd64, nativeSetup-opt-linux-ia64, nativeSetup-opt-linux-ppc, nativeSetup-opt-win32, nativeSetup-opt-winamd64"> ++ <target name="nativeSetup-opt" depends="nativeSetup-opt-freebsd, nativeSetup-opt-solaris, nativeSetup-opt-solaris-x86, nativeSetup-opt-linux, nativeSetup-opt-linux-amd64, nativeSetup-opt-linux-ia64, nativeSetup-opt-linux-ppc, nativeSetup-opt-win32, nativeSetup-opt-winamd64"> + <property name="bldType" value="opt"/> + <property name="javahCoreSrc" + location="${src}/classes/share/javax/media/j3d"/> +@@ -347,6 +360,7 @@ + <javah destdir="${javahCoreTarget}" force="yes"> + <classpath> + <pathelement path="${build}/${platform}/${bldType}/classes"/> ++ <pathelement path="${vecmath_home}/build/opt/lib/ext/vecmath.jar"/> + </classpath> + + <class name="javax.media.j3d.Background"/> diff --git a/java/java3d/files/patch-j3d-core_src_native_ogl_build-freebsd.xml b/java/java3d/files/patch-j3d-core_src_native_ogl_build-freebsd.xml new file mode 100644 index 000000000000..738dbc9f237d --- /dev/null +++ b/java/java3d/files/patch-j3d-core_src_native_ogl_build-freebsd.xml @@ -0,0 +1,77 @@ +--- j3d-core/src/native/ogl/build-freebsd.xml.orig 2026-04-09 07:04:07 UTC ++++ j3d-core/src/native/ogl/build-freebsd.xml +@@ -0,0 +1,74 @@ ++<?xml version="1.0"?> ++ ++<!-- Ant file for building native ogl renderer files for FreeBSD --> ++<project name="j3d-core native" default="compile"> ++ ++ <target name="init" depends="init-cg,init-nocg"> ++ <!-- Create the build directories for freebsd --> ++ <mkdir dir="${build}/${platform}/${bldType}/native/ogl/objs"/> ++ <mkdir dir="${build}/${platform}/${bldType}/lib/${os.arch}"/> ++ ++ <property name="oglsrc" location="${src}/native/ogl"/> ++ </target> ++ ++ <target name="init-cg" if="build.cg"> ++ <property name="cflags.cg" value="-DCOMPILE_CG_SHADERS=1"/> ++ </target> ++ ++ <target name="init-nocg" unless="build.cg"> ++ <property name="cflags.cg" value=""/> ++ </target> ++ ++ <target name="compile-ogl"> ++ <echo message="Executing native renderer build [${bldType}]"/> ++ ++ <!-- Compile the c source files--> ++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> ++ <arg line="-fPIC -I${oglsrc} -I${ports.localbase}/include -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/DrawingSurfaceObjectAWT.c ${oglsrc}/Canvas3D.c ${oglsrc}/GraphicsContext3D.c ${oglsrc}/NativeScreenInfo.c ${oglsrc}/NativeConfigTemplate3D.c ${oglsrc}/MasterControl.c ${oglsrc}/GeometryArrayRetained.c ${oglsrc}/Attributes.c ${oglsrc}/CgShaderProgram.c ${oglsrc}/GLSLShaderProgram.c ${oglsrc}/Lights.c"/> ++ </exec> ++ ++ <!-- Create the library file--> ++ <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> ++ ++ <target name="compile-ogl-cg" if="build.cg"> ++ <!-- Compile the wrapper --> ++ <exec dir="${build}/${platform}/${bldType}/native/ogl/objs" executable="gcc"> ++ <arg line="-I${oglsrc} -I${java.home}/../include -I${java.home}/../include/freebsd -I${javahCoreTarget} ${bldFlag} -DLINUX ${cflags.cg} -c ${oglsrc}/CgWrapper.c"/> ++ </exec> ++ ++ <!-- Create the wrapper library --> ++ <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> ++ ++ <target name="compile" depends="init,compile-ogl,compile-ogl-cg"> ++ ++ <!-- Copy the library file --> ++ <copy todir="${build}/${platform}/${bldType}/lib/${os.arch}"> ++ <fileset dir="${build}/${platform}/${bldType}/native/ogl/objs" ++ includes="libj3dcore-ogl*.so" ++ /> ++ </copy> ++ ++ </target> ++ ++ <target name="dist"> ++ <!-- Create the distribution directory --> ++ <mkdir dir="${dist}/${platform}/lib/${os.arch}"/> ++ ++ <!-- Copy the library files --> ++ <copy todir="${dist}/${platform}/lib/${os.arch}"> ++ <fileset dir="${build}/${platform}/opt/lib/${os.arch}" ++ includes="libj3dcore-ogl*.so" ++ /> ++ </copy> ++ ++ </target> ++ ++</project> diff --git a/java/javacpp/Makefile b/java/javacpp/Makefile index fb95197fa505..bb35e1bccfb1 100644 --- a/java/javacpp/Makefile +++ b/java/javacpp/Makefile @@ -1,5 +1,6 @@ PORTNAME= javacpp DISTVERSION= 1.5.13 +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= https://repo1.maven.org/maven2/org/bytedeco/${PORTNAME}/${DISTVERSION}/ DISTFILES= ${DISTNAME}.jar diff --git a/java/javahelp/Makefile b/java/javahelp/Makefile index ebb2a89a75de..8e9e2b3cbdb5 100644 --- a/java/javahelp/Makefile +++ b/java/javahelp/Makefile @@ -1,6 +1,6 @@ PORTNAME= javahelp PORTVERSION= 2.0.05.20170719 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java devel MAINTAINER= ports@FreeBSD.org diff --git a/java/javamail/Makefile b/java/javamail/Makefile index bf6fc435d296..05a3640364a2 100644 --- a/java/javamail/Makefile +++ b/java/javamail/Makefile @@ -1,7 +1,7 @@ PORTNAME= javamail DISTVERSIONPREFIX= ${PORTNAME:tu}- DISTVERSION= 1_6_2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java mail MASTER_SITES= https://github.com/jakartaee/jaf-api/releases/download/1.2.1/:jaf DISTFILES= jakarta.activation.jar:jaf diff --git a/java/jcalendar/Makefile b/java/jcalendar/Makefile index a6e0404c639f..ea052c092834 100644 --- a/java/jcalendar/Makefile +++ b/java/jcalendar/Makefile @@ -1,6 +1,6 @@ PORTNAME= jcalendar PORTVERSION= 1.3.3 -PORTREVISION= 2 +PORTREVISION= 4 CATEGORIES= java misc MASTER_SITES= http://www.toedter.com/download/ @@ -9,7 +9,6 @@ COMMENT= Java Date Chooser WWW= https://www.toedter.com/en/jcalendar/ USES= java:ant,run zip -JAVA_VERSION= 8 WRKSRC= ${WRKDIR}/src PLIST_FILES= %%JAVAJARDIR%%/${PORTNAME}.jar \ diff --git a/java/jcalendar/files/patch-build.xml b/java/jcalendar/files/patch-build.xml new file mode 100644 index 000000000000..f2c44ec7874c --- /dev/null +++ b/java/jcalendar/files/patch-build.xml @@ -0,0 +1,10 @@ +--- build.xml.orig 2026-04-08 20:26:56 UTC ++++ build.xml +@@ -73,7 +73,6 @@ + debug="off" + deprecation="on" + optimize="on" +- source="1.4" + /> + </target> + diff --git a/java/jcckit/Makefile b/java/jcckit/Makefile index 395aeb43cc44..b5cae0f8e284 100644 --- a/java/jcckit/Makefile +++ b/java/jcckit/Makefile @@ -1,6 +1,6 @@ PORTNAME= jcckit PORTVERSION= 1.1 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java graphics MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/JCCKit%20${PORTVERSION} DISTNAME= ${PORTNAME} diff --git a/java/jcommon/Makefile b/java/jcommon/Makefile index 699c706ec07b..98db20f88010 100644 --- a/java/jcommon/Makefile +++ b/java/jcommon/Makefile @@ -1,6 +1,6 @@ PORTNAME= jcommon PORTVERSION= 1.0.23 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= SF/jfreechart/3.%20JCommon/${PORTVERSION} diff --git a/java/jd-gui/Makefile b/java/jd-gui/Makefile index 0f799c34d8c6..5330caf430be 100644 --- a/java/jd-gui/Makefile +++ b/java/jd-gui/Makefile @@ -1,6 +1,6 @@ PORTNAME= jd-gui PORTVERSION= 1.6.6 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONPREFIX= v CATEGORIES= java devel MASTER_SITES= https://github.com/java-decompiler/jd-gui/releases/download/v${PORTVERSION}/:jar diff --git a/java/jflex/Makefile b/java/jflex/Makefile index b6ae45d88a77..8c8b2e137d9d 100644 --- a/java/jflex/Makefile +++ b/java/jflex/Makefile @@ -1,6 +1,6 @@ PORTNAME= jflex PORTVERSION= 1.8.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://github.com/jflex-de/jflex/releases/download/v${PORTVERSION}/ diff --git a/java/jfreechart/Makefile b/java/jfreechart/Makefile index 48c72c381d5a..1935999e8323 100644 --- a/java/jfreechart/Makefile +++ b/java/jfreechart/Makefile @@ -1,6 +1,6 @@ PORTNAME= jfreechart PORTVERSION= 1.0.17 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java graphics MASTER_SITES= SF/${PORTNAME}/1.%20JFreeChart/${PORTVERSION} diff --git a/java/jgraph/Makefile b/java/jgraph/Makefile index f94830f7fabf..d493245cbada 100644 --- a/java/jgraph/Makefile +++ b/java/jgraph/Makefile @@ -1,6 +1,6 @@ PORTNAME= jgraph PORTVERSION= 5.13.0.4 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java graphics MASTER_SITES= http://www.jgraph.com/downloads/jgraph/archive/ \ http://www.bayofrum.net/dist/jgraph/ diff --git a/java/jgraphx/Makefile b/java/jgraphx/Makefile index 91af7b1c69d7..d1b3e45d6484 100644 --- a/java/jgraphx/Makefile +++ b/java/jgraphx/Makefile @@ -1,6 +1,6 @@ PORTNAME= jgraphx PORTVERSION= 4.2.2 -PORTREVISION= 2 +PORTREVISION= 4 DISTVERSIONPREFIX= v CATEGORIES= java graphics @@ -14,7 +14,6 @@ LICENSE_FILE= ${WRKSRC}/license.txt USES= java:ant,run USE_GITHUB= yes GH_ACCOUNT= jgraph -JAVA_VERSION= 8 # math/scilab needs java 8 compatible classes NO_ARCH= yes diff --git a/java/jgraphx/files/patch-build.xml b/java/jgraphx/files/patch-build.xml new file mode 100644 index 000000000000..8bb26d7ca3d1 --- /dev/null +++ b/java/jgraphx/files/patch-build.xml @@ -0,0 +1,30 @@ +# math/scilab needs java 8 compatible classes + +--- build.xml.orig 2026-04-08 19:59:20 UTC ++++ build.xml +@@ -60,6 +60,8 @@ --> + debug="${compile.debug}" + deprecation="${compile.deprecation}" + optimize="${compile.optimize}" ++ source="8" ++ target="8" + destdir="${basedir}/classes"> + <classpath> + <pathelement path="${basedir}/classes"/> +@@ -75,6 +77,7 @@ --> + classpath="${basedir}/classes" + destdir="${basedir}/docs/api" + use="true" ++ source="8" + author="false" + version="false" + windowtitle="${product.name} ${product.version} API Specification" +@@ -152,6 +155,8 @@ --> + + <target name="example" depends="build" description="Compiles the examples"> + <javac srcdir="${example.home}" debug="${compile.debug}" deprecation="${compile.deprecation}" ++ source="8" ++ target="8" + optimize="${compile.optimize}" destdir="${example.home}"> + <classpath> + <pathelement path="${basedir}/lib/${all.jar}"/> diff --git a/java/jlex/Makefile b/java/jlex/Makefile index a9c5a5534e87..0af5138365c1 100644 --- a/java/jlex/Makefile +++ b/java/jlex/Makefile @@ -1,6 +1,6 @@ PORTNAME= jlex PORTVERSION= 1.2.6 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java devel MASTER_SITES= http://www.cs.princeton.edu/~appel/modern/java/JLex/Archive/1.2.6/ DISTNAME= Main diff --git a/java/jmf/Makefile b/java/jmf/Makefile index 649485c937d2..aa9712d6ffd4 100644 --- a/java/jmf/Makefile +++ b/java/jmf/Makefile @@ -1,6 +1,6 @@ PORTNAME= jmf PORTVERSION= 2.1.1e -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java multimedia DISTNAME= ${PORTNAME}-${PORTVERSION:S/./_/g}-alljava diff --git a/java/jode/Makefile b/java/jode/Makefile index 3bb028a15ddb..5e7f4f476b39 100644 --- a/java/jode/Makefile +++ b/java/jode/Makefile @@ -1,6 +1,6 @@ PORTNAME= jode PORTVERSION= 1.1.1.1 -PORTREVISION= 6 +PORTREVISION= 7 CATEGORIES= java devel MASTER_SITES= SF/${PORTNAME}/${PORTNAME}/1.1.2-pre1 DISTNAME= ${PORTNAME}-${VENDOR_VERSION} diff --git a/java/jrosetta/Makefile b/java/jrosetta/Makefile index 24204863f79e..f012ec28b622 100644 --- a/java/jrosetta/Makefile +++ b/java/jrosetta/Makefile @@ -1,6 +1,6 @@ PORTNAME= jrosetta PORTVERSION= 1.0.4 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= java devel MASTER_SITES= http://maven.artenum.com/content/groups/public/com/artenum/${PORTNAME}/${PORTNAME}-api/${PORTVERSION}/:api \ http://maven.artenum.com/content/groups/public/com/artenum/${PORTNAME}/${PORTNAME}-engine/${PORTVERSION}/:engine diff --git a/java/jtiger/Makefile b/java/jtiger/Makefile index 944bad7c79a9..24c1e291d4ee 100644 --- a/java/jtiger/Makefile +++ b/java/jtiger/Makefile @@ -1,6 +1,6 @@ PORTNAME= jtiger PORTVERSION= 2.1.0376 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= http://kaiwitte.org/jtiger/ diff --git a/java/jump/Makefile b/java/jump/Makefile index 8cf951feddd9..99b6f9b877b3 100644 --- a/java/jump/Makefile +++ b/java/jump/Makefile @@ -1,6 +1,6 @@ PORTNAME= jump PORTVERSION= 0.5 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java math MASTER_SITES= SF/${PORTNAME}-math/${PORTNAME}/${PORTVERSION} diff --git a/java/junit/Makefile b/java/junit/Makefile index e6d7d17492f9..aec72828fdfc 100644 --- a/java/junit/Makefile +++ b/java/junit/Makefile @@ -1,6 +1,6 @@ PORTNAME= junit DISTVERSION= 4.13.2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://repo1.maven.org/maven2/${PORTNAME}/${PORTNAME}/${DISTVERSION}/ DISTFILES= ${DISTNAME}.jar ${DISTNAME}-sources.jar diff --git a/java/jxgrabkey/Makefile b/java/jxgrabkey/Makefile index 9028c8640e4e..58d79e15fbbc 100644 --- a/java/jxgrabkey/Makefile +++ b/java/jxgrabkey/Makefile @@ -1,6 +1,6 @@ PORTNAME= jxgrabkey PORTVERSION= 0.3.2 -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java devel MASTER_SITES= SF DISTFILES= ${PORTNAME}-${PORTVERSION}_src${EXTRACT_SUFX} diff --git a/java/lightweight-java-profiler/Makefile b/java/lightweight-java-profiler/Makefile index 5b332fc8001a..2b3b828d998b 100644 --- a/java/lightweight-java-profiler/Makefile +++ b/java/lightweight-java-profiler/Makefile @@ -1,6 +1,6 @@ PORTNAME= lightweight-java-profiler PORTVERSION= g20170308 -PORTREVISION= 1 +PORTREVISION= 3 CATEGORIES= java devel MAINTAINER= ports@FreeBSD.org @@ -17,7 +17,6 @@ ONLY_FOR_ARCHS= amd64 i386 ONLY_FOR_ARCHS_REASON= assembly only available for x86 USES= gmake java shebangfix -JAVA_VERSION= 8 USE_GITHUB= yes GH_ACCOUNT= inevity GH_TAGNAME= e8041b5 @@ -26,7 +25,7 @@ USE_LDCONFIG= yes SHEBANG_FILES= Makefile -MAKE_ENV= JAVA_HOME=${LOCALBASE}/openjdk8 +MAKE_ENV= JAVA_HOME=${JAVA_HOME} .include <bsd.port.pre.mk> diff --git a/java/netbeans/Makefile b/java/netbeans/Makefile index 6b877be176fb..e9c26b992985 100644 --- a/java/netbeans/Makefile +++ b/java/netbeans/Makefile @@ -1,5 +1,6 @@ PORTNAME= netbeans DISTVERSION= 29 +PORTREVISION= 1 CATEGORIES= java devel MASTER_SITES= APACHE/netbeans/netbeans/${DISTVERSION}/ DISTNAME= netbeans-${DISTVERSION}-bin diff --git a/java/netrexx/Makefile b/java/netrexx/Makefile index ea433dae4761..1d0790ce4404 100644 --- a/java/netrexx/Makefile +++ b/java/netrexx/Makefile @@ -1,6 +1,6 @@ PORTNAME= NetRexx PORTVERSION= 2.05 -PORTREVISION= 4 +PORTREVISION= 5 CATEGORIES= java lang MASTER_SITES= ftp://ftp.software.ibm.com/software/awdtools/netrexx/ DISTNAME= NetRexx diff --git a/java/netty/Makefile b/java/netty/Makefile index 092cd2fefa52..1fa8f56d2738 100644 --- a/java/netty/Makefile +++ b/java/netty/Makefile @@ -1,6 +1,6 @@ PORTNAME= netty PORTVERSION= 4.1.53 -PORTREVISION= 1 +PORTREVISION= 2 DISTVERSIONSUFFIX= .Final CATEGORIES= java devel MASTER_SITES= http://dl.bintray.com/netty/downloads/ diff --git a/java/openjdk11/Makefile b/java/openjdk11/Makefile index df374344d96d..612ad8181df6 100644 --- a/java/openjdk11/Makefile +++ b/java/openjdk11/Makefile @@ -53,7 +53,7 @@ MAKE_ENV= LANG="C" \ CXX=${CXX} \ CPP=${CPP} \ LOG=cmdlines \ - MAKEFLAGS="" + MAKEFLAGS="CONF_CHECK=ignore" JDK_ARCH= ${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc/ppc/} BOOTSTRAPJDKFILE= openjdk11-11.0.29+7.1.${JDK_ARCH}.tar.xz diff --git a/java/openjdk17/Makefile b/java/openjdk17/Makefile index 2647ddd9f869..760fa5a5ba2c 100644 --- a/java/openjdk17/Makefile +++ b/java/openjdk17/Makefile @@ -52,7 +52,7 @@ MAKE_ENV= LANG="C" \ CXX=${CXX} \ CPP=${CPP} \ LOG=cmdlines \ - MAKEFLAGS="" + MAKEFLAGS="CONF_CHECK=ignore" JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} BOOTSTRAPJDKFILE= openjdk17-17.0.17+10.1.${JDK_ARCH}.tar.xz diff --git a/java/openjdk21/Makefile b/java/openjdk21/Makefile index f073cea9f4c9..00b5fe8d0fff 100644 --- a/java/openjdk21/Makefile +++ b/java/openjdk21/Makefile @@ -53,7 +53,7 @@ MAKE_ENV= LANG="C" \ CXX=${CXX} \ CPP=${CPP} \ LOG=cmdlines \ - MAKEFLAGS="" + MAKEFLAGS="CONF_CHECK=ignore" JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} BOOTSTRAPJDKFILE= openjdk21-21.0.9+10.1.${JDK_ARCH}.tar.xz diff --git a/java/openjdk22/Makefile b/java/openjdk22/Makefile deleted file mode 100644 index ec094df130f4..000000000000 --- a/java/openjdk22/Makefile +++ /dev/null @@ -1,191 +0,0 @@ -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} -MASTER_SITES= LOCAL/openjdk:boot -DISTFILES= ${BOOTSTRAPJDKFILE}:boot - -MAINTAINER= java@FreeBSD.org -COMMENT?= Java Development Kit ${JDK_MAJOR_VERSION} -WWW= https://openjdk.java.net/projects/jdk/22/ - -LICENSE= GPLv2 - -DEPRECATED= No longer supported by upstream -EXPIRATION_DATE= 2026-04-12 - -ONLY_FOR_ARCHS= aarch64 amd64 i386 powerpc64 powerpc64le - -BUILD_DEPENDS= zip:archivers/zip \ - autoconf>0:devel/autoconf \ - ${LOCALBASE}/include/cups/cups.h:print/cups \ - bash:shells/bash \ - gsed:textproc/gsed -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 -RUN_DEPENDS= javavm:java/javavmwrapper \ - xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype - -USES= compiler:features cpe gmake iconv jpeg pkgconfig xorg -USE_XORG= x11 xext xi xrandr xrender xt xtst - -CPE_VENDOR= oracle - -USE_GITHUB= yes -GH_ACCOUNT= battleblow -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" \ - CLASSPATH="" \ - JAVA_HOME="" \ - LD_LIBRARY_PATH="" \ - CC=${CC} \ - CXX=${CXX} \ - CPP=${CPP} \ - LOG=cmdlines \ - MAKEFLAGS="" - -JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} -BOOTSTRAPJDKFILE= openjdk22-22.0.2+9.1_2.${JDK_ARCH}.tar.xz -JDK_OSARCH= bsd-${JDK_ARCH} -JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} -.if defined(BUILD_JRE) -JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre -.else -JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk -.endif -INSTALLDIR= ${PREFIX}/${PKGBASE} -BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk - -NOPRECIOUSMAKEVARS= yes - -JDK_MAJOR_VERSION= 22 -JDK_MINOR_VERSION= 0 -JDK_PATCH_VERSION= 2 -JDK_BUILD_NUMBER= 9 -BSD_JDK_VERSION= 1 - -JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 - -GNU_CONFIGURE= yes -CONFIGURE_ENV= CC=${CC} \ - CXX=${CXX} \ - CPP=${CPP} \ - 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-freetype-include=${LOCALBASE}/include/freetype2 \ - --with-freetype-lib=${LOCALBASE}/lib \ - --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}" - -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> - -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-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}" -.else -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 -CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}" -CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}" -.endif - -.if ${ARCH} == aarch64 -CONFIGURE_ARGS+= --with-boot-jdk-jvmargs=-XX:-UseCompressedClassPointers --disable-dtrace -MAKE_ENV+= JAVA_TOOL_OPTIONS="-XX:-UseCompressedClassPointers" -.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/openjdk22/distinfo b/java/openjdk22/distinfo deleted file mode 100644 index e8332114080f..000000000000 --- a/java/openjdk22/distinfo +++ /dev/null @@ -1,13 +0,0 @@ -TIMESTAMP = 1722138875 -SHA256 (openjdk22-22.0.2+9.1_2.aarch64.tar.xz) = 887281b7b4fe8f29d3dae1f537e91f52ceda8003aa1c7f36368885c43ae96515 -SIZE (openjdk22-22.0.2+9.1_2.aarch64.tar.xz) = 169326232 -SHA256 (openjdk22-22.0.2+9.1_2.ppc64.tar.xz) = 23873f8e3a82b94c974831a293768ce0c30c3a2ddd366c2287b72cec8975f920 -SIZE (openjdk22-22.0.2+9.1_2.ppc64.tar.xz) = 168129156 -SHA256 (openjdk22-22.0.2+9.1_2.ppc64le.tar.xz) = 5413106ff0906f1cc21d3ca88bf0919b443fc8168364f3e4b803e00757b37777 -SIZE (openjdk22-22.0.2+9.1_2.ppc64le.tar.xz) = 169066748 -SHA256 (openjdk22-22.0.2+9.1_2.x86.tar.xz) = 6c4bd9fd60d21ed0b4c9d13a72391e9a09f0f9654a5ef7cf8443a41562d9e231 -SIZE (openjdk22-22.0.2+9.1_2.x86.tar.xz) = 165259492 -SHA256 (openjdk22-22.0.2+9.1_2.x86_64.tar.xz) = 35df03be023f64176d5f3dc1ff4dfc8b70863f9ae0cd1fd4057b703a837444cf -SIZE (openjdk22-22.0.2+9.1_2.x86_64.tar.xz) = 171246324 -SHA256 (battleblow-jdk22u-jdk-22.0.2+9-1_GH0.tar.gz) = 5e2731b979cab49d5004cf0aca58c642c94c1808c48278bff6c440945874f24c -SIZE (battleblow-jdk22u-jdk-22.0.2+9-1_GH0.tar.gz) = 112154344 diff --git a/java/openjdk22/files/patch-configure b/java/openjdk22/files/patch-configure deleted file mode 100644 index 4bc4479f5e4a..000000000000 --- a/java/openjdk22/files/patch-configure +++ /dev/null @@ -1,14 +0,0 @@ ---- configure.orig 2019-03-12 12:38:39.648907000 -0700 -+++ configure 2019-03-12 12:39:04.275572000 -0700 -@@ -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. -@@ -32,4 +32,4 @@ - # 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/openjdk22/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk22/files/patch-make_autoconf_flags-cflags.m4 deleted file mode 100644 index 5156c18515da..000000000000 --- a/java/openjdk22/files/patch-make_autoconf_flags-cflags.m4 +++ /dev/null @@ -1,13 +0,0 @@ ---- make/autoconf/flags-cflags.m4.orig 2020-01-08 09:12:31 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" - 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 - fi - - elif test "x$TOOLCHAIN_TYPE" = xsolstudio; then diff --git a/java/openjdk22/files/patch-make_autoconf_help.m4 b/java/openjdk22/files/patch-make_autoconf_help.m4 deleted file mode 100644 index 6581b3fef247..000000000000 --- a/java/openjdk22/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/openjdk22/files/patch-make_autoconf_libraries.m4 b/java/openjdk22/files/patch-make_autoconf_libraries.m4 deleted file mode 100644 index 0911464a6522..000000000000 --- a/java/openjdk22/files/patch-make_autoconf_libraries.m4 +++ /dev/null @@ -1,15 +0,0 @@ ---- make/autoconf/libraries.m4~ 2019-08-12 19:10:36.292217000 -0700 -+++ make/autoconf/libraries.m4 2019-08-12 19:18:15.523606000 -0700 -@@ -188,9 +188,9 @@ - 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/openjdk22/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk22/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk deleted file mode 100644 index 65f66318255d..000000000000 --- a/java/openjdk22/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk +++ /dev/null @@ -1,11 +0,0 @@ ---- make/modules/java.desktop/lib/Awt2dLibraries.gmk.orig 2021-09-18 15:30:22.109237000 -0700 -+++ make/modules/java.desktop/lib/Awt2dLibraries.gmk 2021-09-18 15:31:02.024314000 -0700 -@@ -530,7 +530,7 @@ - LDFLAGS_unix := -L$(INSTALL_LIBRARIES_HERE), \ - LDFLAGS_aix := -Wl$(COMMA)-berok, \ - LIBS := $(BUILD_LIBFONTMANAGER_FONTLIB), \ -- LIBS_unix := -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ -+ LIBS_unix := -lfontconfig -lawt -ljava -ljvm $(LIBM) $(LIBCXX), \ - LIBS_macosx := -lawt_lwawt -framework CoreText -framework CoreFoundation -framework CoreGraphics, \ - LIBS_windows := $(WIN_JAVA_LIB) advapi32.lib user32.lib gdi32.lib \ - $(WIN_AWT_LIB), \ diff --git a/java/openjdk22/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk22/files/patch-src_hotspot_os_bsd_os__bsd.cpp deleted file mode 100644 index 402f0f475bc3..000000000000 --- a/java/openjdk22/files/patch-src_hotspot_os_bsd_os__bsd.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- 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/openjdk22/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c b/java/openjdk22/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c deleted file mode 100644 index 537ecdc3047c..000000000000 --- a/java/openjdk22/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c +++ /dev/null @@ -1,209 +0,0 @@ ---- src/java.desktop/share/native/libfontmanager/freetypeScaler.c.orig 2020-07-08 21:34:01 UTC -+++ src/java.desktop/share/native/libfontmanager/freetypeScaler.c -@@ -43,6 +43,7 @@ - #include FT_SYNTHESIS_H - #include FT_LCD_FILTER_H - #include FT_MODULE_H -+#include <fontconfig/fontconfig.h> - - #include "fontscaler.h" - -@@ -87,6 +88,133 @@ typedef struct FTScalerContext { - int ptsz; /* size in points */ - } FTScalerContext; - -+typedef struct { -+ FT_Render_Mode ftRenderMode; -+ int ftLoadFlags; -+ FT_LcdFilter ftLcdFilter; -+} RenderingProperties; -+ -+static FcPattern* matchedPattern(const FcChar8* family, double ptSize) { -+ FcPattern* pattern = FcPatternCreate(); -+ if (!pattern) -+ return 0; -+ -+ FcPatternAddString(pattern, FC_FAMILY, family); -+ FcPatternAddBool(pattern, FC_SCALABLE, FcTrue); -+ FcPatternAddDouble(pattern, FC_SIZE, ptSize); -+ -+ FcConfigSubstitute(0, pattern, FcMatchPattern); -+ FcDefaultSubstitute(pattern); -+ -+ FcResult res; -+ FcPattern *match = FcFontMatch(0, pattern, &res); -+ FcPatternDestroy(pattern); -+ return (res == FcResultMatch) ? match : NULL; -+} -+ -+static void readFontconfig(const FcChar8* family, double ptSize, jint aaType, RenderingProperties* rp) { -+ FcPattern *pattern = matchedPattern(family, ptSize); -+ -+ FT_Render_Mode ftRenderMode = FT_RENDER_MODE_NORMAL; -+ int ftLoadFlags = FT_LOAD_DEFAULT; -+ FT_LcdFilter ftLcdFilter = FT_LCD_FILTER_DEFAULT; -+ FcBool fcAntialias = 0; -+ char horizontal = 1; -+ -+ // subpixel order -+ if (aaType == TEXT_AA_ON) -+ ftRenderMode = FT_RENDER_MODE_NORMAL; -+ else if (aaType == TEXT_AA_OFF) -+ ftRenderMode = FT_RENDER_MODE_MONO; -+ else { -+ int fcRGBA = FC_RGBA_UNKNOWN; -+ if (pattern) -+ FcPatternGetInteger(pattern, FC_RGBA, 0, &fcRGBA); -+ switch (fcRGBA) { -+ case FC_RGBA_NONE: -+ ftRenderMode = FT_RENDER_MODE_NORMAL; -+ break; -+ case FC_RGBA_RGB: -+ case FC_RGBA_BGR: -+ ftRenderMode = FT_RENDER_MODE_LCD; -+ horizontal = 1; -+ break; -+ case FC_RGBA_VRGB: -+ case FC_RGBA_VBGR: -+ ftRenderMode = FT_RENDER_MODE_LCD_V; -+ horizontal = 0; -+ break; -+ default: -+ ftRenderMode = FT_RENDER_MODE_NORMAL; -+ break; -+ } -+ } -+ -+ // loading mode -+ if (aaType == TEXT_AA_OFF) -+ ftLoadFlags |= FT_LOAD_TARGET_MONO; -+ else { -+ int fcHintStyle = FC_HINT_NONE; -+ if (pattern) -+ FcPatternGetInteger(pattern, FC_HINT_STYLE, 0, &fcHintStyle); -+ switch (fcHintStyle) { -+ case FC_HINT_NONE: -+ ftLoadFlags |= FT_LOAD_NO_HINTING; -+ break; -+ case FC_HINT_SLIGHT: -+ ftLoadFlags |= FT_LOAD_TARGET_LIGHT; -+ break; -+ case FC_HINT_MEDIUM: -+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL; -+ break; -+ case FC_HINT_FULL: -+ if (aaType == TEXT_AA_ON) -+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL; -+ else -+ ftLoadFlags |= horizontal ? FT_LOAD_TARGET_LCD : FT_LOAD_TARGET_LCD_V; -+ break; -+ default: -+ ftLoadFlags |= FT_LOAD_TARGET_NORMAL; -+ break; -+ } -+ } -+ -+ // autohinting -+ FcBool fcAutohint = 0; -+ if (pattern && FcPatternGetBool(pattern, FC_AUTOHINT, 0, &fcAutohint) == FcResultMatch) -+ if (fcAutohint) -+ ftLoadFlags |= FT_LOAD_FORCE_AUTOHINT; -+ -+ // LCD filter -+ int fcLCDFilter = FC_LCD_DEFAULT; -+ if (pattern) -+ FcPatternGetInteger(pattern, FC_LCD_FILTER, 0, &fcLCDFilter); -+ switch (fcLCDFilter) { -+ case FC_LCD_NONE: -+ ftLcdFilter = FT_LCD_FILTER_NONE; -+ break; -+ case FC_LCD_DEFAULT: -+ ftLcdFilter = FT_LCD_FILTER_DEFAULT; -+ break; -+ case FC_LCD_LIGHT: -+ ftLcdFilter = FT_LCD_FILTER_LIGHT; -+ break; -+ case FC_LCD_LEGACY: -+ ftLcdFilter = FT_LCD_FILTER_LEGACY; -+ break; -+ default: -+ ftLcdFilter = FT_LCD_FILTER_DEFAULT; -+ break; -+ } -+ -+ if (pattern) -+ FcPatternDestroy(pattern); -+ -+ rp->ftRenderMode = ftRenderMode; -+ rp->ftLoadFlags = ftLoadFlags; -+ rp->ftLcdFilter = ftLcdFilter; -+} -+ - #ifdef DEBUG - /* These are referenced in the freetype sources if DEBUG macro is defined. - To simplify work with debuging version of freetype we define -@@ -868,29 +996,12 @@ static jlong - renderFlags |= FT_LOAD_NO_HINTING; - } - -- if (!context->useSbits) { -- renderFlags |= FT_LOAD_NO_BITMAP; -- } -+ RenderingProperties renderingProperties; -+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name, -+ context->ptsz, context->aaType, &renderingProperties); - -- /* NB: in case of non identity transform -- we might also prefer to disable transform before hinting, -- and apply it explicitly after hinting is performed. -- Or we can disable hinting. */ -- -- /* select appropriate hinting mode */ -- if (context->aaType == TEXT_AA_OFF) { -- target = FT_LOAD_TARGET_MONO; -- } else if (context->aaType == TEXT_AA_ON) { -- target = FT_LOAD_TARGET_NORMAL; -- } else if (context->aaType == TEXT_AA_LCD_HRGB || -- context->aaType == TEXT_AA_LCD_HBGR) { -- target = FT_LOAD_TARGET_LCD; -- } else { -- target = FT_LOAD_TARGET_LCD_V; -- } -- renderFlags |= target; -- -- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); -+ FT_Library_SetLcdFilter(scalerInfo->library, renderingProperties.ftLcdFilter); -+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); - if (error) { - //do not destroy scaler yet. - //this can be problem of particular context (e.g. with bad transform) -@@ -915,11 +1026,11 @@ static jlong - glyphInfo = getNullGlyphImage(); - return ptr_to_jlong(glyphInfo); - } -- error = FT_Render_Glyph(ftglyph, FT_LOAD_TARGET_MODE(target)); -- if (error != 0) { -- return ptr_to_jlong(getNullGlyphImage()); -- } - } -+ error = FT_Render_Glyph(ftglyph, renderingProperties.ftRenderMode); -+ if (error != 0) { -+ return ptr_to_jlong(getNullGlyphImage()); -+ } - - if (renderImage) { - width = (UInt16) ftglyph->bitmap.width; -@@ -1134,9 +1245,11 @@ static FT_Outline* getFTOutline(JNIEnv* env, jobject f - return NULL; - } - -- renderFlags = FT_LOAD_NO_HINTING | FT_LOAD_NO_BITMAP; -+ RenderingProperties renderingProperties; -+ readFontconfig((const FcChar8 *) scalerInfo->face->family_name, -+ context->ptsz, context->aaType, &renderingProperties); - -- error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderFlags); -+ error = FT_Load_Glyph(scalerInfo->face, glyphCode, renderingProperties.ftLoadFlags); - if (error) { - return NULL; - } diff --git a/java/openjdk22/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk22/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c deleted file mode 100644 index 421548d0f4a5..000000000000 --- a/java/openjdk22/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/pkg-descr b/java/openjdk22/pkg-descr deleted file mode 100644 index bbc3e1c1edc7..000000000000 --- a/java/openjdk22/pkg-descr +++ /dev/null @@ -1 +0,0 @@ -An open-source implementation of the Java Platform, Standard Edition, diff --git a/java/openjdk22/pkg-message b/java/openjdk22/pkg-message deleted file mode 100644 index 811dcb1e3b58..000000000000 --- a/java/openjdk22/pkg-message +++ /dev/null @@ -1,16 +0,0 @@ -[ -{ type: install - message: <<EOM -This OpenJDK implementation may require procfs(5) mounted on /proc for some -applications. - -If you have not done it yet, please do the following: - - mount -t 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/openjdk23/Makefile b/java/openjdk23/Makefile index 8ac48f12b7d7..c2f572484908 100644 --- a/java/openjdk23/Makefile +++ b/java/openjdk23/Makefile @@ -58,7 +58,7 @@ MAKE_ENV= CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ LOG=cmdlines \ - MAKEFLAGS="" + MAKEFLAGS="CONF_CHECK=ignore" JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} BOOTSTRAPJDKFILE= openjdk23-23.0.2+7.2_1.${JDK_ARCH}.tar.xz diff --git a/java/openjdk24/Makefile b/java/openjdk24/Makefile index 4c1a1649f2eb..ac3687f5f51d 100644 --- a/java/openjdk24/Makefile +++ b/java/openjdk24/Makefile @@ -53,7 +53,7 @@ MAKE_ENV= CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ LOG=cmdlines \ - MAKEFLAGS="" + MAKEFLAGS="CONF_CHECK=ignore" JDK_ARCH= ${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/} BOOTSTRAPJDKFILE= openjdk24-24.0.2+12.2_2.${JDK_ARCH}.tar.xz diff --git a/java/openjdk25/Makefile b/java/openjdk25/Makefile index f73808b82620..21ad5e2697cf 100644 --- a/java/openjdk25/Makefile +++ b/java/openjdk25/Makefile @@ -1,7 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_FULL_VERSION:S/.0.0//} -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} MASTER_SITES= LOCAL/openjdk:boot @@ -29,7 +29,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le FLAVORS= jdk jre headless jre_headless headless_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-headless -jre_PKGNAMESUFFIX= -jre +jre_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre jre_headless_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre-headless FLAVOR?= ${BUILD_JRE:?jre:${FLAVORS:[1]}} @@ -101,7 +101,7 @@ MAKE_ENV= CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ LOG=cmdlines \ - MAKEFLAGS="" + MAKEFLAGS="CONF_CHECK=ignore" .if ${FLAVOR:Mjre*} ALL_TARGET= legacy-images diff --git a/java/openjdk26/Makefile b/java/openjdk26/Makefile index cfa7e4d5f5ce..62cd334194dc 100644 --- a/java/openjdk26/Makefile +++ b/java/openjdk26/Makefile @@ -1,6 +1,7 @@ PORTNAME= openjdk DISTVERSIONPREFIX= jdk- DISTVERSION= ${JDK_FULL_VERSION:S/.0.0//} +PORTREVISION= 1 CATEGORIES= java devel PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} MASTER_SITES= LOCAL/openjdk:boot @@ -28,7 +29,7 @@ ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le FLAVORS= jdk jre headless jre_headless headless_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-headless -jre_PKGNAMESUFFIX= -jre +jre_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre jre_headless_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre-headless FLAVOR?= ${BUILD_JRE:?jre:${FLAVORS:[1]}} @@ -100,7 +101,7 @@ MAKE_ENV= CLASSPATH="" \ JAVA_HOME="" \ LD_LIBRARY_PATH="" \ LOG=cmdlines \ - MAKEFLAGS="" + MAKEFLAGS="CONF_CHECK=ignore" .if ${FLAVOR:Mjre*} ALL_TARGET= legacy-images diff --git a/java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_atomicAccess__bsd__ppc.hpp b/java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_atomicAccess__bsd__ppc.hpp new file mode 100644 index 000000000000..b72ed96107c4 --- /dev/null +++ b/java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_atomicAccess__bsd__ppc.hpp @@ -0,0 +1,30 @@ +--- src/hotspot/os_cpu/bsd_ppc/atomicAccess_bsd_ppc.hpp.orig 2026-04-13 10:20:52 UTC ++++ src/hotspot/os_cpu/bsd_ppc/atomicAccess_bsd_ppc.hpp +@@ -0,0 +1,27 @@ ++/* ++ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2012, 2025 SAP SE. All rights reserved. ++ * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. ++ * ++ * This code is free software; you can redistribute it and/or modify it ++ * under the terms of the GNU General Public License version 2 only, as ++ * published by the Free Software Foundation. ++ * ++ * This code is distributed in the hope that it will be useful, but WITHOUT ++ * ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or ++ * FITNESS FOR A PARTICULAR PURPOSE. See the GNU General Public License ++ * version 2 for more details (a copy is included in the LICENSE file that ++ * accompanied this code). ++ * ++ * You should have received a copy of the GNU General Public License version ++ * 2 along with this work; if not, write to the Free Software Foundation, ++ * Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301 USA. ++ * ++ * Please contact Oracle, 500 Oracle Parkway, Redwood Shores, CA 94065 USA ++ * or visit www.oracle.com if you need additional information or have any ++ * questions. ++ * ++ */ ++ ++// Including inline assembler functions that are shared between multiple PPC64 platforms. ++#include "atomicAccess_ppc.hpp" diff --git a/java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_orderAccess__bsd__ppc.hpp b/java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_orderAccess__bsd__ppc.hpp new file mode 100644 index 000000000000..07877328b08c --- /dev/null +++ b/java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_orderAccess__bsd__ppc.hpp @@ -0,0 +1,80 @@ +--- src/hotspot/os_cpu/bsd_ppc/orderAccess_bsd_ppc.hpp.orig 2026-04-13 11:00:19 UTC ++++ src/hotspot/os_cpu/bsd_ppc/orderAccess_bsd_ppc.hpp +@@ -1,6 +1,6 @@ + /* +- * Copyright (c) 1997, 2020, Oracle and/or its affiliates. All rights reserved. +- * Copyright (c) 2012, 2014 SAP SE. All rights reserved. ++ * Copyright (c) 1997, 2025, Oracle and/or its affiliates. All rights reserved. ++ * Copyright (c) 2012, 2025 SAP SE. All rights reserved. + * DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. + * + * This code is free software; you can redistribute it and/or modify it +@@ -23,66 +23,5 @@ + * + */ + +-#ifndef OS_CPU_BSD_PPC_VM_ORDERACCESS_BSD_PPC_HPP +-#define OS_CPU_BSD_PPC_VM_ORDERACCESS_BSD_PPC_HPP +- +-// Included in orderAccess.hpp header file. +- +-#ifndef PPC64 +-#error "OrderAccess currently only implemented for PPC64" +-#endif +- +-// Compiler version last used for testing: gcc 4.1.2 +-// Please update this information when this file changes +- +-// Implementation of class OrderAccess. +- +-// +-// Machine barrier instructions: +-// +-// - sync Two-way memory barrier, aka fence. +-// - lwsync orders Store|Store, +-// Load|Store, +-// Load|Load, +-// but not Store|Load +-// - eieio orders Store|Store +-// - isync Invalidates speculatively executed instructions, +-// but isync may complete before storage accesses +-// associated with instructions preceding isync have +-// been performed. +-// +-// Semantic barrier instructions: +-// (as defined in orderAccess.hpp) +-// +-// - release orders Store|Store, (maps to lwsync) +-// Load|Store +-// - acquire orders Load|Store, (maps to lwsync) +-// Load|Load +-// - fence orders Store|Store, (maps to sync) +-// Load|Store, +-// Load|Load, +-// Store|Load +-// +- +-#define inlasm_sync() __asm__ __volatile__ ("sync" : : : "memory"); +-#define inlasm_lwsync() __asm__ __volatile__ ("lwsync" : : : "memory"); +-#define inlasm_eieio() __asm__ __volatile__ ("eieio" : : : "memory"); +-#define inlasm_isync() __asm__ __volatile__ ("isync" : : : "memory"); +- +-inline void OrderAccess::loadload() { inlasm_lwsync(); } +-inline void OrderAccess::storestore() { inlasm_lwsync(); } +-inline void OrderAccess::loadstore() { inlasm_lwsync(); } +-inline void OrderAccess::storeload() { inlasm_sync(); } +- +-inline void OrderAccess::acquire() { inlasm_lwsync(); } +-inline void OrderAccess::release() { inlasm_lwsync(); } +-inline void OrderAccess::fence() { inlasm_sync(); } +-inline void OrderAccess::cross_modify_fence_impl() +- { inlasm_isync(); } +- +-#undef inlasm_sync +-#undef inlasm_lwsync +-#undef inlasm_eieio +-#undef inlasm_isync +- +-#endif // OS_CPU_BSD_PPC_VM_ORDERACCESS_BSD_PPC_HPP ++// Including inline assembler functions that are shared between multiple PPC64 platforms. ++#include "orderAccess_ppc.hpp" diff --git a/java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp new file mode 100644 index 000000000000..d6c4a26c8093 --- /dev/null +++ b/java/openjdk26/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp @@ -0,0 +1,89 @@ +--- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig 2026-04-13 11:53:22 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) { +@@ -204,7 +204,6 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, + address stub = nullptr; + address pc = nullptr; + +- //%note os_trap_1 + if (info != nullptr && uc != nullptr && thread != nullptr) { + pc = (address) os::Posix::ucontext_get_pc(uc); + +@@ -279,15 +278,7 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, + + CodeBlob *cb = nullptr; + int stop_type = -1; +- // Handle signal from NativeJump::patch_verified_entry(). +- if (sig == SIGILL && nativeInstruction_at(pc)->is_sigill_not_entrant()) { +- if (TraceTraps) { +- tty->print_cr("trap: not_entrant"); +- } +- stub = SharedRuntime::get_handle_wrong_method_stub(); +- } +- +- else if ((sig == (USE_POLL_BIT_ONLY ? SIGTRAP : SIGSEGV)) && ++ if ((sig == (USE_POLL_BIT_ONLY ? SIGTRAP : SIGSEGV)) && + // A bsd-ppc64 kernel before 2.6.6 doesn't set si_addr on some segfaults + // in 64bit mode (cf. http://www.kernel.org/pub/bsd/kernel/v2.6/ChangeLog-2.6.6), + // especially when we try to read from the safepoint polling page. So the check +@@ -315,6 +306,17 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, + stub = SharedRuntime::polling_page_return_handler_blob()->entry_point(); + } + ++ // SIGTRAP-based nmethod entry barriers. ++ else if (sig == SIGTRAP && TrapBasedNMethodEntryBarriers && ++ nativeInstruction_at(pc)->is_sigtrap_nmethod_entry_barrier() && ++ CodeCache::contains((void*) pc)) { ++ if (TraceTraps) { ++ tty->print_cr("trap: nmethod entry barrier at " INTPTR_FORMAT " (SIGTRAP)", p2i(pc)); ++ } ++ stub = StubRoutines::method_entry_barrier(); ++ uc->uc_mcontext.mc_lr = (uintptr_t)(pc + BytesPerInstWord); // emulate call by setting LR ++ } ++ + // SIGTRAP-based ic miss check in compiled code. + else if (sig == SIGTRAP && TrapBasedICMissChecks && + nativeInstruction_at(pc)->is_sigtrap_ic_miss_check()) { +@@ -408,7 +410,8 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, + // flushing of icache is not necessary. + stub = pc + 4; // continue with next instruction. + } +- else if (thread->thread_state() == _thread_in_vm && ++ else if ((thread->thread_state() == _thread_in_vm || ++ thread->thread_state() == _thread_in_native) && + sig == SIGBUS && thread->doing_unsafe_access()) { + address next_pc = pc + 4; + if (UnsafeMemoryAccess::contains_pc(pc)) { +@@ -419,6 +422,15 @@ bool PosixSignals::pd_hotspot_signal_handler(int sig, + return true; + } + } ++ ++ // jni_fast_Get<Primitive>Field can trap at certain pc's if a GC kicks in ++ // and the heap gets shrunk before the field access. ++ if ((sig == SIGSEGV) || (sig == SIGBUS)) { ++ address addr = JNI_FastGetField::find_slowcase_pc(pc); ++ if (addr != (address)-1) { ++ stub = addr; ++ } ++ } + } + + if (stub != nullptr) { +@@ -497,7 +509,7 @@ void os::print_register_info(outputStream *st, const v + break; + default: + st->print("r%-2d=", n-3); +- print_location(st, uc->uc_mcontext.mc_gpr[n-3]); ++ print_location(st, (intptr_t)uc->uc_mcontext.mc_gpr[n-3]); + break; + } + ++n; diff --git a/java/openjfx14/Makefile b/java/openjfx14/Makefile index 81388d0893df..53ec7afcbbbd 100644 --- a/java/openjfx14/Makefile +++ b/java/openjfx14/Makefile @@ -1,6 +1,6 @@ PORTNAME= openjfx DISTVERSION= 14.0.2.1+1 -PORTREVISION= 19 +PORTREVISION= 20 CATEGORIES= java x11-toolkits devel MASTER_SITES= https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-core/7.7.1/:core \ https://repo.maven.apache.org/maven2/org/apache/lucene/lucene-grouping/7.7.1/:grouping \ diff --git a/java/phpeclipse/Makefile b/java/phpeclipse/Makefile index b8d0954c660e..3f4902ed14f3 100644 --- a/java/phpeclipse/Makefile +++ b/java/phpeclipse/Makefile @@ -1,6 +1,6 @@ PORTNAME= phpeclipse PORTVERSION= 1.2.3 -PORTREVISION= 9 +PORTREVISION= 10 CATEGORIES= java editors devel MASTER_SITES= SF/${PORTNAME}/a%29%20Eclipse%203.3.x/PHPEclipse-${PORTVERSION} DISTNAME= PHPEclipse-${PLIST_VER}-src diff --git a/java/proguard/Makefile b/java/proguard/Makefile index 54457a950918..e5bbd638096b 100644 --- a/java/proguard/Makefile +++ b/java/proguard/Makefile @@ -1,6 +1,6 @@ PORTNAME= proguard PORTVERSION= 7.0.0 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://github.com/Guardsquare/proguard/releases/download/v${PORTVERSION}/ diff --git a/java/sigar/Makefile b/java/sigar/Makefile index b9f14883336c..623f7d3e7f5f 100644 --- a/java/sigar/Makefile +++ b/java/sigar/Makefile @@ -1,6 +1,6 @@ PORTNAME= sigar PORTVERSION= 1.7.3 -PORTREVISION= 12 +PORTREVISION= 13 CATEGORIES= java devel PKGNAMEPREFIX= java- diff --git a/java/sqlitejdbc/Makefile b/java/sqlitejdbc/Makefile index cf41e036eef7..fdd9073e1ddb 100644 --- a/java/sqlitejdbc/Makefile +++ b/java/sqlitejdbc/Makefile @@ -2,7 +2,7 @@ PORTNAME= sqlitejdbc PORTVERSION= 056 DISTVERSIONPREFIX= v DISTVERSIONSUFFIX= -src -PORTREVISION= 3 +PORTREVISION= 4 CATEGORIES= java databases MASTER_SITES= http://files.zentus.com/sqlitejdbc/ diff --git a/java/trove4j/Makefile b/java/trove4j/Makefile index 6dec901b8c47..787c429c0848 100644 --- a/java/trove4j/Makefile +++ b/java/trove4j/Makefile @@ -1,6 +1,6 @@ PORTNAME= trove4j PORTVERSION= 3.1a1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://bitbucket.org/${PORTNAME}/trove/downloads/ DISTNAME= trove-${PORTVERSION} diff --git a/java/visualvm/Makefile b/java/visualvm/Makefile index db6fd667d81e..128bbaac7b8f 100644 --- a/java/visualvm/Makefile +++ b/java/visualvm/Makefile @@ -1,6 +1,6 @@ PORTNAME= visualvm DISTVERSION= 2.1.9 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java devel MASTER_SITES= https://github.com/oracle/visualvm/releases/download/${PORTVERSION}/ DISTNAME= visualvm_${PORTVERSION:S/.//g} diff --git a/java/wildfly/Makefile b/java/wildfly/Makefile index 1d4665d33b4b..9cbcfadaae6f 100644 --- a/java/wildfly/Makefile +++ b/java/wildfly/Makefile @@ -1,6 +1,6 @@ PORTNAME= wildfly DISTVERSION= 39.0.1 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= java www MASTER_SITES= https://github.com/${PORTNAME}/${PORTNAME}/releases/download/${WILDFLY_VERSION}/ DISTNAME= wildfly-${WILDFLY_VERSION} |