Update to JRuby 9.4.0.0

Update embedded jffi to 1.3.10.

Use Java 17 instead of 1.8.

Create appropriate site_ruby directory.

lang/jruby/Makefile

@@ -3,12 +3,12 @@ ONLY_FOR_ARCHS = amd64
 
 COMMENT =	pure-Java implementation of the Ruby language
 
-V =		9.3.9.0
+V =		9.4.0.0
 DISTNAME =	jruby-dist-${V}-bin
 PKGNAME =	jruby-${V}
 CATEGORIES =	lang lang/ruby
 DISTFILES =	${DISTNAME}.tar.gz \
-		jffi-1.3.5.tar.gz:0 \
+		jffi-1.3.10.tar.gz:0 \
 		${JRUBY_LAUNCHER_GEM}:1
 
 HOMEPAGE =	http://www.jruby.org/
@@ -23,7 +23,7 @@ MASTER_SITES0 =	https://github.com/jnr/jffi/archive/refs/tags/
 MASTER_SITES1 =	${MASTER_SITE_RUBYGEMS}
 
 MODULES =	java
-MODJAVA_VER =	1.8+
+MODJAVA_VER =	17+
 MODJAVA_BUILD =	ant
 USE_GMAKE =	Yes
 
@@ -42,6 +42,7 @@ JFFI_HOME =	${WRKDIST}/jffi
 JFFI_ARCH =	${MACHINE_ARCH:S/amd64/x86_64/}-OpenBSD
 FFI_ARCH =	${JFFI_ARCH:L}
 JRUBY_LAUNCHER_GEM = jruby-launcher-1.1.19-java.gem
+JRUBY_RUBY_VERSION =	3.1
 SUBST_VARS =	JRUBY_HOME JFFI_ARCH FFI_ARCH RAKE_V RDOC_V JAVA_HOME
 
 MODJAVA_BUILD_DIR = ${JFFI_HOME}
@@ -77,13 +78,13 @@ do-install:
 	ln -s ${TRUEPREFIX}/jruby/bin/jruby ${PREFIX}/bin/jruby
 	${INSTALL_DATA_DIR} ${JRUBY_HOME}
 	${INSTALL_DATA_DIR} ${JRUBY_HOME}/bin
-	for file in ast bundle bundler gem jgem jirb jirb_swing jruby jrubyc racc rake rdoc ri; \
+	for file in ast bundle bundler erb irb gem jgem jirb jirb_swing jruby jrubyc racc rake rdoc ri; \
 	  do ${INSTALL_SCRIPT} ${WRKBUILD}/bin/$$file ${JRUBY_HOME}/bin/$$file; \
 	done
 	${INSTALL_DATA_DIR} ${JRUBY_HOME}/lib
 	cd ${WRKBUILD}/lib && tar -cf - * | \
 		tar -C ${JRUBY_HOME}/lib -xf -
-	mkdir -p ${JRUBY_HOME}/lib/ruby/{1.8,1.9,2.0}/site_ruby
+	mkdir -p ${JRUBY_HOME}/lib/ruby/${JRUBY_RUBY_VERSION}/site_ruby
 	find ${JRUBY_HOME}/lib \( -name '*.orig' -o -name '*.beforesubst' \) \
 		-delete
 	mv ${JRUBY_HOME}/lib/ruby/gems/{shared,1.8}

lang/jruby/distinfo

@@ -1,6 +1,6 @@
-SHA256 (jffi-1.3.5.tar.gz) = 15HSIg5X5jGP9s1jfd64nWu4O9HkJivnhS9tVmnLLrQ=
-SHA256 (jruby-dist-9.3.9.0-bin.tar.gz) = JR5t2NHS+CkiyMd414V+G++C/lyiz3e8CTVkIdCwWrg=
+SHA256 (jffi-1.3.10.tar.gz) = QZWOTjjcxTOTidj4/JjERqcokJJ5SOiQualLs/ivHsw=
+SHA256 (jruby-dist-9.4.0.0-bin.tar.gz) = iXu4qYrUOty/X9OqdeyFszEoOMlJWSyj9iPcH1adKHA=
 SHA256 (jruby-launcher-1.1.19-java.gem) = LPGrpNcsdLNq7MSjCxiSXh4h+vcPVuC0ykUyUYquGJo=
-SIZE (jffi-1.3.5.tar.gz) = 3152240
-SIZE (jruby-dist-9.3.9.0-bin.tar.gz) = 28614865
+SIZE (jffi-1.3.10.tar.gz) = 3304571
+SIZE (jruby-dist-9.4.0.0-bin.tar.gz) = 29468004
 SIZE (jruby-launcher-1.1.19-java.gem) = 64000

lang/jruby/patches/patch-jffi_build_xml

@@ -3,7 +3,7 @@ Work with Java 10+.
 Index: jffi/build.xml
 --- jffi/build.xml.orig
 +++ jffi/build.xml
-@@ -146,8 +146,9 @@
+@@ -151,8 +151,9 @@
  
    <target name="-do-compile" depends="-init">
      <mkdir dir="${build.classes.dir}"/>
@@ -14,7 +14,7 @@ Index: jffi/build.xml
    </target>
  
    <target name="-compile-java" depends="-do-compile"/>
-@@ -315,27 +316,10 @@
+@@ -320,27 +321,10 @@
  
  
    <target name="-generate-version" depends="-init,-init-vars,-generate-version-source">