java/openjdk22: Add a port of JDK 22

11 files changed, 497 insertions, 0 deletions

diff --git a/java/Makefile b/java/Makefile
index 18a775c0c462..8b29713ba389 100644
--- a/java/Makefile
+++ b/java/Makefile
@@ -92,6 +92,7 @@
     SUBDIR += openjdk19
     SUBDIR += openjdk20
     SUBDIR += openjdk21
+    SUBDIR += openjdk22
     SUBDIR += openjdk8
     SUBDIR += openjdk8-jre
     SUBDIR += openjfx14
diff --git a/java/openjdk22/Makefile b/java/openjdk22/Makefile
new file mode 100644
index 000000000000..dbe4098c1b48
--- /dev/null
+++ b/java/openjdk22/Makefile
@@ -0,0 +1,201 @@
+PORTNAME=	openjdk
+DISTVERSIONPREFIX=	jdk-
+DISTVERSION=	${JDK_MAJOR_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+CATEGORIES=	java devel
+PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
+
+MAINTAINER=	java@FreeBSD.org
+COMMENT?=	Java Development Kit ${JDK_MAJOR_VERSION}
+WWW=		https://openjdk.java.net/projects/jdk/22/
+
+LICENSE=	GPLv2
+
+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=	jdk22
+
+NO_CCACHE=	yes
+
+_MAKE_JOBS=	#
+MAKE_ENV=	LANG="C" \
+		LC_ALL="C" \
+		CLASSPATH="" \
+		JAVA_HOME="" \
+		LD_LIBRARY_PATH="" \
+		CC=${CC} \
+		CXX=${CXX} \
+		CPP=${CPP} \
+		MAKEFLAGS=""
+
+JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:S/i386/x86/:S/powerpc64/ppc64/}
+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}
+
+NOPRECIOUSMAKEVARS=	yes
+
+JDK_MAJOR_VERSION=	22
+JDK_MINOR_VERSION=	0
+JDK_PATCH_VERSION=	0
+JDK_BUILD_NUMBER=	36
+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-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>
+
+BOOTSTRAP_JDKS=	${LOCALBASE}/openjdk22 ${LOCALBASE}/openjdk21
+
+# do we have valid native jdk installed?
+.for BJDK in ${BOOTSTRAP_JDKS}
+.  if !defined(BOOTSTRAPJDKDIR) && exists(${BJDK}/bin/javac)
+BOOTSTRAPJDKDIR=	${BJDK}
+.  endif
+.endfor
+
+# if no valid jdk found, set dependency
+.if !defined(BOOTSTRAPJDKDIR)
+BOOTSTRAPJDKDIR?=	${LOCALBASE}/openjdk21
+BUILD_DEPENDS+=		${BOOTSTRAPJDKDIR}/bin/javac:java/openjdk21
+.endif
+
+JDK_BUILD_JVM=	server
+
+MAKE_ENV+=		--with-toolchain-type=${COMPILER_TYPE}
+CONFIGURE_ARGS+=	--with-toolchain-type=${COMPILER_TYPE}
+
+.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
+.if ${COMPILER_VERSION} >= 130
+EXTRA_CFLAGS+=		-Wno-unused-but-set-parameter
+.if ${COMPILER_VERSION} >= 140
+EXTRA_CFLAGS+=		-Wno-bitwise-instead-of-logical
+.endif
+.if ${COMPILER_VERSION} >= 160
+EXTRA_CFLAGS+=		-Wno-error=deprecated-non-prototype
+.endif
+CONFIGURE_ARGS+=	--with-extra-cflags="${EXTRA_CFLAGS}"
+CONFIGURE_ARGS+=	--with-extra-cxxflags="${EXTRA_CFLAGS}"
+.endif
+.endif
+
+.if ${ARCH} == aarch64 || ${ARCH:Mpowerpc64*}
+CONFIGURE_ARGS+=	--disable-warnings-as-errors
+.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
new file mode 100644
index 000000000000..b9846af000e1
--- /dev/null
+++ b/java/openjdk22/distinfo
@@ -0,0 +1,3 @@
+TIMESTAMP = 1709401903
+SHA256 (battleblow-jdk22-jdk-22+36-1_GH0.tar.gz) = 5defdd386289a0ac4c898642216f45bf71f58dddae66d67df113ca63847d65c9
+SIZE (battleblow-jdk22-jdk-22+36-1_GH0.tar.gz) = 112090664
diff --git a/java/openjdk22/files/patch-configure b/java/openjdk22/files/patch-configure
new file mode 100644
index 000000000000..4bc4479f5e4a
--- /dev/null
+++ b/java/openjdk22/files/patch-configure
@@ -0,0 +1,14 @@
+--- 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
new file mode 100644
index 000000000000..5156c18515da
--- /dev/null
+++ b/java/openjdk22/files/patch-make_autoconf_flags-cflags.m4
@@ -0,0 +1,13 @@
+--- 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_libraries.m4 b/java/openjdk22/files/patch-make_autoconf_libraries.m4
new file mode 100644
index 000000000000..0911464a6522
--- /dev/null
+++ b/java/openjdk22/files/patch-make_autoconf_libraries.m4
@@ -0,0 +1,15 @@
+--- 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
new file mode 100644
index 000000000000..65f66318255d
--- /dev/null
+++ b/java/openjdk22/files/patch-make_modules_java.desktop_lib_Awt2dLibraries.gmk
@@ -0,0 +1,11 @@
+--- 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
new file mode 100644
index 000000000000..402f0f475bc3
--- /dev/null
+++ b/java/openjdk22/files/patch-src_hotspot_os_bsd_os__bsd.cpp
@@ -0,0 +1,11 @@
+--- src/hotspot/os/bsd/os_bsd.cpp.orig	2021-09-29 21:25:10 UTC
++++ src/hotspot/os/bsd/os_bsd.cpp
+@@ -361,7 +361,7 @@
+     #elif defined(__NetBSD__)
+       #define DEFAULT_LIBPATH "/usr/lib:/usr/pkg/lib"
+     #else
+-      #define DEFAULT_LIBPATH "/usr/lib:/usr/local/lib"
++      #define DEFAULT_LIBPATH "/usr/lib:%%LOCALBASE%%/lib"
+     #endif
+   #else
+     #define DEFAULT_LIBPATH OVERRIDE_LIBPATH
diff --git a/java/openjdk22/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c b/java/openjdk22/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c
new file mode 100644
index 000000000000..537ecdc3047c
--- /dev/null
+++ b/java/openjdk22/files/patch-src_java.desktop_share_native_libfontmanager_freetypeScaler.c
@@ -0,0 +1,209 @@
+--- 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/pkg-descr b/java/openjdk22/pkg-descr
new file mode 100644
index 000000000000..bbc3e1c1edc7
--- /dev/null
+++ b/java/openjdk22/pkg-descr
@@ -0,0 +1 @@
+An open-source implementation of the Java Platform, Standard Edition,
diff --git a/java/openjdk22/pkg-message b/java/openjdk22/pkg-message
new file mode 100644
index 000000000000..2ea3d87d89c8
--- /dev/null
+++ b/java/openjdk22/pkg-message
@@ -0,0 +1,18 @@
+[
+{ type: install
+  message: <<EOM
+This OpenJDK implementation requires fdescfs(5) mounted on /dev/fd and
+procfs(5) mounted on /proc.
+
+If you have not done it yet, please do the following:
+
+	mount -t fdescfs fdesc /dev/fd
+	mount -t procfs proc /proc
+
+To make it permanent, you need the following lines in /etc/fstab:
+
+	fdesc	/dev/fd		fdescfs		rw	0	0
+	proc	/proc		procfs		rw	0	0
+EOM
+}
+]