On Sun, Feb 02, 2025 at 11:48:14AM -0800, Andrew Hewus Fresh wrote:
> And here's the patch to remove p5-Test2-Suite, it is now included with
> perl 5.40.
>
> I also need to do the same for p5-Term-Table, once I know I got this
> right. I could also do them together if preferred.
>
> Sorry I forgot to CC you on the first part bluhm.
>
> What did I miss doing?
Several ports have devel/p5-Test2-Suite as dependency. These entries
have to be removed first.
p5-Test2-Suite package has $Test2::Suite::VERSION 0.000163, base
Perl base has 0.000162. Is this a problem? Grepping ports makefiles
did not find such version dependencies.
bluhm
>
> OK?
>
>
> Index: devel/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/Makefile,v
> diff -u -p -u -r1.2470 Makefile
> --- devel/Makefile 21 Jan 2025 08:08:56 -0000 1.2470
> +++ devel/Makefile 2 Feb 2025 19:37:33 -0000
> @@ -1233,7 +1233,6 @@
> SUBDIR += p5-Test-YAML-Valid
> SUBDIR += p5-Test-utf8
> SUBDIR += p5-Test2-Plugin-NoWarnings
> - SUBDIR += p5-Test2-Suite
> SUBDIR += p5-Test2-Tools-Explain
> SUBDIR += p5-Text-Control
> SUBDIR += p5-Text-FixEOL
> Index: devel/p5-Test2-Suite/Makefile
> ===================================================================
> RCS file: devel/p5-Test2-Suite/Makefile
> diff -N devel/p5-Test2-Suite/Makefile
> --- devel/p5-Test2-Suite/Makefile 2 Jul 2024 11:12:03 -0000 1.14
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,24 +0,0 @@
> -COMMENT = set of tools built upon the Test2 framework
> -
> -DISTNAME = Test2-Suite-0.000163
> -CPAN_AUTHOR = EXODIST
> -
> -CATEGORIES = devel
> -
> -MAINTAINER = Alexander Bluhm <bl...@openbsd.org>
> -
> -# Perl
> -PERMIT_PACKAGE = Yes
> -
> -MODULES = cpan
> -RUN_DEPENDS = devel/p5-Module-Pluggable>=2.7 \
> - devel/p5-Term-Table>=0.013
> -TEST_DEPENDS = converters/p5-JSON-MaybeXS \
> - converters/p5-Unicode-LineBreak \
> - devel/p5-Devel-MAT-Dumper \
> - devel/p5-Sub-Name \
> - devel/p5-Term-Size-Any
> -
> -PKG_ARCH = *
> -
> -.include <bsd.port.mk>
> Index: devel/p5-Test2-Suite/distinfo
> ===================================================================
> RCS file: devel/p5-Test2-Suite/distinfo
> diff -N devel/p5-Test2-Suite/distinfo
> --- devel/p5-Test2-Suite/distinfo 2 Jul 2024 11:12:03 -0000 1.11
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,2 +0,0 @@
> -SHA256 (Test2-Suite-0.000163.tar.gz) =
> 4zbC2S1DxPAGiqDWcBnVZyOrgkceG9kCgwC7ahYCwKk=
> -SIZE (Test2-Suite-0.000163.tar.gz) = 245738
> Index: devel/p5-Test2-Suite/pkg/DESCR
> ===================================================================
> RCS file: devel/p5-Test2-Suite/pkg/DESCR
> diff -N devel/p5-Test2-Suite/pkg/DESCR
> --- devel/p5-Test2-Suite/pkg/DESCR 19 Apr 2019 14:42:01 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,3 +0,0 @@
> -Rich set of tools, plugins, bundles, etc built upon the Test2 testing
> -library. If you are interested in writing tests, this is the
> -distribution for you.
> Index: devel/p5-Test2-Suite/pkg/PLIST
> ===================================================================
> RCS file: devel/p5-Test2-Suite/pkg/PLIST
> diff -N devel/p5-Test2-Suite/pkg/PLIST
> --- devel/p5-Test2-Suite/pkg/PLIST 2 Jul 2024 11:12:03 -0000 1.7
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,262 +0,0 @@
> -${P5SITE}/Test2/
> -${P5SITE}/Test2/AsyncSubtest/
> -${P5SITE}/Test2/AsyncSubtest.pm
> -${P5SITE}/Test2/AsyncSubtest/Event/
> -${P5SITE}/Test2/AsyncSubtest/Event/Attach.pm
> -${P5SITE}/Test2/AsyncSubtest/Event/Detach.pm
> -${P5SITE}/Test2/AsyncSubtest/Formatter.pm
> -${P5SITE}/Test2/AsyncSubtest/Hub.pm
> -${P5SITE}/Test2/Bundle/
> -${P5SITE}/Test2/Bundle.pm
> -${P5SITE}/Test2/Bundle/Extended.pm
> -${P5SITE}/Test2/Bundle/More.pm
> -${P5SITE}/Test2/Bundle/Simple.pm
> -${P5SITE}/Test2/Compare/
> -${P5SITE}/Test2/Compare.pm
> -${P5SITE}/Test2/Compare/Array.pm
> -${P5SITE}/Test2/Compare/Bag.pm
> -${P5SITE}/Test2/Compare/Base.pm
> -${P5SITE}/Test2/Compare/Bool.pm
> -${P5SITE}/Test2/Compare/Custom.pm
> -${P5SITE}/Test2/Compare/DeepRef.pm
> -${P5SITE}/Test2/Compare/Delta.pm
> -${P5SITE}/Test2/Compare/Event.pm
> -${P5SITE}/Test2/Compare/EventMeta.pm
> -${P5SITE}/Test2/Compare/Float.pm
> -${P5SITE}/Test2/Compare/Hash.pm
> -${P5SITE}/Test2/Compare/Isa.pm
> -${P5SITE}/Test2/Compare/Meta.pm
> -${P5SITE}/Test2/Compare/Negatable.pm
> -${P5SITE}/Test2/Compare/Number.pm
> -${P5SITE}/Test2/Compare/Object.pm
> -${P5SITE}/Test2/Compare/OrderedSubset.pm
> -${P5SITE}/Test2/Compare/Pattern.pm
> -${P5SITE}/Test2/Compare/Ref.pm
> -${P5SITE}/Test2/Compare/Regex.pm
> -${P5SITE}/Test2/Compare/Scalar.pm
> -${P5SITE}/Test2/Compare/Set.pm
> -${P5SITE}/Test2/Compare/String.pm
> -${P5SITE}/Test2/Compare/Undef.pm
> -${P5SITE}/Test2/Compare/Wildcard.pm
> -${P5SITE}/Test2/Manual/
> -${P5SITE}/Test2/Manual.pm
> -${P5SITE}/Test2/Manual/Anatomy/
> -${P5SITE}/Test2/Manual/Anatomy.pm
> -${P5SITE}/Test2/Manual/Anatomy/API.pm
> -${P5SITE}/Test2/Manual/Anatomy/Context.pm
> -${P5SITE}/Test2/Manual/Anatomy/EndToEnd.pm
> -${P5SITE}/Test2/Manual/Anatomy/Event.pm
> -${P5SITE}/Test2/Manual/Anatomy/Hubs.pm
> -${P5SITE}/Test2/Manual/Anatomy/IPC.pm
> -${P5SITE}/Test2/Manual/Anatomy/Utilities.pm
> -${P5SITE}/Test2/Manual/Concurrency.pm
> -${P5SITE}/Test2/Manual/Contributing.pm
> -${P5SITE}/Test2/Manual/Testing/
> -${P5SITE}/Test2/Manual/Testing.pm
> -${P5SITE}/Test2/Manual/Testing/Introduction.pm
> -${P5SITE}/Test2/Manual/Testing/Migrating.pm
> -${P5SITE}/Test2/Manual/Testing/Planning.pm
> -${P5SITE}/Test2/Manual/Testing/Todo.pm
> -${P5SITE}/Test2/Manual/Tooling/
> -${P5SITE}/Test2/Manual/Tooling.pm
> -${P5SITE}/Test2/Manual/Tooling/FirstTool.pm
> -${P5SITE}/Test2/Manual/Tooling/Formatter.pm
> -${P5SITE}/Test2/Manual/Tooling/Nesting.pm
> -${P5SITE}/Test2/Manual/Tooling/Plugin/
> -${P5SITE}/Test2/Manual/Tooling/Plugin/TestExit.pm
> -${P5SITE}/Test2/Manual/Tooling/Plugin/TestingDone.pm
> -${P5SITE}/Test2/Manual/Tooling/Plugin/ToolCompletes.pm
> -${P5SITE}/Test2/Manual/Tooling/Plugin/ToolStarts.pm
> -${P5SITE}/Test2/Manual/Tooling/Subtest.pm
> -${P5SITE}/Test2/Manual/Tooling/TestBuilder.pm
> -${P5SITE}/Test2/Manual/Tooling/Testing.pm
> -${P5SITE}/Test2/Mock.pm
> -${P5SITE}/Test2/Plugin/
> -${P5SITE}/Test2/Plugin.pm
> -${P5SITE}/Test2/Plugin/BailOnFail.pm
> -${P5SITE}/Test2/Plugin/DieOnFail.pm
> -${P5SITE}/Test2/Plugin/ExitSummary.pm
> -${P5SITE}/Test2/Plugin/SRand.pm
> -${P5SITE}/Test2/Plugin/Times.pm
> -${P5SITE}/Test2/Plugin/UTF8.pm
> -${P5SITE}/Test2/Require/
> -${P5SITE}/Test2/Require.pm
> -${P5SITE}/Test2/Require/AuthorTesting.pm
> -${P5SITE}/Test2/Require/AutomatedTesting.pm
> -${P5SITE}/Test2/Require/EnvVar.pm
> -${P5SITE}/Test2/Require/ExtendedTesting.pm
> -${P5SITE}/Test2/Require/Fork.pm
> -${P5SITE}/Test2/Require/Module.pm
> -${P5SITE}/Test2/Require/NonInteractiveTesting.pm
> -${P5SITE}/Test2/Require/Perl.pm
> -${P5SITE}/Test2/Require/RealFork.pm
> -${P5SITE}/Test2/Require/ReleaseTesting.pm
> -${P5SITE}/Test2/Require/Threads.pm
> -${P5SITE}/Test2/Suite.pm
> -${P5SITE}/Test2/Todo.pm
> -${P5SITE}/Test2/Tools/
> -${P5SITE}/Test2/Tools.pm
> -${P5SITE}/Test2/Tools/AsyncSubtest.pm
> -${P5SITE}/Test2/Tools/Basic.pm
> -${P5SITE}/Test2/Tools/Class.pm
> -${P5SITE}/Test2/Tools/ClassicCompare.pm
> -${P5SITE}/Test2/Tools/Compare.pm
> -${P5SITE}/Test2/Tools/Defer.pm
> -${P5SITE}/Test2/Tools/Encoding.pm
> -${P5SITE}/Test2/Tools/Event.pm
> -${P5SITE}/Test2/Tools/Exception.pm
> -${P5SITE}/Test2/Tools/Exports.pm
> -${P5SITE}/Test2/Tools/GenTemp.pm
> -${P5SITE}/Test2/Tools/Grab.pm
> -${P5SITE}/Test2/Tools/Mock.pm
> -${P5SITE}/Test2/Tools/Ref.pm
> -${P5SITE}/Test2/Tools/Refcount.pm
> -${P5SITE}/Test2/Tools/Spec.pm
> -${P5SITE}/Test2/Tools/Subtest.pm
> -${P5SITE}/Test2/Tools/Target.pm
> -${P5SITE}/Test2/Tools/Tester.pm
> -${P5SITE}/Test2/Tools/Warnings.pm
> -${P5SITE}/Test2/Util/
> -${P5SITE}/Test2/Util/Grabber.pm
> -${P5SITE}/Test2/Util/Guard.pm
> -${P5SITE}/Test2/Util/Importer.pm
> -${P5SITE}/Test2/Util/Ref.pm
> -${P5SITE}/Test2/Util/Stash.pm
> -${P5SITE}/Test2/Util/Sub.pm
> -${P5SITE}/Test2/Util/Table/
> -${P5SITE}/Test2/Util/Table.pm
> -${P5SITE}/Test2/Util/Table/Cell.pm
> -${P5SITE}/Test2/Util/Table/LineBreak.pm
> -${P5SITE}/Test2/Util/Term.pm
> -${P5SITE}/Test2/Util/Times.pm
> -${P5SITE}/Test2/V0.pm
> -${P5SITE}/Test2/Workflow/
> -${P5SITE}/Test2/Workflow.pm
> -${P5SITE}/Test2/Workflow/BlockBase.pm
> -${P5SITE}/Test2/Workflow/Build.pm
> -${P5SITE}/Test2/Workflow/Runner.pm
> -${P5SITE}/Test2/Workflow/Task/
> -${P5SITE}/Test2/Workflow/Task.pm
> -${P5SITE}/Test2/Workflow/Task/Action.pm
> -${P5SITE}/Test2/Workflow/Task/Group.pm
> -@man man/man3p/Test2::AsyncSubtest.3p
> -@man man/man3p/Test2::AsyncSubtest::Event::Attach.3p
> -@man man/man3p/Test2::AsyncSubtest::Event::Detach.3p
> -@man man/man3p/Test2::AsyncSubtest::Hub.3p
> -@man man/man3p/Test2::Bundle.3p
> -@man man/man3p/Test2::Bundle::Extended.3p
> -@man man/man3p/Test2::Bundle::More.3p
> -@man man/man3p/Test2::Bundle::Simple.3p
> -@man man/man3p/Test2::Compare.3p
> -@man man/man3p/Test2::Compare::Array.3p
> -@man man/man3p/Test2::Compare::Bag.3p
> -@man man/man3p/Test2::Compare::Base.3p
> -@man man/man3p/Test2::Compare::Bool.3p
> -@man man/man3p/Test2::Compare::Custom.3p
> -@man man/man3p/Test2::Compare::DeepRef.3p
> -@man man/man3p/Test2::Compare::Delta.3p
> -@man man/man3p/Test2::Compare::Event.3p
> -@man man/man3p/Test2::Compare::EventMeta.3p
> -@man man/man3p/Test2::Compare::Float.3p
> -@man man/man3p/Test2::Compare::Hash.3p
> -@man man/man3p/Test2::Compare::Isa.3p
> -@man man/man3p/Test2::Compare::Meta.3p
> -@man man/man3p/Test2::Compare::Negatable.3p
> -@man man/man3p/Test2::Compare::Number.3p
> -@man man/man3p/Test2::Compare::Object.3p
> -@man man/man3p/Test2::Compare::OrderedSubset.3p
> -@man man/man3p/Test2::Compare::Pattern.3p
> -@man man/man3p/Test2::Compare::Ref.3p
> -@man man/man3p/Test2::Compare::Regex.3p
> -@man man/man3p/Test2::Compare::Scalar.3p
> -@man man/man3p/Test2::Compare::Set.3p
> -@man man/man3p/Test2::Compare::String.3p
> -@man man/man3p/Test2::Compare::Undef.3p
> -@man man/man3p/Test2::Compare::Wildcard.3p
> -@man man/man3p/Test2::Manual.3p
> -@man man/man3p/Test2::Manual::Anatomy.3p
> -@man man/man3p/Test2::Manual::Anatomy::API.3p
> -@man man/man3p/Test2::Manual::Anatomy::Context.3p
> -@man man/man3p/Test2::Manual::Anatomy::EndToEnd.3p
> -@man man/man3p/Test2::Manual::Anatomy::Event.3p
> -@man man/man3p/Test2::Manual::Anatomy::Hubs.3p
> -@man man/man3p/Test2::Manual::Anatomy::IPC.3p
> -@man man/man3p/Test2::Manual::Anatomy::Utilities.3p
> -@man man/man3p/Test2::Manual::Concurrency.3p
> -@man man/man3p/Test2::Manual::Contributing.3p
> -@man man/man3p/Test2::Manual::Testing.3p
> -@man man/man3p/Test2::Manual::Testing::Introduction.3p
> -@man man/man3p/Test2::Manual::Testing::Migrating.3p
> -@man man/man3p/Test2::Manual::Testing::Planning.3p
> -@man man/man3p/Test2::Manual::Testing::Todo.3p
> -@man man/man3p/Test2::Manual::Tooling.3p
> -@man man/man3p/Test2::Manual::Tooling::FirstTool.3p
> -@man man/man3p/Test2::Manual::Tooling::Formatter.3p
> -@man man/man3p/Test2::Manual::Tooling::Nesting.3p
> -@man man/man3p/Test2::Manual::Tooling::Plugin::TestExit.3p
> -@man man/man3p/Test2::Manual::Tooling::Plugin::TestingDone.3p
> -@man man/man3p/Test2::Manual::Tooling::Plugin::ToolCompletes.3p
> -@man man/man3p/Test2::Manual::Tooling::Plugin::ToolStarts.3p
> -@man man/man3p/Test2::Manual::Tooling::Subtest.3p
> -@man man/man3p/Test2::Manual::Tooling::TestBuilder.3p
> -@man man/man3p/Test2::Manual::Tooling::Testing.3p
> -@man man/man3p/Test2::Mock.3p
> -@man man/man3p/Test2::Plugin.3p
> -@man man/man3p/Test2::Plugin::BailOnFail.3p
> -@man man/man3p/Test2::Plugin::DieOnFail.3p
> -@man man/man3p/Test2::Plugin::ExitSummary.3p
> -@man man/man3p/Test2::Plugin::SRand.3p
> -@man man/man3p/Test2::Plugin::Times.3p
> -@man man/man3p/Test2::Plugin::UTF8.3p
> -@man man/man3p/Test2::Require.3p
> -@man man/man3p/Test2::Require::AuthorTesting.3p
> -@man man/man3p/Test2::Require::AutomatedTesting.3p
> -@man man/man3p/Test2::Require::EnvVar.3p
> -@man man/man3p/Test2::Require::ExtendedTesting.3p
> -@man man/man3p/Test2::Require::Fork.3p
> -@man man/man3p/Test2::Require::Module.3p
> -@man man/man3p/Test2::Require::NonInteractiveTesting.3p
> -@man man/man3p/Test2::Require::Perl.3p
> -@man man/man3p/Test2::Require::RealFork.3p
> -@man man/man3p/Test2::Require::ReleaseTesting.3p
> -@man man/man3p/Test2::Require::Threads.3p
> -@man man/man3p/Test2::Suite.3p
> -@man man/man3p/Test2::Todo.3p
> -@man man/man3p/Test2::Tools.3p
> -@man man/man3p/Test2::Tools::AsyncSubtest.3p
> -@man man/man3p/Test2::Tools::Basic.3p
> -@man man/man3p/Test2::Tools::Class.3p
> -@man man/man3p/Test2::Tools::ClassicCompare.3p
> -@man man/man3p/Test2::Tools::Compare.3p
> -@man man/man3p/Test2::Tools::Defer.3p
> -@man man/man3p/Test2::Tools::Encoding.3p
> -@man man/man3p/Test2::Tools::Event.3p
> -@man man/man3p/Test2::Tools::Exception.3p
> -@man man/man3p/Test2::Tools::Exports.3p
> -@man man/man3p/Test2::Tools::GenTemp.3p
> -@man man/man3p/Test2::Tools::Grab.3p
> -@man man/man3p/Test2::Tools::Mock.3p
> -@man man/man3p/Test2::Tools::Ref.3p
> -@man man/man3p/Test2::Tools::Refcount.3p
> -@man man/man3p/Test2::Tools::Spec.3p
> -@man man/man3p/Test2::Tools::Subtest.3p
> -@man man/man3p/Test2::Tools::Target.3p
> -@man man/man3p/Test2::Tools::Tester.3p
> -@man man/man3p/Test2::Tools::Warnings.3p
> -@man man/man3p/Test2::Util::Grabber.3p
> -@man man/man3p/Test2::Util::Guard.3p
> -@man man/man3p/Test2::Util::Importer.3p
> -@man man/man3p/Test2::Util::Ref.3p
> -@man man/man3p/Test2::Util::Stash.3p
> -@man man/man3p/Test2::Util::Sub.3p
> -@man man/man3p/Test2::Util::Table.3p
> -@man man/man3p/Test2::Util::Table::LineBreak.3p
> -@man man/man3p/Test2::Util::Times.3p
> -@man man/man3p/Test2::V0.3p
> -@man man/man3p/Test2::Workflow.3p
> -@man man/man3p/Test2::Workflow::BlockBase.3p
> -@man man/man3p/Test2::Workflow::Build.3p
> -@man man/man3p/Test2::Workflow::Runner.3p
> -@man man/man3p/Test2::Workflow::Task.3p
> -@man man/man3p/Test2::Workflow::Task::Action.3p
> -@man man/man3p/Test2::Workflow::Task::Group.3p
