develooper Front page | perl.perl5.changes | Postings from September 2019

[perl.git] branch corion/cpan-sync updated. v5.31.3-141-g5c0cb9d069

From:
Max Maischein
Date:
September 13, 2019 07:36
Subject:
[perl.git] branch corion/cpan-sync updated. v5.31.3-141-g5c0cb9d069
Message ID:
E1i8g8B-0007aC-AC@git.dc.perl.space
In perl.git, the branch corion/cpan-sync has been updated

<https://perl5.git.perl.org/perl.git/commitdiff/5c0cb9d069b83b284c2800f9efae359e60e9fda6?hp=0d1c9c5ca5534cc4606a66c4f9f14a83e208dd22>

- Log -----------------------------------------------------------------
commit 5c0cb9d069b83b284c2800f9efae359e60e9fda6
Author: Max Maischein <corion@corion.net>
Date:   Fri Sep 13 09:36:19 2019 +0200

    Update ExtUtils::Makemaker from 7.36 to 7.38

-----------------------------------------------------------------------

Summary of changes:
 Porting/Maintainers.pl                             |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm    |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm    |   2 +-
 .../ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm         |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm     |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm     |   8 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm    |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm  |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm     |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm  |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm   |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm     |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm     |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm     |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm    |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm    |  27 +++++-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm     |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm     |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm   |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm   |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm         |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm  |   2 +-
 .../lib/ExtUtils/MakeMaker/Config.pm               |   2 +-
 .../lib/ExtUtils/MakeMaker/FAQ.pod                 |   2 +-
 .../lib/ExtUtils/MakeMaker/Locale.pm               |   2 +-
 .../lib/ExtUtils/MakeMaker/Tutorial.pod            |   2 +-
 .../lib/ExtUtils/MakeMaker/version.pm              |   2 +-
 .../lib/ExtUtils/MakeMaker/version/regex.pm        |   2 +-
 .../ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm |   2 +-
 cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm    |   2 +-
 cpan/ExtUtils-MakeMaker/t/build_man.t              | 105 ++++++++++++++++++++-
 cpan/ExtUtils-MakeMaker/t/pod2man.t                |   2 +-
 35 files changed, 164 insertions(+), 40 deletions(-)

diff --git a/Porting/Maintainers.pl b/Porting/Maintainers.pl
index 881ab5baef..ce6f0b64f1 100755
--- a/Porting/Maintainers.pl
+++ b/Porting/Maintainers.pl
@@ -468,7 +468,7 @@ use File::Glob qw(:case);
     },
 
     'ExtUtils::MakeMaker' => {
-        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.36.tar.gz',
+        'DISTRIBUTION' => 'BINGOS/ExtUtils-MakeMaker-7.38.tar.gz',
         'FILES'        => q[cpan/ExtUtils-MakeMaker],
         'EXCLUDED'     => [
             qr{^t/lib/Test/},
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm
index 52c47d2ccf..60f68db0fc 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command.pm
@@ -7,7 +7,7 @@ use vars qw(@ISA @EXPORT @EXPORT_OK $VERSION);
 @ISA       = qw(Exporter);
 @EXPORT    = qw(cp rm_f rm_rf mv cat eqtime mkpath touch test_f test_d chmod
                 dos2unix);
-$VERSION = '7.36';
+$VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 my $Is_VMS   = $^O eq 'VMS';
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
index 4e07ea5e59..7ac8679e67 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Command/MM.pm
@@ -10,7 +10,7 @@ our @ISA = qw(Exporter);
 
 our @EXPORT  = qw(test_harness pod2man perllocal_install uninstall
                   warn_if_old_packlist test_s cp_nonempty);
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 my $Is_VMS = $^O eq 'VMS';
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
index 44c4c399ff..c9087469ff 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist.pm
@@ -2,7 +2,7 @@ package ExtUtils::Liblist;
 
 use strict;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 use File::Spec;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
index d6565422d0..af4725df95 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Liblist/Kid.pm
@@ -11,7 +11,7 @@ use 5.006;
 
 use strict;
 use warnings;
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 use ExtUtils::MakeMaker::Config;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
index 340ff2da3d..f0add38fc1 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM.pm
@@ -3,7 +3,7 @@ package ExtUtils::MM;
 use strict;
 use ExtUtils::MakeMaker::Config;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::Liblist;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
index c771b9b2b1..dc88042d5f 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_AIX.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_AIX;
 
 use strict;
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 use ExtUtils::MakeMaker::Config;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
index 6d459bbeaf..50539fd6b6 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Any.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_Any;
 
 use strict;
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 use Carp;
@@ -1088,9 +1088,9 @@ manifypods : pure_all config $dependencies
 END
 
     my @man_cmds;
-    foreach my $section (qw(1 3)) {
-        my $pods = $self->{"MAN${section}PODS"};
-        my $p2m = sprintf <<'CMD', $section, "$]" > 5.008 ? " -u" : "";
+    foreach my $num (qw(1 3)) {
+        my $pods = $self->{"MAN${num}PODS"};
+        my $p2m = sprintf <<'CMD', "\$(MAN${num}SECTION)", "$]" > 5.008 ? " -u" : "";
 	$(NOECHO) $(POD2MAN) --section=%s --perm_rw=$(PERM_RW)%s
 CMD
         push @man_cmds, $self->split_command($p2m, map {($_,$pods->{$_})} sort keys %$pods);
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
index 4b72d4dd8f..c3ba21daa9 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_BeOS.pm
@@ -26,7 +26,7 @@ require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 
 our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
index f1ca8f2cbb..c9ac9d978d 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Cygwin.pm
@@ -9,7 +9,7 @@ require ExtUtils::MM_Unix;
 require ExtUtils::MM_Win32;
 our @ISA = qw( ExtUtils::MM_Unix );
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
index 1cff5729eb..00ad5606ba 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_DOS.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_DOS;
 
 use strict;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::MM_Any;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
index 3f01443cc5..30c40e7f6c 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Darwin.pm
@@ -7,7 +7,7 @@ BEGIN {
     our @ISA = qw( ExtUtils::MM_Unix );
 }
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
index 0029b87f15..67e1026868 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_MacOS.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_MacOS;
 
 use strict;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 sub new {
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
index 038c22f98f..9e1c212904 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_NW5.pm
@@ -22,7 +22,7 @@ use strict;
 use ExtUtils::MakeMaker::Config;
 use File::Basename;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::MM_Win32;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
index e212cb876b..c96631887b 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_OS2.pm
@@ -5,7 +5,7 @@ use strict;
 use ExtUtils::MakeMaker qw(neatvalue);
 use File::Spec;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::MM_Any;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
index 813de3b14a..446fbf83d8 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_QNX.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_QNX;
 
 use strict;
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::MM_Unix;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
index d531422197..2edb150896 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_UWIN.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_UWIN;
 
 use strict;
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::MM_Unix;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
index a0a2ee102f..b6834e9000 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Unix.pm
@@ -14,7 +14,7 @@ use ExtUtils::MakeMaker qw($Verbose neatvalue _sprintf562);
 
 # If we make $VERSION an our variable parse_version() breaks
 use vars qw($VERSION);
-$VERSION = '7.36';
+$VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::MM_Any;
@@ -419,6 +419,7 @@ sub constants {
               INST_ARCHLIB INST_SCRIPT INST_BIN INST_LIB
               INST_MAN1DIR INST_MAN3DIR
               MAN1EXT      MAN3EXT
+              MAN1SECTION  MAN3SECTION
               INSTALLDIRS INSTALL_BASE DESTDIR PREFIX
               PERLPREFIX      SITEPREFIX      VENDORPREFIX
                    ),
@@ -968,6 +969,7 @@ sub dynamic_lib {
             my ($v, $d, $f) = File::Spec->splitpath($ext);
             my @d = File::Spec->splitdir($d);
             shift @d if $d[0] eq 'lib';
+            pop @d if $d[$#d] eq '';
             my $instdir = $self->catdir('$(INST_ARCHLIB)', 'auto', @d, $f);
 
             # Dynamic library names may need special handling.
@@ -1499,6 +1501,24 @@ sub init_MANPODS {
             $self->$init_method();
         }
     }
+
+    # logic similar to picking man${num}ext in perl's Configure script
+    foreach my $num (1,3) {
+        my $installdirs = uc $self->{INSTALLDIRS};
+        $installdirs = '' if $installdirs eq 'PERL';
+        my $mandir = $self->_expand_macros(
+            $self->{ "INSTALL${installdirs}MAN${num}DIR" } );
+        my $section = $num;
+
+        foreach ($num, "${num}p", "${num}pm", qw< l n o C L >, "L$num") {
+            if ( $mandir =~ /\b(?:man|cat)$_$/ ) {
+                $section = $_;
+                last;
+            }
+        }
+
+        $self->{"MAN${num}SECTION"} = $section;
+    }
 }
 
 
@@ -2227,6 +2247,7 @@ sub init_xs {
 		my ($v, $d, $f) = File::Spec->splitpath($ext);
 		my @d = File::Spec->splitdir($d);
 		shift @d if defined $d[0] and $d[0] eq 'lib';
+		pop @d if $d[$#d] eq '';
 		my $instdir = $self->catdir('$(INST_ARCHLIB)', 'auto', @d, $f);
 		my $instfile = $self->catfile($instdir, $f);
 		push @statics, "$instfile\$(LIB_EXT)";
@@ -2797,14 +2818,14 @@ sub _find_static_libs {
 
 Called by a utility method of makeaperl. Checks whether a given file
 is an XS library by seeing whether it defines any symbols starting
-with C<boot_>.
+with C<boot_> (with an optional leading underscore - needed on MacOS).
 
 =cut
 
 sub xs_static_lib_is_xs {
     my ($self, $libfile) = @_;
     my $devnull = File::Spec->devnull;
-    return `nm $libfile 2>$devnull` =~ /\bboot_/;
+    return `nm $libfile 2>$devnull` =~ /\b_?boot_/;
 }
 
 =item makefile (o)
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
index 24e5346263..bed8751ffa 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VMS.pm
@@ -15,7 +15,7 @@ BEGIN {
 
 use File::Basename;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::MM_Any;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
index 9f7c89a747..7f568deafb 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_VOS.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MM_VOS;
 
 use strict;
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::MM_Unix;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
index 253b2ca6d8..8462cdb0c4 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win32.pm
@@ -27,7 +27,7 @@ use ExtUtils::MakeMaker qw(neatvalue _sprintf562);
 require ExtUtils::MM_Any;
 require ExtUtils::MM_Unix;
 our @ISA = qw( ExtUtils::MM_Any ExtUtils::MM_Unix );
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 $ENV{EMXSHELL} = 'sh'; # to run `commands`
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
index 440c3a7f84..18a2544819 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MM_Win95.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_Win95;
 
 use strict;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require ExtUtils::MM_Win32;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
index 73f9e10893..4ec7414cb5 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MY.pm
@@ -3,7 +3,7 @@ package ExtUtils::MY;
 use strict;
 require ExtUtils::MM;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 our @ISA = qw(ExtUtils::MM);
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
index 90790d4d6d..b30baf8082 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker.pm
@@ -24,7 +24,7 @@ my %Recognized_Att_Keys;
 our %macro_fsentity; # whether a macro is a filesystem name
 our %macro_dep; # whether a macro is a dependency
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 # Emulate something resembling CVS $Revision$
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
index f437a65e5d..47034c35b9 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Config.pm
@@ -2,7 +2,7 @@ package ExtUtils::MakeMaker::Config;
 
 use strict;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 use Config ();
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
index a5449c2dcf..d2833b7aa0 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/FAQ.pod
@@ -1,6 +1,6 @@
 package ExtUtils::MakeMaker::FAQ;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 1;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm
index bf59fdc6e9..e6419c67b2 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Locale.pm
@@ -1,7 +1,7 @@
 package ExtUtils::MakeMaker::Locale;
 
 use strict;
-our $VERSION = "7.36";
+our $VERSION = "7.38";
 $VERSION =~ tr/_//d;
 
 use base 'Exporter';
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
index 7c36252cc8..c02220f318 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/Tutorial.pod
@@ -1,6 +1,6 @@
 package ExtUtils::MakeMaker::Tutorial;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm
index b6d3550e30..a061cceca4 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version.pm
@@ -15,7 +15,7 @@ use strict;
 
 use vars qw(@ISA $VERSION $CLASS $STRICT $LAX *declare *qv);
 
-$VERSION = '7.36';
+$VERSION = '7.38';
 $VERSION =~ tr/_//d;
 $CLASS = 'version';
 
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm
index 951a4c2397..ddea7c949f 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/MakeMaker/version/regex.pm
@@ -10,7 +10,7 @@ use strict;
 
 use vars qw($VERSION $CLASS $STRICT $LAX);
 
-$VERSION = '7.36';
+$VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 #--------------------------------------------------------------------------#
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
index ea5eae5787..ad22e46d95 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mkbootstrap.pm
@@ -3,7 +3,7 @@ package ExtUtils::Mkbootstrap;
 # There's just too much Dynaloader incest here to turn on strict vars.
 use strict 'refs';
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 require Exporter;
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
index 6e0b063f19..f0352b26c2 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/Mksymlists.pm
@@ -10,7 +10,7 @@ use Config;
 
 our @ISA = qw(Exporter);
 our @EXPORT = qw(&Mksymlists);
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 sub Mksymlists {
diff --git a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
index 18a70c5e11..5f36ce67ba 100644
--- a/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
+++ b/cpan/ExtUtils-MakeMaker/lib/ExtUtils/testlib.pm
@@ -3,7 +3,7 @@ package ExtUtils::testlib;
 use strict;
 use warnings;
 
-our $VERSION = '7.36';
+our $VERSION = '7.38';
 $VERSION =~ tr/_//d;
 
 use Cwd;
diff --git a/cpan/ExtUtils-MakeMaker/t/build_man.t b/cpan/ExtUtils-MakeMaker/t/build_man.t
index a88ccd23f1..278fd3d316 100644
--- a/cpan/ExtUtils-MakeMaker/t/build_man.t
+++ b/cpan/ExtUtils-MakeMaker/t/build_man.t
@@ -7,7 +7,7 @@ BEGIN {
 }
 
 use strict;
-use Test::More tests => 10;
+use Test::More tests => 46;
 
 use File::Spec;
 use File::Temp qw[tempdir];
@@ -81,3 +81,106 @@ ok((my $stdout = tie *STDOUT, 'TieOut'), 'tie stdout');
     );
     is_deeply $mm->{MAN3PODS}, { "Foo.pm" => "Foo.1" }, 'override man3pod';
 }
+
+unlink $README;
+
+# Check that we find the manage section from the directory
+{
+    local $Config{installman1dir}       = '';
+    local $Config{installman3dir}       = '';
+    local $Config{installsiteman1dir}   = '';
+    local $Config{installsiteman3dir}   = '';
+    local $Config{installvendorman1dir} = '';
+    local $Config{installvendorman3dir} = '';
+    local $Config{usevendorprefix}      = '';
+    local $Config{vendorprefixexp}      = '';
+
+    my $INSTALLDIRS = 'site';
+
+    my $sections_ok = sub {
+        my ( $man1section, $man3section, $m ) = @_;
+        local $Test::Builder::Level = $Test::Builder::Level + 1;
+
+        my $stdout = tie *STDOUT, 'TieOut' or die;
+        my $mm     = WriteMakefile(
+            NAME         => 'Big::Dummy',
+            VERSION_FROM => 'lib/Big/Dummy.pm',
+            INSTALLDIRS  => $INSTALLDIRS,
+        );
+
+        is( $mm->{MAN1SECTION}, $man1section,
+            "$m man1section is $man1section" );
+        is( $mm->{MAN3SECTION}, $man3section,
+            "$m man3section is $man3section" );
+    };
+
+    # Correctly detect known man sections
+    foreach my $s ( '{num}', '{num}p', '{num}pm', qw< l n o C L >, "L{num}", )
+    {
+        ( my $man1section = $s ) =~ s/\{num\}/1/;
+        ( my $man3section = $s ) =~ s/\{num\}/3/;
+
+        $Config{installman1dir}
+            = File::Spec->catdir( 'foo', "man$man1section" );
+        $Config{installman3dir}
+            = File::Spec->catdir( 'foo', "man$man3section" );
+
+        $sections_ok->( $man1section, $man3section, "From main [$s]" );
+    }
+
+    # Ignore unknown man sections
+    foreach my $s ( '', qw< 2 2p 33 >, "C{num}" ) {
+        ( my $man1section = $s ) =~ s/\{num\}/1/;
+        ( my $man3section = $s ) =~ s/\{num\}/3/;
+
+        $Config{installman1dir}
+            = File::Spec->catdir( 'foo', "man$man1section" );
+        $Config{installman3dir}
+            = File::Spec->catdir( 'foo', "man$man3section" );
+
+        $sections_ok->( 1, 3, "Ignore unrecognized [$s]" );
+    }
+
+    # Look in the right installman?dir based on INSTALLDIRS
+    {
+        $Config{installman1dir}     = File::Spec->catdir( 'foo', 'cat1p' );
+        $Config{installman3dir}     = File::Spec->catdir( 'foo', 'cat3p' );
+        $Config{installsiteman1dir} = File::Spec->catdir( 'foo', 'catL' );
+        $Config{installsiteman3dir} = File::Spec->catdir( 'foo', 'catL3' );
+
+        $sections_ok->( 'L', 'L3', "From site" );
+
+        my $installwas = $INSTALLDIRS;
+        $INSTALLDIRS = 'perl';
+        $sections_ok->( '1p', '3p', "From main" );
+        $INSTALLDIRS = $installwas;
+
+    }
+
+    # Set MAN?SECTION in Makefile
+    {
+        $Config{installman1dir} = File::Spec->catdir( 'foo', 'man1pm' );
+        $Config{installman3dir} = File::Spec->catdir( 'foo', 'man3pm' );
+        $Config{installsiteman1dir} = '';
+        $Config{installsiteman3dir} = '';
+
+        my $stdout = tie *STDOUT, 'TieOut' or die;
+        my $mm     = WriteMakefile(
+            NAME         => 'Big::Dummy',
+            VERSION_FROM => 'lib/Big/Dummy.pm',
+            MAN1PODS     => { foo => 'foo.1' },
+            INSTALLDIRS  => $INSTALLDIRS,
+        );
+
+        my $makefile = slurp('Makefile');
+
+        like $makefile, qr/\QMAN1SECTION = 1pm\E/xms, "Set MAN1SECTION";
+        like $makefile, qr/\QMAN3SECTION = 3pm\E/xms, "Set MAN3SECTION";
+
+        like $makefile, qr/\Q$(POD2MAN) --section=$(MAN1SECTION) \E/,
+            "Set POD2MAN section to \$(MAN1SECTION)";
+        like $makefile, qr/\Q$(POD2MAN) --section=$(MAN3SECTION) \E/,
+            "Set POD2MAN section to \$(MAN3SECTION)";
+    }
+}
+
diff --git a/cpan/ExtUtils-MakeMaker/t/pod2man.t b/cpan/ExtUtils-MakeMaker/t/pod2man.t
index d206e0bc95..e3bc00dd40 100644
--- a/cpan/ExtUtils-MakeMaker/t/pod2man.t
+++ b/cpan/ExtUtils-MakeMaker/t/pod2man.t
@@ -19,7 +19,7 @@ use Test::More tests => 3;
 
     pod2man("--perm_rw");
 
-    like $warnings, qr/^Option perm_rw requires an argument/;
+    like $warnings, qr/Option perm_rw requires an argument/;
 };
 
 

-- 
Perl5 Master Repository



nntp.perl.org: Perl Programming lists via nntp and http.
Comments to Ask Bjørn Hansen at ask@perl.org | Group listing | About