diff options
Diffstat (limited to 'java')
27 files changed, 352 insertions, 651 deletions
diff --git a/java/Makefile b/java/Makefile index 766accebdd6b..a4a2e0fd6188 100644 --- a/java/Makefile +++ b/java/Makefile @@ -46,6 +46,7 @@ SUBDIR += java-subversion SUBDIR += java-zoneinfo SUBDIR += java3d + SUBDIR += javacpp SUBDIR += javahelp SUBDIR += javamail SUBDIR += javavmwrapper @@ -81,13 +82,13 @@ SUBDIR += openjdk11-jre SUBDIR += openjdk17 SUBDIR += openjdk17-jre - SUBDIR += openjdk20 SUBDIR += openjdk21 SUBDIR += openjdk21-jre SUBDIR += openjdk22 SUBDIR += openjdk23 SUBDIR += openjdk24 SUBDIR += openjdk25 + SUBDIR += openjdk26 SUBDIR += openjdk8 SUBDIR += openjdk8-jre SUBDIR += openjfx14 diff --git a/java/eclipse/Makefile b/java/eclipse/Makefile index 49922c8e949a..87b7ae8b051b 100644 --- a/java/eclipse/Makefile +++ b/java/eclipse/Makefile @@ -1,6 +1,5 @@ PORTNAME= eclipse -DISTVERSION= 4.38 -PORTREVISION= 1 +DISTVERSION= 4.39 CATEGORIES= java devel ECLIPSE_TAG= R${DISTVERSION:S|.|_|g} @@ -64,12 +63,16 @@ MAVEN_PARAMS= --offline \ -Dnative=gtk.freebsd.${MAVEN_ARCH} \ -DskipTests clean verify -ECLIPSE_RESULT= eclipse.platform.releng.tychoeclipsebuilder/eclipse.platform.repository/target/products/org.eclipse.sdk.ide-freebsd.gtk.${MAVEN_ARCH}.tar.gz +ECLIPSE_RESULT= products/eclipse-sdk/target/products/org.eclipse.sdk.ide-freebsd.gtk.${MAVEN_ARCH}.tar.gz .if ${COMPILER_TYPE} == clang CFLAGS+= -Wno-deprecated-non-prototype .endif +_ICONS_PNG= 16 22 24 32 48 64 128 256 512 1024 +_ICONS_SVG= 16 32 48 +_ICONS_PATH= ${STAGEDIR}${DATADIR}/plugins/org.eclipse.platform_${DISTVERSION}.0.v* + do-build: cd ${WRKSRC} && ${SETENV} ${MAVEN_ENV} mvn ${MAVEN_PARAMS} @@ -78,9 +81,21 @@ do-install: ${TAR} -x --directory ${STAGEDIR}${DATADIR}/.. --file ${WRKSRC}/${ECLIPSE_RESULT} ${INSTALL_SCRIPT} ${WRKDIR}/${PORTNAME} ${STAGEDIR}${PREFIX}/bin + ${MKDIR} ${_ICONS_PNG:C|([0-9]*)|${STAGEDIR}${PREFIX}/share/icons/hicolor/\1x\1/apps|} +.for _ICON in ${_ICONS_PNG} + ${INSTALL_DATA} \ + ${_ICONS_PATH}/${PORTNAME}${_ICON}.png \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${_ICON}x${_ICON}/apps/${PORTNAME}.png +.endfor +.for _ICON in ${_ICONS_SVG} + ${INSTALL_DATA} \ + ${_ICONS_PATH}/${PORTNAME}${_ICON}.svg \ + ${STAGEDIR}${PREFIX}/share/icons/hicolor/${_ICON}x${_ICON}/apps/${PORTNAME}.svg +.endfor + # Generate dynamic plist, to cater for different ARCHS post-install: - cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} -not -type d >> ${TMPPLIST} + cd ${STAGEDIR}${PREFIX} && ${FIND} -s bin/${PORTNAME} share/${PORTNAME} share/icons -not -type d >> ${TMPPLIST} cd ${STAGEDIR}${PREFIX} && ${FIND} -ds share/${PORTNAME} -type d | ${SED} -e 's,^,@dir ,' >> ${TMPPLIST} .include <bsd.port.post.mk> diff --git a/java/eclipse/distinfo b/java/eclipse/distinfo index 7f7a836f6970..59cef3423c5d 100644 --- a/java/eclipse/distinfo +++ b/java/eclipse/distinfo @@ -1,29 +1,29 @@ -TIMESTAMP = 1765528395 -SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.38-R4_38_maintenance_GH0.tar.gz) = c0d44900fe9d64af0cb27d1b1fc2445508c8d2af3ff442616f6d1de3e6c252c9 -SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.38-R4_38_maintenance_GH0.tar.gz) = 26111995 -SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_38_GH0.tar.gz) = d1aa9abe7ed55abcab4933f1d576569d78766c51ddca7fc7dd54bb977d3b0378 -SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_38_GH0.tar.gz) = 40156 -SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_38_GH0.tar.gz) = d1e600c5f2595fa3838f104f708ed4da785c2677be429a4392013be48dac397c -SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_38_GH0.tar.gz) = 15861511 -SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_38_GH0.tar.gz) = 2e964233cf7c36da9755dd301dc74cd0436588af3377be4ac368954173f37d89 -SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_38_GH0.tar.gz) = 34885792 -SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_38_GH0.tar.gz) = a05314680bca99f52cb40cdaddd2c0e6996ef8727d4323b2a42c0d7a7d097881 -SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_38_GH0.tar.gz) = 2405662 -SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_38_GH0.tar.gz) = 5beea79773f7fe24fc8a31de796f003777fcc6ff61232c11f668b56af0405a87 -SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_38_GH0.tar.gz) = 26497055 -SHA256 (eclipse/chirontt-eclipse.pde-R4_38_maintenance_GH0.tar.gz) = 92f9497f1b7fc498f96d5d6236beb09671486c2090883028d98b490383e152d5 -SIZE (eclipse/chirontt-eclipse.pde-R4_38_maintenance_GH0.tar.gz) = 36076831 -SHA256 (eclipse/chirontt-eclipse.platform-R4_38_maintenance_GH0.tar.gz) = 88f086a23d444d416b6c2f688bc7f0f37cd8550729028766dec82c6b3d291cd0 -SIZE (eclipse/chirontt-eclipse.platform-R4_38_maintenance_GH0.tar.gz) = 16956101 -SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_38_maintenance_GH0.tar.gz) = fc7ebf35e9a478a056c9fc8da9801a96df5285e2ecb65f77685d297b5ffdb1da -SIZE (eclipse/chirontt-eclipse.platform.swt-R4_38_maintenance_GH0.tar.gz) = 11731948 -SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_38_maintenance_GH0.tar.gz) = cbae415598f28bd2e69ba0acb957a857122bffc1b971cefb2e4b9682978b172e -SIZE (eclipse/chirontt-eclipse.platform.ui-R4_38_maintenance_GH0.tar.gz) = 16537801 -SHA256 (eclipse/chirontt-equinox-R4_38_maintenance_GH0.tar.gz) = 66d2a87afc0c81cc98521cdfd26929c8c548f3dfe9fc4fd8f2572ad18c2a5e7d -SIZE (eclipse/chirontt-equinox-R4_38_maintenance_GH0.tar.gz) = 4198326 -SHA256 (eclipse/chirontt-equinox.binaries-R4_38_maintenance_GH0.tar.gz) = a3c840b7476eec595c00452ba2742c68636d7961912fb5477d2e4642bcdb4de4 -SIZE (eclipse/chirontt-equinox.binaries-R4_38_maintenance_GH0.tar.gz) = 1611409 -SHA256 (eclipse/chirontt-p2-R4_38_maintenance_GH0.tar.gz) = 8455d7382010d1a1232a0982e9b8323b15c5af62db619118e94df0025f5c3418 -SIZE (eclipse/chirontt-p2-R4_38_maintenance_GH0.tar.gz) = 54032735 -SHA256 (eclipse/NorbertXYZ-eclipse-maven-4.38_GH0.tar.gz) = 3d0cc3dd63062443aac636d55637cdf44858f34198e5541682f32610758118ac -SIZE (eclipse/NorbertXYZ-eclipse-maven-4.38_GH0.tar.gz) = 519463770 +TIMESTAMP = 1773648540 +SHA256 (eclipse/chirontt-eclipse.platform.releng.aggregator-4.39-R4_39_maintenance_GH0.tar.gz) = 378cd7c3037c84f539a1ed634811136da379f6eaac8c3682ccc49b8f2e1a48cc +SIZE (eclipse/chirontt-eclipse.platform.releng.aggregator-4.39-R4_39_maintenance_GH0.tar.gz) = 25797034 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt-R4_39_GH0.tar.gz) = 30c8b70e9fb6fc1f8c0369c61d2c443836900233b3be06dbda17074cb2d45061 +SIZE (eclipse/eclipse-jdt-eclipse.jdt-R4_39_GH0.tar.gz) = 40087 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core-R4_39_GH0.tar.gz) = 0e63a0efd614be76836baf3629c9098eb1ae33fdd799f444e021be261587b867 +SIZE (eclipse/eclipse-jdt-eclipse.jdt.core-R4_39_GH0.tar.gz) = 15924834 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_39_GH0.tar.gz) = ad7004e26857197b2007545fc4a57d59db6eebbe7d81d95f30f11280524a5679 +SIZE (eclipse/eclipse-jdt-eclipse.jdt.core.binaries-R4_39_GH0.tar.gz) = 34885788 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_39_GH0.tar.gz) = 0d69392d92abbcbaf913deb63ee07752b20b165d609e4ad502605b55316825f4 +SIZE (eclipse/eclipse-jdt-eclipse.jdt.debug-R4_39_GH0.tar.gz) = 2411125 +SHA256 (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_39_GH0.tar.gz) = 3e1cc77e45209db4920d93f41cbd265ab63c32078fa8c48403df8bc65c7f194c +SIZE (eclipse/eclipse-jdt-eclipse.jdt.ui-R4_39_GH0.tar.gz) = 26528884 +SHA256 (eclipse/chirontt-eclipse.pde-R4_39_maintenance_GH0.tar.gz) = ba86ec9fcf90f595f21fd99574efe7e41673b186f14061d76c2a2f5f313c6fca +SIZE (eclipse/chirontt-eclipse.pde-R4_39_maintenance_GH0.tar.gz) = 36098532 +SHA256 (eclipse/chirontt-eclipse.platform-R4_39_maintenance_GH0.tar.gz) = 74cdef78e42fb3598329606fef44edadb216cf3102994fbbe83f922e480986f6 +SIZE (eclipse/chirontt-eclipse.platform-R4_39_maintenance_GH0.tar.gz) = 18229588 +SHA256 (eclipse/chirontt-eclipse.platform.swt-R4_39_maintenance_GH0.tar.gz) = edec9d9814ce0147acf0a921fddbc04590233ba14fc01f9ab7c8f3e5a7e41477 +SIZE (eclipse/chirontt-eclipse.platform.swt-R4_39_maintenance_GH0.tar.gz) = 12026213 +SHA256 (eclipse/chirontt-eclipse.platform.ui-R4_39_maintenance_GH0.tar.gz) = 4afb5c8ccf6321eabac09c8efdd3e03d603b5c95d35c2be80229dac55b3a5352 +SIZE (eclipse/chirontt-eclipse.platform.ui-R4_39_maintenance_GH0.tar.gz) = 16530676 +SHA256 (eclipse/chirontt-equinox-R4_39_maintenance_GH0.tar.gz) = e8477d15f42cc47f8d50e8e350acff2ed26ff59faca083304442ed8a2562b8f1 +SIZE (eclipse/chirontt-equinox-R4_39_maintenance_GH0.tar.gz) = 4197745 +SHA256 (eclipse/chirontt-equinox.binaries-R4_39_maintenance_GH0.tar.gz) = 296b289dc17a4daf58902499ab56dfad91fa5723834d61442871c10e8092ace7 +SIZE (eclipse/chirontt-equinox.binaries-R4_39_maintenance_GH0.tar.gz) = 1612884 +SHA256 (eclipse/chirontt-p2-R4_39_maintenance_GH0.tar.gz) = 74026b592a39fbf0d8444be86c0e36b31ff0bd008428c3df3f197323f73b80d2 +SIZE (eclipse/chirontt-p2-R4_39_maintenance_GH0.tar.gz) = 54033896 +SHA256 (eclipse/NorbertXYZ-eclipse-maven-4.39_GH0.tar.gz) = a24d7dd54ce2e2fc9bf32dc0bb894bb7937c6b14a3dead3c84528e105230e923 +SIZE (eclipse/NorbertXYZ-eclipse-maven-4.39_GH0.tar.gz) = 502837774 diff --git a/java/icedtea-web/Makefile b/java/icedtea-web/Makefile index 1cbe56403533..5434cf0a5c7a 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= 33 +PORTREVISION= 34 CATEGORIES= java www MAINTAINER= java@FreeBSD.org diff --git a/java/java-getopt/Makefile b/java/java-getopt/Makefile index cf851d879e33..03d475a2319e 100644 --- a/java/java-getopt/Makefile +++ b/java/java-getopt/Makefile @@ -6,7 +6,7 @@ MASTER_SITES= http://www.urbanophile.com/arenn/hacking/getopt/ MAINTAINER= ports@FreeBSD.org COMMENT= Java version of GNU getopt family functions -WWW= https://www.urbanophile.com/arenn/hacking/download.html #getopt +WWW= https://www.urbanophile.com/arenn/hacking/download.html\#getopt LICENSE= LGPL20 diff --git a/java/javacpp/Makefile b/java/javacpp/Makefile new file mode 100644 index 000000000000..fb95197fa505 --- /dev/null +++ b/java/javacpp/Makefile @@ -0,0 +1,43 @@ +PORTNAME= javacpp +DISTVERSION= 1.5.13 +CATEGORIES= java devel +MASTER_SITES= https://repo1.maven.org/maven2/org/bytedeco/${PORTNAME}/${DISTVERSION}/ +DISTFILES= ${DISTNAME}.jar +EXTRACT_ONLY= + +MAINTAINER= markus.graf@markusgraf.net +COMMENT= Java-C++ bridge generator +WWW= https://github.com/bytedeco/javacpp + +LICENSE= APACHE20 + +ONLY_FOR_ARCHS= amd64 +ONLY_FOR_ARCHS_REASON= Needs upstream patch per arch + +TEST_DEPENDS= ${JAVALIBDIR}/junit.jar:java/junit \ + ${JAVALIBDIR}/hamcrest.jar:java/hamcrest \ + mvn:devel/maven + +USES= java + +USE_GITHUB= nodefault +GH_ACCOUNT= bytedeco:test +GH_PROJECT= ${PORTNAME}:test + +NO_BUILD= yes + +PLIST_FILES= ${JAVAJARDIR}/${PORTNAME}-${DISTVERSION}.jar \ + ${JAVAJARDIR}/${PORTNAME}.jar + +TESTING_UNSAFE= Requires network access + +do-install: + ${INSTALL_DATA} -v ${DISTDIR}/${DISTNAME}.jar ${STAGEDIR}/${JAVAJARDIR}/ + ${LN} -vsf ${DISTNAME}.jar ${STAGEDIR}/${JAVAJARDIR}/${PORTNAME}.jar + +do-test: +# Only extract for test, not on build servers + ${TAR} xf ${DISTDIR}/${DISTFILES:[2]:C/:.*//} -C ${WRKDIR} + cd ${WRKSRC} && mvn test + +.include <bsd.port.mk> diff --git a/java/javacpp/distinfo b/java/javacpp/distinfo new file mode 100644 index 000000000000..e4dbfe92cafd --- /dev/null +++ b/java/javacpp/distinfo @@ -0,0 +1,5 @@ +TIMESTAMP = 1773334874 +SHA256 (javacpp-1.5.13.jar) = 077f27d663cc928adce43e912a90ec06f97f92f120ca02d414735ae0fb1c743c +SIZE (javacpp-1.5.13.jar) = 526511 +SHA256 (bytedeco-javacpp-1.5.13_GH0.tar.gz) = 4d34c137af6158d69d4b24c65370d34cf9166130b8172c9d7fa5130e6a3105a3 +SIZE (bytedeco-javacpp-1.5.13_GH0.tar.gz) = 300523 diff --git a/java/javacpp/pkg-descr b/java/javacpp/pkg-descr new file mode 100644 index 000000000000..002007a0e884 --- /dev/null +++ b/java/javacpp/pkg-descr @@ -0,0 +1,4 @@ +JavaCPP provides efficient access to native C++ inside Java, not unlike the way +some C/C++ compilers interact with assembly language. No need to invent new +languages. Instead, similar to what cppyy strives to do for Python, it exploits +the syntactic and semantic similarities between Java and C++. diff --git a/java/openjdk20/Makefile b/java/openjdk20/Makefile deleted file mode 100644 index 5303be58d478..000000000000 --- a/java/openjdk20/Makefile +++ /dev/null @@ -1,182 +0,0 @@ -PORTNAME= openjdk -DISTVERSIONPREFIX= jdk- -DISTVERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} -PORTREVISION= 5 -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/20/ - -LICENSE= GPLv2 - -DEPRECATED= No longer supported by upstream -EXPIRATION_DATE= 2026-03-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= jdk20u - -NO_CCACHE= yes - -# Suppress passing -j to do-build target via Mk/bsd.port.mk -# In the JDK build the number of parallel jobs is passed in via configure --with-num-cores=N -_MAKE_JOBS= # -MAKE_ENV= LANG="C" \ - LC_ALL="C" \ - 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= openjdk20-20.0.2+9.1_3.${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= 20 -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 - @${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 - -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/openjdk20/distinfo b/java/openjdk20/distinfo deleted file mode 100644 index f9710d0a4a9b..000000000000 --- a/java/openjdk20/distinfo +++ /dev/null @@ -1,13 +0,0 @@ -TIMESTAMP = 1766157633 -SHA256 (openjdk20-20.0.2+9.1_3.aarch64.tar.xz) = 4f2cbd343d102ce64e074f6cdba2576314e4333034d73cde0fe862c60f116850 -SIZE (openjdk20-20.0.2+9.1_3.aarch64.tar.xz) = 165170468 -SHA256 (openjdk20-20.0.2+9.1_3.ppc64.tar.xz) = d4bb08c5d5cd14fd46a5d008d0abc06fa81e197738fdf85da285e547bf3fff7d -SIZE (openjdk20-20.0.2+9.1_3.ppc64.tar.xz) = 164279232 -SHA256 (openjdk20-20.0.2+9.1_3.ppc64le.tar.xz) = fa1443a9a5b5c111ff6e47ae5cc310cde307b740ed84ee7dfcd3f5dfecb64e7c -SIZE (openjdk20-20.0.2+9.1_3.ppc64le.tar.xz) = 165194700 -SHA256 (openjdk20-20.0.2+9.1_3.x86.tar.xz) = e282998ba34489b30563d49d19dca155c8b982cb400af0eaa71f683cb4506faf -SIZE (openjdk20-20.0.2+9.1_3.x86.tar.xz) = 161116020 -SHA256 (openjdk20-20.0.2+9.1_3.x86_64.tar.xz) = a9f76e7f51497ea06ca83076c879d38c5586464be83bdac6585495b6ce0b5c9f -SIZE (openjdk20-20.0.2+9.1_3.x86_64.tar.xz) = 167203788 -SHA256 (battleblow-jdk20u-jdk-20.0.2+9-1_GH0.tar.gz) = 61b32462e53841dd8641e6b21de91bae9a141ed58a41972f6a6cfba45ac8c4a2 -SIZE (battleblow-jdk20u-jdk-20.0.2+9-1_GH0.tar.gz) = 109736899 diff --git a/java/openjdk20/files/patch-configure b/java/openjdk20/files/patch-configure deleted file mode 100644 index 59daa4ff854f..000000000000 --- a/java/openjdk20/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, 2014, 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/openjdk20/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk20/files/patch-make_autoconf_flags-cflags.m4 deleted file mode 100644 index 5156c18515da..000000000000 --- a/java/openjdk20/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/openjdk20/files/patch-make_autoconf_help.m4 b/java/openjdk20/files/patch-make_autoconf_help.m4 deleted file mode 100644 index 6581b3fef247..000000000000 --- a/java/openjdk20/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/openjdk20/files/patch-make_hotspot_lib_JvmMapfile.gmk b/java/openjdk20/files/patch-make_hotspot_lib_JvmMapfile.gmk deleted file mode 100644 index 12bd16b87198..000000000000 --- a/java/openjdk20/files/patch-make_hotspot_lib_JvmMapfile.gmk +++ /dev/null @@ -1,20 +0,0 @@ ---- make/hotspot/lib/JvmMapfile.gmk.orig 2024-01-26 16:33:03 UTC -+++ make/hotspot/lib/JvmMapfile.gmk -@@ -53,7 +53,7 @@ endif - # platform dependent. - - ifeq ($(call isTargetOs, linux), true) -- DUMP_SYMBOLS_CMD := $(NM) --defined-only *$(OBJ_SUFFIX) -+ DUMP_SYMBOLS_CMD := $(NM) --extern-only --defined-only *$(OBJ_SUFFIX) - ifneq ($(FILTER_SYMBOLS_PATTERN), ) - FILTER_SYMBOLS_PATTERN := $(FILTER_SYMBOLS_PATTERN)| - endif -@@ -134,7 +134,7 @@ else ifeq ($(call isTargetOs, bsd), true) - if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \ - }' - else -- DUMP_SYMBOLS_CMD := $(NM) --defined-only *$(OBJ_SUFFIX) -+ DUMP_SYMBOLS_CMD := $(NM) --extern-only --defined-only *$(OBJ_SUFFIX) - FILTER_SYMBOLS_AWK_SCRIPT := \ - '{ \ - if ($$3 ~ /$(FILTER_SYMBOLS_PATTERN)/) print $$3; \ diff --git a/java/openjdk20/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk b/java/openjdk20/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk deleted file mode 100644 index 65f66318255d..000000000000 --- a/java/openjdk20/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/openjdk20/files/patch-src_hotspot_os__cpu_bsd__ppc_javaThread__bsd__ppc.cpp b/java/openjdk20/files/patch-src_hotspot_os__cpu_bsd__ppc_javaThread__bsd__ppc.cpp deleted file mode 100644 index 513f41c41191..000000000000 --- a/java/openjdk20/files/patch-src_hotspot_os__cpu_bsd__ppc_javaThread__bsd__ppc.cpp +++ /dev/null @@ -1,28 +0,0 @@ ---- src/hotspot/os_cpu/bsd_ppc/javaThread_bsd_ppc.cpp.orig 2023-10-02 13:02:10 UTC -+++ src/hotspot/os_cpu/bsd_ppc/javaThread_bsd_ppc.cpp -@@ -58,14 +58,14 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* - // if we were running Java code when SIGPROF came in. - if (isInJava) { - ucontext_t* uc = (ucontext_t*) ucontext; -- address pc = (address)uc->uc_mcontext.regs->nip; -+ address pc = (address)uc->uc_mcontext.mc_srr0; - - if (pc == NULL) { - // ucontext wasn't useful - return false; - } - -- frame ret_frame((intptr_t*)uc->uc_mcontext.regs->gpr[1/*REG_SP*/], pc); -+ frame ret_frame((intptr_t*)uc->uc_mcontext.mc_gpr[1/*REG_SP*/], pc); - - if (ret_frame.fp() == NULL) { - // The found frame does not have a valid frame pointer. -@@ -84,7 +84,7 @@ bool JavaThread::pd_get_top_frame_for_profiling(frame* - if (!Method::is_valid_method(m)) return false; - if (!Metaspace::contains(m->constMethod())) return false; - -- uint64_t reg_bcp = uc->uc_mcontext.regs->gpr[14/*R14_bcp*/]; -+ uint64_t reg_bcp = uc->uc_mcontext.mc_gpr[14/*R14_bcp*/]; - uint64_t istate_bcp = istate->bcp; - uint64_t code_start = (uint64_t)(m->code_base()); - uint64_t code_end = (uint64_t)(m->code_base() + m->code_size()); diff --git a/java/openjdk20/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp b/java/openjdk20/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp deleted file mode 100644 index d3b0e0b9821e..000000000000 --- a/java/openjdk20/files/patch-src_hotspot_os__cpu_bsd__ppc_os__bsd__ppc.cpp +++ /dev/null @@ -1,19 +0,0 @@ ---- src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp.orig 2022-12-21 16:54:47 UTC -+++ src/hotspot/os_cpu/bsd_ppc/os_bsd_ppc.cpp -@@ -187,16 +187,6 @@ frame os::current_frame() { - bool PosixSignals::pd_hotspot_signal_handler(int sig, siginfo_t* info, - ucontext_t* uc, JavaThread* thread) { - -- // Moved SafeFetch32 handling outside thread!=NULL conditional block to make -- // it work if no associated JavaThread object exists. -- if (uc) { -- address const pc = os::Posix::ucontext_get_pc(uc); -- if (pc && StubRoutines::is_safefetch_fault(pc)) { -- os::Posix::ucontext_set_pc(uc, StubRoutines::continuation_for_safefetch_fault(pc)); -- return true; -- } -- } -- - // decide if this trap can be handled by a stub - address stub = NULL; - address pc = NULL; diff --git a/java/openjdk20/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c b/java/openjdk20/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c deleted file mode 100644 index 537ecdc3047c..000000000000 --- a/java/openjdk20/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/openjdk20/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c b/java/openjdk20/files/patch-src_jdk.management_unix_native_libmanagement__ext_OperatingSystemImpl.c deleted file mode 100644 index 421548d0f4a5..000000000000 --- a/java/openjdk20/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/openjdk26/Makefile b/java/openjdk26/Makefile new file mode 100644 index 000000000000..cfa7e4d5f5ce --- /dev/null +++ b/java/openjdk26/Makefile @@ -0,0 +1,206 @@ +PORTNAME= openjdk +DISTVERSIONPREFIX= jdk- +DISTVERSION= ${JDK_FULL_VERSION:S/.0.0//} +CATEGORIES= java devel +PKGNAMESUFFIX?= ${JDK_MAJOR_VERSION} +MASTER_SITES= LOCAL/openjdk:boot +DISTFILES= ${BOOTSTRAPJDKFILE}:boot + +MAINTAINER= java@FreeBSD.org +COMMENT= ${COMMENT_${FLAVOR}} ${JDK_MAJOR_VERSION} +COMMENT_jdk= Java Development Kit +COMMENT_headless= Java Development Kit (headless version) +COMMENT_jre= Java Runtime Environment +COMMENT_jre_headless= Java Runtime Environment (headless version) + +WWW= https://openjdk.java.net/projects/jdk/26/ + +LICENSE= GPLv2 + +ONLY_FOR_ARCHS= aarch64 amd64 powerpc64 powerpc64le + +# This port supports the following flavors: +# +# - jdk (default) Full OpenJDK including dev tools and x11 support +# - headless Full OpenJDK including dev tools, but without x11 support +# - jre Java Runtime Environment including x11 support +# - jre_headless Jave Runtime Environment without x11 support +FLAVORS= jdk jre headless jre_headless + +headless_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-headless +jre_PKGNAMESUFFIX= -jre +jre_headless_PKGNAMESUFFIX= ${JDK_MAJOR_VERSION}-jre-headless + +FLAVOR?= ${BUILD_JRE:?jre:${FLAVORS:[1]}} + +BUILD_DEPENDS= ${LOCALBASE}/include/cups/cups.h:print/cups \ + bash:shells/bash \ + gsed:textproc/gsed \ + zip:archivers/zip + +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 +.if ${FLAVOR:M*headless} == "" +RUN_DEPENDS+= xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype +.endif + +USES= autoreconf:build compiler:features cpe gmake iconv jpeg pkgconfig xorg + +CPE_VENDOR= oracle + +USE_GITHUB= yes +GH_ACCOUNT= freebsd + +USE_XORG= x11 xext xi xrandr xrender xt xtst + +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 +.if ${FLAVOR:M*headless} +CONFIGURE_ARGS+= --enable-headless-only +.endif + +CONFIGURE_ENV= ac_cv_path_SED=${LOCALBASE}/bin/gsed +CONFIGURE_TARGET= ${JDK_ARCH}-portbld-${OPSYS:tl}${OSREL} + +# Suppress passing -j to do-build target via Mk/bsd.port.mk +# In the JDK build the number of parallel jobs is passed in via configure --with-num-cores=N +_MAKE_JOBS= # +MAKE_ENV= CLASSPATH="" \ + JAVA_HOME="" \ + LD_LIBRARY_PATH="" \ + LOG=cmdlines \ + MAKEFLAGS="" + +.if ${FLAVOR:Mjre*} +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/} +BOOTSTRAPJDKFILE= openjdk25-25.0.1+8.f.1.${JDK_ARCH}.tar.xz +JDK_OSARCH= bsd-${JDK_ARCH} +JDK_BUILDDIR= ${WRKSRC}/build/${JDK_OSARCH}-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE} +.if ${FLAVOR:Mjre*} +BUILD_JRE= true +JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jre +.else +JDK_IMAGEDIR= ${JDK_BUILDDIR}/images/jdk +.endif +INSTALLDIR= ${PREFIX}/${PKGBASE} +BOOTSTRAPJDKDIR= ${WRKDIR}/boot-jdk + +NO_CCACHE= yes +NOPRECIOUSMAKEVARS= yes + +JDK_MAJOR_VERSION= 26 +JDK_MINOR_VERSION= 0 +JDK_PATCH_VERSION= 0 +JDK_BUILD_NUMBER= 35 +BSD_JDK_VERSION= 1 +JDK_FULL_VERSION= ${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION} + +JDK_BUG_URL= https://bugs.freebsd.org/bugzilla/enter_bug.cgi?product=Ports%20%26%20Packages&component=Individual%20Port(s)&short_desc=java/${PORTNAME}${JDK_MAJOR_VERSION}%3A%20 + +.ifnmake portclippy +JAVAVMS_COMMENT= OpenJDK${JDK_MAJOR_VERSION} +.endif + +.include <bsd.port.pre.mk> + +JDK_BUILD_JVM= server + +MAKE_ENV+= --with-toolchain-type=${COMPILER_TYPE} +CONFIGURE_ARGS+= --with-toolchain-type=${COMPILER_TYPE} +CONFIGURE_ARGS+= --disable-warnings-as-errors + +.if ${COMPILER_TYPE} == gcc +USE_GCC= yes +CONFIGURE_ARGS+= --with-extra-cflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ + --with-extra-cxxflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT}" \ + --with-extra-ldflags="-Wl,-rpath=${LOCALBASE}/lib/gcc${GCC_DEFAULT} -L${LOCALBASE}/lib/gcc${GCC_DEFAULT}" +.else +MAKE_ENV+= USE_CLANG=true +EXTRA_CFLAGS+= -Wno-unused-but-set-parameter +EXTRA_CFLAGS+= -Wno-bitwise-instead-of-logical \ + -Wno-error=deprecated-non-prototype +CONFIGURE_ARGS+= --with-extra-cflags="${EXTRA_CFLAGS}" +CONFIGURE_ARGS+= --with-extra-cxxflags="${EXTRA_CFLAGS}" +.endif + +.if ${ARCH} == aarch64 +CONFIGURE_ARGS+= --disable-dtrace +.endif + +.if empty(ICONV_LIB) +ICONV_CFLAGS= -DLIBICONV_PLUG +.else +ICONV_CFLAGS= -I${LOCALBASE}/include +ICONV_LDFLAGS= -L${LOCALBASE}/lib +ICONV_LIBS= ${ICONV_LIB} +.endif + +post-patch: + @${RM} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/thread_bsd_ppc.cpp + @${MV} ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/thread_bsd_ppc.hpp \ + ${WRKSRC}/src/hotspot/os_cpu/bsd_ppc/javaThread_bsd_ppc.hpp + + @${FIND} ${WRKSRC} -name '*.orig' -delete + @${CHMOD} 755 ${WRKSRC}/configure + @${REINPLACE_CMD} -e 's|%%LOCALBASE%%|${LOCALBASE}|' \ + ${WRKSRC}/configure \ + ${WRKSRC}/src/hotspot/os/bsd/os_bsd.cpp + @${REINPLACE_CMD} -e 's|%%ICONV_CFLAGS%%|${ICONV_CFLAGS}|' \ + -e 's|%%ICONV_LDFLAGS%%|${ICONV_LDFLAGS}|' \ + -e 's|%%ICONV_LIBS%%|${ICONV_LIBS}|' \ + ${WRKSRC}/make/autoconf/libraries.m4 + +post-build: +.if defined(OPENJDK_SYMLINK_CACERTS) + @${RM} ${JDK_IMAGEDIR}/lib/security/cacerts + @${LN} -sf ${OPENJDK_SYMLINK_CACERTS} ${JDK_IMAGEDIR}/lib/security/cacerts +.endif + +do-install: + @${MKDIR} ${STAGEDIR}${INSTALLDIR} + @cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR} + @cd ${STAGEDIR}${INSTALLDIR} && \ + ${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; + @${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper + @${ECHO} "@javavm ${INSTALLDIR}/bin/java" >> ${TMPPLIST} + @${FIND} ${STAGEDIR}${INSTALLDIR} -not -type d | ${SORT} | \ + ${SED} -e 's|^${STAGEDIR}${PREFIX}/||' >> ${TMPPLIST} + +.include <bsd.port.post.mk> diff --git a/java/openjdk26/distinfo b/java/openjdk26/distinfo new file mode 100644 index 000000000000..01a6c4fdf6bc --- /dev/null +++ b/java/openjdk26/distinfo @@ -0,0 +1,11 @@ +TIMESTAMP = 1773920001 +SHA256 (openjdk25-25.0.1+8.f.1.aarch64.tar.xz) = cb1d88e0e299a0c2347dbbaa17c3650403a28e8065076cf7898478646c473b2b +SIZE (openjdk25-25.0.1+8.f.1.aarch64.tar.xz) = 189254412 +SHA256 (openjdk25-25.0.1+8.f.1.ppc64.tar.xz) = ae3e9658208889233f374b172b06f10b36fb19061d830252384a5e98aebe7184 +SIZE (openjdk25-25.0.1+8.f.1.ppc64.tar.xz) = 186892692 +SHA256 (openjdk25-25.0.1+8.f.1.ppc64le.tar.xz) = dabfb39d05b31c41c76d6c172af3836b2a6fda9dc86111d7b5730ca780de6223 +SIZE (openjdk25-25.0.1+8.f.1.ppc64le.tar.xz) = 188302548 +SHA256 (openjdk25-25.0.1+8.f.1.x86_64.tar.xz) = 0449e5a9257d8eb7ed1518af1e4e9e546ee63e4bfaf21e1021e9ab45d2840f27 +SIZE (openjdk25-25.0.1+8.f.1.x86_64.tar.xz) = 191262784 +SHA256 (freebsd-openjdk-jdk-26+35-1_GH0.tar.gz) = c5db71942e814bcc44c6788536a062678e43856dfaa08549e77fc90e838e0816 +SIZE (freebsd-openjdk-jdk-26+35-1_GH0.tar.gz) = 121724470 diff --git a/java/openjdk26/files/patch-configure b/java/openjdk26/files/patch-configure new file mode 100644 index 000000000000..4c97fddabcd2 --- /dev/null +++ b/java/openjdk26/files/patch-configure @@ -0,0 +1,14 @@ +--- configure.orig 2025-10-24 11:51:54 UTC ++++ configure +@@ -1,4 +1,4 @@ +-#!/bin/bash ++#!%%LOCALBASE%%/bin/bash + # + # Copyright (c) 2012, 2023, Oracle and/or its affiliates. All rights reserved. + # DO NOT ALTER OR REMOVE COPYRIGHT NOTICES OR THIS FILE HEADER. +@@ -36,4 +36,4 @@ fi + # Delegate to wrapper, forcing wrapper to believe $0 is this script by using -c. + # This trick is needed to get autoconf to co-operate properly. + # The ${-:+-$-} construction passes on bash options. +-bash ${-:+-$-} -c ". \"${this_script_dir}/make/autoconf/configure\"" "${this_script_dir}/configure" CHECKME "${this_script_dir}" "$@" ++%%LOCALBASE%%/bin/bash ${-:+-$-} -c ". \"${this_script_dir}/make/autoconf/configure\"" "${this_script_dir}/configure" CHECKME "${this_script_dir}" "$@" diff --git a/java/openjdk26/files/patch-make_autoconf_flags-cflags.m4 b/java/openjdk26/files/patch-make_autoconf_flags-cflags.m4 new file mode 100644 index 000000000000..81bc372519f5 --- /dev/null +++ b/java/openjdk26/files/patch-make_autoconf_flags-cflags.m4 @@ -0,0 +1,12 @@ +--- make/autoconf/flags-cflags.m4.orig 2025-09-16 10:24:48 UTC ++++ make/autoconf/flags-cflags.m4 +@@ -780,6 +780,9 @@ AC_DEFUN([FLAGS_SETUP_CFLAGS_CPU_DEP], + # Use Power8, this is the first CPU to support PPC64 LE with ELFv2 ABI. + $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=power8 -mtune=power10" + fi ++ if test "x$FLAGS_CPU" = xppc64; then ++ $1_CFLAGS_CPU_JVM="${$1_CFLAGS_CPU_JVM} -DABI_ELFv2 -mcpu=powerpc64 -mtune=power5" ++ fi + fi + if test "x$OPENJDK_TARGET_OS" = xaix; then + $1_CFLAGS_CPU="-mcpu=pwr8" diff --git a/java/openjdk20/files/patch-make_autoconf_libraries.m4 b/java/openjdk26/files/patch-make_autoconf_libraries.m4 index 0911464a6522..9c86f7093ac7 100644 --- a/java/openjdk20/files/patch-make_autoconf_libraries.m4 +++ b/java/openjdk26/files/patch-make_autoconf_libraries.m4 @@ -1,6 +1,6 @@ ---- 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 @@ +--- make/autoconf/libraries.m4.orig 2025-10-24 12:39:13 UTC ++++ make/autoconf/libraries.m4 +@@ -212,9 +212,9 @@ AC_DEFUN_ONCE([LIB_SETUP_MISC_LIBS], ICONV_LDFLAGS="-L/usr/local/lib" ICONV_LIBS=-liconv elif test "x$OPENJDK_TARGET_OS_ENV" = "xbsd.freebsd"; then diff --git a/java/openjdk20/files/patch-src_hotspot_os_bsd_os__bsd.cpp b/java/openjdk26/files/patch-src_hotspot_os_bsd_os__bsd.cpp index 402f0f475bc3..402f0f475bc3 100644 --- a/java/openjdk20/files/patch-src_hotspot_os_bsd_os__bsd.cpp +++ b/java/openjdk26/files/patch-src_hotspot_os_bsd_os__bsd.cpp diff --git a/java/openjdk20/pkg-descr b/java/openjdk26/pkg-descr index bbc3e1c1edc7..a6701ff6ef33 100644 --- a/java/openjdk20/pkg-descr +++ b/java/openjdk26/pkg-descr @@ -1 +1 @@ -An open-source implementation of the Java Platform, Standard Edition, +An open-source implementation of the Java Platform, Standard Edition. diff --git a/java/openjdk20/pkg-message b/java/openjdk26/pkg-message index 811dcb1e3b58..c072654ad070 100644 --- a/java/openjdk20/pkg-message +++ b/java/openjdk26/pkg-message @@ -1,8 +1,7 @@ [ { type: install message: <<EOM -This OpenJDK implementation may require procfs(5) mounted on /proc for some -applications. +This OpenJDK implementation may require procfs(5) mounted on /proc. If you have not done it yet, please do the following: |