X-Git-Url: http://git.vpit.fr/?p=perl%2Fmodules%2FVariable-Magic.git;a=blobdiff_plain;f=Makefile.PL;h=9abd4077d3707ea01b13a9499b385927d664b5ec;hp=05b4eb3fb0a34e47faed575a274e08d2c1efb706;hb=HEAD;hpb=d29a774d106d145036eda849ab57f42410100008

diff --git a/Makefile.PL b/Makefile.PL
index 05b4eb3..7e22e37 100644
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -4,26 +4,11 @@ use strict;
 use warnings;
 use ExtUtils::MakeMaker;
 
-BEGIN {
- eval { require Config };
- die 'OS unsupported' if $@;
- Config->import(qw/%Config/);
-}
+use Config;
 
 my @DEFINES;
 my %macro;
 
-my $pl = $Config{perl_patchlevel};
-print "Checking perl patchlevel... ";
-if (defined $pl && length $pl) {
- $pl = int $pl;
- push @DEFINES, '-DVMG_PERL_PATCHLEVEL=' . $pl;
- print $pl, "\n";
-} else {
- $pl = undef;
- print "none\n";
-}
-
 my $as_perl = eval {
  require ActivePerl;
  defined &ActivePerl::BUILD ? ActivePerl::BUILD() : undef
@@ -31,7 +16,7 @@ my $as_perl = eval {
 
 my $is_as_822 = 0;
 print "Checking if this is ActiveState Perl 5.8.8 build 822 or higher... ";
-if ($^V eq v5.8.8 and defined $as_perl and $as_perl >= 822) {
+if ("$]" == 5.008_008 and defined $as_perl and $as_perl >= 822) {
  $is_as_822 = 1;
  push @DEFINES, '-DVMG_COMPAT_ARRAY_PUSH_NOLEN=1';
 }
@@ -40,31 +25,40 @@ print $is_as_822 ? "yes\n" : "no\n";
 my $is_gcc_34 = 0;
 print "Checking if this is gcc 3.4 on Windows trying to link against an import library... ";
 if ($^O eq 'MSWin32' and not grep /^LD[A-Z]*=/, @ARGV) {
- my ($libperl, $gccversion) = map $_ || '', @Config{qw/libperl gccversion/};
+ my ($libperl, $gccversion) = map $_ || '', @Config{qw<libperl gccversion>};
  if ($gccversion =~ /^3\.4\.[0-9]+/ and $libperl =~ s/\.lib$//) {
   $is_gcc_34 = 1;
-  my ($lddlflags, $ldflags) = @Config{qw/lddlflags ldflags/};
+  my ($lddlflags, $ldflags) = @Config{qw<lddlflags ldflags>};
   $_ ||= '', s/-L(?:".*?"|\S+)//g for $lddlflags, $ldflags;
   $libperl = "-l$libperl";
   my $libdirs = join ' ',
                  map { s/(?<!\\)((?:\\\\)*")/\\$1/g; qq[-L"$_"] }
-                  @Config{qw/bin sitebin/};
+                  @Config{qw<bin sitebin>};
   $macro{LDDLFLAGS}    = "$lddlflags $libdirs $libperl";
   $macro{LDFLAGS}      = "$ldflags $libdirs $libperl";
-  $macro{PERL_ARCHIVE} = '',
+  eval <<'  MY_SECTION';
+   package MY;
+   sub dynamic_lib {
+    my $self = shift;
+    my $inherited = $self->SUPER::dynamic_lib(@_);
+    $inherited =~ s/"?\$\(PERL_ARCHIVE\)"?//g;
+    return $inherited;
+   }
+  MY_SECTION
+  die $@ if $@;
  }
 }
 print $is_gcc_34 ? "yes\n" : "no\n";
 
 # Threads, Windows and 5.8.x don't seem to be best friends
-if ($^O eq 'MSWin32' && $^V lt v5.9.0) {
- push @DEFINES, '-DVMG_MULTIPLICITY=0';
+if ($^O eq 'MSWin32' && "$]" < 5.009) {
+ push @DEFINES, '-DXSH_MULTIPLICITY=0';
  print "Thread safety disabled for perl 5.8.x on Windows.\n"
 }
 
 # Fork emulation got "fixed" in 5.10.1
-if ($^O eq 'MSWin32' && $^V lt v5.10.1) {
- push @DEFINES, '-DVMG_FORKSAFE=0';
+if ($^O eq 'MSWin32' && "$]" < 5.010_001) {
+ push @DEFINES, '-DXSH_FORKSAFE=0';
  print "Fork safety not ensured for perl 5.8.x and 5.10.0 on Windows.\n";
 }
 
@@ -78,6 +72,14 @@ my $dist = 'Variable-Magic';
 (my $file = $dist) =~ s{-}{/}g;
 $file = "lib/$file.pm";
 
+my $bug_web    = "http://rt.cpan.org/Dist/Display.html?Name=$dist",
+my $bug_mailto = 'bug-' . lc($dist) . '@rt.cpan.org';
+
+my $repo_host = 'git.vpit.fr';
+my @repo_path = ('perl', 'modules', "$dist.git");
+my $repo_url  = join '/', 'http:', '', $repo_host, @repo_path, '';
+my $repo_web  = "http://$repo_host/?p=" . join('%2F', @repo_path);
+
 my %PREREQ_PM = (
  'Carp'     => 0,
  'Exporter' => 0,
@@ -85,44 +87,66 @@ my %PREREQ_PM = (
  'base'     => 0,
 );
 
+my %BUILD_REQUIRES = (
+ 'Carp'                => 0,
+ 'Config'              => 0,
+ 'ExtUtils::MakeMaker' => 0,
+ 'IO::Handle'          => 0,
+ 'IO::Select'          => 0,
+ 'IPC::Open3'          => 0,
+ 'POSIX'               => 0,
+ 'Socket'              => 0,
+ 'Test::More'          => 0,
+ 'lib'                 => 0,
+ %PREREQ_PM,
+);
+
 my %META = (
+ 'meta-spec' => {
+  version => '2',
+  url     => 'http://search.cpan.org/perldoc?CPAN::Meta::Spec',
+ },
  configure_requires => {
   'Config'              => 0,
   'ExtUtils::MakeMaker' => 0,
  },
  build_requires => {
-  'Carp'                => 0,
-  'Config'              => 0,
-  'ExtUtils::MakeMaker' => 0,
-  'Test::More'          => 0,
-  %PREREQ_PM,
+  %BUILD_REQUIRES,
  },
  dynamic_config => 1,
  resources => {
-  bugtracker => "http://rt.cpan.org/NoAuth/ReportBug.html?Queue=$dist",
+  bugtracker => {
+   web    => $bug_web,
+   mailto => $bug_mailto,
+  },
   homepage   => "http://search.cpan.org/dist/$dist/",
   license    => 'http://dev.perl.org/licenses/',
-  repository => "http://git.profvince.com/?p=perl%2Fmodules%2F$dist.git",
+  repository => {
+   type => 'git',
+   url  => $repo_url,
+   web  => $repo_web,
+  },
  },
 );
 
 WriteMakefile(
  NAME             => $name,
- AUTHOR           => 'Vincent Pit <perl@profvince.com>',
+ AUTHOR           => 'Vincent Pit <vpit@cpan.org>',
  LICENSE          => 'perl',
  VERSION_FROM     => $file,
  ABSTRACT_FROM    => $file,
  PL_FILES         => {},
  @DEFINES,
+ BUILD_REQUIRES   => \%BUILD_REQUIRES,
  PREREQ_PM        => \%PREREQ_PM,
- MIN_PERL_VERSION => 5.008,
+ MIN_PERL_VERSION => '5.008',
  META_MERGE       => \%META,
  dist             => {
-  PREOP    => "pod2text $file > \$(DISTVNAME)/README",
+  PREOP    => "pod2text -u $file > \$(DISTVNAME)/README",
   COMPRESS => 'gzip -9f', SUFFIX => 'gz'
  },
  clean            => {
-  FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt"
+  FILES => "$dist-* *.gcov *.gcda *.gcno cover_db Debian_CPANTS.txt*"
  },
  %macro,
 );