diff --git a/devel/node-thrift/pkg-plist b/devel/node-thrift/pkg-plist
index 7756f7367800..9cdd8ebcbec4 100644
--- a/devel/node-thrift/pkg-plist
+++ b/devel/node-thrift/pkg-plist
@@ -1,68 +1,71 @@
 lib/node/thrift
 lib/node_modules/thrift/CMakeLists.txt
 lib/node_modules/thrift/Makefile.am
 lib/node_modules/thrift/Makefile.in
 lib/node_modules/thrift/README.md
 lib/node_modules/thrift/coding_standards.md
 lib/node_modules/thrift/examples/Makefile
 lib/node_modules/thrift/examples/README.md
 lib/node_modules/thrift/examples/client.js
 lib/node_modules/thrift/examples/client_multitransport.js
 lib/node_modules/thrift/examples/hello.html
 lib/node_modules/thrift/examples/hello.js
 lib/node_modules/thrift/examples/hello.thrift
 lib/node_modules/thrift/examples/httpClient.js
 lib/node_modules/thrift/examples/httpServer.js
 lib/node_modules/thrift/examples/httpServer.py
 lib/node_modules/thrift/examples/parse.js
 lib/node_modules/thrift/examples/server.js
 lib/node_modules/thrift/examples/server_http.js
 lib/node_modules/thrift/examples/server_multitransport.js
 lib/node_modules/thrift/examples/user.thrift
 lib/node_modules/thrift/lib/thrift/binary.js
 lib/node_modules/thrift/lib/thrift/binary_protocol.js
 lib/node_modules/thrift/lib/thrift/browser.js
 lib/node_modules/thrift/lib/thrift/buffered_transport.js
 lib/node_modules/thrift/lib/thrift/compact_protocol.js
 lib/node_modules/thrift/lib/thrift/connection.js
 lib/node_modules/thrift/lib/thrift/create_client.js
 lib/node_modules/thrift/lib/thrift/framed_transport.js
 lib/node_modules/thrift/lib/thrift/header_protocol.js
 lib/node_modules/thrift/lib/thrift/header_transport.js
 lib/node_modules/thrift/lib/thrift/http_connection.js
 lib/node_modules/thrift/lib/thrift/index.js
 lib/node_modules/thrift/lib/thrift/input_buffer_underrun_error.js
 lib/node_modules/thrift/lib/thrift/int64_util.js
 lib/node_modules/thrift/lib/thrift/json_parse.js
 lib/node_modules/thrift/lib/thrift/json_protocol.js
 lib/node_modules/thrift/lib/thrift/log.js
 lib/node_modules/thrift/lib/thrift/multiplexed_processor.js
 lib/node_modules/thrift/lib/thrift/multiplexed_protocol.js
 lib/node_modules/thrift/lib/thrift/ohos_connection.js
 lib/node_modules/thrift/lib/thrift/protocol.js
 lib/node_modules/thrift/lib/thrift/server.js
 lib/node_modules/thrift/lib/thrift/thrift.js
 lib/node_modules/thrift/lib/thrift/transport.js
 lib/node_modules/thrift/lib/thrift/web_server.js
 lib/node_modules/thrift/lib/thrift/ws_connection.js
 lib/node_modules/thrift/lib/thrift/ws_transport.js
 lib/node_modules/thrift/lib/thrift/xhr_connection.js
 lib/node_modules/thrift/test/binary.test.js
 lib/node_modules/thrift/test/certificates.README
-lib/node_modules/thrift/test/client.js
+lib/node_modules/thrift/test/client.mjs
 lib/node_modules/thrift/test/deep-constructor.test.js
 lib/node_modules/thrift/test/episodic-code-generation-test/client.js
 lib/node_modules/thrift/test/episodic-code-generation-test/episodic_compilation.package.json
 lib/node_modules/thrift/test/episodic-code-generation-test/server.js
 lib/node_modules/thrift/test/exceptions.js
 lib/node_modules/thrift/test/header.test.js
 lib/node_modules/thrift/test/helpers.js
+lib/node_modules/thrift/test/include.test.mjs
 lib/node_modules/thrift/test/int64.test.js
+lib/node_modules/thrift/test/package-lock.json
+lib/node_modules/thrift/test/package.json
 lib/node_modules/thrift/test/server.crt
-lib/node_modules/thrift/test/server.js
+lib/node_modules/thrift/test/server.mjs
 lib/node_modules/thrift/test/server.key
-lib/node_modules/thrift/test/test-cases.js
+lib/node_modules/thrift/test/test-cases.mjs
 lib/node_modules/thrift/test/test_header_payload
 lib/node_modules/thrift/test/testAll.sh
-lib/node_modules/thrift/test/test_driver.js
-lib/node_modules/thrift/test/test_handler.js
+lib/node_modules/thrift/test/test_driver.mjs
+lib/node_modules/thrift/test/test_handler.mjs
diff --git a/devel/rubygem-thrift/distinfo b/devel/rubygem-thrift/distinfo
index 66740a65a838..33d038fccaf0 100644
--- a/devel/rubygem-thrift/distinfo
+++ b/devel/rubygem-thrift/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742810482
-SHA256 (rubygem/thrift-0.21.0.gem) = 62c92fc29eae93a53031741393f30f2f2a034c06aea3aac1ec561f58e5f0626b
-SIZE (rubygem/thrift-0.21.0.gem) = 75264
+TIMESTAMP = 1755686832
+SHA256 (rubygem/thrift-0.22.0.gem) = 7a44a197529af812f89ed0c26a3be60c43b378a488262efaeba966246fbb5d78
+SIZE (rubygem/thrift-0.22.0.gem) = 75264
diff --git a/devel/thrift-cpp/Makefile b/devel/thrift-cpp/Makefile
index d09a41ef6f11..7cdd743db759 100644
--- a/devel/thrift-cpp/Makefile
+++ b/devel/thrift-cpp/Makefile
@@ -1,49 +1,48 @@
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION} # to keep in sync with thrift
-PORTREVISION=	1
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
 PKGNAMESUFFIX=	-cpp
 DISTNAME=	thrift-${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	C++ interface to Thrift
 WWW=		https://thrift.apache.org/
 
 BROKEN_i386=	undefined reference to 'boost::atomics::detail::lockpool::scoped_lock::scoped_lock(void const volatile*)'
 
 LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
 		libevent.so:devel/libevent
 
 USES=			bison cmake pkgconfig compiler:c++11-lang cpe \
 			pathfix ssl
 CPE_VENDOR=		apache
 USE_LDCONFIG=		yes
 
 CMAKE_ON=		BUILD_CPP
 CMAKE_OFF=		BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL BUILD_TESTING
 
 MAKE_JOBS_UNSAFE=	yes
 DISTINFO_FILE=		${.CURDIR}/../thrift/distinfo
 PLIST_SUB=		PORTVERSION="${THRIFT_PORTVERSION}"
 
 .include <bsd.port.pre.mk>
 
 .if ${CHOSEN_COMPILER_TYPE} == clang
 USE_CXXSTD=	c++11
 .endif
 
 .if ${SSL_DEFAULT} != base
 LDFLAGS+=	-L${OPENSSLLIB}
 CFLAGS+=	-I${OPENSSLINC}
 .endif
 
 post-install:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/lib/lib*.so
 	${LN} -sf libthrift-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthrift.so.0
 	${LN} -sf libthriftnb-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftnb.so.0
 	${LN} -sf libthriftz-${PORTVERSION}.so ${STAGEDIR}${PREFIX}/lib/libthriftz.so.0
 
 .include "../thrift/bsd.thrift.mk"
 .include <bsd.port.post.mk>
diff --git a/devel/thrift/Makefile b/devel/thrift/Makefile
index 2022e9fc2c87..3ec660e477b5 100644
--- a/devel/thrift/Makefile
+++ b/devel/thrift/Makefile
@@ -1,51 +1,51 @@
 PORTNAME=	thrift
 PORTVERSION=	${THRIFT_PORTVERSION}	# get these from bsd.thrift.mk. any upgrade needs to check ALL dependencies
 PORTREVISION=	0
 PORTEPOCH=	1
 CATEGORIES=	devel
 MASTER_SITES=	APACHE/thrift/${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	Framework for scalable cross-language services development
 WWW=		https://thrift.apache.org/
 
 LICENSE=	APACHE20
 
 LIB_DEPENDS=	libevent.so:devel/libevent
 
 USES=		bison cmake compiler:c++11-lang cpe pkgconfig
 CPE_VENDOR=	apache
 USE_LDCONFIG=	yes
 
 # For C++ support, use devel/thrift-cpp
-# For C glib support, use devel/thrift-c_glib.
-# For Perl support, use devel/p5-Thrift.
-# For Python support, use devel/py-thrift.
-# For Ruby support, use devel/rubygem-thrift.
-# For nodejs support, use devel/node-thrift.
+# For C glib support, use devel/thrift-c_glib
+# For Perl support, use devel/p5-Thrift
+# For Python support, use devel/py-thrift
+# For Ruby support, use devel/rubygem-thrift
+# For nodejs support, use devel/node-thrift
 # Other languages are not yet supported, please feel free to contribute
 # using one of the leaf ports as an example.
 CMAKE_OFF=	BUILD_CPP BUILD_C_GLIB BUILD_JAVA BUILD_JAVASCRIPT BUILD_NODEJS BUILD_PYTHON BUILD_HASKELL
 
 .include <bsd.port.pre.mk>
 .include "bsd.thrift.mk"
 
 PLIST_SUB+=	PORTVERSION="${PORTVERSION}"
 
 post-patch:
 	@${REINPLACE_CMD} 's,-Werror,,' ${WRKSRC}/compiler/cpp/Makefile.am \
 		${WRKSRC}/lib/rb/ext/extconf.rb
 
 pre-configure:
 	@${REINPLACE_CMD} '/config.h/d' ${WRKSRC}/lib/cpp/Makefile.am
 
 post-install:
 	@${ECHO_MSG}
 	@${ECHO_MSG} "For use with C++, the same compiler as used to build this port must be used"
 	@${ECHO_MSG} "to compile and link your generated IDL bindings."
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Note: The Thrift white paper may be downloaded from:"
 	@${ECHO_MSG} "http://thrift.apache.org/static/thrift-20070401.pdf"
 	@${ECHO_MSG}
 
 .include <bsd.port.post.mk>
diff --git a/devel/thrift/bsd.thrift.mk b/devel/thrift/bsd.thrift.mk
index 8e045d4bcd46..7b0f8b60bfe7 100644
--- a/devel/thrift/bsd.thrift.mk
+++ b/devel/thrift/bsd.thrift.mk
@@ -1,30 +1,30 @@
 # to use:
 # in your makefile, set:
 # PORTVERSION=	${THRIFT_PORTVERSION}
 # see $PORTSDIR/devel/thrift for examples 
-THRIFT_PORTVERSION=	0.21.0
+THRIFT_PORTVERSION=	0.22.0
 
 LICENSE=		APACHE20
 
 MASTER_SITE_APACHE+=	https://archive.apache.org/dist/%SUBDIR%/ 
 CONFIGURE_ARGS+=	\
 		--without-tests
 
 # Make sure we install thrift compiler related files not with child packages
 .if !empty(PKGNAMESUFFIX) || ${PORTNAME} != "thrift"
 _USES_install+= 900:thrift-post-install
 BUILD_DEPENDS+=	thrift>=${PORTVERSION}:devel/thrift
 RUN_DEPENDS+=	thrift>=${PORTVERSION}:devel/thrift
 
 CMAKE_ARGS+=	-DTHRIFT_COMPILER=${PREFIX}/bin/thrift
 CMAKE_ON+=	BUILD_SHARED_LIBS
 CMAKE_OFF+=	BUILD_COMPILER
 
 thrift-post-install:
 	${RM} ${STAGEDIR}${PREFIX}/lib/cmake/thrift/FindLibevent.cmake
 	${RM} ${STAGEDIR}${PREFIX}/lib/cmake/thrift/ThriftConfig.cmake
 	${RM} ${STAGEDIR}${PREFIX}/lib/cmake/thrift/ThriftConfigVersion.cmake
 .else
 MAKE_ON+=	BUILD_COMPILER
 CMAKE_OFF+=	BUILD_SHARED_LIB
 .endif
diff --git a/devel/thrift/distinfo b/devel/thrift/distinfo
index 6d337e77f668..0fcb9103ed83 100644
--- a/devel/thrift/distinfo
+++ b/devel/thrift/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1742808377
-SHA256 (thrift-0.21.0.tar.gz) = 9a24f3eba9a4ca493602226c16d8c228037db3b9291c6fc4019bfe3bd39fc67c
-SIZE (thrift-0.21.0.tar.gz) = 4398072
+TIMESTAMP = 1755676434
+SHA256 (thrift-0.22.0.tar.gz) = 794a0e455787960d9f27ab92c38e34da27e8deeda7a5db0e59dc64a00df8a1e5
+SIZE (thrift-0.22.0.tar.gz) = 4422267