On Fri, Jul 25, 2014 at 12:08:02AM +0400, Vadim Zhukov wrote:
> So I propose the following. Okay?
I didn't test it, but I don't see any dependent ports for p5-TAP-Parser,
so the concept is OK by me.
> --
> WBR,
> Vadim Zhukov
>
>
> Index: quirks/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/Makefile,v
> retrieving revision 1.162
> diff -u -p -r1.162 Makefile
> --- quirks/Makefile 24 Jul 2014 19:54:59 -0000 1.162
> +++ quirks/Makefile 24 Jul 2014 20:05:58 -0000
> @@ -5,7 +5,7 @@ CATEGORIES = devel databases
> DISTFILES =
>
> # API.rev
> -PKGNAME = quirks-2.8
> +PKGNAME = quirks-2.9
> PKG_ARCH = *
> MAINTAINER = Marc Espie <es...@openbsd.org>
>
> Index: quirks/files/Quirks.pm
> ===================================================================
> RCS file: /cvs/ports/devel/quirks/files/Quirks.pm,v
> retrieving revision 1.168
> diff -u -p -r1.168 Quirks.pm
> --- quirks/files/Quirks.pm 24 Jul 2014 19:54:59 -0000 1.168
> +++ quirks/files/Quirks.pm 24 Jul 2014 20:05:58 -0000
> @@ -352,6 +352,7 @@ my $stem_extensions = {
> 'nagios-plugins-pgsql' => 'monitoring-plugins-pgsql',
> 'kdnssd' => 'zeroconf-ioslave',
> 'kwallet' => 'kwalletmanager',
> + 'p5-TAP-Parser' => 'p5-Test-Harness',
> };
>
> # reasons for obsolete packages
> Index: p5-Test-Harness/Makefile
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Test-Harness/Makefile,v
> retrieving revision 1.16
> diff -u -p -r1.16 Makefile
> --- p5-Test-Harness/Makefile 26 Apr 2014 22:11:43 -0000 1.16
> +++ p5-Test-Harness/Makefile 24 Jul 2014 20:05:58 -0000
> @@ -4,6 +4,7 @@ COMMENT = Run Perl standard test scripts
>
> DISTNAME = Test-Harness-3.30
> CATEGORIES = devel
> +REVISION = 0
>
> MAINTAINER = Andrew Fresh <afre...@openbsd.org>
>
> Index: p5-Test-Harness/pkg/PLIST
> ===================================================================
> RCS file: /cvs/ports/devel/p5-Test-Harness/pkg/PLIST,v
> retrieving revision 1.8
> diff -u -p -r1.8 PLIST
> --- p5-Test-Harness/pkg/PLIST 26 Apr 2014 22:11:43 -0000 1.8
> +++ p5-Test-Harness/pkg/PLIST 24 Jul 2014 20:05:58 -0000
> @@ -1,4 +1,6 @@
> @comment $OpenBSD: PLIST,v 1.8 2014/04/26 22:11:43 afresh1 Exp $
> +@conflict p5-TAP-Parser-*
> +@pkgpath devel/p5-TAP-Parser
> bin/prove
> ${P5SITE}/App/
> ${P5SITE}/App/Prove/
> Index: p5-TAP-Parser/Makefile
> ===================================================================
> RCS file: p5-TAP-Parser/Makefile
> diff -N p5-TAP-Parser/Makefile
> --- p5-TAP-Parser/Makefile 11 Mar 2013 10:50:22 -0000 1.5
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,18 +0,0 @@
> -# $OpenBSD: Makefile,v 1.5 2013/03/11 10:50:22 espie Exp $
> -
> -COMMENT= parse TAP output
> -
> -MODULES= cpan
> -DISTNAME= TAP-Parser-0.54
> -REVISION= 0
> -CATEGORIES= devel
> -
> -# perl
> -PERMIT_PACKAGE_CDROM= Yes
> -
> -CPAN_AUTHOR= ANDYA
> -
> -CONFIGURE_STYLE= modbuild
> -USE_GROFF = Yes
> -
> -.include <bsd.port.mk>
> Index: p5-TAP-Parser/distinfo
> ===================================================================
> RCS file: p5-TAP-Parser/distinfo
> diff -N p5-TAP-Parser/distinfo
> --- p5-TAP-Parser/distinfo 14 Sep 2007 05:53:04 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,5 +0,0 @@
> -MD5 (TAP-Parser-0.54.tar.gz) = gie5N/716T/o1cDmSLLZ4A==
> -RMD160 (TAP-Parser-0.54.tar.gz) = z7pABjHQe4hMdvtY6UdB30H5r2M=
> -SHA1 (TAP-Parser-0.54.tar.gz) = smGs8PR8fNyYs4h7xPdkmpjbXxY=
> -SHA256 (TAP-Parser-0.54.tar.gz) =
> Aeu2MZFBFHof+0Y4qbKw4fH9j6mZokNfltoAoevRpTs=
> -SIZE (TAP-Parser-0.54.tar.gz) = 116215
> Index: p5-TAP-Parser/patches/patch-Build_PL
> ===================================================================
> RCS file: p5-TAP-Parser/patches/patch-Build_PL
> diff -N p5-TAP-Parser/patches/patch-Build_PL
> --- p5-TAP-Parser/patches/patch-Build_PL 14 Sep 2007 05:53:04 -0000
> 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,21 +0,0 @@
> -$OpenBSD: patch-Build_PL,v 1.1.1.1 2007/09/14 05:53:04 msf Exp $
> ---- Build.PL.orig Fri Sep 14 14:36:53 2007
> -+++ Build.PL Fri Sep 14 14:37:34 2007
> -@@ -36,16 +36,6 @@ my $builder = $build_class->new(
> - add_to_cleanup => ['TAP-Parser-*'],
> - );
> -
> --if ($builder->prompt(
> -- "TAP::Parser includes \"runtests\" which is the equivalent of the\n"
> -- . "TAP::Harness \"prove\". If you choose to install runtests you
> will be able\n"
> -- . "to run a module's test suite via TAP::Parser by typing
> \"runtests -rb\" in\n"
> -- . "the project's root directory.\n\n"
> -- . "Do you wish to install the 'runtests' utility?", "y"
> -- ) =~ /^[Yy]/
> -- )
> --{
> -- $builder->script_files( ["bin/runtests"] );
> --}
> -+$builder->script_files( ["bin/runtests"] );
> -
> - $builder->create_build_script();
> Index: p5-TAP-Parser/pkg/DESCR
> ===================================================================
> RCS file: p5-TAP-Parser/pkg/DESCR
> diff -N p5-TAP-Parser/pkg/DESCR
> --- p5-TAP-Parser/pkg/DESCR 14 Sep 2007 05:53:04 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1 +0,0 @@
> -TAP::Parser is designed as a replacement for Test::Harness.
> Index: p5-TAP-Parser/pkg/PLIST
> ===================================================================
> RCS file: p5-TAP-Parser/pkg/PLIST
> diff -N p5-TAP-Parser/pkg/PLIST
> --- p5-TAP-Parser/pkg/PLIST 14 Sep 2007 05:53:04 -0000 1.1.1.1
> +++ /dev/null 1 Jan 1970 00:00:00 -0000
> @@ -1,56 +0,0 @@
> -@comment $OpenBSD: PLIST,v 1.1.1.1 2007/09/14 05:53:04 msf Exp $
> -bin/runtests
> -${P5SITE}/TAP/
> -${P5SITE}/TAP/Base.pm
> -${P5SITE}/TAP/Harness/
> -${P5SITE}/TAP/Harness.pm
> -${P5SITE}/TAP/Harness/Color.pm
> -${P5SITE}/TAP/Harness/Compatible.pm
> -${P5SITE}/TAP/Parser/
> -${P5SITE}/TAP/Parser.pm
> -${P5SITE}/TAP/Parser/Aggregator.pm
> -${P5SITE}/TAP/Parser/Grammar.pm
> -${P5SITE}/TAP/Parser/Iterator/
> -${P5SITE}/TAP/Parser/Iterator.pm
> -${P5SITE}/TAP/Parser/Iterator/Array.pm
> -${P5SITE}/TAP/Parser/Iterator/Process.pm
> -${P5SITE}/TAP/Parser/Iterator/Stream.pm
> -${P5SITE}/TAP/Parser/Result/
> -${P5SITE}/TAP/Parser/Result.pm
> -${P5SITE}/TAP/Parser/Result/Bailout.pm
> -${P5SITE}/TAP/Parser/Result/Comment.pm
> -${P5SITE}/TAP/Parser/Result/Plan.pm
> -${P5SITE}/TAP/Parser/Result/Test.pm
> -${P5SITE}/TAP/Parser/Result/Unknown.pm
> -${P5SITE}/TAP/Parser/Result/Version.pm
> -${P5SITE}/TAP/Parser/Result/YAML.pm
> -${P5SITE}/TAP/Parser/Source/
> -${P5SITE}/TAP/Parser/Source.pm
> -${P5SITE}/TAP/Parser/Source/Perl.pm
> -${P5SITE}/TAP/Parser/YAMLish/
> -${P5SITE}/TAP/Parser/YAMLish/Reader.pm
> -${P5SITE}/TAP/Parser/YAMLish/Writer.pm
> -@man man/man1/runtests.1
> -@man man/man3p/TAP::Base.3p
> -@man man/man3p/TAP::Harness.3p
> -@man man/man3p/TAP::Harness::Color.3p
> -@man man/man3p/TAP::Harness::Compatible.3p
> -@man man/man3p/TAP::Parser.3p
> -@man man/man3p/TAP::Parser::Aggregator.3p
> -@man man/man3p/TAP::Parser::Grammar.3p
> -@man man/man3p/TAP::Parser::Iterator.3p
> -@man man/man3p/TAP::Parser::Iterator::Array.3p
> -@man man/man3p/TAP::Parser::Iterator::Process.3p
> -@man man/man3p/TAP::Parser::Iterator::Stream.3p
> -@man man/man3p/TAP::Parser::Result.3p
> -@man man/man3p/TAP::Parser::Result::Bailout.3p
> -@man man/man3p/TAP::Parser::Result::Comment.3p
> -@man man/man3p/TAP::Parser::Result::Plan.3p
> -@man man/man3p/TAP::Parser::Result::Test.3p
> -@man man/man3p/TAP::Parser::Result::Unknown.3p
> -@man man/man3p/TAP::Parser::Result::Version.3p
> -@man man/man3p/TAP::Parser::Result::YAML.3p
> -@man man/man3p/TAP::Parser::Source.3p
> -@man man/man3p/TAP::Parser::Source::Perl.3p
> -@man man/man3p/TAP::Parser::YAMLish::Reader.3p
> -@man man/man3p/TAP::Parser::YAMLish::Writer.3p
--
andrew - http://afresh1.com
Life's unfair - but root password helps!
