diff --git a/archivers/snappy/patches/patch-CMakeLists_txt b/archivers/snappy/patches/patch-CMakeLists_txt
new file mode 100644
index 000000000..cd2263d08
--- /dev/null
+++ b/archivers/snappy/patches/patch-CMakeLists_txt
@@ -0,0 +1,14 @@
+omit -Werror (when clang is used)
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -69,7 +69,7 @@ else(CMAKE_CXX_COMPILER_ID STREQUAL "MSVC")
+   # Use -Werror for clang only.
+   if(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+     if(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+-      set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
++    #set(CMAKE_CXX_FLAGS "${CMAKE_CXX_FLAGS} -Werror")
+     endif(NOT CMAKE_CXX_FLAGS MATCHES "-Werror")
+   endif(CMAKE_CXX_COMPILER_ID MATCHES "Clang")
+ 
diff --git a/devel/arm-none-eabi/gcc/Makefile b/devel/arm-none-eabi/gcc/Makefile
index f1ee670e2..d45019ba8 100644
--- a/devel/arm-none-eabi/gcc/Makefile
+++ b/devel/arm-none-eabi/gcc/Makefile
@@ -3,7 +3,7 @@ COMMENT=	gcc for ${CONFIG} cross-development
 VERSION=	12.2.0
 DISTNAME=	gcc-${VERSION}
 PKGNAME=	${CONFIG}-gcc-${VERSION}
-REVISION=	0
+REVISION=	1
 
 USE_NOEXECONLY=	Yes
 
@@ -55,7 +55,6 @@ CONFIGURE_ARGS+=--enable-languages=${LANGS}	\
 		--with-gmp=${LOCALBASE}		\
 		--with-newlib			\
 		--disable-libcc1		\
-		--disable-lto			\
 		--enable-cpp			\
 		--without-isl			\
 		--without-zstd
diff --git a/devel/arm-none-eabi/gcc/pkg/PLIST b/devel/arm-none-eabi/gcc/pkg/PLIST
index b92d0095b..24cb0ea81 100644
--- a/devel/arm-none-eabi/gcc/pkg/PLIST
+++ b/devel/arm-none-eabi/gcc/pkg/PLIST
@@ -11,6 +11,7 @@
 @bin bin/${CONFIG}-gcov
 @bin bin/${CONFIG}-gcov-dump
 @bin bin/${CONFIG}-gcov-tool
+@bin bin/${CONFIG}-lto-dump
 libexec/gcc/
 libexec/gcc/${CONFIG}/
 libexec/gcc/${CONFIG}/${VERSION}/
@@ -23,7 +24,10 @@ libexec/gcc/${CONFIG}/${VERSION}/install-tools/fixinc.sh
 @bin libexec/gcc/${CONFIG}/${VERSION}/install-tools/fixincl
 libexec/gcc/${CONFIG}/${VERSION}/install-tools/mkheaders
 libexec/gcc/${CONFIG}/${VERSION}/install-tools/mkinstalldirs
+libexec/gcc/${CONFIG}/${VERSION}/liblto_plugin.la
+@so libexec/gcc/${CONFIG}/${VERSION}/liblto_plugin.so
 @bin libexec/gcc/${CONFIG}/${VERSION}/lto-wrapper
+@bin libexec/gcc/${CONFIG}/${VERSION}/lto1
 libexec/gcc/${CONFIG}/${VERSION}/plugin/
 @bin libexec/gcc/${CONFIG}/${VERSION}/plugin/gengtype
 @man man/man1/${CONFIG}-cpp.1
@@ -35,3 +39,4 @@ libexec/gcc/${CONFIG}/${VERSION}/plugin/
 @comment @man man/man7/fsf-funding.7
 @comment @man man/man7/gfdl.7
 @comment @man man/man7/gpl.7
+@man man/man1/${CONFIG}-lto-dump.1
diff --git a/games/vcmi/Makefile b/games/vcmi/Makefile
index 9239e5bd2..516fa53c7 100644
--- a/games/vcmi/Makefile
+++ b/games/vcmi/Makefile
@@ -1,4 +1,4 @@
-DISTNAME = 	vcmi-1.3.2.20230916
+PKGNAME = 	vcmi-1.3.2.20230919
 
 COMMENT =	HoMM3 engine rewrite
 
@@ -8,7 +8,14 @@ HOMEPAGE =	https://vcmi.eu/
 
 MAINTAINER =	Kirill Bychkov <kirby@openbsd.org>
 
-SITES =		http://www.linklevel.net/distfiles/
+DIST_TUPLE += github vcmi vcmi \
+		b7de6854836373b1f77e24e94c1a933e782f3d34 .
+DIST_TUPLE += github fuzzylite fuzzylite \
+		7aee562d6ca17f3cf42588ffb5116e03017c3c50 AI/FuzzyLite
+DIST_TUPLE += github google googletest \
+		b796f7d44681514f58a683a3a71ff17c94edb0c1 test/googletest
+
+WRKDIST=        ${WRKDIR}/vcmi-b7de6854836373b1f77e24e94c1a933e782f3d34
 
 # GPLv2+
 PERMIT_PACKAGE =	Yes
diff --git a/games/vcmi/distinfo b/games/vcmi/distinfo
index 513c49867..1f40cff57 100644
--- a/games/vcmi/distinfo
+++ b/games/vcmi/distinfo
@@ -1,2 +1,6 @@
-SHA256 (vcmi-1.3.2.20230916.tar.gz) = +B79NOEtX3jjGlr92aYf24C3MG5RkutcQl0iEIG8YaI=
-SIZE (vcmi-1.3.2.20230916.tar.gz) = 11634943
+SHA256 (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = cOf9r/LVFHo79ZDMgXGWbZmDzNSZQAL4IWyDskBZl0Y=
+SHA256 (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) = JoHejAkwsGENxSomAvrUHQ2vo9f/EDDaZXXVb8H0ykY=
+SHA256 (vcmi-vcmi-b7de6854836373b1f77e24e94c1a933e782f3d34.tar.gz) = C+RsiEDZzSAUyYAcAJWqUyGxu8rveO0oeflSatQ9v9o=
+SIZE (fuzzylite-fuzzylite-7aee562d6ca17f3cf42588ffb5116e03017c3c50.tar.gz) = 2194254
+SIZE (google-googletest-b796f7d44681514f58a683a3a71ff17c94edb0c1.tar.gz) = 864010
+SIZE (vcmi-vcmi-b7de6854836373b1f77e24e94c1a933e782f3d34.tar.gz) = 8675937
diff --git a/graphics/Makefile b/graphics/Makefile
index 71f6e38ce..e795dad18 100644
--- a/graphics/Makefile
+++ b/graphics/Makefile
@@ -299,6 +299,7 @@
      SUBDIR += scratch
      SUBDIR += scrot
      SUBDIR += seq2gif
+     SUBDIR += shaderc
      SUBDIR += shotwell
      SUBDIR += simgear
      SUBDIR += simple-scan
diff --git a/graphics/shaderc/Makefile b/graphics/shaderc/Makefile
new file mode 100644
index 000000000..ce757190a
--- /dev/null
+++ b/graphics/shaderc/Makefile
@@ -0,0 +1,41 @@
+COMMENT =	SL/HLSL to SPIR-V shader compiler
+
+DIST_TUPLE =	github google shaderc v2023.6 .
+
+SHARED_LIBS +=	shaderc_shared		0.0 # 0.0
+
+CATEGORIES =	graphics
+
+# Apache 2
+PERMIT_PACKAGE = Yes
+
+WANTLIB += ${COMPILER_LIBCXX} HLSL SPIRV c glslang m
+
+COMPILER =	base-clang ports-gcc
+
+MODULES =	devel/cmake \
+		lang/python
+
+MODPY_RUNDEP =	No
+
+BUILD_DEPENDS =	devel/gtest \
+		graphics/spirv-headers \
+		graphics/spirv-tools
+
+LIB_DEPENDS =	graphics/glslang
+
+CXXFLAGS +=	-I${LOCALBASE}/include \
+		-I${LOCALBASE}/include/glslang \
+		-std=c++14
+
+LDFLAGS +=	-L${LOCALBASE}/lib
+
+CONFIGURE_ENV +=	LDFLAGS="${LDFLAGS}"
+CONFIGURE_ARGS +=	-DSHADERC_ENABLE_WERROR_COMPILE=OFF
+
+# fake the deps version
+pre-configure:
+	echo '"spirv-tools system\\n"' >> ${WRKSRC}/glslc/src/build-version.inc
+	echo '"glslang system\\n"' >> ${WRKSRC}/glslc/src/build-version.inc
+
+.include <bsd.port.mk>
diff --git a/graphics/shaderc/distinfo b/graphics/shaderc/distinfo
new file mode 100644
index 000000000..f998a6772
--- /dev/null
+++ b/graphics/shaderc/distinfo
@@ -0,0 +1,2 @@
+SHA256 (google-shaderc-v2023.6.tar.gz) = 5A/UqHpW9mEOIjEiF58IbVxPEafg4qpGHwMlw6Csxq4=
+SIZE (google-shaderc-v2023.6.tar.gz) = 226361
diff --git a/graphics/shaderc/patches/patch-CMakeLists_txt b/graphics/shaderc/patches/patch-CMakeLists_txt
new file mode 100644
index 000000000..e74a955ed
--- /dev/null
+++ b/graphics/shaderc/patches/patch-CMakeLists_txt
@@ -0,0 +1,14 @@
+disable bundled dependencies
+
+Index: CMakeLists.txt
+--- CMakeLists.txt.orig
++++ CMakeLists.txt
+@@ -120,7 +120,7 @@ endif(MSVC)
+ 
+ # Configure subdirectories.
+ # We depend on these for later projects, so they should come first.
+-add_subdirectory(third_party)
++# add_subdirectory(third_party)
+ 
+ add_subdirectory(libshaderc_util)
+ add_subdirectory(libshaderc)
diff --git a/graphics/shaderc/patches/patch-cmake_utils_cmake b/graphics/shaderc/patches/patch-cmake_utils_cmake
new file mode 100644
index 000000000..05db2fe1d
--- /dev/null
+++ b/graphics/shaderc/patches/patch-cmake_utils_cmake
@@ -0,0 +1,24 @@
+- fix building with system gtest
+- remove -std=c++11; gtest wants at least C++14
+
+Index: cmake/utils.cmake
+--- cmake/utils.cmake.orig
++++ cmake/utils.cmake
+@@ -18,7 +18,7 @@ function (shaderc_use_gmock TARGET)
+   target_include_directories(${TARGET} PRIVATE
+     ${gmock_SOURCE_DIR}/include
+     ${gtest_SOURCE_DIR}/include)
+-  target_link_libraries(${TARGET} PRIVATE gmock gtest_main)
++  target_link_libraries(${TARGET} PRIVATE gmock gtest gtest_main)
+ endfunction(shaderc_use_gmock)
+ 
+ function(shaderc_default_c_compile_options TARGET)
+@@ -59,7 +59,7 @@ endfunction(shaderc_default_c_compile_options)
+ function(shaderc_default_compile_options TARGET)
+   shaderc_default_c_compile_options(${TARGET})
+   if (NOT "${MSVC}")
+-    target_compile_options(${TARGET} PRIVATE -std=c++11)
++    target_compile_options(${TARGET} PRIVATE)
+     if (NOT SHADERC_ENABLE_SHARED_CRT)
+       if (WIN32)
+         # For MinGW cross compile, statically link to the C++ runtime.
diff --git a/graphics/shaderc/patches/patch-glslc_CMakeLists_txt b/graphics/shaderc/patches/patch-glslc_CMakeLists_txt
new file mode 100644
index 000000000..ba130e0e1
--- /dev/null
+++ b/graphics/shaderc/patches/patch-glslc_CMakeLists_txt
@@ -0,0 +1,23 @@
+- fix libraries needed
+- remove the generation fo the build-version.inc file
+
+Index: glslc/CMakeLists.txt
+--- glslc/CMakeLists.txt.orig
++++ glslc/CMakeLists.txt
+@@ -43,7 +43,7 @@ if (SHADERC_ENABLE_WGSL_OUTPUT)
+ endif(SHADERC_ENABLE_WGSL_OUTPUT)
+ 
+ target_link_libraries(glslc PRIVATE
+-  glslang OSDependent OGLCompiler HLSL glslang SPIRV    # Glslang libraries
++  glslang HLSL glslang SPIRV    # Glslang libraries
+   $<$<BOOL:${SHADERC_ENABLE_WGSL_OUTPUT}>:libtint>      # Tint libraries, optional
+   shaderc_util shaderc                                  # internal Shaderc libraries
+   ${CMAKE_THREAD_LIBS_INIT})
+@@ -53,7 +53,6 @@ shaderc_default_compile_options(glslc_exe)
+ target_include_directories(glslc_exe PRIVATE ${CMAKE_CURRENT_BINARY_DIR}/.. ${spirv-tools_SOURCE_DIR}/include)
+ set_target_properties(glslc_exe PROPERTIES OUTPUT_NAME glslc)
+ target_link_libraries(glslc_exe PRIVATE glslc shaderc_util shaderc)
+-add_dependencies(glslc_exe build-version)
+ 
+ shaderc_add_tests(
+   TEST_PREFIX glslc
diff --git a/graphics/shaderc/patches/patch-glslc_test_CMakeLists_txt b/graphics/shaderc/patches/patch-glslc_test_CMakeLists_txt
new file mode 100644
index 000000000..166997a48
--- /dev/null
+++ b/graphics/shaderc/patches/patch-glslc_test_CMakeLists_txt
@@ -0,0 +1,13 @@
+use system' spriv-tools not the bundled one
+
+Index: glslc/test/CMakeLists.txt
+--- glslc/test/CMakeLists.txt.orig
++++ glslc/test/CMakeLists.txt
+@@ -23,6 +23,6 @@ if(${SHADERC_ENABLE_TESTS})
+   add_test(NAME glslc_tests
+     COMMAND ${PYTHON_EXECUTABLE}
+     ${CMAKE_CURRENT_SOURCE_DIR}/glslc_test_framework.py
+-    $<TARGET_FILE:glslc_exe> $<TARGET_FILE:spirv-dis>
++    $<TARGET_FILE:glslc_exe> spirv-dis
+     --test-dir ${CMAKE_CURRENT_SOURCE_DIR})
+ endif()
diff --git a/graphics/shaderc/patches/patch-libshaderc_CMakeLists_txt b/graphics/shaderc/patches/patch-libshaderc_CMakeLists_txt
new file mode 100644
index 000000000..17d45da45
--- /dev/null
+++ b/graphics/shaderc/patches/patch-libshaderc_CMakeLists_txt
@@ -0,0 +1,23 @@
+fix libraries needed
+
+Index: libshaderc/CMakeLists.txt
+--- libshaderc/CMakeLists.txt.orig
++++ libshaderc/CMakeLists.txt
+@@ -63,7 +63,7 @@ endif(SHADERC_ENABLE_INSTALL)
+ 
+ find_package(Threads)
+ set(SHADERC_LIBS
+-  glslang OSDependent OGLCompiler glslang ${CMAKE_THREAD_LIBS_INIT}
++  glslang glslang ${CMAKE_THREAD_LIBS_INIT}
+   shaderc_util
+   SPIRV # from glslang
+   SPIRV-Tools
+@@ -115,7 +115,7 @@ endif(SHADERC_ENABLE_INSTALL)
+ 
+ shaderc_add_tests(
+   TEST_PREFIX shaderc_combined
+-  LINK_LIBS shaderc_combined ${CMAKE_THREAD_LIBS_INIT}
++  LINK_LIBS shaderc_combined ${SHADERC_LIBS}
+   INCLUDE_DIRS include ${shaderc_SOURCE_DIR}/libshaderc_util/include ${glslang_SOURCE_DIR}
+                ${spirv-tools_SOURCE_DIR}/include
+                ${SPIRV-Headers_SOURCE_DIR}/include
diff --git a/graphics/shaderc/patches/patch-libshaderc_util_CMakeLists_txt b/graphics/shaderc/patches/patch-libshaderc_util_CMakeLists_txt
new file mode 100644
index 000000000..35784cb15
--- /dev/null
+++ b/graphics/shaderc/patches/patch-libshaderc_util_CMakeLists_txt
@@ -0,0 +1,16 @@
+fix libraries needed
+
+Index: libshaderc_util/CMakeLists.txt
+--- libshaderc_util/CMakeLists.txt.orig
++++ libshaderc_util/CMakeLists.txt
+@@ -46,8 +46,8 @@ add_definitions(-DENABLE_HLSL)
+ 
+ find_package(Threads)
+ target_link_libraries(shaderc_util PRIVATE
+-  glslang OSDependent OGLCompiler HLSL glslang SPIRV
+-  SPIRV-Tools-opt ${CMAKE_THREAD_LIBS_INIT})
++  glslang glslang SPIRV
++  SPIRV-Tools-opt SPIRV-Tools ${CMAKE_THREAD_LIBS_INIT})
+ 
+ shaderc_add_tests(
+   TEST_PREFIX shaderc_util
diff --git a/graphics/shaderc/pkg/DESCR b/graphics/shaderc/pkg/DESCR
new file mode 100644
index 000000000..928c7f99c
--- /dev/null
+++ b/graphics/shaderc/pkg/DESCR
@@ -0,0 +1,16 @@
+shaderc is a collection of tools, libraries and tests for shader
+compilation. At the moment it includes:
+
+ - glslc, a command line compiler for GLSL/HLSL to SPIR-V, and
+ - libshaderc, a library API for accessing glslc functionality.
+
+glslc wraps around core functionality in glslang and SPIRV-Tools. glslc
+and its library aims to to provide:
+
+ - a command line compiler with GCC- and Clang-like usage, for better
+   integration with build systems
+ - an API where functionality can be added without breaking existing
+   clients
+ - an API supporting standard concurrency patterns across multiple
+   operating systems
+ - increased functionality such as file #include support
diff --git a/graphics/shaderc/pkg/PLIST b/graphics/shaderc/pkg/PLIST
new file mode 100644
index 000000000..eebe13543
--- /dev/null
+++ b/graphics/shaderc/pkg/PLIST
@@ -0,0 +1,13 @@
+@bin bin/glslc
+include/shaderc/
+include/shaderc/env.h
+include/shaderc/shaderc.h
+include/shaderc/shaderc.hpp
+include/shaderc/status.h
+include/shaderc/visibility.h
+@static-lib lib/libshaderc.a
+@static-lib lib/libshaderc_combined.a
+@lib lib/libshaderc_shared.so.${LIBshaderc_shared_VERSION}
+lib/pkgconfig/shaderc.pc
+lib/pkgconfig/shaderc_combined.pc
+lib/pkgconfig/shaderc_static.pc
diff --git a/lang/erlang/26/Makefile b/lang/erlang/26/Makefile
index 1f9b8b2b9..330ea6c6d 100644
--- a/lang/erlang/26/Makefile
+++ b/lang/erlang/26/Makefile
@@ -6,7 +6,7 @@ USE_WXNEEDED=	Yes
 COMMENT-main=	${COMMENT}
 COMMENT-wx=	WxWidgets bindings for Erlang
 
-V=		26.0.2
+V=		26.1
 DISTNAME=	otp_src_${V}
 PORTROACH=	limit:^OTP-26\.
 PKGNAME=	erlang-${V}
@@ -67,44 +67,44 @@ UPDATE_PLIST_ARGS = -i V
 
 # Use the target 'gen-versions' to update this list
 ERL_VERSIONS=	\
-ASN1_VSN        5.1 \
-COMMON_TEST_VSN 1.25 \
-COMPILER_VSN    8.3.2 \
-CRYPTO_VSN      5.2 \
-DEBUGGER_VSN    5.3.1 \
-DIALYZER_VSN    5.1 \
+ASN1_VSN        5.2 \
+COMMON_TEST_VSN 1.25.1 \
+COMPILER_VSN    8.4 \
+CRYPTO_VSN      5.3 \
+DEBUGGER_VSN    5.3.2 \
+DIALYZER_VSN    5.1.1 \
 DIAMETER_VSN    2.3 \
 EDOC_VSN        1.2 \
 EI_VSN          5.4 \
 ELDAP_VSN       1.2.11 \
 EMACS_VSN       2.7.0 \
-ERL_DOCGEN_VSN  1.5 \
+ERL_DOCGEN_VSN  1.5.1 \
 ERL_INTERFACE_VSN       5.4 \
 ET_VSN          1.7 \
 EUNIT_VSN       2.8.2 \
 FTP_VSN         1.2 \
-INETS_VSN       9.0.1 \
+INETS_VSN       9.0.2 \
 JINTERFACE_VSN  1.14 \
-KERNEL_VSN      9.0.2 \
-MEGACO_VSN      4.4.4 \
-MNESIA_VSN      4.22 \
-OBSERVER_VSN    2.15 \
+KERNEL_VSN      9.1 \
+MEGACO_VSN      4.5 \
+MNESIA_VSN      4.22.1 \
+OBSERVER_VSN    2.15.1 \
 ODBC_VSN        2.14 \
 OS_MON_VSN      2.9 \
 PARSETOOLS_VSN  2.5 \
-PUBLIC_KEY_VSN  1.14 \
+PUBLIC_KEY_VSN  1.14.1 \
 RELTOOL_VSN     1.0 \
 RUNTIME_TOOLS_VSN       2.0 \
 SASL_VSN        4.2.1 \
-SNMP_VSN        5.14 \
+SNMP_VSN        5.15 \
 SSH_VSN         5.0.1 \
-SSL_VSN         11.0.2 \
-STDLIB_VSN      5.0.2 \
+SSL_VSN         11.0.3 \
+STDLIB_VSN      5.1 \
 SYNTAX_TOOLS_VSN        3.1 \
 TFTP_VSN        1.1 \
 TOOLS_VSN       3.6 \
 WX_VSN          2.3 \
-XMERL_VSN       1.3.32 \
-ERTS_VSN        14.0.2
+XMERL_VSN       1.3.31.1 \
+ERTS_VSN        14.1
 
 .include <bsd.port.mk>
diff --git a/lang/erlang/26/distinfo b/lang/erlang/26/distinfo
index ddf9c066f..4079f55a5 100644
--- a/lang/erlang/26/distinfo
+++ b/lang/erlang/26/distinfo
@@ -1,4 +1,4 @@
-SHA256 (otp_doc_man_26.0.2.tar.gz) = M8y1N/sZvYr733OgsTC5oZotXW1B2AmuknBq5zMGs/4=
-SHA256 (otp_src_26.0.2.tar.gz) = R4U+qSMGQ6CjEARDPwenHBuS1uAJRTT2KeO3Xbxi8ZM=
-SIZE (otp_doc_man_26.0.2.tar.gz) = 1742245
-SIZE (otp_src_26.0.2.tar.gz) = 107096862
+SHA256 (otp_doc_man_26.1.tar.gz) = phIAJTVt9l41nYHTJobQflJ+D2lCD7m7nzu9aKdBiXo=
+SHA256 (otp_src_26.1.tar.gz) = +RTd6nkBmrJTORHN1PkWU3JqybBWGz7FeqbsvMPfP1U=
+SIZE (otp_doc_man_26.1.tar.gz) = 1745691
+SIZE (otp_src_26.1.tar.gz) = 107409296
diff --git a/lang/erlang/26/patches/patch-lib_crypto_c_src_openssl_config_h b/lang/erlang/26/patches/patch-lib_crypto_c_src_openssl_config_h
deleted file mode 100644
index 3d1d3bc42..000000000
--- a/lang/erlang/26/patches/patch-lib_crypto_c_src_openssl_config_h
+++ /dev/null
@@ -1,17 +0,0 @@
-Index: lib/crypto/c_src/openssl_config.h
---- lib/crypto/c_src/openssl_config.h.orig
-+++ lib/crypto/c_src/openssl_config.h
-@@ -322,6 +322,13 @@
- # endif
- #endif
- 
-+#ifdef HAS_LIBRESSL
-+# if LIBRESSL_VERSION_NUMBER >= 0x3070000fL
-+#   define HAVE_CHACHA20_POLY1305
-+#   define HAVE_CHACHA20
-+# endif
-+#endif
-+
- #if OPENSSL_VERSION_NUMBER <= PACKED_OPENSSL_VERSION(0,9,8,'l')
- # define HAVE_ECB_IVEC_BUG
- # define HAVE_UPDATE_EMPTY_DATA_BUG
diff --git a/lang/erlang/26/patches/patch-lib_crypto_c_src_otp_test_engine_c b/lang/erlang/26/patches/patch-lib_crypto_c_src_otp_test_engine_c
deleted file mode 100644
index df38b151f..000000000
--- a/lang/erlang/26/patches/patch-lib_crypto_c_src_otp_test_engine_c
+++ /dev/null
@@ -1,16 +0,0 @@
-With opaque EVP_MD_METHOD, erlang needs to use EVP_MD_meth_*()
-instead of initializing the method statically.
-
-Index: lib/crypto/c_src/otp_test_engine.c
---- lib/crypto/c_src/otp_test_engine.c.orig
-+++ lib/crypto/c_src/otp_test_engine.c
-@@ -36,8 +36,7 @@
- #define PACKED_OPENSSL_VERSION_PLAIN(MAJ, MIN, FIX) \
-     PACKED_OPENSSL_VERSION(MAJ,MIN,FIX,('a'-1))
- 
--#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0) \
--    || defined(LIBRESSL_VERSION_NUMBER)
-+#if OPENSSL_VERSION_NUMBER < PACKED_OPENSSL_VERSION_PLAIN(1,1,0)
- # define OLD
- #endif
- 
diff --git a/lang/erlang/26/pkg/PLIST-main b/lang/erlang/26/pkg/PLIST-main
index c875c5e0e..da44d94d2 100644
--- a/lang/erlang/26/pkg/PLIST-main
+++ b/lang/erlang/26/pkg/PLIST-main
@@ -333,7 +333,6 @@ lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/ct_default.css
 lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/jquery-latest.js
 lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/jquery.tablesorter.min.js
 lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/tile1.jpg
-lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/priv/vts.tool
 lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/src/
 lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/src/ct.erl
 lib/${ERLANG_V}/lib/${ERL_COMMON_TEST}/src/ct_config.erl
@@ -3536,6 +3535,7 @@ lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/digraph_utils.chunk
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin.chunk
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin_context.chunk
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin_expand.chunk
+lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin_key.chunk
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/edlin_type_suggestion.chunk
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/epp.chunk
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/doc/chunks/erl_abstract_code.chunk
@@ -3627,6 +3627,7 @@ lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/digraph_utils.beam
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin.beam
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin_context.beam
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin_expand.beam
+lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin_key.beam
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/edlin_type_suggestion.beam
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/epp.beam
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/ebin/erl_abstract_code.beam
@@ -3731,6 +3732,7 @@ lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/digraph_utils.erl
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin.erl
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin_context.erl
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin_expand.erl
+lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin_key.erl
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/edlin_type_suggestion.erl
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/epp.erl
 lib/${ERLANG_V}/lib/${ERL_STDLIB}/src/erl_abstract_code.erl
@@ -4137,6 +4139,7 @@ lib/${ERLANG_V}/man/man3/
 @man lib/${ERLANG_V}/man/man3/disksup.3
 @man lib/${ERLANG_V}/man/man3/driver_entry.3
 @man lib/${ERLANG_V}/man/man3/dyntrace.3
+@man lib/${ERLANG_V}/man/man3/edlin.3
 @man lib/${ERLANG_V}/man/man3/edlin_expand.3
 @man lib/${ERLANG_V}/man/man3/edoc.3
 @man lib/${ERLANG_V}/man/man3/edoc_doclet.3
diff --git a/lang/ruby/3.2/Makefile b/lang/ruby/3.2/Makefile
index 8594f6c6f..67dd4c2db 100644
--- a/lang/ruby/3.2/Makefile
+++ b/lang/ruby/3.2/Makefile
@@ -3,7 +3,7 @@ DISTNAME =		ruby-${VERSION}
 SHARED_LIBS =		ruby32	0.0
 NEXTVER =		3.3
 PKGSPEC-main ?=         ruby->=3.2.0,<${NEXTVER}
-REVISION-main =		0
+REVISION-main =		1
 
 PSEUDO_FLAVORS=		no_ri_docs bootstrap
 # Do not build the RI docs on slow arches
diff --git a/lang/ruby/3.2/patches/patch-configure b/lang/ruby/3.2/patches/patch-configure
index df0c9dad7..795bc95b8 100644
--- a/lang/ruby/3.2/patches/patch-configure
+++ b/lang/ruby/3.2/patches/patch-configure
@@ -17,6 +17,15 @@ Index: configure
  
      ac_cv_path_mkdir="mkdir"
   ;; #(
+@@ -10897,7 +10897,7 @@ esac
+     case "$target_cpu" in #(
+   aarch64) :
+ 
+-	for opt in -mbranch-protection=pac-ret -msign-return-address=all
++	for opt in -mbranch-protection=standard -msign-return-address=all
+ do :
+ 
+ 
 @@ -12117,7 +12117,7 @@ fi
       ;; #(
    root:*) :
diff --git a/multimedia/pipewire/helvum/Makefile b/multimedia/pipewire/helvum/Makefile
index e9c33dc7f..a21727280 100644
--- a/multimedia/pipewire/helvum/Makefile
+++ b/multimedia/pipewire/helvum/Makefile
@@ -13,16 +13,19 @@ MODULES=		devel/cargo
 
 #BUILD_DEPENDS=		devel/appstream-glib
 
-# libclang.so
-MODULES +=		lang/clang
-MODCARGO_ENV=		LIBCLANG_PATH=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib \
-			LD_LIBRARY_PATH=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
-
-#MODCARGO_CRATES_UPDATE=	libspa libspa-sys
-
 LIB_DEPENDS=		multimedia/pipewire/pipewire \
 			x11/gtk+4
 
+# needs eventfd
+LIB_DEPENDS +=		devel/epoll-shim
+#MODCARGO_RUSTFLAGS +=	-L${LOCALBASE}/lib -C link-arg=-lepoll-shim
+MODCARGO_RUSTFLAGS +=	-L${LOCALBASE}/lib -lepoll-shim
+
+# libclang.so
+MODULES +=		lang/clang
+MODCARGO_ENV +=		LIBCLANG_PATH=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib \
+			LD_LIBRARY_PATH=${LOCALBASE}/llvm${MODCLANG_VERSION}/lib
+
 pre-configure:
 	${MODCARGO_configure}
 
diff --git a/net/nextcloudclient/Makefile b/net/nextcloudclient/Makefile
index 52e369e4b..55872e7c8 100644
--- a/net/nextcloudclient/Makefile
+++ b/net/nextcloudclient/Makefile
@@ -2,7 +2,7 @@ USE_WXNEEDED =	Yes
 
 COMMENT =	desktop sync client for Nextcloud
 
-V =		3.9.3
+V =		3.10.0
 DISTNAME =	nextcloudclient-${V}
 
 GH_ACCOUNT =	nextcloud
@@ -13,8 +13,8 @@ CATEGORIES =	net
 
 HOMEPAGE =	https://nextcloud.com
 
-SHARED_LIBS +=  nextcloudsync             12.0 # 3.9.1
-SHARED_LIBS +=  nextcloud_csync           6.0 # 3.9.1
+SHARED_LIBS +=  nextcloudsync             13.0 # 3.10.0
+SHARED_LIBS +=  nextcloud_csync           6.1 # 3.10.0
 SHARED_LIBS +=  nextcloudsync_vfs_suffix  1.0 # 3.9.0
 
 MAINTAINER =	Adriano Barbosa <barbosa.aob@gmail.com>
diff --git a/net/nextcloudclient/distinfo b/net/nextcloudclient/distinfo
index 497f32246..e5b7b529a 100644
--- a/net/nextcloudclient/distinfo
+++ b/net/nextcloudclient/distinfo
@@ -1,2 +1,2 @@
-SHA256 (nextcloudclient-3.9.3.tar.gz) = QCdaKUC/vQDXS/7L3nua8gCZhQ3RZIB5L1NSr6f7U/o=
-SIZE (nextcloudclient-3.9.3.tar.gz) = 15752014
+SHA256 (nextcloudclient-3.10.0.tar.gz) = CLoDQISahTcbEKT2kEmiXs8pBIUiGAuZqRSnCX7FA0k=
+SIZE (nextcloudclient-3.10.0.tar.gz) = 13529232
diff --git a/sysutils/sysclean/Makefile b/sysutils/sysclean/Makefile
index 3bcab6658..fb9b6b173 100644
--- a/sysutils/sysclean/Makefile
+++ b/sysutils/sysclean/Makefile
@@ -1,6 +1,6 @@
 COMMENT =	list obsolete files between OpenBSD upgrades
 
-V =		3.5
+V =		3.6
 DISTNAME =	sysclean-${V}
 
 CATEGORIES =	sysutils
diff --git a/sysutils/sysclean/distinfo b/sysutils/sysclean/distinfo
index 119cfd0dc..642ca364e 100644
--- a/sysutils/sysclean/distinfo
+++ b/sysutils/sysclean/distinfo
@@ -1,2 +1,2 @@
-SHA256 (sysclean-3.5.tar.gz) = Xt1rbSz5aTYgFNktNaDLsMpa7dFzR7jVJxu5nfU9eKo=
-SIZE (sysclean-3.5.tar.gz) = 7596
+SHA256 (sysclean-3.6.tar.gz) = 2DC+gjYaV258RzWrEpXXQCXguJyvP5CHe3LkmnkBMoM=
+SIZE (sysclean-3.6.tar.gz) = 7594
diff --git a/textproc/py-yaml/Makefile b/textproc/py-yaml/Makefile
index fb2b24344..c2092cb46 100644
--- a/textproc/py-yaml/Makefile
+++ b/textproc/py-yaml/Makefile
@@ -3,7 +3,7 @@ COMMENT=	YAML parser and emitter in Python
 MODPY_EGG_VERSION=5.4.1
 DISTNAME=	PyYAML-${MODPY_EGG_VERSION}
 PKGNAME=	py-yaml-${MODPY_EGG_VERSION}
-REVISION=	3
+REVISION=	4
 
 CATEGORIES=	textproc
 
@@ -21,11 +21,14 @@ FLAVOR=		python3
 
 MODULES=	lang/python
 MODPY_PI=	Yes
-MODPY_SETUPTOOLS= Yes
-
-MODPY_SETUP_ARGS= --with-libyaml
+MODPY_PYBUILD=	setuptools
 CFLAGS+=	-I${LOCALBASE}/include
 LIB_DEPENDS=	devel/libyaml
 BUILD_DEPENDS=	lang/cython${MODPY_FLAVOR}
 
+# https://github.com/yaml/pyyaml/issues/640
+MODPY_PYTEST=	No
+do-test:
+	cd ${WRKSRC}; ${MODPY_BIN} setup.py test
+
 .include <bsd.port.mk>
diff --git a/textproc/py-yaml/pkg/PLIST b/textproc/py-yaml/pkg/PLIST
index e312b8b0d..0e0075d0f 100644
--- a/textproc/py-yaml/pkg/PLIST
+++ b/textproc/py-yaml/pkg/PLIST
@@ -1,33 +1,52 @@
 @conflict py-yaml-*
 @pkgpath textproc/py-yaml
-lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/
-lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/PKG-INFO
-lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/SOURCES.txt
-lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/dependency_links.txt
-lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}-py${MODPY_VERSION}.egg-info/top_level.txt
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}.dist-info/
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}.dist-info/LICENSE
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}.dist-info/METADATA
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}.dist-info/RECORD
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}.dist-info/WHEEL
+lib/python${MODPY_VERSION}/site-packages/PyYAML-${MODPY_EGG_VERSION}.dist-info/top_level.txt
 lib/python${MODPY_VERSION}/site-packages/_yaml/
 lib/python${MODPY_VERSION}/site-packages/_yaml/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/_yaml/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/_yaml/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/_yaml/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
 lib/python${MODPY_VERSION}/site-packages/yaml/
 lib/python${MODPY_VERSION}/site-packages/yaml/__init__.py
 ${MODPY_COMMENT}lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}/
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}__init__.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}composer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}composer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}constructor.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}constructor.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}cyaml.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}cyaml.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}dumper.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}dumper.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}emitter.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}emitter.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}error.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}events.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}loader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}nodes.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}nodes.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}parser.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}reader.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}representer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}representer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}resolver.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}scanner.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}serializer.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}serializer.${MODPY_PYC_MAGIC_TAG}pyc
+lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}${MODPY_PYOEXTENSION}
 lib/python${MODPY_VERSION}/site-packages/yaml/${MODPY_PYCACHE}tokens.${MODPY_PYC_MAGIC_TAG}pyc
 @so lib/python${MODPY_VERSION}/site-packages/yaml/_yaml.${MODPY_PYC_MAGIC_TAG}so
 lib/python${MODPY_VERSION}/site-packages/yaml/composer.py