diff --git a/devel/catch/Makefile b/devel/catch/Makefile
index 59dd601a3eeb..79fb88a83716 100644
--- a/devel/catch/Makefile
+++ b/devel/catch/Makefile
@@ -1,37 +1,30 @@
 PORTNAME=	catch
-DISTVERSION=	3.14.0
+PORTVERSION=	2.13.10
 DISTVERSIONPREFIX=	v
+PORTEPOCH=	1
 CATEGORIES=	devel
 
 MAINTAINER=	sunpoet@FreeBSD.org
 COMMENT=	Header-only test framework for C++
 WWW=		https://github.com/catchorg/Catch2
 
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 USES=		cmake compiler:c++14-lang python:build
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	catchorg
 GH_PROJECT=	Catch2
 
 CMAKE_ARGS=	-DCMAKE_INSTALL_DOCDIR=${DOCSDIR}
-CMAKE_ON=	BUILD_SHARED_LIBS \
-		CATCH_DEVELOPMENT_BUILD
-CMAKE_OFF=	CATCH_ENABLE_WERROR
+NO_ARCH=	yes
 
 PORTSCOUT=	limit:^2\.
 
 OPTIONS_DEFINE=	DOCS
 
-PORTDOCS=	*
-
-# tests as of 3.14.0:
-# test cases:   517 |   494 passed | 7 skipped | 16 failed as expected
-# assertions: 84776 | 84753 passed | 23 failed as expected
-
 do-test:
-	@${BUILD_WRKSRC}/tests/SelfTest
+	${BUILD_WRKSRC}/projects/SelfTest
 
 .include <bsd.port.mk>
diff --git a/devel/catch/distinfo b/devel/catch/distinfo
index d52e5e73b456..b7543c473caa 100644
--- a/devel/catch/distinfo
+++ b/devel/catch/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1776228259
-SHA256 (catchorg-Catch2-v3.14.0_GH0.tar.gz) = ba2a939efead3c833c499cf487e185762f419a71d30158cd1b43c6079c586490
-SIZE (catchorg-Catch2-v3.14.0_GH0.tar.gz) = 1183590
+TIMESTAMP = 1777572480
+SHA256 (catchorg-Catch2-v2.13.10_GH0.tar.gz) = d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943
+SIZE (catchorg-Catch2-v2.13.10_GH0.tar.gz) = 662225
diff --git a/devel/catch/files/patch-clang19 b/devel/catch/files/patch-clang19
new file mode 100644
index 000000000000..672213fbe950
--- /dev/null
+++ b/devel/catch/files/patch-clang19
@@ -0,0 +1,11 @@
+--- projects/CMakeLists.txt.orig	2022-10-16 09:02:17 UTC
++++ projects/CMakeLists.txt
+@@ -354,7 +354,7 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|G
+ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" )
+     target_compile_options( SelfTest PRIVATE -Wall -Wextra -Wunreachable-code -Wpedantic -Wmissing-declarations )
+     if (CATCH_ENABLE_WERROR)
+-        target_compile_options( SelfTest PRIVATE -Werror -Wno-error=pragmas )
++        target_compile_options( SelfTest PRIVATE -Werror -Wno-error=pragmas -Wno-error=c++20-extensions )
+     endif()
+ endif()
+ # Clang specific options go here
diff --git a/devel/catch/files/patch-clang21 b/devel/catch/files/patch-clang21
new file mode 100644
index 000000000000..ecaf1667a42c
--- /dev/null
+++ b/devel/catch/files/patch-clang21
@@ -0,0 +1,73 @@
+--- include/internal/catch_approx.cpp.orig	2022-10-16 09:02:17 UTC
++++ include/internal/catch_approx.cpp
+@@ -73,10 +73,10 @@ namespace literals {
+ } // end namespace Detail
+ 
+ namespace literals {
+-    Detail::Approx operator "" _a(long double val) {
++    Detail::Approx operator ""_a(long double val) {
+         return Detail::Approx(val);
+     }
+-    Detail::Approx operator "" _a(unsigned long long val) {
++    Detail::Approx operator ""_a(unsigned long long val) {
+         return Detail::Approx(val);
+     }
+ } // end namespace literals
+--- include/internal/catch_approx.h.orig	2022-10-16 09:02:17 UTC
++++ include/internal/catch_approx.h
+@@ -118,8 +118,8 @@ namespace literals {
+ } // end namespace Detail
+ 
+ namespace literals {
+-    Detail::Approx operator "" _a(long double val);
+-    Detail::Approx operator "" _a(unsigned long long val);
++    Detail::Approx operator ""_a(long double val);
++    Detail::Approx operator ""_a(unsigned long long val);
+ } // end namespace literals
+ 
+ template<>
+--- include/internal/catch_stringref.h.orig	2022-10-16 09:02:17 UTC
++++ include/internal/catch_stringref.h
+@@ -92,12 +92,12 @@ namespace Catch {
+     auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;
+ 
+ 
+-    constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
++    constexpr auto operator ""_sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {
+         return StringRef( rawChars, size );
+     }
+ } // namespace Catch
+ 
+-constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
++constexpr auto operator ""_catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {
+     return Catch::StringRef( rawChars, size );
+ }
+ 
+--- projects/SelfTest/IntrospectiveTests/String.tests.cpp.orig	2022-10-16 09:02:17 UTC
++++ projects/SelfTest/IntrospectiveTests/String.tests.cpp
+@@ -141,7 +141,7 @@ TEST_CASE("StringRef at compilation time", "[Strings][
+         STATIC_REQUIRE(sr1.size() == 3);
+         STATIC_REQUIRE(sr1.isNullTerminated());
+ 
+-        using Catch::operator"" _sr;
++        using Catch::operator""_sr;
+         constexpr auto sr2 = ""_sr;
+         STATIC_REQUIRE(sr2.empty());
+         STATIC_REQUIRE(sr2.size() == 0);
+--- projects/SelfTest/UsageTests/ToStringVariant.tests.cpp.orig	2022-10-16 09:02:17 UTC
++++ projects/SelfTest/UsageTests/ToStringVariant.tests.cpp
+@@ -10,12 +10,12 @@ struct MyType1 {
+ struct MyType1 {
+     MyType1() = default;
+     [[noreturn]] MyType1(MyType1 const&) { throw 1; }
+-    MyType1& operator=(MyType1 const&) { throw 3; }
++    [[noreturn]] MyType1& operator=(MyType1 const&) { throw 3; }
+ };
+ struct MyType2 {
+     MyType2() = default;
+     [[noreturn]] MyType2(MyType2 const&) { throw 2; }
+-    MyType2& operator=(MyType2 const&) { throw 4; }
++    [[noreturn]] MyType2& operator=(MyType2 const&) { throw 4; }
+ };
+ 
+ TEST_CASE( "variant<std::monostate>", "[toString][variant][approvals]")
diff --git a/devel/catch/pkg-plist b/devel/catch/pkg-plist
index fe93bff564e7..cb4f7cc4c007 100644
--- a/devel/catch/pkg-plist
+++ b/devel/catch/pkg-plist
@@ -1,201 +1,42 @@
-include/catch2/benchmark/catch_benchmark.hpp
-include/catch2/benchmark/catch_benchmark_all.hpp
-include/catch2/benchmark/catch_chronometer.hpp
-include/catch2/benchmark/catch_clock.hpp
-include/catch2/benchmark/catch_constructor.hpp
-include/catch2/benchmark/catch_environment.hpp
-include/catch2/benchmark/catch_estimate.hpp
-include/catch2/benchmark/catch_execution_plan.hpp
-include/catch2/benchmark/catch_optimizer.hpp
-include/catch2/benchmark/catch_outlier_classification.hpp
-include/catch2/benchmark/catch_sample_analysis.hpp
-include/catch2/benchmark/detail/catch_analyse.hpp
-include/catch2/benchmark/detail/catch_benchmark_function.hpp
-include/catch2/benchmark/detail/catch_benchmark_stats.hpp
-include/catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp
-include/catch2/benchmark/detail/catch_complete_invoke.hpp
-include/catch2/benchmark/detail/catch_estimate_clock.hpp
-include/catch2/benchmark/detail/catch_measure.hpp
-include/catch2/benchmark/detail/catch_repeat.hpp
-include/catch2/benchmark/detail/catch_run_for_at_least.hpp
-include/catch2/benchmark/detail/catch_stats.hpp
-include/catch2/benchmark/detail/catch_timing.hpp
-include/catch2/catch_all.hpp
-include/catch2/catch_approx.hpp
-include/catch2/catch_assertion_info.hpp
-include/catch2/catch_assertion_result.hpp
-include/catch2/catch_case_sensitive.hpp
-include/catch2/catch_config.hpp
-include/catch2/catch_get_random_seed.hpp
-include/catch2/catch_message.hpp
-include/catch2/catch_section_info.hpp
-include/catch2/catch_session.hpp
-include/catch2/catch_tag_alias.hpp
-include/catch2/catch_tag_alias_autoregistrar.hpp
-include/catch2/catch_template_test_macros.hpp
-include/catch2/catch_test_case_info.hpp
-include/catch2/catch_test_macros.hpp
-include/catch2/catch_test_run_info.hpp
-include/catch2/catch_test_spec.hpp
-include/catch2/catch_timer.hpp
-include/catch2/catch_tostring.hpp
-include/catch2/catch_totals.hpp
-include/catch2/catch_translate_exception.hpp
-include/catch2/catch_user_config.hpp
-include/catch2/catch_version.hpp
-include/catch2/catch_version_macros.hpp
-include/catch2/generators/catch_generator_exception.hpp
-include/catch2/generators/catch_generators.hpp
-include/catch2/generators/catch_generators_adapters.hpp
-include/catch2/generators/catch_generators_all.hpp
-include/catch2/generators/catch_generators_random.hpp
-include/catch2/generators/catch_generators_range.hpp
-include/catch2/generators/catch_generators_throw.hpp
-include/catch2/interfaces/catch_interfaces_all.hpp
-include/catch2/interfaces/catch_interfaces_capture.hpp
-include/catch2/interfaces/catch_interfaces_config.hpp
-include/catch2/interfaces/catch_interfaces_enum_values_registry.hpp
-include/catch2/interfaces/catch_interfaces_exception.hpp
-include/catch2/interfaces/catch_interfaces_generatortracker.hpp
-include/catch2/interfaces/catch_interfaces_registry_hub.hpp
-include/catch2/interfaces/catch_interfaces_reporter.hpp
-include/catch2/interfaces/catch_interfaces_reporter_factory.hpp
-include/catch2/interfaces/catch_interfaces_tag_alias_registry.hpp
-include/catch2/interfaces/catch_interfaces_test_invoker.hpp
-include/catch2/interfaces/catch_interfaces_testcase.hpp
-include/catch2/internal/catch_assertion_handler.hpp
-include/catch2/internal/catch_case_insensitive_comparisons.hpp
-include/catch2/internal/catch_clara.hpp
-include/catch2/internal/catch_commandline.hpp
-include/catch2/internal/catch_compare_traits.hpp
-include/catch2/internal/catch_compiler_capabilities.hpp
-include/catch2/internal/catch_config_android_logwrite.hpp
-include/catch2/internal/catch_config_counter.hpp
-include/catch2/internal/catch_config_prefix_messages.hpp
-include/catch2/internal/catch_config_static_analysis_support.hpp
-include/catch2/internal/catch_config_uncaught_exceptions.hpp
-include/catch2/internal/catch_config_wchar.hpp
-include/catch2/internal/catch_console_colour.hpp
-include/catch2/internal/catch_console_width.hpp
-include/catch2/internal/catch_container_nonmembers.hpp
-include/catch2/internal/catch_context.hpp
-include/catch2/internal/catch_debug_console.hpp
-include/catch2/internal/catch_debugger.hpp
-include/catch2/internal/catch_decomposer.hpp
-include/catch2/internal/catch_deprecation_macro.hpp
-include/catch2/internal/catch_enforce.hpp
-include/catch2/internal/catch_enum_values_registry.hpp
-include/catch2/internal/catch_errno_guard.hpp
-include/catch2/internal/catch_exception_translator_registry.hpp
-include/catch2/internal/catch_fatal_condition_handler.hpp
-include/catch2/internal/catch_floating_point_helpers.hpp
-include/catch2/internal/catch_getenv.hpp
-include/catch2/internal/catch_is_permutation.hpp
-include/catch2/internal/catch_istream.hpp
-include/catch2/internal/catch_jsonwriter.hpp
-include/catch2/internal/catch_lazy_expr.hpp
-include/catch2/internal/catch_leak_detector.hpp
-include/catch2/internal/catch_lifetimebound.hpp
-include/catch2/internal/catch_list.hpp
-include/catch2/internal/catch_logical_traits.hpp
-include/catch2/internal/catch_message_info.hpp
-include/catch2/internal/catch_meta.hpp
-include/catch2/internal/catch_move_and_forward.hpp
-include/catch2/internal/catch_noncopyable.hpp
-include/catch2/internal/catch_optional.hpp
-include/catch2/internal/catch_output_redirect.hpp
-include/catch2/internal/catch_parse_numbers.hpp
-include/catch2/internal/catch_path_filter.hpp
-include/catch2/internal/catch_platform.hpp
-include/catch2/internal/catch_polyfills.hpp
-include/catch2/internal/catch_preprocessor.hpp
-include/catch2/internal/catch_preprocessor_internal_stringify.hpp
-include/catch2/internal/catch_preprocessor_remove_parens.hpp
-include/catch2/internal/catch_random_floating_point_helpers.hpp
-include/catch2/internal/catch_random_integer_helpers.hpp
-include/catch2/internal/catch_random_number_generator.hpp
-include/catch2/internal/catch_random_seed_generation.hpp
-include/catch2/internal/catch_reporter_registry.hpp
-include/catch2/internal/catch_reporter_spec_parser.hpp
-include/catch2/internal/catch_result_type.hpp
-include/catch2/internal/catch_reusable_string_stream.hpp
-include/catch2/internal/catch_run_context.hpp
-include/catch2/internal/catch_section.hpp
-include/catch2/internal/catch_sharding.hpp
-include/catch2/internal/catch_singletons.hpp
-include/catch2/internal/catch_source_line_info.hpp
-include/catch2/internal/catch_startup_exception_registry.hpp
-include/catch2/internal/catch_stdstreams.hpp
-include/catch2/internal/catch_stream_end_stop.hpp
-include/catch2/internal/catch_string_manip.hpp
-include/catch2/internal/catch_stringref.hpp
-include/catch2/internal/catch_tag_alias_registry.hpp
-include/catch2/internal/catch_template_test_registry.hpp
-include/catch2/internal/catch_test_case_info_hasher.hpp
-include/catch2/internal/catch_test_case_registry_impl.hpp
-include/catch2/internal/catch_test_case_tracker.hpp
-include/catch2/internal/catch_test_failure_exception.hpp
-include/catch2/internal/catch_test_macro_impl.hpp
-include/catch2/internal/catch_test_registry.hpp
-include/catch2/internal/catch_test_spec_parser.hpp
-include/catch2/internal/catch_textflow.hpp
-include/catch2/internal/catch_thread_local.hpp
-include/catch2/internal/catch_thread_support.hpp
-include/catch2/internal/catch_to_string.hpp
-include/catch2/internal/catch_uncaught_exceptions.hpp
-include/catch2/internal/catch_uniform_floating_point_distribution.hpp
-include/catch2/internal/catch_uniform_integer_distribution.hpp
-include/catch2/internal/catch_unique_name.hpp
-include/catch2/internal/catch_unique_ptr.hpp
-include/catch2/internal/catch_unreachable.hpp
-include/catch2/internal/catch_void_type.hpp
-include/catch2/internal/catch_wildcard_pattern.hpp
-include/catch2/internal/catch_windows_h_proxy.hpp
-include/catch2/internal/catch_xmlwriter.hpp
-include/catch2/matchers/catch_matchers.hpp
-include/catch2/matchers/catch_matchers_all.hpp
-include/catch2/matchers/catch_matchers_container_properties.hpp
-include/catch2/matchers/catch_matchers_contains.hpp
-include/catch2/matchers/catch_matchers_exception.hpp
-include/catch2/matchers/catch_matchers_floating_point.hpp
-include/catch2/matchers/catch_matchers_predicate.hpp
-include/catch2/matchers/catch_matchers_quantifiers.hpp
-include/catch2/matchers/catch_matchers_range_equals.hpp
-include/catch2/matchers/catch_matchers_string.hpp
-include/catch2/matchers/catch_matchers_templated.hpp
-include/catch2/matchers/catch_matchers_vector.hpp
-include/catch2/matchers/internal/catch_matchers_impl.hpp
-include/catch2/reporters/catch_reporter_automake.hpp
-include/catch2/reporters/catch_reporter_common_base.hpp
-include/catch2/reporters/catch_reporter_compact.hpp
-include/catch2/reporters/catch_reporter_console.hpp
-include/catch2/reporters/catch_reporter_cumulative_base.hpp
-include/catch2/reporters/catch_reporter_event_listener.hpp
-include/catch2/reporters/catch_reporter_helpers.hpp
-include/catch2/reporters/catch_reporter_json.hpp
-include/catch2/reporters/catch_reporter_junit.hpp
-include/catch2/reporters/catch_reporter_multi.hpp
-include/catch2/reporters/catch_reporter_registrars.hpp
-include/catch2/reporters/catch_reporter_sonarqube.hpp
-include/catch2/reporters/catch_reporter_streaming_base.hpp
-include/catch2/reporters/catch_reporter_tap.hpp
-include/catch2/reporters/catch_reporter_teamcity.hpp
-include/catch2/reporters/catch_reporter_xml.hpp
-include/catch2/reporters/catch_reporters_all.hpp
+include/catch2/catch.hpp
+include/catch2/catch_reporter_automake.hpp
+include/catch2/catch_reporter_sonarqube.hpp
+include/catch2/catch_reporter_tap.hpp
+include/catch2/catch_reporter_teamcity.hpp
 lib/cmake/Catch2/Catch.cmake
 lib/cmake/Catch2/Catch2Config.cmake
 lib/cmake/Catch2/Catch2ConfigVersion.cmake
-lib/cmake/Catch2/Catch2Targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Catch2/Catch2Targets.cmake
 lib/cmake/Catch2/CatchAddTests.cmake
-lib/cmake/Catch2/CatchShardTests.cmake
-lib/cmake/Catch2/CatchShardTestsImpl.cmake
 lib/cmake/Catch2/ParseAndAddCatchTests.cmake
-lib/libCatch2.so
-lib/libCatch2.so.3.14.0
-lib/libCatch2Main.so
-lib/libCatch2Main.so.3.14.0
 share/Catch2/gdbinit
 share/Catch2/lldbinit
-share/pkgconfig/catch2-with-main.pc
 share/pkgconfig/catch2.pc
+%%PORTDOCS%%%%DOCSDIR%%/Readme.md
+%%PORTDOCS%%%%DOCSDIR%%/assertions.md
+%%PORTDOCS%%%%DOCSDIR%%/benchmarks.md
+%%PORTDOCS%%%%DOCSDIR%%/ci-and-misc.md
+%%PORTDOCS%%%%DOCSDIR%%/cmake-integration.md
+%%PORTDOCS%%%%DOCSDIR%%/command-line.md
+%%PORTDOCS%%%%DOCSDIR%%/commercial-users.md
+%%PORTDOCS%%%%DOCSDIR%%/configuration.md
+%%PORTDOCS%%%%DOCSDIR%%/contributing.md
+%%PORTDOCS%%%%DOCSDIR%%/deprecations.md
+%%PORTDOCS%%%%DOCSDIR%%/event-listeners.md
+%%PORTDOCS%%%%DOCSDIR%%/generators.md
+%%PORTDOCS%%%%DOCSDIR%%/limitations.md
+%%PORTDOCS%%%%DOCSDIR%%/list-of-examples.md
+%%PORTDOCS%%%%DOCSDIR%%/logging.md
+%%PORTDOCS%%%%DOCSDIR%%/matchers.md
+%%PORTDOCS%%%%DOCSDIR%%/opensource-users.md
+%%PORTDOCS%%%%DOCSDIR%%/other-macros.md
+%%PORTDOCS%%%%DOCSDIR%%/own-main.md
+%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes.md
+%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-process.md
+%%PORTDOCS%%%%DOCSDIR%%/reporters.md
+%%PORTDOCS%%%%DOCSDIR%%/slow-compiles.md
+%%PORTDOCS%%%%DOCSDIR%%/test-cases-and-sections.md
+%%PORTDOCS%%%%DOCSDIR%%/test-fixtures.md
+%%PORTDOCS%%%%DOCSDIR%%/tostring.md
+%%PORTDOCS%%%%DOCSDIR%%/tutorial.md
+%%PORTDOCS%%%%DOCSDIR%%/why-catch.md