java/bootstrap-openjdk17: Add i386 support

3 files changed, 23 insertions, 15 deletions

diff --git a/java/bootstrap-openjdk17/Makefile b/java/bootstrap-openjdk17/Makefile
index c131f8c13acf..9cb49ca170af 100644
--- a/java/bootstrap-openjdk17/Makefile
+++ b/java/bootstrap-openjdk17/Makefile
@@ -11,7 +11,7 @@ COMMENT=	Java Development Kit 17
 
 LICENSE=	GPLv2
 
-ONLY_FOR_ARCHS=	aarch64 amd64 powerpc64 powerpc64le
+ONLY_FOR_ARCHS=	aarch64 amd64 i386 powerpc64 powerpc64le
 
 USES=		tar:xz
 
@@ -34,6 +34,12 @@ PLIST_SUB+=	NOT_PPC64="@comment "
 PLIST_SUB+=	NOT_PPC64=""
 .endif
 
+.if ${ARCH} == i386
+PLIST_SUB+=	NOT_I386="@comment "
+.else
+PLIST_SUB+=	NOT_I386=""
+.endif
+
 do-install:
 	@cd ${WRKSRC} && ${COPYTREE_SHARE} . ${INSTALLDIR}
 	@cd ${WRKSRC} && ${COPYTREE_BIN} bin ${INSTALLDIR}
diff --git a/java/bootstrap-openjdk17/distinfo b/java/bootstrap-openjdk17/distinfo
index 378d0bd3d5fa..8a7464323e7c 100644
--- a/java/bootstrap-openjdk17/distinfo
+++ b/java/bootstrap-openjdk17/distinfo
@@ -1,8 +1,10 @@
-TIMESTAMP = 1640000063
+TIMESTAMP = 1641023254
 SHA256 (bootstrap-openjdk17-aarch64-17.0.1.12.1.tar.xz) = a1bf65078fbd9bc0826df4e3979ebd4d882b52fc04303b460a9d0d090f68e7a3
 SIZE (bootstrap-openjdk17-aarch64-17.0.1.12.1.tar.xz) = 108306712
 SHA256 (bootstrap-openjdk17-amd64-17.0.1.12.1.tar.xz) = 1c8469678ab77e61d78f05ff1e317a46a3208af086eb6dff822d487513adcaea
 SIZE (bootstrap-openjdk17-amd64-17.0.1.12.1.tar.xz) = 109958368
+SHA256 (bootstrap-openjdk17-i386-17.0.1.12.1.tar.xz) = dd9843939bcccb5772f4485a4553264e81dfb39a42f794de50200bd352f773c3
+SIZE (bootstrap-openjdk17-i386-17.0.1.12.1.tar.xz) = 104910036
 SHA256 (bootstrap-openjdk17-powerpc64-elfv2-17.0.1.12.1.tar.xz) = 083e22f78add71a6f6c96a8aa87aa147e790f56a39beba8b33f70166256e920f
 SIZE (bootstrap-openjdk17-powerpc64-elfv2-17.0.1.12.1.tar.xz) = 104895520
 SHA256 (bootstrap-openjdk17-powerpc64le-17.0.1.12.1.tar.xz) = f9677056f6b2fc2c0f1a33a1b75b4cbc592eb8d3b39ab9fed4b22e5f7b468e1f
diff --git a/java/bootstrap-openjdk17/pkg-plist b/java/bootstrap-openjdk17/pkg-plist
index 81e17de84512..1bc00082b797 100644
--- a/java/bootstrap-openjdk17/pkg-plist
+++ b/java/bootstrap-openjdk17/pkg-plist
@@ -45,7 +45,7 @@
 %%JDK_ROOT%%/lib/libzip.so
 %%JDK_ROOT%%/lib/modules
 %%JDK_ROOT%%/lib/classlist
-%%JDK_ROOT%%/lib/server/classes_nocoops.jsa
+%%NOT_I386%%%%JDK_ROOT%%/lib/server/classes_nocoops.jsa
 %%JDK_ROOT%%/lib/server/libjsig.so
 %%JDK_ROOT%%/lib/server/libjvm.so
 %%JDK_ROOT%%/lib/server/classes.jsa
@@ -140,18 +140,18 @@
 %%JDK_ROOT%%/legal/jdk.javadoc/jquery.md
 %%JDK_ROOT%%/legal/jdk.javadoc/jqueryUI.md
 %%JDK_ROOT%%/legal/jdk.javadoc/ADDITIONAL_LICENSE_INFO
-%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
-%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/LICENSE
-%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
-%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
-%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/LICENSE
-%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ASSEMBLY_EXCEPTION
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/LICENSE
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler/ADDITIONAL_LICENSE_INFO
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ASSEMBLY_EXCEPTION
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/LICENSE
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.compiler.management/ADDITIONAL_LICENSE_INFO
 %%JDK_ROOT%%/legal/jdk.jartool/ASSEMBLY_EXCEPTION
 %%JDK_ROOT%%/legal/jdk.jartool/LICENSE
 %%JDK_ROOT%%/legal/jdk.jartool/ADDITIONAL_LICENSE_INFO
-%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
-%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/LICENSE
-%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ASSEMBLY_EXCEPTION
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/LICENSE
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/legal/jdk.internal.vm.ci/ADDITIONAL_LICENSE_INFO
 %%JDK_ROOT%%/legal/jdk.internal.opt/ASSEMBLY_EXCEPTION
 %%JDK_ROOT%%/legal/jdk.internal.opt/LICENSE
 %%JDK_ROOT%%/legal/jdk.internal.opt/jopt-simple.md
@@ -327,7 +327,7 @@
 %%JDK_ROOT%%/jmods/jdk.internal.jvmstat.jmod
 %%JDK_ROOT%%/jmods/jdk.internal.le.jmod
 %%JDK_ROOT%%/jmods/jdk.internal.opt.jmod
-%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.ci.jmod
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.ci.jmod
 %%JDK_ROOT%%/jmods/jdk.jdi.jmod
 %%JDK_ROOT%%/jmods/jdk.jdwp.agent.jmod
 %%JDK_ROOT%%/jmods/jdk.management.agent.jmod
@@ -335,8 +335,8 @@
 %%JDK_ROOT%%/jmods/jdk.management.jmod
 %%JDK_ROOT%%/jmods/jdk.naming.dns.jmod
 %%JDK_ROOT%%/jmods/java.compiler.jmod
-%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.jmod
-%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.management.jmod
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.jmod
+%%NOT_I386%%%%NOT_PPC64%%%%JDK_ROOT%%/jmods/jdk.internal.vm.compiler.management.jmod
 %%JDK_ROOT%%/jmods/jdk.jartool.jmod
 %%JDK_ROOT%%/jmods/jdk.javadoc.jmod
 %%JDK_ROOT%%/jmods/jdk.jcmd.jmod