From e5157e49389faebcb42b7237d55fbf096d9c2523 Mon Sep 17 00:00:00 2001 From: afresh1 Date: Mon, 17 Nov 2014 20:56:47 +0000 Subject: Fix merge conflicts, remove extra files, match upstream perl-5.20.1 ok deraadt@ sthen@ espie@ miod@ --- .../Module-Build/lib/Module/Build/ModuleInfo.pm | 2 +- .../lib/Module/Build/Platform/Amiga.pm | 34 ---------------------- .../lib/Module/Build/Platform/EBCDIC.pm | 34 ---------------------- .../lib/Module/Build/Platform/MPEiX.pm | 34 ---------------------- .../lib/Module/Build/Platform/RiscOS.pm | 34 ---------------------- 5 files changed, 1 insertion(+), 137 deletions(-) delete mode 100644 gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm delete mode 100644 gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm delete mode 100644 gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm delete mode 100644 gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm (limited to 'gnu/usr.bin/perl/cpan/Module-Build/lib/Module') diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm index b36cc388c3d..2e1483154dc 100644 --- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm +++ b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/ModuleInfo.pm @@ -4,7 +4,7 @@ package Module::Build::ModuleInfo; use strict; use vars qw($VERSION); -$VERSION = '0.4003'; +$VERSION = '0.4205'; $VERSION = eval $VERSION; require Module::Metadata; diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm deleted file mode 100644 index 0be3dde62ec..00000000000 --- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/Amiga.pm +++ /dev/null @@ -1,34 +0,0 @@ -package Module::Build::Platform::Amiga; - -use strict; -use vars qw($VERSION); -$VERSION = '0.4003'; -$VERSION = eval $VERSION; -use Module::Build::Base; - -use vars qw(@ISA); -@ISA = qw(Module::Build::Base); - - -1; -__END__ - - -=head1 NAME - -Module::Build::Platform::Amiga - Builder class for Amiga platforms - -=head1 DESCRIPTION - -The sole purpose of this module is to inherit from -C. Please see the L for the docs. - -=head1 AUTHOR - -Ken Williams - -=head1 SEE ALSO - -perl(1), Module::Build(3), ExtUtils::MakeMaker(3) - -=cut diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm deleted file mode 100644 index 8c4349b5f6c..00000000000 --- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/EBCDIC.pm +++ /dev/null @@ -1,34 +0,0 @@ -package Module::Build::Platform::EBCDIC; - -use strict; -use vars qw($VERSION); -$VERSION = '0.4003'; -$VERSION = eval $VERSION; -use Module::Build::Base; - -use vars qw(@ISA); -@ISA = qw(Module::Build::Base); - - -1; -__END__ - - -=head1 NAME - -Module::Build::Platform::EBCDIC - Builder class for EBCDIC platforms - -=head1 DESCRIPTION - -The sole purpose of this module is to inherit from -C. Please see the L for the docs. - -=head1 AUTHOR - -Ken Williams - -=head1 SEE ALSO - -perl(1), Module::Build(3), ExtUtils::MakeMaker(3) - -=cut diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm deleted file mode 100644 index 5688a99329d..00000000000 --- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/MPEiX.pm +++ /dev/null @@ -1,34 +0,0 @@ -package Module::Build::Platform::MPEiX; - -use strict; -use vars qw($VERSION); -$VERSION = '0.4003'; -$VERSION = eval $VERSION; -use Module::Build::Base; - -use vars qw(@ISA); -@ISA = qw(Module::Build::Base); - - -1; -__END__ - - -=head1 NAME - -Module::Build::Platform::MPEiX - Builder class for MPEiX platforms - -=head1 DESCRIPTION - -The sole purpose of this module is to inherit from -C. Please see the L for the docs. - -=head1 AUTHOR - -Ken Williams - -=head1 SEE ALSO - -perl(1), Module::Build(3), ExtUtils::MakeMaker(3) - -=cut diff --git a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm b/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm deleted file mode 100644 index 6ed9d3d1c37..00000000000 --- a/gnu/usr.bin/perl/cpan/Module-Build/lib/Module/Build/Platform/RiscOS.pm +++ /dev/null @@ -1,34 +0,0 @@ -package Module::Build::Platform::RiscOS; - -use strict; -use vars qw($VERSION); -$VERSION = '0.4003'; -$VERSION = eval $VERSION; -use Module::Build::Base; - -use vars qw(@ISA); -@ISA = qw(Module::Build::Base); - - -1; -__END__ - - -=head1 NAME - -Module::Build::Platform::RiscOS - Builder class for RiscOS platforms - -=head1 DESCRIPTION - -The sole purpose of this module is to inherit from -C. Please see the L for the docs. - -=head1 AUTHOR - -Ken Williams - -=head1 SEE ALSO - -perl(1), Module::Build(3), ExtUtils::MakeMaker(3) - -=cut -- cgit v1.2.3-59-g8ed1b