diff --git a/lang/ruby33/Makefile b/lang/ruby33/Makefile
index 7d16bb778252..2e0371df2d1a 100644
--- a/lang/ruby33/Makefile
+++ b/lang/ruby33/Makefile
@@ -1,202 +1,203 @@
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_DISTVERSION}
+PORTREVISION=	1
 PORTEPOCH=	${RUBY_PORTEPOCH}
 CATEGORIES=	lang ruby
 MASTER_SITES=	RUBY/${MASTER_SITE_SUBDIR_RUBY}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Object-oriented interpreted scripting language
 WWW=		https://www.ruby-lang.org/en/ \
 		https://github.com/ruby/ruby
 
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
 BUILD_DEPENDS=	libffi>=0:devel/libffi
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libyaml.so:textproc/libyaml
 
 USES=		autoreconf cpe localbase ruby:none ssl tar:xz
 
 CPE_VENDOR=	ruby-lang
 CPE_UPDATE=	p0
 
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--disable-rpath \
 		--enable-install-static-library \
 		--enable-pthread \
 		--enable-shared \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
 CONFIGURE_ENV=	debugflags=
 EXTRACT_AFTER_ARGS=	\
 		--exclude ${DISTNAME}/bin/gem \
 		--exclude ${DISTNAME}/ext/win32* \
 		--exclude ${DISTNAME}/lib/bundler* \
 		--exclude ${DISTNAME}/libexec/bundler \
 		--exclude ${DISTNAME}/man/erb.1 \
 		--exclude ${DISTNAME}/man/irb.1 \
 		--exclude ${DISTNAME}/man/ri.1 \
 		--no-same-owner --no-same-permissions
 GNU_CONFIGURE=	yes
 # Keep this, else ruby will fail to load libraries dependent of libpthread.
 LIBS+=		-lpthread
 USE_LDCONFIG=	yes
 
 RUBY_VER=	3.3
 
 EXTDOCS=	ripper/README stringio/README.md syslog/syslog.txt
 EXTSAMPLES=	bigdecimal/sample/*.rb
 INSTALLED_MANUALS=	ruby
 INSTALLED_SCRIPTS=	ruby
 # Macros to change variables in rbconfig.rb
 # NOTE: The last argument RB_SET_CONF_VAR is a dummy argument. See bug 222872.
 RB_SET_CONF_VAR=${SH} -c \
 		'${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' \
 		RB_SET_CONF_VAR
 
 OPTIONS_DEFINE=	CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC YJIT
 OPTIONS_DEFAULT=RDOC
 OPTIONS_SUB=	yes
 CAPIDOCS_DESC=	Build and install C API documents
 GMP_DESC=	Use GMP to accelerate Bignum operations
 RDOC_DESC=	Build and install Rdoc indexes
 YJIT_DESC=	Enable YJIT (Yet Another Ruby JIT)
 
 CAPIDOCS_BUILD_DEPENDS=	dot:graphics/graphviz \
 			doxygen>=1.8.13,2:devel/doxygen
 CAPIDOCS_CONFIGURE_ENABLE=	install-capi
 GMP_CONFIGURE_WITH=	gmp
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 RDOC_CONFIGURE_ENABLE=	install-rdoc
 YJIT_BUILD_DEPENDS=	${RUST_DEFAULT}>=1.58.0:lang/${RUST_DEFAULT}
 YJIT_CONFIGURE_ENABLE=	yjit
 
 .include <bsd.port.pre.mk>
 
 # PORTREVISION/PORTEPOCH hack
 
 .if ${PORTREVISION} != 0
 _SUF1=		_${PORTREVISION}
 .endif
 
 .if ${PORTEPOCH} != 0
 _SUF2=		,${PORTEPOCH}
 .endif
 
 #.if ${OPSYS} == "FreeBSD"
 #.if exists(/usr/sbin/dtrace) && (${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64le || ${ARCH} == powerpc64 || ${ARCH} == powerpc)
 #CONFIGURE_ARGS+=--enable-dtrace
 #.else
 #CONFIGURE_ARGS+=--disable-dtrace
 #.endif
 #.endif
 
 # keep in sync with all platforms where libunwind is available
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == \
 	i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc
 CONFIGURE_ARGS+=--with-setjmp-type=_setjmp
 CONFIGURE_ENV+=	ac_cv_func__setjmp=yes
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 PLIST_SUB+=	IF_DEFAULT=""
 .else
 PKGNAMESUFFIX=	${RUBY_SUFFIX}
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
 post-extract-DOCS-on:
 	${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc/ChangeLog
 
 post-build:
 #
 # Hack to allow modules to be installed into separate PREFIX and/or under user
 # privileges
 #
 	@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
 	@${RB_SET_CONF_VAR} "INSTALL" "'/usr/bin/install -c'"
 	@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
 	@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
 	@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
 
 post-build-CAPIDOCS-on:
 	@${FIND} ${WRKSRC}/doc -type d -empty -delete
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_VENDORARCHLIBDIR}
 
 pre-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${RUBY_DOCDIR}
 
 pre-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${RUBY_EXAMPLESDIR}
 
 pre-install-RDOC-on:
 	${MKDIR} ${STAGEDIR}${RUBY_RIDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
 
 post-install:
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 #
 # Link just installed "ruby" to "ruby33", etc.
 #
 . for FILE in ${INSTALLED_SCRIPTS}
 	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 #
 # Link "ruby.1.gz" to "ruby33.1.gz", etc.
 #
 . for FILE in ${INSTALLED_MANUALS}
 	${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/${FILE}.1.gz
 . endfor
 .endif
 
 post-install-CAPIDOCS-on:
 	${RM} ${WRKSRC}/doc/capi/.timestamp ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp
 	cd ${STAGEDIR}${PREFIX} && ${FIND} share/doc/ruby${RUBY_SUFFIX}/capi/ -type f >> ${TMPPLIST}
 
 post-install-DEBUG-off:
 #
 # XXX: hack to strip ruby binary. Ruby uses its own install script that seems
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ruby${RUBY_SUFFIX}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
 	${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 .endif
 
 post-install-DOCS-on:
 # Create all dirs required (":u" isn't available in STABLE yet :-()
 	${MKDIR} ${EXTDOCS:C|^([^/]+)/.*|\1|:S|^|${STAGEDIR}${RUBY_DOCDIR}/|}
 .for FILE in ${EXTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_DOCDIR}/${FILE:C|^([^/]+)/.*|\1|}/
 .endfor
 	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
 	${INSTALL_DATA} ${WRKSRC}/COPYING* ${WRKSRC}/LEGAL ${WRKSRC}/README* ${STAGEDIR}${RUBY_DOCDIR}/
 
 post-install-EXAMPLES-on:
 # Create all dirs required (":u" isn't available in STABLE yet :-()
 	${MKDIR} ${EXTSAMPLES:C|^([^/]+)/.*|\1|:S|^|${STAGEDIR}${RUBY_EXAMPLESDIR}/|}
 .for FILE in ${EXTSAMPLES}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_EXAMPLESDIR}/${FILE:C|^([^/]+)/.*|\1|}/
 .endfor
 	(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_EXAMPLESDIR}/)
 
 do-test:
 	cd ${WRKSRC} && ${MAKE_CMD} test
 
 .include <bsd.port.post.mk>
diff --git a/lang/ruby33/files/patch-configure.ac b/lang/ruby33/files/patch-configure.ac
index b83eddb09e5c..1e195de7f3dd 100644
--- a/lang/ruby33/files/patch-configure.ac
+++ b/lang/ruby33/files/patch-configure.ac
@@ -1,36 +1,46 @@
---- configure.ac.orig	2023-11-12 04:51:16 UTC
+--- configure.ac.orig	2026-03-26 00:05:04 UTC
 +++ configure.ac
-@@ -1356,7 +1356,7 @@ AC_CHECK_HEADERS(ucontext.h)
- AC_CHECK_HEADERS(utime.h)
- AC_CHECK_HEADERS(sys/epoll.h)
+@@ -1359,7 +1359,7 @@ AC_CHECK_HEADERS(stdatomic.h)
+ AC_CHECK_HEADERS(sys/event.h)
+ AC_CHECK_HEADERS(stdatomic.h)
  
 -AS_CASE("$target_cpu", [x64|x86_64|i[3-6]86*], [
 +AS_CASE("$target_cpu", [amd64|x64|x86_64|i[3-6]86*], [
    AC_CHECK_HEADERS(x86intrin.h)
  ])
  RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
-@@ -3101,7 +3101,7 @@ AC_SUBST(EXTOBJS)
+@@ -2699,6 +2699,9 @@ AS_CASE([$coroutine_type], [yes|''], [
+         [i386-freebsd*], [
+             coroutine_type=x86
+         ],
++        [arm*-freebsd*], [
++          coroutine_type=arm32
++        ],
+         [aarch64-freebsd*], [
+             coroutine_type=arm64
+         ],
+@@ -3112,7 +3115,7 @@ AC_SUBST(EXTOBJS)
  			: ${LDSHARED='$(CC) -shared'}
  			AS_IF([test "$rb_cv_binary_elf" = yes], [
  			    LDFLAGS="$LDFLAGS -rdynamic"
 -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
 +			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
  			], [
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			])
-@@ -3559,6 +3559,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -3570,6 +3573,7 @@ AS_CASE("$enable_shared", [yes], [
      [freebsd*|dragonfly*], [
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 +	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
  	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -4391,6 +4392,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
+@@ -4397,6 +4401,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
          arch="${target_cpu}-mingw-ucrt"
      ], [
          arch="${target_cpu}-${target_os}"
 +	AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
      ])
      AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
  
diff --git a/lang/ruby34/Makefile b/lang/ruby34/Makefile
index 3db8ee1270dc..46b8a39efad5 100644
--- a/lang/ruby34/Makefile
+++ b/lang/ruby34/Makefile
@@ -1,196 +1,197 @@
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_DISTVERSION}
+PORTREVISION=	2
 PORTEPOCH=	${RUBY_PORTEPOCH}
 CATEGORIES=	lang ruby
 MASTER_SITES=	RUBY/${MASTER_SITE_SUBDIR_RUBY}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Object-oriented interpreted scripting language
 WWW=		https://www.ruby-lang.org/en/ \
 		https://github.com/ruby/ruby
 
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
 BUILD_DEPENDS=	libffi>=0:devel/libffi
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libyaml.so:textproc/libyaml
 
 USES=		autoreconf cpe localbase ruby:none ssl tar:xz
 
 CPE_VENDOR=	ruby-lang
 CPE_UPDATE=	p0
 
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--disable-rpath \
 		--enable-install-static-library \
 		--enable-pthread \
 		--enable-shared \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
 CONFIGURE_ENV=	debugflags=
 EXTRACT_AFTER_ARGS=	\
 		--exclude ${DISTNAME}/bin/gem \
 		--exclude ${DISTNAME}/ext/win32* \
 		--exclude ${DISTNAME}/lib/bundler* \
 		--exclude ${DISTNAME}/lib/irb* \
 		--exclude ${DISTNAME}/man/erb.1 \
 		--exclude ${DISTNAME}/man/irb.1 \
 		--exclude ${DISTNAME}/man/ri.1 \
 		--exclude ${DISTNAME}/sample/win32ole \
 		--no-same-owner --no-same-permissions
 GNU_CONFIGURE=	yes
 # Keep this, else ruby will fail to load libraries dependent of libpthread.
 LIBS+=		-lpthread
 USE_LDCONFIG=	yes
 
 RUBY_VER=	3.4
 
 EXTDOCS=	ripper/README stringio/README.md
 INSTALLED_MANUALS=	ruby
 INSTALLED_SCRIPTS=	ruby
 # Macros to change variables in rbconfig.rb
 # NOTE: The last argument RB_SET_CONF_VAR is a dummy argument. See bug 222872.
 RB_SET_CONF_VAR=${SH} -c \
 		'${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' \
 		RB_SET_CONF_VAR
 
 OPTIONS_DEFINE=	CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC YJIT
 OPTIONS_DEFAULT=RDOC
 OPTIONS_SUB=	yes
 CAPIDOCS_DESC=	Build and install C API documents
 GMP_DESC=	Use GMP to accelerate Bignum operations
 RDOC_DESC=	Build and install Rdoc indexes
 YJIT_DESC=	Enable YJIT (Yet Another Ruby JIT)
 
 CAPIDOCS_BUILD_DEPENDS=	dot:graphics/graphviz \
 			doxygen>=1.8.13,2:devel/doxygen
 CAPIDOCS_CONFIGURE_ENABLE=	install-capi
 GMP_CONFIGURE_WITH=	gmp
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 RDOC_CONFIGURE_ENABLE=	install-rdoc
 YJIT_BUILD_DEPENDS=	${RUST_DEFAULT}>=1.58.0:lang/${RUST_DEFAULT}
 YJIT_CONFIGURE_ENABLE=	yjit
 
 .include <bsd.port.pre.mk>
 
 # PORTREVISION/PORTEPOCH hack
 
 .if ${PORTREVISION} != 0
 _SUF1=		_${PORTREVISION}
 .endif
 
 .if ${PORTEPOCH} != 0
 _SUF2=		,${PORTEPOCH}
 .endif
 
 #.if ${OPSYS} == "FreeBSD"
 #.if exists(/usr/sbin/dtrace) && (${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64le || ${ARCH} == powerpc64 || ${ARCH} == powerpc)
 #CONFIGURE_ARGS+=--enable-dtrace
 #.else
 #CONFIGURE_ARGS+=--disable-dtrace
 #.endif
 #.endif
 
 # keep in sync with all platforms where libunwind is available
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == \
 	i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc
 CONFIGURE_ARGS+=--with-setjmp-type=_setjmp
 CONFIGURE_ENV+=	ac_cv_func__setjmp=yes
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 PLIST_SUB+=	IF_DEFAULT=""
 .else
 PKGNAMESUFFIX=	${RUBY_SUFFIX}
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
 post-extract-DOCS-on:
 	${MV} ${WRKSRC}/ChangeLog ${WRKSRC}/doc/ChangeLog
 
 post-build:
 #
 # Hack to allow modules to be installed into separate PREFIX and/or under user
 # privileges
 #
 	@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
 	@${RB_SET_CONF_VAR} "INSTALL" "'/usr/bin/install -c'"
 	@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
 	@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
 	@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
 
 post-build-CAPIDOCS-on:
 	@${FIND} ${WRKSRC}/doc -type d -empty -delete
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_VENDORARCHLIBDIR}
 
 pre-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${RUBY_DOCDIR}
 
 pre-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${RUBY_EXAMPLESDIR}
 
 pre-install-RDOC-on:
 	${MKDIR} ${STAGEDIR}${RUBY_RIDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
 
 post-install:
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 #
 # Link just installed "ruby" to "ruby34", etc.
 #
 . for FILE in ${INSTALLED_SCRIPTS}
 	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 #
 # Link "ruby.1.gz" to "ruby34.1.gz", etc.
 #
 . for FILE in ${INSTALLED_MANUALS}
 	${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/${FILE}.1.gz
 . endfor
 .endif
 
 post-install-CAPIDOCS-on:
 	${RM} ${WRKSRC}/doc/capi/.timestamp ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp
 	cd ${STAGEDIR}${PREFIX} && ${FIND} share/doc/ruby${RUBY_SUFFIX}/capi/ -type f >> ${TMPPLIST}
 
 post-install-DEBUG-off:
 #
 # XXX: hack to strip ruby binary. Ruby uses its own install script that seems
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ruby${RUBY_SUFFIX}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
 	${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 .endif
 
 post-install-DOCS-on:
 # Create all dirs required (":u" isn't available in STABLE yet :-()
 	${MKDIR} ${EXTDOCS:C|^([^/]+)/.*|\1|:S|^|${STAGEDIR}${RUBY_DOCDIR}/|}
 .for FILE in ${EXTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_DOCDIR}/${FILE:C|^([^/]+)/.*|\1|}/
 .endfor
 	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
 	${INSTALL_DATA} ${WRKSRC}/COPYING* ${WRKSRC}/LEGAL ${WRKSRC}/README* ${STAGEDIR}${RUBY_DOCDIR}/
 
 post-install-EXAMPLES-on:
 	(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_EXAMPLESDIR}/)
 
 do-test:
 	cd ${WRKSRC} && ${MAKE_CMD} test
 
 .include <bsd.port.post.mk>
diff --git a/lang/ruby34/files/patch-configure.ac b/lang/ruby34/files/patch-configure.ac
index 2e3c608f9449..8d1d1cfeb097 100644
--- a/lang/ruby34/files/patch-configure.ac
+++ b/lang/ruby34/files/patch-configure.ac
@@ -1,36 +1,46 @@
---- configure.ac.orig	2024-12-12 01:10:13 UTC
+--- configure.ac.orig	2026-03-11 09:51:47 UTC
 +++ configure.ac
-@@ -1411,7 +1411,7 @@ AC_CHECK_HEADERS(stdatomic.h)
+@@ -1409,7 +1409,7 @@ AC_CHECK_HEADERS(stdatomic.h)
  AC_CHECK_HEADERS(stdckdint.h)
  AC_CHECK_HEADERS(stdatomic.h)
  
 -AS_CASE("$target_cpu", [x64|x86_64|[i[3-6]86*]], [
 +AS_CASE("$target_cpu", [amd64|x64|x86_64|[i[3-6]86*]], [
    AC_CHECK_HEADERS(x86intrin.h)
  ])
  RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
-@@ -3149,7 +3149,7 @@ AC_SUBST(EXTOBJS)
+@@ -2728,6 +2728,9 @@ AS_CASE([$coroutine_type], [yes|''], [
+         [i386-freebsd*], [
+             coroutine_type=x86
+         ],
++        [arm*-freebsd*], [
++	    coroutine_type=arm32
++        ],
+         [aarch64-freebsd*], [
+             coroutine_type=arm64
+         ],
+@@ -3147,7 +3150,7 @@ AC_SUBST(EXTOBJS)
  			: ${LDSHARED='$(CC) -shared'}
  			AS_IF([test "$rb_cv_binary_elf" = yes], [
  			    LDFLAGS="$LDFLAGS -rdynamic"
 -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
 +			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
  			], [
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			])
-@@ -3611,6 +3611,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -3609,6 +3612,7 @@ AS_CASE("$enable_shared", [yes], [
      [freebsd*|dragonfly*], [
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 +	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
  	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -4443,6 +4444,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
+@@ -4442,6 +4446,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
          arch="${target_cpu}-mingw-ucrt"
      ], [
          arch="${target_cpu}-${target_os}"
 +	AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
      ])
      AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")
  
diff --git a/lang/ruby40/Makefile b/lang/ruby40/Makefile
index d91cdbfd4882..b9496684e786 100644
--- a/lang/ruby40/Makefile
+++ b/lang/ruby40/Makefile
@@ -1,193 +1,194 @@
 PORTNAME=	ruby
 PORTVERSION=	${RUBY_DISTVERSION}
+PORTREVISION=	1
 PORTEPOCH=	${RUBY_PORTEPOCH}
 CATEGORIES=	lang ruby
 MASTER_SITES=	RUBY/${MASTER_SITE_SUBDIR_RUBY}
 DIST_SUBDIR=	ruby
 
 MAINTAINER=	ruby@FreeBSD.org
 COMMENT=	Object-oriented interpreted scripting language
 WWW=		https://www.ruby-lang.org/en/ \
 		https://github.com/ruby/ruby
 
 LICENSE=	BSD2CLAUSE RUBY
 LICENSE_COMB=	dual
 LICENSE_FILE_BSD2CLAUSE=${WRKSRC}/BSDL
 LICENSE_FILE_RUBY=	${WRKSRC}/COPYING
 
 # Using LIB_DEPENDS finds the libffi from gcc which causes problems
 BUILD_DEPENDS=	libffi>=0:devel/libffi
 LIB_DEPENDS=	libffi.so:devel/libffi \
 		libyaml.so:textproc/libyaml
 
 USES=		autoreconf cpe localbase ruby:none ssl tar:xz
 
 CPE_VENDOR=	ruby-lang
 CPE_UPDATE=	p0
 
 CONFIGURE_ARGS=	${RUBY_CONFIGURE_ARGS} \
 		--disable-rpath \
 		--enable-install-static-library \
 		--enable-pthread \
 		--enable-shared \
 		--with-ruby-version=minor \
 		--with-sitedir="${PREFIX}/lib/ruby/site_ruby" \
 		--with-vendordir="${PREFIX}/lib/ruby/vendor_ruby"
 CONFIGURE_ENV=	debugflags=
 EXTRACT_AFTER_ARGS=	\
 		--exclude ${DISTNAME}/bin/gem \
 		--exclude ${DISTNAME}/ext/win32* \
 		--exclude ${DISTNAME}/lib/bundler* \
 		--exclude ${DISTNAME}/lib/irb* \
 		--exclude ${DISTNAME}/man/erb.1 \
 		--exclude ${DISTNAME}/man/irb.1 \
 		--exclude ${DISTNAME}/man/ri.1 \
 		--exclude ${DISTNAME}/sample/win32ole \
 		--no-same-owner --no-same-permissions
 GNU_CONFIGURE=	yes
 # Keep this, else ruby will fail to load libraries dependent of libpthread.
 LIBS+=		-lpthread
 USE_LDCONFIG=	yes
 
 RUBY_VER=	4.0
 
 EXTDOCS=	ripper/README stringio/README.md
 INSTALLED_MANUALS=	ruby
 INSTALLED_SCRIPTS=	ruby
 # Macros to change variables in rbconfig.rb
 # NOTE: The last argument RB_SET_CONF_VAR is a dummy argument. See bug 222872.
 RB_SET_CONF_VAR=	${SH} -c \
 			'${REINPLACE_CMD} -E -e "s,(CONFIG\[\"$$0\"\][[:space:]]*=[[:space:]]*)(\(?)(.*)(\)?),\1\2$$1\4," ${WRKSRC}/rbconfig.rb' \
 			RB_SET_CONF_VAR
 
 OPTIONS_DEFINE=	CAPIDOCS DEBUG DOCS EXAMPLES GMP RDOC YJIT
 OPTIONS_DEFAULT=RDOC
 OPTIONS_SUB=	yes
 CAPIDOCS_DESC=	Build and install C API documents
 GMP_DESC=	Use GMP to accelerate Bignum operations
 RDOC_DESC=	Build and install Rdoc indexes
 YJIT_DESC=	Enable YJIT (Yet Another Ruby JIT)
 
 CAPIDOCS_BUILD_DEPENDS=	dot:graphics/graphviz \
 			doxygen>=1.8.13,2:devel/doxygen
 CAPIDOCS_CONFIGURE_ENABLE=	install-capi
 GMP_LIB_DEPENDS=	libgmp.so:math/gmp
 GMP_CONFIGURE_WITH=	gmp
 RDOC_CONFIGURE_ENABLE=	install-rdoc
 YJIT_BUILD_DEPENDS=	${RUST_DEFAULT}>=1.58.0:lang/${RUST_DEFAULT}
 YJIT_CONFIGURE_ENABLE=	yjit
 
 .include <bsd.port.pre.mk>
 
 # PORTREVISION/PORTEPOCH hack
 
 .if ${PORTREVISION} != 0
 _SUF1=		_${PORTREVISION}
 .endif
 
 .if ${PORTEPOCH} != 0
 _SUF2=		,${PORTEPOCH}
 .endif
 
 #.if ${OPSYS} == "FreeBSD"
 #.if exists(/usr/sbin/dtrace) && (${ARCH} == amd64 || ${ARCH} == i386 || ${ARCH} == powerpc64le || ${ARCH} == powerpc64 || ${ARCH} == powerpc)
 #CONFIGURE_ARGS+=--enable-dtrace
 #.else
 #CONFIGURE_ARGS+=--disable-dtrace
 #.endif
 #.endif
 
 # keep in sync with all platforms where libunwind is available
 .if ${ARCH} == aarch64 || ${ARCH} == amd64 || ${ARCH} == armv7 || ${ARCH} == \
 	i386 || ${ARCH} == powerpc || ${ARCH} == powerpc64 || ${ARCH} == powerpc64le
 LIB_DEPENDS+=	libunwind.so:devel/libunwind
 .endif
 
 .if ${ARCH} == armv6 || ${ARCH} == armv7 || ${ARCH} == powerpc
 CONFIGURE_ARGS+=--with-setjmp-type=_setjmp
 CONFIGURE_ENV+=	ac_cv_func__setjmp=yes
 .endif
 
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 PLIST_SUB+=	IF_DEFAULT=""
 .else
 PKGNAMESUFFIX=	${RUBY_SUFFIX}
 PLIST_SUB+=	IF_DEFAULT="@comment "
 .endif
 
 post-build:
 #
 # Hack to allow modules to be installed into separate PREFIX and/or under user
 # privileges
 #
 	@${RB_SET_CONF_VAR} "prefix" "ENV['PREFIX'] || \3"
 	@${RB_SET_CONF_VAR} "INSTALL" "'/usr/bin/install -c'"
 	@${RB_SET_CONF_VAR} "INSTALL_PROGRAM" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} ${STRIP} -m ${BINMODE}' : '${INSTALL_PROGRAM}'"
 	@${RB_SET_CONF_VAR} "INSTALL_SCRIPT" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${BINMODE}' : '${INSTALL_SCRIPT}'"
 	@${RB_SET_CONF_VAR} "INSTALL_DATA" "ENV['RB_USER_INSTALL'] ? '${INSTALL} ${COPY} -m ${SHAREMODE}' : '${INSTALL_DATA}'"
 
 post-build-CAPIDOCS-on:
 	@${FIND} ${WRKSRC}/doc -type d -empty -delete
 
 pre-install:
 	${MKDIR} ${STAGEDIR}${RUBY_SITEARCHLIBDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_VENDORARCHLIBDIR}
 
 pre-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${RUBY_DOCDIR}
 
 pre-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${RUBY_EXAMPLESDIR}
 
 pre-install-RDOC-on:
 	${MKDIR} ${STAGEDIR}${RUBY_RIDIR}
 	${MKDIR} ${STAGEDIR}${RUBY_SITERIDIR}
 
 post-install:
 .if ${RUBY_VER} == ${RUBY_DEFAULT_VER}
 #
 # Link just installed "ruby" to "ruby40", etc.
 #
 . for FILE in ${INSTALLED_SCRIPTS}
 	${LN} -fs ${FILE}${RUBY_SUFFIX} ${STAGEDIR}${PREFIX}/bin/${FILE}
 . endfor
 #
 # Link "ruby.1.gz" to "ruby40.1.gz", etc.
 #
 . for FILE in ${INSTALLED_MANUALS}
 	${LN} -fs ${FILE}${RUBY_SUFFIX}.1.gz ${STAGEDIR}${PREFIX}/share/man/man1/${FILE}.1.gz
 . endfor
 .endif
 
 post-install-CAPIDOCS-on:
 	${RM} ${WRKSRC}/doc/capi/.timestamp ${STAGEDIR}${PREFIX}/share/doc/ruby${RUBY_SUFFIX}/capi/.timestamp
 	cd ${STAGEDIR}${PREFIX} && ${FIND} share/doc/ruby${RUBY_SUFFIX}/capi/ -type f >> ${TMPPLIST}
 
 post-install-DEBUG-off:
 #
 # XXX: hack to strip ruby binary. Ruby uses its own install script that seems
 # bogus to hack.
 #
 .if defined(STRIP) && ${STRIP} == -s
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/ruby${RUBY_SUFFIX}
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/libruby${RUBY_SHLIBVER}.so.${RUBY_SHLIBVER}
 	${FIND} ${STAGEDIR}${RUBY_ARCHLIBDIR} -type f -name '*\.so' -exec ${STRIP_CMD} {} \;
 .endif
 
 post-install-DOCS-on:
 # Create all dirs required (":u" isn't available in STABLE yet :-()
 	${MKDIR} ${EXTDOCS:C|^([^/]+)/.*|\1|:S|^|${STAGEDIR}${RUBY_DOCDIR}/|}
 .for FILE in ${EXTDOCS}
 	${INSTALL_DATA} ${WRKSRC}/ext/${FILE} \
 		${STAGEDIR}${RUBY_DOCDIR}/${FILE:C|^([^/]+)/.*|\1|}/
 .endfor
 	@(cd ${WRKSRC}/doc/ && ${COPYTREE_SHARE} \* ${STAGEDIR}${RUBY_DOCDIR}/)
 	${INSTALL_DATA} ${WRKSRC}/COPYING* ${WRKSRC}/LEGAL ${WRKSRC}/README* ${STAGEDIR}${RUBY_DOCDIR}/
 
 post-install-EXAMPLES-on:
 	(cd ${WRKSRC}/sample/ && ${COPYTREE_SHARE} . ${STAGEDIR}${RUBY_EXAMPLESDIR}/)
 
 do-test:
 	cd ${WRKSRC} && ${MAKE_CMD} test
 
 .include <bsd.port.post.mk>
diff --git a/lang/ruby40/files/patch-configure.ac b/lang/ruby40/files/patch-configure.ac
index 2e3c608f9449..e48af2c4f55d 100644
--- a/lang/ruby40/files/patch-configure.ac
+++ b/lang/ruby40/files/patch-configure.ac
@@ -1,36 +1,46 @@
---- configure.ac.orig	2024-12-12 01:10:13 UTC
+--- configure.ac.orig	2026-05-19 23:22:54 UTC
 +++ configure.ac
-@@ -1411,7 +1411,7 @@ AC_CHECK_HEADERS(stdatomic.h)
+@@ -1444,7 +1444,7 @@ AC_CHECK_HEADERS(stdatomic.h)
  AC_CHECK_HEADERS(stdckdint.h)
  AC_CHECK_HEADERS(stdatomic.h)
  
 -AS_CASE("$target_cpu", [x64|x86_64|[i[3-6]86*]], [
 +AS_CASE("$target_cpu", [amd64|x64|x86_64|[i[3-6]86*]], [
    AC_CHECK_HEADERS(x86intrin.h)
  ])
  RUBY_UNIVERSAL_CHECK_HEADER([x86_64, i386], x86intrin.h)
-@@ -3149,7 +3149,7 @@ AC_SUBST(EXTOBJS)
+@@ -2761,6 +2761,9 @@ AS_CASE([$coroutine_type], [yes|''], [
+         [i386-freebsd*], [
+             coroutine_type=x86
+         ],
++        [arm*-freebsd*], [
++          coroutine_type=arm32
++        ],
+         [aarch64-freebsd*], [
+             coroutine_type=arm64
+         ],
+@@ -3183,7 +3186,7 @@ AC_SUBST(EXTOBJS)
  			: ${LDSHARED='$(CC) -shared'}
  			AS_IF([test "$rb_cv_binary_elf" = yes], [
  			    LDFLAGS="$LDFLAGS -rdynamic"
 -			    DLDFLAGS="$DLDFLAGS "'-Wl,-soname,$@'
 +			    DLDFLAGS="$DLDFLAGS "'-Wl,-E'
  			], [
  			  test "$GCC" = yes && test "$rb_cv_prog_gnu_ld" = yes || LDSHARED='$(LD) -Bshareable'
  			])
-@@ -3611,6 +3611,7 @@ AS_CASE("$enable_shared", [yes], [
+@@ -3644,6 +3647,7 @@ AS_CASE("$enable_shared", [yes], [
      [freebsd*|dragonfly*], [
  	LIBRUBY_SO='lib$(RUBY_SO_NAME).$(SOEXT).$(MAJOR)$(MINOR)'
  	LIBRUBY_SONAME='$(LIBRUBY_SO)'
 +	RUBY_APPEND_OPTIONS(LIBRUBY_DLDFLAGS, ['-Wl,-soname,${LIBRUBY_SO}'])
  	AS_IF([test "$rb_cv_binary_elf" != "yes" ], [
  	    LIBRUBY_SO="$LIBRUBY_SO.\$(TEENY)"
  	    LIBRUBY_ALIASES=''
-@@ -4443,6 +4444,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
+@@ -4546,6 +4550,7 @@ AS_IF([test "${universal_binary-no}" = yes ], [
          arch="${target_cpu}-mingw-ucrt"
      ], [
          arch="${target_cpu}-${target_os}"
 +	AS_CASE(["$target_cpu-$target_os"], [x86_64-freebsd*],[arch=amd64-${target_os}])
      ])
      AC_DEFINE_UNQUOTED(RUBY_PLATFORM, "$arch")