diff --git a/devel/sobjectizer/Makefile b/devel/sobjectizer/Makefile
index fac5744fc3f7..73ad11b0e931 100644
--- a/devel/sobjectizer/Makefile
+++ b/devel/sobjectizer/Makefile
@@ -1,24 +1,22 @@
 PORTNAME=	sobjectizer
-PORTVERSION=	5.7.4.2
-DISTVERSIONPREFIX=	v.
+PORTVERSION=	5.8.3
 CATEGORIES=	devel
+MASTER_SITES=	https://github.com/Stiffstream/${PORTNAME}/releases/download/v.${PORTVERSION}/
+DISTNAME=	so-${PORTVERSION}
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Cross-platform C++ actor framework
 WWW=		https://stiffstream.com/en/products/sobjectizer.html
 
 LICENSE=	BSD3CLAUSE
 LICENSE_FILE=	${WRKSRC}/../LICENSE
 
-USES=		cmake compiler:c++17-lang
-USE_GITHUB=	yes
-GH_ACCOUNT=	Stiffstream
-
+USES=		cmake compiler:c++17-lang tar:xz
 CMAKE_ON=	BUILD_TESTS
 
 WRKSRC_SUBDIR=	dev
 
 do-test:
 	@cd ${TEST_WRKSRC} && ctest -C ${CMAKE_BUILD_TYPE} ${_MAKE_JOBS}
 
 .include <bsd.port.mk>
diff --git a/devel/sobjectizer/distinfo b/devel/sobjectizer/distinfo
index c63b1e640ee6..5d71c3434f66 100644
--- a/devel/sobjectizer/distinfo
+++ b/devel/sobjectizer/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1661003330
-SHA256 (Stiffstream-sobjectizer-v.5.7.4.2_GH0.tar.gz) = defaec29e135a21b1b279b1db8eb56993099a7368baae93e7ea1f3f79909f3d8
-SIZE (Stiffstream-sobjectizer-v.5.7.4.2_GH0.tar.gz) = 991321
+TIMESTAMP = 1730526915
+SHA256 (so-5.8.3.tar.xz) = 43151cfcdac60564f7017397e542e5c89ca170f6b812532e51505655ce63ce49
+SIZE (so-5.8.3.tar.xz) = 817292
diff --git a/devel/sobjectizer/pkg-plist b/devel/sobjectizer/pkg-plist
index 074477a18fad..e9008bc49c70 100644
--- a/devel/sobjectizer/pkg-plist
+++ b/devel/sobjectizer/pkg-plist
@@ -1,147 +1,168 @@
 include/so_5/3rd_party/timertt/all.hpp
 include/so_5/agent.hpp
 include/so_5/agent_context.hpp
 include/so_5/agent_coop_notifications.hpp
+include/so_5/agent_identity.hpp
 include/so_5/agent_ref_fwd.hpp
 include/so_5/agent_state_listener.hpp
 include/so_5/agent_tuning_options.hpp
 include/so_5/all.hpp
 include/so_5/api.hpp
 include/so_5/atomic_refcounted.hpp
+include/so_5/bind_transformer_helpers.hpp
 include/so_5/compiler_features.hpp
 include/so_5/coop.hpp
 include/so_5/coop_handle.hpp
 include/so_5/coop_listener.hpp
 include/so_5/current_thread_id.hpp
 include/so_5/custom_mbox.hpp
 include/so_5/declspec.hpp
 include/so_5/details/abort_on_fatal_error.hpp
 include/so_5/details/always_false.hpp
 include/so_5/details/at_scope_exit.hpp
 include/so_5/details/invoke_noexcept_code.hpp
 include/so_5/details/ios_helpers.hpp
 include/so_5/details/lambda_traits.hpp
 include/so_5/details/remaining_time_counter.hpp
 include/so_5/details/rollback_on_exception.hpp
 include/so_5/details/safe_cv_wait_for.hpp
 include/so_5/details/suppress_exceptions.hpp
 include/so_5/details/sync_helpers.hpp
+include/so_5/detect_os.hpp
 include/so_5/disp/abstract_work_thread.hpp
 include/so_5/disp/active_group/pub.hpp
 include/so_5/disp/active_obj/pub.hpp
 include/so_5/disp/adv_thread_pool/impl/disp.hpp
 include/so_5/disp/adv_thread_pool/pub.hpp
 include/so_5/disp/mpmc_queue_traits/pub.hpp
 include/so_5/disp/mpsc_queue_traits/pub.hpp
+include/so_5/disp/nef_one_thread/params.hpp
+include/so_5/disp/nef_one_thread/pub.hpp
+include/so_5/disp/nef_thread_pool/pub.hpp
 include/so_5/disp/one_thread/params.hpp
 include/so_5/disp/one_thread/pub.hpp
 include/so_5/disp/prio_dedicated_threads/one_per_prio/pub.hpp
 include/so_5/disp/prio_one_thread/quoted_round_robin/impl/demand_queue.hpp
 include/so_5/disp/prio_one_thread/quoted_round_robin/pub.hpp
 include/so_5/disp/prio_one_thread/quoted_round_robin/quotes.hpp
 include/so_5/disp/prio_one_thread/reuse/work_thread.hpp
 include/so_5/disp/prio_one_thread/strictly_ordered/impl/demand_queue.hpp
 include/so_5/disp/prio_one_thread/strictly_ordered/pub.hpp
 include/so_5/disp/reuse/actual_work_thread_factory_to_use.hpp
 include/so_5/disp/reuse/data_source_prefix_helpers.hpp
+include/so_5/disp/reuse/default_thread_pool_size.hpp
 include/so_5/disp/reuse/make_actual_dispatcher.hpp
-include/so_5/disp/reuse/mpmc_ptr_queue.hpp
+include/so_5/disp/reuse/queue_of_queues.hpp
 include/so_5/disp/reuse/thread_pool_stats.hpp
 include/so_5/disp/reuse/work_thread/work_thread.hpp
 include/so_5/disp/reuse/work_thread_activity_tracking.hpp
 include/so_5/disp/reuse/work_thread_factory_params.hpp
+include/so_5/disp/thread_pool/impl/basic_event_queue.hpp
 include/so_5/disp/thread_pool/impl/common_implementation.hpp
 include/so_5/disp/thread_pool/impl/disp.hpp
+include/so_5/disp/thread_pool/impl/work_thread_template.hpp
 include/so_5/disp/thread_pool/pub.hpp
 include/so_5/disp_binder.hpp
 include/so_5/env_infrastructures.hpp
 include/so_5/enveloped_msg.hpp
 include/so_5/environment.hpp
 include/so_5/environment_infrastructure.hpp
 include/so_5/error_logger.hpp
 include/so_5/event_exception_logger.hpp
 include/so_5/event_queue.hpp
 include/so_5/event_queue_hook.hpp
 include/so_5/exception.hpp
 include/so_5/exception_control_flags.hpp
 include/so_5/execution_demand.hpp
 include/so_5/experimental/testing.hpp
 include/so_5/experimental/testing/v1/all.hpp
 include/so_5/fwd.hpp
 include/so_5/handler_makers.hpp
 include/so_5/impl/agent_ptr_compare.hpp
 include/so_5/impl/coop_private_iface.hpp
 include/so_5/impl/coop_repository_basis.hpp
 include/so_5/impl/delivery_filter_storage.hpp
 include/so_5/impl/enveloped_msg_details.hpp
+include/so_5/impl/final_dereg_chain_helpers.hpp
 include/so_5/impl/internal_agent_iface.hpp
 include/so_5/impl/internal_env_iface.hpp
 include/so_5/impl/layer_core.hpp
 include/so_5/impl/local_mbox.hpp
 include/so_5/impl/local_mbox_basic_subscription_info.hpp
 include/so_5/impl/make_mchain.hpp
 include/so_5/impl/mbox_core.hpp
 include/so_5/impl/mbox_iface_for_timers.hpp
 include/so_5/impl/mchain_details.hpp
 include/so_5/impl/message_limit_action_msg_tracer.hpp
-include/so_5/impl/message_limit_internals.hpp
+include/so_5/impl/message_sink_for_agent.hpp
+include/so_5/impl/message_sink_with_message_limit.hpp
+include/so_5/impl/message_sink_without_message_limit.hpp
 include/so_5/impl/mpsc_mbox.hpp
 include/so_5/impl/msg_tracing_helpers.hpp
 include/so_5/impl/mt_env_infrastructure.hpp
 include/so_5/impl/named_local_mbox.hpp
 include/so_5/impl/process_unhandled_exception.hpp
 include/so_5/impl/run_stage.hpp
 include/so_5/impl/st_env_infrastructure_reuse.hpp
+include/so_5/impl/std_message_sinks.hpp
 include/so_5/impl/std_msg_tracer_holder.hpp
 include/so_5/impl/stop_guard_repo.hpp
 include/so_5/impl/subscription_storage_iface.hpp
 include/so_5/impl/thread_join_stuff.hpp
 include/so_5/mbox.hpp
 include/so_5/mbox_fwd.hpp
+include/so_5/mbox_namespace_name.hpp
 include/so_5/mchain.hpp
 include/so_5/mchain_helper_functions.hpp
 include/so_5/mchain_select.hpp
 include/so_5/mchain_select_ifaces.hpp
 include/so_5/message.hpp
 include/so_5/message_handler_format_detector.hpp
 include/so_5/message_holder.hpp
 include/so_5/message_limit.hpp
+include/so_5/message_sink.hpp
 include/so_5/mhood.hpp
 include/so_5/msg_tracing.hpp
+include/so_5/msg_tracing_individual.hpp
+include/so_5/msinks/transform_then_redirect.hpp
+include/so_5/multi_sink_binding.hpp
 include/so_5/nonempty_name.hpp
 include/so_5/optional.hpp
 include/so_5/outliving.hpp
 include/so_5/priority.hpp
 include/so_5/queue_locks_defaults_manager.hpp
 include/so_5/ret_code.hpp
 include/so_5/rt.hpp
 include/so_5/send_functions.hpp
+include/so_5/single_sink_binding.hpp
 include/so_5/so_layer.hpp
 include/so_5/spinlocks.hpp
 include/so_5/state.hpp
 include/so_5/stats/controller.hpp
 include/so_5/stats/impl/activity_tracking.hpp
 include/so_5/stats/impl/ds_agent_core_stats.hpp
 include/so_5/stats/impl/ds_mbox_core_stats.hpp
 include/so_5/stats/impl/ds_timer_thread_stats.hpp
 include/so_5/stats/impl/st_env_stuff.hpp
 include/so_5/stats/impl/std_controller.hpp
 include/so_5/stats/messages.hpp
 include/so_5/stats/prefix.hpp
 include/so_5/stats/repository.hpp
 include/so_5/stats/std_names.hpp
 include/so_5/stats/work_thread_activity.hpp
 include/so_5/stop_guard.hpp
 include/so_5/subscription_storage_fwd.hpp
 include/so_5/thread_helper_functions.hpp
 include/so_5/timers.hpp
+include/so_5/transformed_message.hpp
 include/so_5/types.hpp
+include/so_5/unique_subscribers_mbox.hpp
 include/so_5/version.hpp
 include/so_5/wait_indication.hpp
 include/so_5/wrapped_env.hpp
 lib/cmake/sobjectizer/sobjectizer-config-version.cmake
 lib/cmake/sobjectizer/sobjectizer-config.cmake
 lib/cmake/sobjectizer/sobjectizer-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/sobjectizer/sobjectizer-targets.cmake
-lib/libso.5.7.4.2.so
-lib/libso_s.5.7.4.2.a
+lib/libso.5.8.3.so
+lib/libso_s.5.8.3.a
diff --git a/net/arataga/Makefile b/net/arataga/Makefile
index b3e687c5f524..6154c7d5c2da 100644
--- a/net/arataga/Makefile
+++ b/net/arataga/Makefile
@@ -1,60 +1,60 @@
 PORTNAME=	arataga
 PORTVERSION=	0.5.4
 DISTVERSIONPREFIX=	v
 PORTREVISION=	3
 CATEGORIES=	net
 MASTER_SITES=	SF/sobjectizer/oess/oess-2:oess
 DISTFILES=	oess-2.2.3-full.tar.bz2:oess
 
 MAINTAINER=	danfe@FreeBSD.org
 COMMENT=	Performant SOCKS5/HTTP1.1 proxy server
 WWW=		https://github.com/Stiffstream/arataga
 
 LICENSE=	AGPLv3
 
 BUILD_DEPENDS=	${LOCALBASE}/include/spdlog/spdlog.h:devel/spdlog \
 		${LOCALBASE}/include/asio/ip/address.hpp:net/asio \
 		${LOCALBASE}/include/args.hxx:devel/args
 LIB_DEPENDS=	libso.${_SO5_LIBVER}.so:devel/sobjectizer \
 		libfmt.so:devel/libfmt \
 		libhttp_parser.so:www/http-parser
 TEST_DEPENDS=	${LOCALBASE}/include/doctest/doctest.h:devel/doctest
 
 USES=		compiler:c++17-lang gmake
 MAKEFILE=	${FILESDIR}/makefile
 MAKE_ENV=	SO5_LIBVER=${_SO5_LIBVER}
 WRKSRC_SUBDIR=	${PORTNAME}
 
 TEST_TARGET=	run_unit_tests
 TEST_WRKSRC=	${WRKSRC}/../tests
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	Stiffstream
 GH_PROJECT=	noexcept-ctcheck:nectc restinio:rinio so5extra:so5e
-GH_TAGNAME=	v.1.0.0:nectc v.0.6.16:rinio v.1.5.2:so5e
+GH_TAGNAME=	v.1.0.0:nectc v.0.6.16:rinio v.1.6.2:so5e
 
-_SO5_LIBVER=	5.7.4.2
+_SO5_LIBVER=	5.8.3
 
 PLIST_FILES=	bin/${PORTNAME}
 PORTDOCS=	*.md
 
 OPTIONS_DEFINE=	DOCS
 
 post-extract:
 	@${LN} -s ../../noexcept-ctcheck-v.1.0.0/noexcept_ctcheck \
 		../../restinio-v.0.6.16/dev/restinio \
-		../../so5extra-v.1.5.2/dev/so_5_extra \
+		../../so5extra-v.1.6.2/dev/so_5_extra \
 		../../oess-2.2.3/dev/cpp_util_2 \
 		../../oess-2.2.3/dev/oess_2 ${WRKSRC}
 
 post-patch:
 	@${REINPLACE_CMD} -e '/^#include </s,nodejs/http_parser/,,' \
 		${WRKSRC}/acl_handler/handlers/http/basics.hpp \
 		${WRKSRC}/acl_handler/handlers/http/helpers.hpp
 	@${REINPLACE_CMD} -e '/#include/s,args/,,' ${WRKSRC}/main.cpp
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S,^,${WRKSRC}/../,} ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
diff --git a/net/arataga/distinfo b/net/arataga/distinfo
index 427d02caa1d5..af6f1ec2acef 100644
--- a/net/arataga/distinfo
+++ b/net/arataga/distinfo
@@ -1,11 +1,11 @@
 TIMESTAMP = 1657688985
 SHA256 (oess-2.2.3-full.tar.bz2) = c9285e34752e9689989de3707cea2fc8c0c1d4607a7c35237a740c1cfb4dd8e9
 SIZE (oess-2.2.3-full.tar.bz2) = 219768
 SHA256 (Stiffstream-arataga-v0.5.4_GH0.tar.gz) = 8218415a869b0fa4ceceafd7bd805e963c00585d2140db32cd289b3a5c62061b
 SIZE (Stiffstream-arataga-v0.5.4_GH0.tar.gz) = 195310
 SHA256 (Stiffstream-noexcept-ctcheck-v.1.0.0_GH0.tar.gz) = bdda733ba4fbd9ae4ea9cadba2e95fc6f4e65e18b8261b831aaedc827c712e44
 SIZE (Stiffstream-noexcept-ctcheck-v.1.0.0_GH0.tar.gz) = 7009
 SHA256 (Stiffstream-restinio-v.0.6.16_GH0.tar.gz) = b3208d746087ba979f51b3a32e08463718c33d58720247d53ffb5bda99f4f92a
 SIZE (Stiffstream-restinio-v.0.6.16_GH0.tar.gz) = 665405
-SHA256 (Stiffstream-so5extra-v.1.5.2_GH0.tar.gz) = 5409dc255c970d2085381ceded122b80b9ac896a34bafc5ffc431bae304d485d
-SIZE (Stiffstream-so5extra-v.1.5.2_GH0.tar.gz) = 217824
+SHA256 (Stiffstream-so5extra-v.1.6.2_GH0.tar.gz) = b100372f210ad8894af8139f05bf7994c7926dc737900a8e8604aefbaf52f8b7
+SIZE (Stiffstream-so5extra-v.1.6.2_GH0.tar.gz) = 232324