Date: Sun, 19 Apr 2026 05:41:15 +0800 From: Po-Chuan Hsieh <sunpoet@freebsd.org> To: Yuri Victorovich <yuri@freebsd.org> Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: =?UTF-8?B?UmU6IGdpdDogM2U5ZDcwZTA0ODU2IC0gbWFpbiAtIGRldmVsL2NhdGNoOiB1cGRhdGUgMg==?= =?UTF-8?B?LjEzLjEwIOKGkiAzLjE0LjA=?= Message-ID: <CAMHz58RCYHWG-kgPHHyyzkAbZ8%2Bt3R8c6bQRd%2BJjfXQMA4ZDhg@mail.gmail.com> In-Reply-To: <69df41a0.4643e.4ae4e0fe@gitrepo.freebsd.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] Hello Yuri, I guess you meant to update devel/catch2 rather than devel/catch. Please revert. Thanks. Best regards, sunpoet On Wed, Apr 15, 2026 at 3:43 PM Yuri Victorovich <yuri@freebsd.org> wrote: > The branch main has been updated by yuri: > > URL: > https://cgit.FreeBSD.org/ports/commit/?id=3e9d70e048567f2813400ee7a40dbfa8ad61f49b > > commit 3e9d70e048567f2813400ee7a40dbfa8ad61f49b > Author: Yuri Victorovich <yuri@FreeBSD.org> > AuthorDate: 2026-04-15 07:43:08 +0000 > Commit: Yuri Victorovich <yuri@FreeBSD.org> > CommitDate: 2026-04-15 07:43:17 +0000 > > devel/catch: update 2.13.10 → 3.14.0 > --- > devel/catch/Makefile | 15 ++- > devel/catch/distinfo | 6 +- > devel/catch/files/patch-clang19 | 11 -- > devel/catch/files/patch-clang21 | 73 ------------- > devel/catch/pkg-plist | 225 > ++++++++++++++++++++++++++++++++++------ > 5 files changed, 206 insertions(+), 124 deletions(-) > > diff --git a/devel/catch/Makefile b/devel/catch/Makefile > index 5103183d96f5..59dd601a3eeb 100644 > --- a/devel/catch/Makefile > +++ b/devel/catch/Makefile > @@ -1,6 +1,5 @@ > PORTNAME= catch > -PORTVERSION= 2.13.10 > -PORTREVISION= 1 > +DISTVERSION= 3.14.0 > DISTVERSIONPREFIX= v > CATEGORIES= devel > > @@ -18,13 +17,21 @@ GH_ACCOUNT= catchorg > GH_PROJECT= Catch2 > > CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR} > -NO_ARCH= yes > +CMAKE_ON= BUILD_SHARED_LIBS \ > + CATCH_DEVELOPMENT_BUILD > +CMAKE_OFF= CATCH_ENABLE_WERROR > > 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}/projects/SelfTest > + @${BUILD_WRKSRC}/tests/SelfTest > > .include <bsd.port.mk> > diff --git a/devel/catch/distinfo b/devel/catch/distinfo > index c16498530e36..d52e5e73b456 100644 > --- a/devel/catch/distinfo > +++ b/devel/catch/distinfo > @@ -1,3 +1,3 @@ > -TIMESTAMP = 1679498524 > -SHA256 (catchorg-Catch2-v2.13.10_GH0.tar.gz) = > d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943 > -SIZE (catchorg-Catch2-v2.13.10_GH0.tar.gz) = 662225 > +TIMESTAMP = 1776228259 > +SHA256 (catchorg-Catch2-v3.14.0_GH0.tar.gz) = > ba2a939efead3c833c499cf487e185762f419a71d30158cd1b43c6079c586490 > +SIZE (catchorg-Catch2-v3.14.0_GH0.tar.gz) = 1183590 > diff --git a/devel/catch/files/patch-clang19 > b/devel/catch/files/patch-clang19 > deleted file mode 100644 > index 672213fbe950..000000000000 > --- a/devel/catch/files/patch-clang19 > +++ /dev/null > @@ -1,11 +0,0 @@ > ---- 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 > deleted file mode 100644 > index ecaf1667a42c..000000000000 > --- a/devel/catch/files/patch-clang21 > +++ /dev/null > @@ -1,73 +0,0 @@ > ---- 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 cb4f7cc4c007..fe93bff564e7 100644 > --- a/devel/catch/pkg-plist > +++ b/devel/catch/pkg-plist > @@ -1,42 +1,201 @@ > -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 > +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 > 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 > > [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><div>Hello Yuri,</div><div><br></div><div>I guess you meant to update devel/catch2 rather than devel/catch.</div><div>Please revert.</div><div>Thanks.</div><div><br></div><div>Best regards,</div><div>sunpoet</div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Apr 15, 2026 at 3:43 PM Yuri Victorovich <<a href="mailto:yuri@freebsd.org" target="_blank">yuri@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">The branch main has been updated by yuri:<br> <br> URL: <a href="https://cgit.FreeBSD.org/ports/commit/?id=3e9d70e048567f2813400ee7a40dbfa8ad61f49b" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=3e9d70e048567f2813400ee7a40dbfa8ad61f49b</a><br>; <br> commit 3e9d70e048567f2813400ee7a40dbfa8ad61f49b<br> Author: Yuri Victorovich <yuri@FreeBSD.org><br> AuthorDate: 2026-04-15 07:43:08 +0000<br> Commit: Yuri Victorovich <yuri@FreeBSD.org><br> CommitDate: 2026-04-15 07:43:17 +0000<br> <br> devel/catch: update 2.13.10 → 3.14.0<br> ---<br> devel/catch/Makefile | 15 ++-<br> devel/catch/distinfo | 6 +-<br> devel/catch/files/patch-clang19 | 11 --<br> devel/catch/files/patch-clang21 | 73 -------------<br> devel/catch/pkg-plist | 225 ++++++++++++++++++++++++++++++++++------<br> 5 files changed, 206 insertions(+), 124 deletions(-)<br> <br> diff --git a/devel/catch/Makefile b/devel/catch/Makefile<br> index 5103183d96f5..59dd601a3eeb 100644<br> --- a/devel/catch/Makefile<br> +++ b/devel/catch/Makefile<br> @@ -1,6 +1,5 @@<br> PORTNAME= catch<br> -PORTVERSION= 2.13.10<br> -PORTREVISION= 1<br> +DISTVERSION= 3.14.0<br> DISTVERSIONPREFIX= v<br> CATEGORIES= devel<br> <br> @@ -18,13 +17,21 @@ GH_ACCOUNT= catchorg<br> GH_PROJECT= Catch2<br> <br> CMAKE_ARGS= -DCMAKE_INSTALL_DOCDIR=${DOCSDIR}<br> -NO_ARCH= yes<br> +CMAKE_ON= BUILD_SHARED_LIBS \<br> + CATCH_DEVELOPMENT_BUILD<br> +CMAKE_OFF= CATCH_ENABLE_WERROR<br> <br> PORTSCOUT= limit:^2\.<br> <br> OPTIONS_DEFINE= DOCS<br> <br> +PORTDOCS= *<br> +<br> +# tests as of 3.14.0:<br> +# test cases: 517 | 494 passed | 7 skipped | 16 failed as expected<br> +# assertions: 84776 | 84753 passed | 23 failed as expected<br> +<br> do-test:<br> - ${BUILD_WRKSRC}/projects/SelfTest<br> + @${BUILD_WRKSRC}/tests/SelfTest<br> <br> .include <<a href="http://bsd.port.mk" rel="noreferrer" target="_blank">bsd.port.mk</a>><br> diff --git a/devel/catch/distinfo b/devel/catch/distinfo<br> index c16498530e36..d52e5e73b456 100644<br> --- a/devel/catch/distinfo<br> +++ b/devel/catch/distinfo<br> @@ -1,3 +1,3 @@<br> -TIMESTAMP = 1679498524<br> -SHA256 (catchorg-Catch2-v2.13.10_GH0.tar.gz) = d54a712b7b1d7708bc7a819a8e6e47b2fde9536f487b89ccbca295072a7d9943<br> -SIZE (catchorg-Catch2-v2.13.10_GH0.tar.gz) = 662225<br> +TIMESTAMP = 1776228259<br> +SHA256 (catchorg-Catch2-v3.14.0_GH0.tar.gz) = ba2a939efead3c833c499cf487e185762f419a71d30158cd1b43c6079c586490<br> +SIZE (catchorg-Catch2-v3.14.0_GH0.tar.gz) = 1183590<br> diff --git a/devel/catch/files/patch-clang19 b/devel/catch/files/patch-clang19<br> deleted file mode 100644<br> index 672213fbe950..000000000000<br> --- a/devel/catch/files/patch-clang19<br> +++ /dev/null<br> @@ -1,11 +0,0 @@<br> ---- projects/CMakeLists.txt.orig 2022-10-16 09:02:17 UTC<br> -+++ projects/CMakeLists.txt<br> -@@ -354,7 +354,7 @@ if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|G<br> - if ( CMAKE_CXX_COMPILER_ID MATCHES "Clang|AppleClang|GNU" )<br> - target_compile_options( SelfTest PRIVATE -Wall -Wextra -Wunreachable-code -Wpedantic -Wmissing-declarations )<br> - if (CATCH_ENABLE_WERROR)<br> -- target_compile_options( SelfTest PRIVATE -Werror -Wno-error=pragmas )<br> -+ target_compile_options( SelfTest PRIVATE -Werror -Wno-error=pragmas -Wno-error=c++20-extensions )<br> - endif()<br> - endif()<br> - # Clang specific options go here<br> diff --git a/devel/catch/files/patch-clang21 b/devel/catch/files/patch-clang21<br> deleted file mode 100644<br> index ecaf1667a42c..000000000000<br> --- a/devel/catch/files/patch-clang21<br> +++ /dev/null<br> @@ -1,73 +0,0 @@<br> ---- include/internal/catch_approx.cpp.orig 2022-10-16 09:02:17 UTC<br> -+++ include/internal/catch_approx.cpp<br> -@@ -73,10 +73,10 @@ namespace literals {<br> - } // end namespace Detail<br> - <br> - namespace literals {<br> -- Detail::Approx operator "" _a(long double val) {<br> -+ Detail::Approx operator ""_a(long double val) {<br> - return Detail::Approx(val);<br> - }<br> -- Detail::Approx operator "" _a(unsigned long long val) {<br> -+ Detail::Approx operator ""_a(unsigned long long val) {<br> - return Detail::Approx(val);<br> - }<br> - } // end namespace literals<br> ---- include/internal/catch_approx.h.orig 2022-10-16 09:02:17 UTC<br> -+++ include/internal/catch_approx.h<br> -@@ -118,8 +118,8 @@ namespace literals {<br> - } // end namespace Detail<br> - <br> - namespace literals {<br> -- Detail::Approx operator "" _a(long double val);<br> -- Detail::Approx operator "" _a(unsigned long long val);<br> -+ Detail::Approx operator ""_a(long double val);<br> -+ Detail::Approx operator ""_a(unsigned long long val);<br> - } // end namespace literals<br> - <br> - template<><br> ---- include/internal/catch_stringref.h.orig 2022-10-16 09:02:17 UTC<br> -+++ include/internal/catch_stringref.h<br> -@@ -92,12 +92,12 @@ namespace Catch {<br> - auto operator << ( std::ostream& os, StringRef const& sr ) -> std::ostream&;<br> - <br> - <br> -- constexpr auto operator "" _sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {<br> -+ constexpr auto operator ""_sr( char const* rawChars, std::size_t size ) noexcept -> StringRef {<br> - return StringRef( rawChars, size );<br> - }<br> - } // namespace Catch<br> - <br> --constexpr auto operator "" _catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {<br> -+constexpr auto operator ""_catch_sr( char const* rawChars, std::size_t size ) noexcept -> Catch::StringRef {<br> - return Catch::StringRef( rawChars, size );<br> - }<br> - <br> ---- projects/SelfTest/IntrospectiveTests/String.tests.cpp.orig 2022-10-16 09:02:17 UTC<br> -+++ projects/SelfTest/IntrospectiveTests/String.tests.cpp<br> -@@ -141,7 +141,7 @@ TEST_CASE("StringRef at compilation time", "[Strings][<br> - STATIC_REQUIRE(sr1.size() == 3);<br> - STATIC_REQUIRE(sr1.isNullTerminated());<br> - <br> -- using Catch::operator"" _sr;<br> -+ using Catch::operator""_sr;<br> - constexpr auto sr2 = ""_sr;<br> - STATIC_REQUIRE(sr2.empty());<br> - STATIC_REQUIRE(sr2.size() == 0);<br> ---- projects/SelfTest/UsageTests/ToStringVariant.tests.cpp.orig 2022-10-16 09:02:17 UTC<br> -+++ projects/SelfTest/UsageTests/ToStringVariant.tests.cpp<br> -@@ -10,12 +10,12 @@ struct MyType1 {<br> - struct MyType1 {<br> - MyType1() = default;<br> - [[noreturn]] MyType1(MyType1 const&) { throw 1; }<br> -- MyType1& operator=(MyType1 const&) { throw 3; }<br> -+ [[noreturn]] MyType1& operator=(MyType1 const&) { throw 3; }<br> - };<br> - struct MyType2 {<br> - MyType2() = default;<br> - [[noreturn]] MyType2(MyType2 const&) { throw 2; }<br> -- MyType2& operator=(MyType2 const&) { throw 4; }<br> -+ [[noreturn]] MyType2& operator=(MyType2 const&) { throw 4; }<br> - };<br> - <br> - TEST_CASE( "variant<std::monostate>", "[toString][variant][approvals]")<br> diff --git a/devel/catch/pkg-plist b/devel/catch/pkg-plist<br> index cb4f7cc4c007..fe93bff564e7 100644<br> --- a/devel/catch/pkg-plist<br> +++ b/devel/catch/pkg-plist<br> @@ -1,42 +1,201 @@<br> -include/catch2/catch.hpp<br> -include/catch2/catch_reporter_automake.hpp<br> -include/catch2/catch_reporter_sonarqube.hpp<br> -include/catch2/catch_reporter_tap.hpp<br> -include/catch2/catch_reporter_teamcity.hpp<br> +include/catch2/benchmark/catch_benchmark.hpp<br> +include/catch2/benchmark/catch_benchmark_all.hpp<br> +include/catch2/benchmark/catch_chronometer.hpp<br> +include/catch2/benchmark/catch_clock.hpp<br> +include/catch2/benchmark/catch_constructor.hpp<br> +include/catch2/benchmark/catch_environment.hpp<br> +include/catch2/benchmark/catch_estimate.hpp<br> +include/catch2/benchmark/catch_execution_plan.hpp<br> +include/catch2/benchmark/catch_optimizer.hpp<br> +include/catch2/benchmark/catch_outlier_classification.hpp<br> +include/catch2/benchmark/catch_sample_analysis.hpp<br> +include/catch2/benchmark/detail/catch_analyse.hpp<br> +include/catch2/benchmark/detail/catch_benchmark_function.hpp<br> +include/catch2/benchmark/detail/catch_benchmark_stats.hpp<br> +include/catch2/benchmark/detail/catch_benchmark_stats_fwd.hpp<br> +include/catch2/benchmark/detail/catch_complete_invoke.hpp<br> +include/catch2/benchmark/detail/catch_estimate_clock.hpp<br> +include/catch2/benchmark/detail/catch_measure.hpp<br> +include/catch2/benchmark/detail/catch_repeat.hpp<br> +include/catch2/benchmark/detail/catch_run_for_at_least.hpp<br> +include/catch2/benchmark/detail/catch_stats.hpp<br> +include/catch2/benchmark/detail/catch_timing.hpp<br> +include/catch2/catch_all.hpp<br> +include/catch2/catch_approx.hpp<br> +include/catch2/catch_assertion_info.hpp<br> +include/catch2/catch_assertion_result.hpp<br> +include/catch2/catch_case_sensitive.hpp<br> +include/catch2/catch_config.hpp<br> +include/catch2/catch_get_random_seed.hpp<br> +include/catch2/catch_message.hpp<br> +include/catch2/catch_section_info.hpp<br> +include/catch2/catch_session.hpp<br> +include/catch2/catch_tag_alias.hpp<br> +include/catch2/catch_tag_alias_autoregistrar.hpp<br> +include/catch2/catch_template_test_macros.hpp<br> +include/catch2/catch_test_case_info.hpp<br> +include/catch2/catch_test_macros.hpp<br> +include/catch2/catch_test_run_info.hpp<br> +include/catch2/catch_test_spec.hpp<br> +include/catch2/catch_timer.hpp<br> +include/catch2/catch_tostring.hpp<br> +include/catch2/catch_totals.hpp<br> +include/catch2/catch_translate_exception.hpp<br> +include/catch2/catch_user_config.hpp<br> +include/catch2/catch_version.hpp<br> +include/catch2/catch_version_macros.hpp<br> +include/catch2/generators/catch_generator_exception.hpp<br> +include/catch2/generators/catch_generators.hpp<br> +include/catch2/generators/catch_generators_adapters.hpp<br> +include/catch2/generators/catch_generators_all.hpp<br> +include/catch2/generators/catch_generators_random.hpp<br> +include/catch2/generators/catch_generators_range.hpp<br> +include/catch2/generators/catch_generators_throw.hpp<br> +include/catch2/interfaces/catch_interfaces_all.hpp<br> +include/catch2/interfaces/catch_interfaces_capture.hpp<br> +include/catch2/interfaces/catch_interfaces_config.hpp<br> +include/catch2/interfaces/catch_interfaces_enum_values_registry.hpp<br> +include/catch2/interfaces/catch_interfaces_exception.hpp<br> +include/catch2/interfaces/catch_interfaces_generatortracker.hpp<br> +include/catch2/interfaces/catch_interfaces_registry_hub.hpp<br> +include/catch2/interfaces/catch_interfaces_reporter.hpp<br> +include/catch2/interfaces/catch_interfaces_reporter_factory.hpp<br> +include/catch2/interfaces/catch_interfaces_tag_alias_registry.hpp<br> +include/catch2/interfaces/catch_interfaces_test_invoker.hpp<br> +include/catch2/interfaces/catch_interfaces_testcase.hpp<br> +include/catch2/internal/catch_assertion_handler.hpp<br> +include/catch2/internal/catch_case_insensitive_comparisons.hpp<br> +include/catch2/internal/catch_clara.hpp<br> +include/catch2/internal/catch_commandline.hpp<br> +include/catch2/internal/catch_compare_traits.hpp<br> +include/catch2/internal/catch_compiler_capabilities.hpp<br> +include/catch2/internal/catch_config_android_logwrite.hpp<br> +include/catch2/internal/catch_config_counter.hpp<br> +include/catch2/internal/catch_config_prefix_messages.hpp<br> +include/catch2/internal/catch_config_static_analysis_support.hpp<br> +include/catch2/internal/catch_config_uncaught_exceptions.hpp<br> +include/catch2/internal/catch_config_wchar.hpp<br> +include/catch2/internal/catch_console_colour.hpp<br> +include/catch2/internal/catch_console_width.hpp<br> +include/catch2/internal/catch_container_nonmembers.hpp<br> +include/catch2/internal/catch_context.hpp<br> +include/catch2/internal/catch_debug_console.hpp<br> +include/catch2/internal/catch_debugger.hpp<br> +include/catch2/internal/catch_decomposer.hpp<br> +include/catch2/internal/catch_deprecation_macro.hpp<br> +include/catch2/internal/catch_enforce.hpp<br> +include/catch2/internal/catch_enum_values_registry.hpp<br> +include/catch2/internal/catch_errno_guard.hpp<br> +include/catch2/internal/catch_exception_translator_registry.hpp<br> +include/catch2/internal/catch_fatal_condition_handler.hpp<br> +include/catch2/internal/catch_floating_point_helpers.hpp<br> +include/catch2/internal/catch_getenv.hpp<br> +include/catch2/internal/catch_is_permutation.hpp<br> +include/catch2/internal/catch_istream.hpp<br> +include/catch2/internal/catch_jsonwriter.hpp<br> +include/catch2/internal/catch_lazy_expr.hpp<br> +include/catch2/internal/catch_leak_detector.hpp<br> +include/catch2/internal/catch_lifetimebound.hpp<br> +include/catch2/internal/catch_list.hpp<br> +include/catch2/internal/catch_logical_traits.hpp<br> +include/catch2/internal/catch_message_info.hpp<br> +include/catch2/internal/catch_meta.hpp<br> +include/catch2/internal/catch_move_and_forward.hpp<br> +include/catch2/internal/catch_noncopyable.hpp<br> +include/catch2/internal/catch_optional.hpp<br> +include/catch2/internal/catch_output_redirect.hpp<br> +include/catch2/internal/catch_parse_numbers.hpp<br> +include/catch2/internal/catch_path_filter.hpp<br> +include/catch2/internal/catch_platform.hpp<br> +include/catch2/internal/catch_polyfills.hpp<br> +include/catch2/internal/catch_preprocessor.hpp<br> +include/catch2/internal/catch_preprocessor_internal_stringify.hpp<br> +include/catch2/internal/catch_preprocessor_remove_parens.hpp<br> +include/catch2/internal/catch_random_floating_point_helpers.hpp<br> +include/catch2/internal/catch_random_integer_helpers.hpp<br> +include/catch2/internal/catch_random_number_generator.hpp<br> +include/catch2/internal/catch_random_seed_generation.hpp<br> +include/catch2/internal/catch_reporter_registry.hpp<br> +include/catch2/internal/catch_reporter_spec_parser.hpp<br> +include/catch2/internal/catch_result_type.hpp<br> +include/catch2/internal/catch_reusable_string_stream.hpp<br> +include/catch2/internal/catch_run_context.hpp<br> +include/catch2/internal/catch_section.hpp<br> +include/catch2/internal/catch_sharding.hpp<br> +include/catch2/internal/catch_singletons.hpp<br> +include/catch2/internal/catch_source_line_info.hpp<br> +include/catch2/internal/catch_startup_exception_registry.hpp<br> +include/catch2/internal/catch_stdstreams.hpp<br> +include/catch2/internal/catch_stream_end_stop.hpp<br> +include/catch2/internal/catch_string_manip.hpp<br> +include/catch2/internal/catch_stringref.hpp<br> +include/catch2/internal/catch_tag_alias_registry.hpp<br> +include/catch2/internal/catch_template_test_registry.hpp<br> +include/catch2/internal/catch_test_case_info_hasher.hpp<br> +include/catch2/internal/catch_test_case_registry_impl.hpp<br> +include/catch2/internal/catch_test_case_tracker.hpp<br> +include/catch2/internal/catch_test_failure_exception.hpp<br> +include/catch2/internal/catch_test_macro_impl.hpp<br> +include/catch2/internal/catch_test_registry.hpp<br> +include/catch2/internal/catch_test_spec_parser.hpp<br> +include/catch2/internal/catch_textflow.hpp<br> +include/catch2/internal/catch_thread_local.hpp<br> +include/catch2/internal/catch_thread_support.hpp<br> +include/catch2/internal/catch_to_string.hpp<br> +include/catch2/internal/catch_uncaught_exceptions.hpp<br> +include/catch2/internal/catch_uniform_floating_point_distribution.hpp<br> +include/catch2/internal/catch_uniform_integer_distribution.hpp<br> +include/catch2/internal/catch_unique_name.hpp<br> +include/catch2/internal/catch_unique_ptr.hpp<br> +include/catch2/internal/catch_unreachable.hpp<br> +include/catch2/internal/catch_void_type.hpp<br> +include/catch2/internal/catch_wildcard_pattern.hpp<br> +include/catch2/internal/catch_windows_h_proxy.hpp<br> +include/catch2/internal/catch_xmlwriter.hpp<br> +include/catch2/matchers/catch_matchers.hpp<br> +include/catch2/matchers/catch_matchers_all.hpp<br> +include/catch2/matchers/catch_matchers_container_properties.hpp<br> +include/catch2/matchers/catch_matchers_contains.hpp<br> +include/catch2/matchers/catch_matchers_exception.hpp<br> +include/catch2/matchers/catch_matchers_floating_point.hpp<br> +include/catch2/matchers/catch_matchers_predicate.hpp<br> +include/catch2/matchers/catch_matchers_quantifiers.hpp<br> +include/catch2/matchers/catch_matchers_range_equals.hpp<br> +include/catch2/matchers/catch_matchers_string.hpp<br> +include/catch2/matchers/catch_matchers_templated.hpp<br> +include/catch2/matchers/catch_matchers_vector.hpp<br> +include/catch2/matchers/internal/catch_matchers_impl.hpp<br> +include/catch2/reporters/catch_reporter_automake.hpp<br> +include/catch2/reporters/catch_reporter_common_base.hpp<br> +include/catch2/reporters/catch_reporter_compact.hpp<br> +include/catch2/reporters/catch_reporter_console.hpp<br> +include/catch2/reporters/catch_reporter_cumulative_base.hpp<br> +include/catch2/reporters/catch_reporter_event_listener.hpp<br> +include/catch2/reporters/catch_reporter_helpers.hpp<br> +include/catch2/reporters/catch_reporter_json.hpp<br> +include/catch2/reporters/catch_reporter_junit.hpp<br> +include/catch2/reporters/catch_reporter_multi.hpp<br> +include/catch2/reporters/catch_reporter_registrars.hpp<br> +include/catch2/reporters/catch_reporter_sonarqube.hpp<br> +include/catch2/reporters/catch_reporter_streaming_base.hpp<br> +include/catch2/reporters/catch_reporter_tap.hpp<br> +include/catch2/reporters/catch_reporter_teamcity.hpp<br> +include/catch2/reporters/catch_reporter_xml.hpp<br> +include/catch2/reporters/catch_reporters_all.hpp<br> lib/cmake/Catch2/Catch.cmake<br> lib/cmake/Catch2/Catch2Config.cmake<br> lib/cmake/Catch2/Catch2ConfigVersion.cmake<br> +lib/cmake/Catch2/Catch2Targets-%%CMAKE_BUILD_TYPE%%.cmake<br> lib/cmake/Catch2/Catch2Targets.cmake<br> lib/cmake/Catch2/CatchAddTests.cmake<br> +lib/cmake/Catch2/CatchShardTests.cmake<br> +lib/cmake/Catch2/CatchShardTestsImpl.cmake<br> lib/cmake/Catch2/ParseAndAddCatchTests.cmake<br> +lib/libCatch2.so<br> +lib/libCatch2.so.3.14.0<br> +lib/libCatch2Main.so<br> +lib/libCatch2Main.so.3.14.0<br> share/Catch2/gdbinit<br> share/Catch2/lldbinit<br> +share/pkgconfig/catch2-with-main.pc<br> share/pkgconfig/catch2.pc<br> -%%PORTDOCS%%%%DOCSDIR%%/Readme.md<br> -%%PORTDOCS%%%%DOCSDIR%%/assertions.md<br> -%%PORTDOCS%%%%DOCSDIR%%/benchmarks.md<br> -%%PORTDOCS%%%%DOCSDIR%%/ci-and-misc.md<br> -%%PORTDOCS%%%%DOCSDIR%%/cmake-integration.md<br> -%%PORTDOCS%%%%DOCSDIR%%/command-line.md<br> -%%PORTDOCS%%%%DOCSDIR%%/commercial-users.md<br> -%%PORTDOCS%%%%DOCSDIR%%/configuration.md<br> -%%PORTDOCS%%%%DOCSDIR%%/contributing.md<br> -%%PORTDOCS%%%%DOCSDIR%%/deprecations.md<br> -%%PORTDOCS%%%%DOCSDIR%%/event-listeners.md<br> -%%PORTDOCS%%%%DOCSDIR%%/generators.md<br> -%%PORTDOCS%%%%DOCSDIR%%/limitations.md<br> -%%PORTDOCS%%%%DOCSDIR%%/list-of-examples.md<br> -%%PORTDOCS%%%%DOCSDIR%%/logging.md<br> -%%PORTDOCS%%%%DOCSDIR%%/matchers.md<br> -%%PORTDOCS%%%%DOCSDIR%%/opensource-users.md<br> -%%PORTDOCS%%%%DOCSDIR%%/other-macros.md<br> -%%PORTDOCS%%%%DOCSDIR%%/own-main.md<br> -%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-notes.md<br> -%%PORTDOCS%%%%DOCSDIR%%/%%CMAKE_BUILD_TYPE%%-process.md<br> -%%PORTDOCS%%%%DOCSDIR%%/reporters.md<br> -%%PORTDOCS%%%%DOCSDIR%%/slow-compiles.md<br> -%%PORTDOCS%%%%DOCSDIR%%/test-cases-and-sections.md<br> -%%PORTDOCS%%%%DOCSDIR%%/test-fixtures.md<br> -%%PORTDOCS%%%%DOCSDIR%%/tostring.md<br> -%%PORTDOCS%%%%DOCSDIR%%/tutorial.md<br> -%%PORTDOCS%%%%DOCSDIR%%/why-catch.md<br> <br> </blockquote></div></div> </div>home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAMHz58RCYHWG-kgPHHyyzkAbZ8%2Bt3R8c6bQRd%2BJjfXQMA4ZDhg>