Fix merge conflicts, remove extra files, match upstream perl-5.20.1

ok deraadt@ sthen@ espie@ miod@

28 files changed, 0 insertions, 222 deletions

diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/Foo-Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/Foo-Bar.pm
deleted file mode 100644
index 4fc48c6a188..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/Foo-Bar.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package Acme::FooBar;
-
-our $quux = "hello";
-
-1;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/MyTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/MyTest/Plugin/Foo.pm
deleted file mode 100644
index 29c888baf7a..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Acme/MyTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package Acme::MyTest::Plugin::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm
deleted file mode 100644
index dcc870c4e55..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package EditorJunk::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swo b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swo
deleted file mode 100644
index dcc870c4e55..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swo
+++ /dev/null
@@ -1,9 +0,0 @@
-package EditorJunk::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swp b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swp
deleted file mode 100644
index dcc870c4e55..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Bar.pm.swp
+++ /dev/null
@@ -1,9 +0,0 @@
-package EditorJunk::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Foo.pm
deleted file mode 100644
index 64b8bf4c7b5..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/EditorJunk/Plugin/Foo.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package EditorJunk::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Bar.plugin b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Bar.plugin
deleted file mode 100644
index 2f9b6db0b0f..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Bar.plugin
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Foo.plugin b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Foo.plugin
deleted file mode 100644
index 5386ba5b809..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Foo.plugin
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Quux/Foo.plugin b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Quux/Foo.plugin
deleted file mode 100644
index bb6e08667bd..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/ExtTest/Plugin/Quux/Foo.plugin
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Quux::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/InnerTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/InnerTest/Plugin/Foo.pm
deleted file mode 100644
index 4f5825ea655..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/InnerTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-package InnerTest::Plugin::Foo;
-use strict;
-
-our $FOO = 1;
-
-package InnerTest::Plugin::Bar;
-use strict;
-
-sub bar {}
-
-package InnerTest::Plugin::Quux;
-use strict;
-use base qw(InnerTest::Plugin::Bar);
-
-
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Bar.pm
deleted file mode 100644
index 3c5d79dc9bb..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Bar.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package MyOtherTest::Plugin::Bar;
-use strict;
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Foo.pm
deleted file mode 100644
index 14825724b32..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package MyOtherTest::Plugin::Foo;
-use strict;
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux.pm
deleted file mode 100644
index 22fd55d3b9c..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package MyOtherTest::Plugin::Quux;
-use strict;
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux/Foo.pm
deleted file mode 100644
index a8ecd69f114..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyOtherTest/Plugin/Quux/Foo.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package MyOtherTest::Plugin::Quux::Foo;
-use strict;
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Extend/Plugin/Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Extend/Plugin/Bar.pm
deleted file mode 100644
index 6d112cf39fb..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Extend/Plugin/Bar.pm
+++ /dev/null
@@ -1,17 +0,0 @@
-package MyTest::Extend::Plugin::Bar;
-use strict;
-
-sub new {
-	my $class = shift;
-	my %self = @_;
-
-	return bless \%self, $class;
-}
-
-
-sub nork {
-	return $_[0]->{'nork'};
-}
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Bar.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Bar.pm
deleted file mode 100644
index 2f9b6db0b0f..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Bar.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Bar;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Foo.pm
deleted file mode 100644
index 6ca83175079..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,10 +0,0 @@
-package MyTest::Plugin::Foo;
-
-
-use strict;
-
-sub new { return bless {}, $_[0]; }
-sub frobnitz {}
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Quux/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Quux/Foo.pm
deleted file mode 100644
index bb6e08667bd..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/MyTest/Plugin/Quux/Foo.pm
+++ /dev/null
@@ -1,9 +0,0 @@
-package MyTest::Plugin::Quux::Foo;
-
-
-use strict;
-
-
-1;
-
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/No/Middle.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/No/Middle.pm
deleted file mode 100644
index 9d0e31ac128..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/No/Middle.pm
+++ /dev/null
@@ -1,14 +0,0 @@
-package No::Middle;
-
-sub foo {}
-
-package No::Middle::Package::A;
-
-sub foo {}
-
-
-package No::Middle::Package::B;
-
-sub foo {}
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/OddTest/Plugin/Foo.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/OddTest/Plugin/Foo.pm
deleted file mode 100644
index bcf37e34bf0..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/OddTest/Plugin/Foo.pm
+++ /dev/null
@@ -1,5 +0,0 @@
-package OddFiles/Plugin/Foo.pm
-
-sub new {}
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TA/C/A/I.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TA/C/A/I.pm
deleted file mode 100644
index 35575dfdde7..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TA/C/A/I.pm
+++ /dev/null
@@ -1,13 +0,0 @@
-package TA::C::A::I;
-
-sub foo { }
-
-package TA::C::A::I::A;
-
-sub foo { }
-
-package TA::C::A::I::A::B;
-
-sub foo { }
-
-1;
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm
deleted file mode 100644
index 8417072f3ec..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Text/Abbrev.pm
+++ /dev/null
@@ -1,10 +0,0 @@
-package Text::Abbrev;
-use strict;
-
-sub module_pluggable {
-    return bless {}, shift;
-}
-
-sub MPCHECK { "HELLO" }
-
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/After.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/After.pm
deleted file mode 100644
index b5f69015575..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/After.pm
+++ /dev/null
@@ -1,3 +0,0 @@
-package TriggerTest::Plugin::After;
-
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackAllow.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackAllow.pm
deleted file mode 100644
index 589b154ca4d..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackAllow.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package TriggerTest::Plugin::CallbackAllow;
-
-sub exclude {
-    return 0;
-}
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackDeny.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackDeny.pm
deleted file mode 100644
index e63227f59c1..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/CallbackDeny.pm
+++ /dev/null
@@ -1,6 +0,0 @@
-package TriggerTest::Plugin::CallbackDeny;
-
-sub exclude {
-    return 1;
-}
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Deny.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Deny.pm
deleted file mode 100644
index 311e2a07a04..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Deny.pm
+++ /dev/null
@@ -1,3 +0,0 @@
-package TriggerTest::Plugin::Deny;
-
-1;
\ No newline at end of file
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Error.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Error.pm
deleted file mode 100644
index 620465a942c..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/TriggerTest/Plugin/Error.pm
+++ /dev/null
@@ -1,2 +0,0 @@
-package TriggerTest::Plugin::Error;
-
diff --git a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Zot/.Zork.pm b/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Zot/.Zork.pm
deleted file mode 100644
index e69de29bb2d..00000000000
--- a/gnu/usr.bin/perl/cpan/Module-Pluggable/t/lib/Zot/.Zork.pm
+++ /dev/null