Update catch2 to 3.2.0. There are a few ports changes here:
- No need for python anymore (Only if developer cmake option is set)
- Drop NO_BUILD. It needs to build a static lib now
OK?
Rafael
Index: Makefile
===================================================================
RCS file: /cvs/ports/devel/catch2/Makefile,v
retrieving revision 1.41
diff -u -p -u -p -r1.41 Makefile
--- Makefile 28 Apr 2022 09:47:17 -0000 1.41
+++ Makefile 4 Dec 2022 16:06:56 -0000
@@ -2,7 +2,7 @@ COMMENT = C++-native, header-only, test
GH_ACCOUNT = catchorg
GH_PROJECT = Catch2
-GH_TAGNAME = v2.13.9
+GH_TAGNAME = v3.2.0
PKGNAME = ${DISTNAME:L}
CATEGORIES = devel
@@ -15,21 +15,7 @@ PERMIT_PACKAGE = Yes
# C++11 / C++14
COMPILER = base-clang ports-clang ports-gcc
-MODULES = devel/cmake \
- lang/python
+MODULES = devel/cmake
-MODPY_RUNDEP = No
-
-# just header files
-PKG_ARCH = *
-
-# compile tests only when testing
-NO_BUILD = Yes
-
-pre-configure:
- ln -sf ${MODPY_BIN} ${WRKDIR}/bin/python
-
-pre-test:
- ${MODCMAKE_BUILD_TARGET}
.include <bsd.port.mk>
Index: distinfo
===================================================================
RCS file: /cvs/ports/devel/catch2/distinfo,v
retrieving revision 1.37
diff -u -p -u -p -r1.37 distinfo
--- distinfo 28 Apr 2022 09:47:17 -0000 1.37
+++ distinfo 4 Dec 2022 16:06:56 -0000
@@ -1,2 +1,2 @@
-SHA256 (Catch2-2.13.9.tar.gz) = BtvHYg47lsK2nVe/M3AovyRaIRs83bhDg1v+JY9CelI=
-SIZE (Catch2-2.13.9.tar.gz) = 661915
+SHA256 (Catch2-3.2.0.tar.gz) = /u4EZH4orDy+/0bLQqvI7i2NX2RtNuP7O6J0uMaaWOo=
+SIZE (Catch2-3.2.0.tar.gz) = 1042498
Index: pkg/PLIST
===================================================================
RCS file: /cvs/ports/devel/catch2/pkg/PLIST,v
retrieving revision 1.12
diff -u -p -u -p -r1.12 PLIST
--- pkg/PLIST 11 Mar 2022 18:49:47 -0000 1.12
+++ pkg/PLIST 4 Dec 2022 16:06:56 -0000
@@ -1,17 +1,185 @@
include/catch2/
-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/
+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/
+include/catch2/benchmark/detail/catch_analyse.hpp
+include/catch2/benchmark/detail/catch_benchmark_function.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_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_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/
+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/interfaces/
+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_reporter_registry.hpp
+include/catch2/interfaces/catch_interfaces_tag_alias_registry.hpp
+include/catch2/interfaces/catch_interfaces_testcase.hpp
+include/catch2/internal/
+include/catch2/internal/catch_assertion_handler.hpp
+include/catch2/internal/catch_case_insensitive_comparisons.hpp
+include/catch2/internal/catch_case_sensitive.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_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_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_istream.hpp
+include/catch2/internal/catch_lazy_expr.hpp
+include/catch2/internal/catch_leak_detector.hpp
+include/catch2/internal/catch_list.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_platform.hpp
+include/catch2/internal/catch_polyfills.hpp
+include/catch2/internal/catch_preprocessor.hpp
+include/catch2/internal/catch_preprocessor_remove_parens.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_to_string.hpp
+include/catch2/internal/catch_uncaught_exceptions.hpp
+include/catch2/internal/catch_unique_name.hpp
+include/catch2/internal/catch_unique_ptr.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/
+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_string.hpp
+include/catch2/matchers/catch_matchers_templated.hpp
+include/catch2/matchers/catch_matchers_vector.hpp
+include/catch2/matchers/internal/
+include/catch2/matchers/internal/catch_matchers_impl.hpp
+include/catch2/reporters/
+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_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/
lib/cmake/Catch2/
lib/cmake/Catch2/Catch.cmake
lib/cmake/Catch2/Catch2Config.cmake
lib/cmake/Catch2/Catch2ConfigVersion.cmake
+lib/cmake/Catch2/Catch2Targets${MODCMAKE_BUILD_SUFFIX}
lib/cmake/Catch2/Catch2Targets.cmake
lib/cmake/Catch2/CatchAddTests.cmake
lib/cmake/Catch2/ParseAndAddCatchTests.cmake
+@static-lib lib/libCatch2.a
+@static-lib lib/libCatch2Main.a
share/Catch2/
share/Catch2/gdbinit
share/Catch2/lldbinit
@@ -23,25 +191,30 @@ share/doc/Catch2/ci-and-misc.md
share/doc/Catch2/cmake-integration.md
share/doc/Catch2/command-line.md
share/doc/Catch2/commercial-users.md
+share/doc/Catch2/comparing-floating-point-numbers.md
share/doc/Catch2/configuration.md
share/doc/Catch2/contributing.md
share/doc/Catch2/deprecations.md
share/doc/Catch2/event-listeners.md
+share/doc/Catch2/faq.md
share/doc/Catch2/generators.md
share/doc/Catch2/limitations.md
share/doc/Catch2/list-of-examples.md
share/doc/Catch2/logging.md
share/doc/Catch2/matchers.md
+share/doc/Catch2/migrate-v2-to-v3.md
share/doc/Catch2/opensource-users.md
share/doc/Catch2/other-macros.md
share/doc/Catch2/own-main.md
share/doc/Catch2/release-notes.md
share/doc/Catch2/release-process.md
+share/doc/Catch2/reporter-events.md
share/doc/Catch2/reporters.md
-share/doc/Catch2/slow-compiles.md
share/doc/Catch2/test-cases-and-sections.md
share/doc/Catch2/test-fixtures.md
share/doc/Catch2/tostring.md
share/doc/Catch2/tutorial.md
+share/doc/Catch2/usage-tips.md
share/doc/Catch2/why-catch.md
+share/pkgconfig/catch2-with-main.pc
share/pkgconfig/catch2.pc
