Index: java/openjdk11/Makefile
===================================================================
--- java/openjdk11/Makefile
+++ java/openjdk11/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -28,7 +28,8 @@
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 
-USES=		compiler:features cpe gmake iconv jpeg pkgconfig xorg
+USES=		compiler:features cpe elfctl gmake iconv jpeg \
+		pkgconfig proccontrol xorg
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 CPE_VENDOR=	oracle
@@ -49,6 +50,7 @@
 		CXX=${CXX} \
 		CPP=${CPP} \
 		MAKEFLAGS=""
+PROCCONTROL_SET=protmax:disable wxmap:enable
 
 JDK_OSARCH=	bsd-${ARCH:S/amd64/x86_64/:C/armv.*/arm/:S/i386/x86/:S/powerpc64/ppc64/}
 JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
@@ -198,6 +200,8 @@
 do-install:
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
+	@cd ${STAGEDIR}${INSTALLDIR} && \
+		${FIND} bin -type f -exec ${ELFCTL} -e +noprotmax,wxneeded {} \;
 	@cd ${STAGEDIR}${INSTALLDIR} && \
 		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
 	@${CHMOD} ${BINMODE} ${STAGEDIR}${INSTALLDIR}/lib/jspawnhelper
Index: java/openjdk17/Makefile
===================================================================
--- java/openjdk17/Makefile
+++ java/openjdk17/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -27,7 +28,8 @@
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 
-USES=		compiler:features cpe gmake iconv jpeg pkgconfig xorg
+USES=		compiler:features cpe elfctl gmake iconv jpeg \
+		pkgconfig proccontrol xorg
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 CPE_VENDOR=	oracle
@@ -48,6 +50,7 @@
 		CXX=${CXX} \
 		CPP=${CPP} \
 		MAKEFLAGS=""
+PROCCONTROL_SET=protmax:disable wxmap:enable
 
 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}
@@ -176,7 +179,10 @@
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
-		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
+		${FIND} bin -type f -exec \
+			${ELFCTL} -e +noprotmax,wxneeded {} \; && \
+		${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} | \
Index: java/openjdk18/Makefile
===================================================================
--- java/openjdk18/Makefile
+++ java/openjdk18/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -28,7 +28,8 @@
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 
-USES=		compiler:features cpe gmake iconv jpeg pkgconfig xorg
+USES=		compiler:features cpe elfctl gmake iconv jpeg \
+		pkgconfig proccontrol xorg
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 CPE_VENDOR=	oracle
@@ -49,6 +50,7 @@
 		CXX=${CXX} \
 		CPP=${CPP} \
 		MAKEFLAGS=""
+PROCCONTROL_SET=protmax:disable wxmap:enable
 
 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}
@@ -186,7 +188,10 @@
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
-		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
+	${FIND} bin -type f -exec \
+		${ELFCTL} -e +noprotmax,wxneeded {} \; && \
+	${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} | \
Index: java/openjdk19/Makefile
===================================================================
--- java/openjdk19/Makefile
+++ java/openjdk19/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -28,7 +28,8 @@
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 
-USES=		compiler:features cpe gmake iconv jpeg pkgconfig xorg
+USES=		compiler:features cpe elfctl gmake iconv jpeg \
+		pkgconfig proccontrol xorg
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 CPE_VENDOR=	oracle
@@ -49,6 +50,7 @@
 		CXX=${CXX} \
 		CPP=${CPP} \
 		MAKEFLAGS=""
+PROCCONTROL_SET=protmax:disable wxmap:enable
 
 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}
@@ -176,7 +178,10 @@
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
-		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
+	${FIND} bin -type f -exec \
+		${ELFCTL} -e +noprotmax,wxneeded {} \; && \
+	${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} | \
Index: java/openjdk20/Makefile
===================================================================
--- java/openjdk20/Makefile
+++ java/openjdk20/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -27,7 +28,8 @@
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 
-USES=		compiler:features cpe gmake iconv jpeg pkgconfig xorg
+USES=		compiler:features cpe elfctl gmake iconv jpeg \
+		pkgconfig proccontrol xorg
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 CPE_VENDOR=	oracle
@@ -48,6 +50,7 @@
 		CXX=${CXX} \
 		CPP=${CPP} \
 		MAKEFLAGS=""
+PROCCONTROL_SET=protmax:disable wxmap:enable
 
 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}
@@ -175,7 +178,10 @@
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
-		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
+	${FIND} bin -type f -exec \
+		${ELFCTL} -e +noprotmax,wxneeded {} \; && \
+	${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} | \
Index: java/openjdk21/Makefile
===================================================================
--- java/openjdk21/Makefile
+++ java/openjdk21/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -27,7 +28,8 @@
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 
-USES=		compiler:features cpe gmake iconv jpeg pkgconfig xorg
+USES=		compiler:features cpe elfctl gmake iconv jpeg \
+		pkgconfig proccontrol xorg
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 CPE_VENDOR=	oracle
@@ -48,6 +50,7 @@
 		CXX=${CXX} \
 		CPP=${CPP} \
 		MAKEFLAGS=""
+PROCCONTROL_SET=protmax:disable wxmap:enable
 
 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}
@@ -184,7 +187,10 @@
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
-		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
+	${FIND} bin -type f -exec \
+		${ELFCTL} -e +noprotmax,wxneeded {} \; && \
+	${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} | \
Index: java/openjdk22/Makefile
===================================================================
--- java/openjdk22/Makefile
+++ java/openjdk22/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	openjdk
 DISTVERSIONPREFIX=	jdk-
 DISTVERSION=	${JDK_MAJOR_VERSION}.${JDK_MINOR_VERSION}.${JDK_PATCH_VERSION}+${JDK_BUILD_NUMBER}-${BSD_JDK_VERSION}
+PORTREVISION=	1
 CATEGORIES=	java devel
 PKGNAMESUFFIX?=	${JDK_MAJOR_VERSION}
 
@@ -27,7 +28,8 @@
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		xorg-fonts-truetype>0:x11-fonts/xorg-fonts-truetype
 
-USES=		compiler:features cpe gmake iconv jpeg pkgconfig xorg
+USES=		compiler:features cpe elfctl gmake iconv jpeg \
+		pkgconfig proccontrol xorg
 USE_XORG=	x11 xext xi xrandr xrender xt xtst
 
 CPE_VENDOR=	oracle
@@ -48,6 +50,7 @@
 		CXX=${CXX} \
 		CPP=${CPP} \
 		MAKEFLAGS=""
+PROCCONTROL_SET=protmax:disable wxmap:enable
 
 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}
@@ -184,7 +187,10 @@
 	@${MKDIR} ${STAGEDIR}${INSTALLDIR}
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
-		${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \;
+	${FIND} bin -type f -exec \
+		${ELFCTL} -e +noprotmax,wxneeded {} \; && \
+	${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} | \
Index: java/openjdk8/Makefile
===================================================================
--- java/openjdk8/Makefile
+++ java/openjdk8/Makefile
@@ -23,7 +23,7 @@
 RUN_DEPENDS=	javavm:java/javavmwrapper \
 		dejavu>0:x11-fonts/dejavu
 
-USES=		compiler:features cpe gmake iconv pkgconfig
+USES=		compiler:features cpe elfctl gmake iconv pkgconfig proccontrol
 
 CPE_VENDOR=	oracle
 
@@ -38,6 +38,7 @@
 MAKE_ENV=	CLASSPATH="" JAVA_HOME="" LD_LIBRARY_PATH=""
 MAKE_ENV+=	IGNORE_OLD_CONFIG=true
 MAKE_ENV+=	COMPILER_WARNINGS_FATAL="false"
+PROCCONTROL_SET=protmax:disable wxmap:enable
 
 JDK_BUILDDIR=	${WRKSRC}/build/${JDK_OSARCH}-normal-${JDK_BUILD_JVM}-${JDK_BUILD_TYPE}
 .if !defined(BUILD_JRE)
@@ -268,11 +269,11 @@
 
 post-build:
 .if !defined(BUILD_JRE)
-	@${BOOTSTRAPJDKDIR}/bin/jar cfe \
+	${PROCCONTROL_EXEC} ${BOOTSTRAPJDKDIR}/bin/jar cfe \
 	    ${JRE_IMAGEDIR}/lib/compilefontconfig.jar \
 	    build.tools.compilefontconfig.CompileFontConfig \
 	    -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/compilefontconfig
-	@${BOOTSTRAPJDKDIR}/bin/jar cfe \
+	${PROCCONTROL_EXEC} ${BOOTSTRAPJDKDIR}/bin/jar cfe \
 	    ${JRE_IMAGEDIR}/lib/javazic.jar \
 	    build.tools.tzdb.TzdbZoneRulesCompiler \
 	    -C ${JDK_BUILDDIR}/jdk/btclasses build/tools/tzdb
@@ -291,14 +292,22 @@
 .if !defined(BUILD_JRE)
 	@cd ${JDK_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
+	${FIND} bin jre/bin -type f ! -name *.cgi \
+		-exec ${ELFCTL} -e +noprotmax,wxneeded {} \; && \
 	${FIND} bin jre/bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \
+	${ELFCTL} -e +noprotmax,wxneeded jre/${JDK_JVMDIR}/jexec \
+	    jre/${JDK_JVMDIR}/jspawnhelper ${JDK_JVMDIR}/jexec && \
 	${CHMOD} ${BINMODE} jre/${JDK_JVMDIR}/jexec \
 	    jre/${JDK_JVMDIR}/jspawnhelper ${JDK_JVMDIR}/jexec
 	@${ECHO_CMD} "@dir ${INSTALLDIR}/jre/lib/applet" >> ${TMPPLIST}
 .else
 	@cd ${JRE_IMAGEDIR} && ${COPYTREE_SHARE} . ${STAGEDIR}${INSTALLDIR}
 	@cd ${STAGEDIR}${INSTALLDIR} && \
+	${FIND} bin -type f ! -name *.cgi \
+		-exec ${ELFCTL} -e +noprotmax,wxneeded {} \; && \
 	${FIND} bin -type f -exec ${CHMOD} ${BINMODE} {} \; && \
+	${ELFCTL} -e +noprotmax,wxneeded ${JDK_JVMDIR}/jexec \
+		${JDK_JVMDIR}/jspawnhelper && \
 	${CHMOD} ${BINMODE} ${JDK_JVMDIR}/jexec ${JDK_JVMDIR}/jspawnhelper
 	@${ECHO_CMD} "@dir ${INSTALLDIR}/lib/applet" >> ${TMPPLIST}
 .endif