Integrate:

[ 20461]
Subject: Re: [perl #23202] coredump on ext/POSIX/t/posix with NetBSD-1.6
From: alian <alian@cpan.org>
Date: Sat, 02 Aug 2003 16:19:25 +0200
Message-ID: <3F2BC86D.2050400@jupiter.alianet>

Plus, un-mark a test as TODO for darwin >= 6.6 (by M. Schwern)

[ 20462]
Subject: [PATCH] Re: [perl #23207] persistant sideffect involving bitwise xor and substr
From: Enache Adrian <enache@rdslink.ro>
Date: Sun, 3 Aug 2003 18:00:05 +0300
Message-ID: <20030803150005.GA1319@ratsnest.hole>

[ 20463]
Subject: Re: [PATCH] Re: [perl #23206] Benchmark::cmpthese usage message wrong
From: Michael G Schwern <schwern@pobox.com>
Date: Sun, 3 Aug 2003 16:12:35 -0700
Message-ID: <20030803231235.GJ24350@windhund.schwern.org>

[ 20464]
Upgrade to ExtUtils::MakeMaker 6.15.

[ 20465]
Subject: [PATCH] 4 bugs in Test::More
From: Fergal Daly <fergal@esatclear.ie> (by way of Fergal Daly <fergal@esatclear.ie>)
Date: Fri, 21 Mar 2003 10:57:31 +0000
Message-Id: <200303211057.31879.fergal@esatclear.ie>

[ 20466]
Subject: Debian patch that skips podless modules
From: Alexey Tourbin <at@altlinux.ru>
Date: Sun, 3 Aug 2003 21:33:00 +0400
Message-ID: <20030803173300.GC2076@julia.office.altlinux.ru>

(plus Schwern's and Robert's nits)

[ 20467]
Apparently the newly introduce -DDARWIN did conflict with
some Apple definition, how ironic...
p4raw-link: @20467 on //depot/perl: 6239f2daa03877fbd4818ee3cd82a01a135ecb43
p4raw-link: @20466 on //depot/perl: 63fae90782a9851db725590019f02999dc17a13e
p4raw-link: @20465 on //depot/perl: 582cb20e4de9cf2d47abf705ff2908664756c5f0
p4raw-link: @20464 on //depot/perl: 64964e6db0c4795cc54eb4a384a3552aad1ae32d
p4raw-link: @20463 on //depot/perl: 53aa2791f2814657eac3bbbec321e82f3209ae86
p4raw-link: @20462 on //depot/perl: 6214ab63745c28e26e752f88d98bf89671cabc77
p4raw-link: @20461 on //depot/perl: 7eb03357e6e31f7e9e759242eb85abc02adea5cf

p4raw-id: //depot/maint-5.8/perl@20468
p4raw-integrated: from //depot/perl@20460 'copy in'
	lib/Test/Simple/t/is_deeply.t (@14178..)
	lib/Test/Simple/t/More.t (@16154..) lib/Test/More.pm (@17783..)
	lib/Benchmark.pm (@17878..) t/op/substr.t (@18705..)
	ext/POSIX/t/posix.t (@18999..) lib/Benchmark.t (@20016..)
	lib/ExtUtils/t/MM_Unix.t (@20341..) installman (@20386..)
	lib/ExtUtils/Changes lib/ExtUtils/META.yml
	lib/ExtUtils/MM_Any.pm lib/ExtUtils/MM_Unix.pm
	lib/ExtUtils/MakeMaker.pm (@20408..) 'merge in' pp.c (@20305..)
	perl.h (@20324..) hints/darwin.sh (@20411..)

1 files changed, 11 insertions, 12 deletions

diff --git a/lib/ExtUtils/MM_Any.pm b/lib/ExtUtils/MM_Any.pm
index 347ae391bd..8b418c0f3c 100644
--- a/lib/ExtUtils/MM_Any.pm
+++ b/lib/ExtUtils/MM_Any.pm
@@ -2,7 +2,7 @@ package ExtUtils::MM_Any;
 
 use strict;
 use vars qw($VERSION @ISA);
-$VERSION = 0.06;
+$VERSION = 0.07;
 @ISA = qw(File::Spec);
 
 use Config;
@@ -326,18 +326,15 @@ put them into the INST_* directories.
 sub manifypods {
     my $self          = shift;
 
-    my $POD2MAN_EXE_macro = $self->POD2MAN_EXE_macro();
+    my $POD2MAN_macro = $self->POD2MAN_macro();
     my $manifypods_target = $self->manifypods_target();
 
     return <<END_OF_TARGET;
 
-# --- Begin manifypods section:
-$POD2MAN_EXE_macro
+$POD2MAN_macro
 
 $manifypods_target
 
-# --- End manifypods section --- #
-
 END_OF_TARGET
 
 }
@@ -376,7 +373,7 @@ END
     foreach my $section (qw(1 3)) {
         my $pods = $self->{"MAN${section}PODS"};
         push @man_cmds, $self->split_command(<<CMD, %$pods);
-	\$(NOECHO) \$(POD2MAN_EXE) --section=$section --perm_rw=\$(PERM_RW)
+	\$(NOECHO) \$(POD2MAN) --section=$section --perm_rw=\$(PERM_RW)
 CMD
     }
 
@@ -432,27 +429,28 @@ MAKE_FRAG
     return $make_frag;
 }
 
-=item POD2MAN_EXE_macro
+=item POD2MAN_macro
 
-  my $pod2man_exe_macro = $self->POD2MAN_EXE_macro
+  my $pod2man_macro = $self->POD2MAN_macro
 
-Returns a definition for the POD2MAN_EXE macro.  This is a program
+Returns a definition for the POD2MAN macro.  This is a program
 which emulates the pod2man utility.  You can add more switches to the
 command by simply appending them on the macro.
 
 Typical usage:
 
-    $(POD2MAN_EXE) --section=3 --perm_rw=$(PERM_RW) podfile man_page
+    $(POD2MAN) --section=3 --perm_rw=$(PERM_RW) podfile1 man_page1 ...
 
 =cut
 
-sub POD2MAN_EXE_macro {
+sub POD2MAN_macro {
     my $self = shift;
 
 # Need the trailing '--' so perl stops gobbling arguments and - happens
 # to be an alternative end of line seperator on VMS so we quote it
     return <<'END_OF_DEF';
 POD2MAN_EXE = $(PERLRUN) "-MExtUtils::Command::MM" -e pod2man "--"
+POD2MAN = $(POD2MAN_EXE)
 END_OF_DEF
 }
 
@@ -588,6 +586,7 @@ MAKE_FRAG
     }
     
     my $meta = <<YAML;
+# http://module-build.sourceforge.net/META-spec.html
 #XXXXXXX This is a prototype!!!  It will change in the future!!! XXXXX#
 name:         $self->{DISTNAME}
 version:      $self->{VERSION}