Fix merge issues, remove excess files - match perl-5.32.1 dist

OK sthen@

12 files changed, 101 insertions, 135 deletions

diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq.pm b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq.pm
index b3645bc3cbb..c8016cf5233 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq.pm
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq.pm
@@ -2,6 +2,6 @@ use strict;
 use warnings;
 package perlfaq;
 
-our $VERSION = '5.20190126';
+our $VERSION = '5.20200523';
 
 1;
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq.pod
index 3dd9f6c3c93..3b7345aa64a 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq.pod
@@ -4,7 +4,7 @@ perlfaq - Frequently asked questions about Perl
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
@@ -89,11 +89,11 @@ Which version of Perl should I use?
 
 =item *
 
-What are Perl 4, Perl 5, or Perl 6?
+What are Perl 4, Perl 5, or Raku (Perl 6)?
 
 =item *
 
-What is Perl 6?
+What is Raku (Perl 6)?
 
 =item *
 
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq1.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq1.pod
index 4c023f8eb41..0ec9f16161c 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq1.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq1.pod
@@ -4,7 +4,7 @@ perlfaq1 - General Questions About Perl
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
@@ -123,11 +123,11 @@ current stable release of Perl.
 
 =back
 
-=head2 What are Perl 4, Perl 5, or Perl 6?
+=head2 What are Perl 4, Perl 5, or Raku (Perl 6)?
 
-In short, Perl 4 is the parent to both Perl 5 and Perl 6. Perl 5 is the older
-sibling, and though they are different languages, someone who knows one will
-spot many similarities in the other.
+In short, Perl 4 is the parent to both Perl 5 and Raku (formerly known as
+Perl 6). Perl 5 is the older sibling, and though they are different languages,
+someone who knows one will spot many similarities in the other.
 
 The number after Perl (i.e. the 5 after Perl 5) is the major release
 of the perl interpreter as well as the version of the language. Each
@@ -138,31 +138,30 @@ The current major release of Perl is Perl 5, first released in
 1994. It can run scripts from the previous major release, Perl 4
 (March 1991), but has significant differences.
 
-Perl 6 is a reinvention of Perl, it is a language in the same lineage but
-not compatible. The two are complementary, not mutually exclusive. Perl 6 is
-not meant to replace Perl 5, and vice versa. See L</"What is Perl 6?"> below
-to find out more.
+Raku is a reinvention of Perl, a language in the same lineage but
+not compatible. The two are complementary, not mutually exclusive. Raku is
+not meant to replace Perl, and vice versa. See L</"What is Raku (Perl 6)?">
+below to find out more.
 
 See L<perlhist> for a history of Perl revisions.
 
-=head2 What is Perl 6?
+=head2 What is Raku (Perl 6)?
 
-Perl 6 was I<originally> described as the community's rewrite of Perl 5,
-however as the language evolved, it became clear that it is a separate
-language, but in the same language family as Perl 5.
+Raku (formerly known as Perl 6) was I<originally> described as the community's
+rewrite of Perl, however as the language evolved, it became clear that it is
+a separate language, but in the same language family as Perl.
 
-Perl 6 is not intended primarily as a replacement for Perl 5, but as its
-own thing - and libraries exist to allow you to call Perl 5 code from Perl
-6 programs and vice versa.
+Raku is not intended primarily as a replacement for Perl, but as its
+own thing - and libraries exist to allow you to call Perl code from Raku
+programs and vice versa.
 
-Contrary to popular belief, Perl 6 and Perl 5 peacefully coexist with one
-another. Perl 6 has proven to be a fascinating source of ideas for those
-using Perl 5 (the L<Moose> object system is a well-known example). There is
+Contrary to popular belief, Raku and Perl peacefully coexist with one
+another. Raku has proven to be a fascinating source of ideas for those
+using Perl (the L<Moose> object system is a well-known example). There is
 overlap in the communities, and this overlap fosters the tradition of sharing
 and borrowing that have been instrumental to Perl's success.
 
-If you want to learn more about Perl 6 read the Perl 6 developers
-page at L<http://www.perl6.org/> and get involved.
+For more about Raku see L<https://www.raku.org/>.
 
 "We're really serious about reinventing everything that needs reinventing."
 --Larry Wall
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq2.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq2.pod
index c039bdfd133..447ad087eb6 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq2.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq2.pod
@@ -4,7 +4,7 @@ perlfaq2 - Obtaining and Learning about Perl
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
@@ -213,10 +213,9 @@ First, ensure that you've found an actual bug. Second, ensure you've
 found an actual bug.
 
 If you've found a bug with the perl interpreter or one of the modules
-in the standard library (those that come with Perl), you can use the
-L<perlbug> utility that comes with Perl (>= 5.004). It collects
-information about your installation to include with your message, then
-sends the message to the right place.
+in the standard library (those that come with Perl), you can submit a
+bug report to the GitHub issue tracker at
+L<https://github.com/Perl/perl5/issues>.
 
 To determine if a module came with your version of Perl, you can
 install and use the L<Module::CoreList> module. It has the information
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq3.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq3.pod
index df99fd8d878..481c3c94674 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq3.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq3.pod
@@ -4,7 +4,7 @@ perlfaq3 - Programming Tools
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
@@ -300,8 +300,8 @@ L<http://www.ddj.com/184404522> , and "Profiling in Perl"
 L<http://www.ddj.com/184404580> .
 
 Perl.com has two interesting articles on profiling: "Profiling Perl",
-by Simon Cozens, L<http://www.perl.com/lpt/a/850> and "Debugging and
-Profiling mod_perl Applications", by Frank Wiles,
+by Simon Cozens, L<https://www.perl.com/pub/2004/06/25/profiling.html/>
+and "Debugging and Profiling mod_perl Applications", by Frank Wiles,
 L<http://www.perl.com/pub/a/2006/02/09/debug_mod_perl.html> .
 
 Randal L. Schwartz writes about profiling in "Speeding up Your Perl
@@ -340,7 +340,7 @@ Put that in your F<.exrc> file (replacing the caret characters
 with control characters) and away you go. In insert mode, ^T is
 for indenting, ^D is for undenting, and ^O is for blockdenting--as
 it were. A more complete example, with comments, can be found at
-L<http://www.cpan.org/authors/id/TOMC/scripts/toms.exrc.gz>
+L<http://www.cpan.org/authors/id/T/TO/TOMC/scripts/toms.exrc.gz>
 
 =head2 Is there an IDE or Windows Perl Editor?
 
@@ -497,7 +497,7 @@ L<http://www.vim.org/>
 
 =item Vile
 
-L<http://dickey.his.com/vile/vile.html>
+L<http://invisible-island.net/vile/vile.html>
 
 =back
 
@@ -558,7 +558,7 @@ are text editors for OS X that have a Perl sensitivity mode
 =head2 Where can I get Perl macros for vi?
 
 For a complete version of Tom Christiansen's vi configuration file,
-see L<http://www.cpan.org/authors/Tom_Christiansen/scripts/toms.exrc.gz> ,
+see L<http://www.cpan.org/authors/id/T/TO/TOMC/scripts/toms.exrc.gz> ,
 the standard benchmark file for vi emulators. The file runs best with nvi,
 the current version of vi out of Berkeley, which incidentally can be built
 with an embedded Perl interpreter--see L<http://www.cpan.org/src/misc/> .
@@ -581,7 +581,7 @@ For CPerlMode, see L<http://www.emacswiki.org/cgi-bin/wiki/CPerlMode>
 
 The Curses module from CPAN provides a dynamically loadable object
 module interface to a curses library. A small demo can be found at the
-directory L<http://www.cpan.org/authors/Tom_Christiansen/scripts/rep.gz> ;
+directory L<http://www.cpan.org/authors/id/T/TO/TOMC/scripts/rep.gz> ;
 this program repeats a command and updates the screen as needed, rendering
 B<rep ps axu> similar to B<top>.
 
@@ -1066,7 +1066,7 @@ guides and references in L<perlfaq9> or in the CGI MetaFAQ:
 
     L<http://www.perl.org/CGI_MetaFAQ.html>
 
-Looking in to L<Plack> and modern Perl web frameworks is highly recommended,
+Looking into L<https://plackperl.org> and modern Perl web frameworks is highly recommended,
 though; web programming in Perl has evolved a long way from the old days of
 simple CGI scripts.
 
@@ -1098,7 +1098,8 @@ XS support files.
 
 Download the ExtUtils::Embed kit from CPAN and run `make test'. If
 the tests pass, read the pods again and again and again. If they
-fail, see L<perlbug> and send a bug report with the output of
+fail, submit a bug report to L<https://github.com/Perl/perl5/issues>
+with the output of
 C<make test TEST_VERBOSE=1> along with C<perl -V>.
 
 =head2 When I tried to run my script, I got this message. What does it mean?
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq4.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq4.pod
index 55f9f6fd138..1a20aba2e71 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq4.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq4.pod
@@ -4,7 +4,7 @@ perlfaq4 - Data Manipulation
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
@@ -1422,21 +1422,7 @@ Hearing the word "in" is an I<in>dication that you probably should have
 used a hash, not a list or array, to store your data. Hashes are
 designed to answer this question quickly and efficiently. Arrays aren't.
 
-That being said, there are several ways to approach this. In Perl 5.10
-and later, you can use the smart match operator to check that an item is
-contained in an array or a hash:
-
-    use 5.010;
-
-    if( $item ~~ @array ) {
-        say "The array contains $item"
-    }
-
-    if( $item ~~ %hash ) {
-        say "The hash contains $item"
-    }
-
-With earlier versions of Perl, you have to do a bit more work. If you
+That being said, there are several ways to approach this. If you
 are going to make this query many times over arbitrary string values,
 the fastest way is probably to invert the original array and maintain a
 hash whose keys are the first array's values:
@@ -1472,16 +1458,16 @@ of the original list or array. They only pay off if you have to test
 multiple values against the same array.
 
 If you are testing only once, the standard module L<List::Util> exports
-the function C<first> for this purpose. It works by stopping once it
+the function C<any> for this purpose. It works by stopping once it
 finds the element. It's written in C for speed, and its Perl equivalent
 looks like this subroutine:
 
-    sub first (&@) {
+    sub any (&@) {
         my $code = shift;
         foreach (@_) {
-            return $_ if &{$code}();
+            return 1 if $code->();
         }
-        undef;
+        return 0;
     }
 
 If speed is of little concern, the common idiom uses grep in scalar context
@@ -1514,19 +1500,6 @@ in either A or in B but not in both. Think of it as an xor operation.
 
 =head2 How do I test whether two arrays or hashes are equal?
 
-With Perl 5.10 and later, the smart match operator can give you the answer
-with the least amount of work:
-
-    use 5.010;
-
-    if( @array1 ~~ @array2 ) {
-        say "The arrays are the same";
-    }
-
-    if( %hash1 ~~ %hash2 ) # doesn't check values!  {
-        say "The hash keys are the same";
-    }
-
 The following code works for single-level arrays. It uses a
 stringwise comparison, and does not distinguish defined versus
 undefined empty strings. Modify if you have other needs.
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq5.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq5.pod
index aa7764b969d..a7fc0eabd12 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq5.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq5.pod
@@ -4,7 +4,7 @@ perlfaq5 - Files and Formats
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq6.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq6.pod
index eeaad01e2b9..9a45f0e6703 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq6.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq6.pod
@@ -4,7 +4,7 @@ perlfaq6 - Regular Expressions
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq7.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq7.pod
index c2014646cc2..a69e0536f08 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq7.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq7.pod
@@ -4,7 +4,7 @@ perlfaq7 - General Perl Language Issues
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq8.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq8.pod
index d9418ed5039..8ee088a3594 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq8.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq8.pod
@@ -4,7 +4,7 @@ perlfaq8 - System Interaction
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
@@ -1323,7 +1323,7 @@ settings. See the L<ExtUtils::Makemaker> documentation for more details.
 (contributed by brian d foy)
 
 If you know the directory already, you can add it to C<@INC> as you would
-for any other directory. You might <use lib> if you know the directory
+for any other directory. You might C<use lib> if you know the directory
 at compile time:
 
     use lib $directory;
@@ -1400,10 +1400,6 @@ environment variables, run-time switches, and in-code statements:
 
 =back
 
-The last is particularly useful because it knows about machine-dependent
-architectures. The C<lib.pm> pragmatic module was first
-included with the 5.002 release of Perl.
-
 =head2 Where are modules installed?
 
 Modules are installed on a case-by-case basis (as provided by the methods
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq9.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq9.pod
index 4a6799c5894..15ca2d03b8b 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq9.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlfaq9.pod
@@ -4,7 +4,7 @@ perlfaq9 - Web, Email and Networking
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION
 
@@ -78,7 +78,7 @@ Plack is like Ruby's Rack or Python's Paste for WSGI.
 
 You could build a web site using L<Plack> and your own code,
 but for anything other than a very basic web site, using a web framework
-(that uses L<Plack>) is a better option.
+(that uses L<https://plackperl.org>) is a better option.
 
 =head2 How do I remove HTML from a string?
 
@@ -95,29 +95,30 @@ L<HTML::LinkExtor> or L<HTML::Parser>. You might even use
 L<HTML::SimpleLinkExtor> as an example for something specifically
 suited to your needs.
 
-You can use L<URI::Find> to extract URLs from an arbitrary text document.
+You can use L<URI::Find> or L<URL::Search> to extract URLs from an
+arbitrary text document.
 
 =head2 How do I fetch an HTML file?
 
 (contributed by brian d foy)
 
-Use the libwww-perl distribution. The L<LWP::Simple> module can fetch web
-resources and give their content back to you as a string:
+The core L<HTTP::Tiny> module can fetch web resources and give their
+content back to you as a string:
 
-    use LWP::Simple qw(get);
+    use HTTP::Tiny;
 
-    my $html = get( "http://www.example.com/index.html" );
+    my $ua = HTTP::Tiny->new;
+    my $html = $ua->get( "http://www.example.com/index.html" )->{content};
 
 It can also store the resource directly in a file:
 
-    use LWP::Simple qw(getstore);
+    $ua->mirror( "http://www.example.com/index.html", "foo.html" );
 
-    getstore( "http://www.example.com/index.html", "foo.html" );
-
-If you need to do something more complicated, you can use
-L<LWP::UserAgent> module to create your own user-agent (e.g. browser)
-to get the job done. If you want to simulate an interactive web
-browser, you can use the L<WWW::Mechanize> module.
+If you need to do something more complicated, the L<HTTP::Tiny> object can
+be customized by setting attributes, or you can use L<LWP::UserAgent> from
+the libwww-perl distribution or L<Mojo::UserAgent> from the Mojolicious
+distribution to make common tasks easier. If you want to simulate an
+interactive web browser, you can use the L<WWW::Mechanize> module.
 
 =head2 How do I automate an HTML form submission?
 
@@ -126,25 +127,26 @@ and forms or a web site, you can use L<WWW::Mechanize>. See its
 documentation for all the details.
 
 If you're submitting values using the GET method, create a URL and encode
-the form using the C<query_form> method:
+the form using the C<www_form_urlencode> method from L<HTTP::Tiny>:
+
+    use HTTP::Tiny;
 
-    use LWP::Simple;
-    use URI::URL;
+    my $ua = HTTP::Tiny->new;
 
-    my $url = url('L<http://www.perl.com/cgi-bin/cpan_mod')>;
-    $url->query_form(module => 'DB_File', readme => 1);
-    $content = get($url);
+    my $query = $ua->www_form_urlencode([ q => 'DB_File', lucky => 1 ]);
+    my $url = "https://metacpan.org/search?$query";
+    my $content = $ua->get($url)->{content};
 
-If you're using the POST method, create your own user agent and encode
-the content appropriately.
+If you're using the POST method, the C<post_form> method will encode the
+content appropriately.
 
-    use HTTP::Request::Common qw(POST);
-    use LWP::UserAgent;
+    use HTTP::Tiny;
 
-    my $ua = LWP::UserAgent->new();
-    my $req = POST 'L<http://www.perl.com/cgi-bin/cpan_mod'>,
-                   [ module => 'DB_File', readme => 1 ];
-    my $content = $ua->request($req)->as_string;
+    my $ua = HTTP::Tiny->new;
+
+    my $url = 'https://metacpan.org/search';
+    my $form = [ q => 'DB_File', lucky => 1 ];
+    my $content = $ua->post_form($url, $form)->{content};
 
 =head2 How do I decode or create those %-encodings on the web?
 X<URI> X<URI::Escape> X<RFC 2396>
@@ -287,26 +289,18 @@ your policy says it is. You really are best off asking the user.
 
 =head2 How do I send email?
 
-Use the L<Email::MIME> and L<Email::Sender::Simple> modules, like so:
+Use the L<Email::Stuffer> module, like so:
 
   # first, create your message
-  my $message = Email::MIME->create(
-    header_str => [
-      From    => 'you@example.com',
-      To      => 'friend@example.com',
-      Subject => 'Happy birthday!',
-    ],
-    attributes => {
-      encoding => 'quoted-printable',
-      charset  => 'utf-8',
-    },
-    body_str => "Happy birthday to you!\n",
-  );
-
-  use Email::Sender::Simple qw(sendmail);
-  sendmail($message);
-
-By default, L<Email::Sender::Simple> will try `sendmail` first, if it exists
+  my $message = Email::Stuffer->from('you@example.com')
+                              ->to('friend@example.com')
+                              ->subject('Happy birthday!')
+                              ->text_body("Happy birthday to you!\n");
+
+  $message->send_or_die;
+
+By default, L<Email::Sender::Simple> (the C<send> and C<send_or_die> methods
+use this under the hood) will try C<sendmail> first, if it exists
 in your $PATH. This generally isn't the case. If there's a remote mail
 server you use to send mail, consider investigating one of the Transport
 classes. At time of writing, the available transports include:
@@ -326,14 +320,9 @@ uses TLS or SSL and can authenticate to the server via SASL.
 
 =back
 
-Telling L<Email::Sender::Simple> to use your transport is straightforward.
+Telling L<Email::Stuffer> to use your transport is straightforward.
 
-  sendmail(
-    $message,
-    {
-      transport => $email_sender_transport_object,
-    }
-  );
+  $message->transport($email_sender_transport_object)->send_or_die;
 
 =head2 How do I use MIME to make an attachment to a mail message?
 
@@ -342,6 +331,15 @@ objects themselves are parts and can be attached to other L<Email::MIME>
 objects. Consult the L<Email::MIME> documentation for more information,
 including all of the supported methods and examples of their use.
 
+L<Email::Stuffer> uses L<Email::MIME> under the hood to construct
+messages, and wraps the most common attachment tasks with the simple
+C<attach> and C<attach_file> methods.
+
+  Email::Stuffer->to('friend@example.com')
+                ->subject('The file')
+                ->attach_file('stuff.csv')
+                ->send_or_die;
+
 =head2 How do I read email?
 
 Use the L<Email::Folder> module, like so:
diff --git a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlglossary.pod b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlglossary.pod
index 3fef83de0db..2e7eedad3c5 100644
--- a/gnu/usr.bin/perl/cpan/perlfaq/lib/perlglossary.pod
+++ b/gnu/usr.bin/perl/cpan/perlfaq/lib/perlglossary.pod
@@ -7,7 +7,7 @@ perlglossary - Perl Glossary
 
 =head1 VERSION
 
-version 5.20190126
+version 5.20200523
 
 =head1 DESCRIPTION