improve all Makefile.PLs

diff --git a/FT2/FT2.pm b/FT2/FT2.pm
index 288a2e06bc71d68ec9eb133664030534d958010f..e89b1470fea80e51a7a78c926eb0c1d7494ff3b0 100644 (file)
--- a/FT2/FT2.pm
+++ b/FT2/FT2.pm
@@ -6,7 +6,7 @@ use vars qw($VERSION @ISA);
 @ISA = qw(Imager::Font);
 
 BEGIN {
 @ISA = qw(Imager::Font);
 
 BEGIN {

-  $VERSION = "0.94";
+  $VERSION = "0.95";

 
   require XSLoader;
   XSLoader::load('Imager::Font::FT2', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::Font::FT2', $VERSION);

diff --git a/FT2/Makefile.PL b/FT2/Makefile.PL
index b2925be5cf3b1b3b00fdc164bfcb8fbd06541143..c655098b2092e3ce02415111ab4cf2e67b2d0322 100644 (file)
--- a/FT2/Makefile.PL
+++ b/FT2/Makefile.PL
@@ -15,8 +15,6 @@ GetOptions("incpath=s", \@incpaths,
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 

-my $MM_ver = eval $ExtUtils::MakeMaker::VERSION;
-

 my %opts = 
   (
    NAME => 'Imager::Font::FT2',
 my %opts = 
   (
    NAME => 'Imager::Font::FT2',


@@ -25,6 +23,35 @@ my %opts =
    clean => { FILES => 'testout' },
   );
 
    clean => { FILES => 'testout' },
   );
 

+if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+  $opts{LICENSE} = "perl_5";
+  $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
+  $opts{ABSTRACT} = 'FreeType 2 font driver for Imager';
+  $opts{META_MERGE} =
+    {
+     'meta-spec' =>
+     {
+      version => "2",
+      url => "https://metacpan.org/pod/CPAN::Meta::Spec",
+     },
+     resources =>
+     {
+      homepage => "http://imager.perl.org/",
+      repository =>
+      {
+       type => "git",
+       url => "git://git.imager.perl.org/imager.git",
+       web => "http://git.imager.perl.org/imager.git",
+      },
+      bugtracker =>
+      {
+       web => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       mailto => 'bug-Imager@rt.cpan.org',
+      },
+     },
+    };
+}
+

 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";
 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";


@@ -39,23 +66,40 @@ else {
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.95" );
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.95" );

-  if ($MM_ver >= 6.46) {
-    $opts{META_MERGE} =
+  if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+    $opts{META_MERGE}{prereqs} =

       {
       {

-       configure_requires => 
+       configure =>

        {
        {

-       @Imager_req,
+       requires =>
+       {
+        @Imager_req,
+       },

        },
        },

-       build_requires => 
+       build =>

        {
        {

-       @Imager_req,
-       "Test::More" => "0.47",
+       requires =>
+       {
+        @Imager_req,
+        'Scalar::Util' => 1.00,
+        "Test::More" => "0.47",
+       }

        },
        },

-       resources =>
+       runtime =>

        {
        {

-       homepage => "http://imager.perl.org/",
-       repository => "git://git.imager.perl.org/imager.git",
-       bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       requires =>
+       {
+        @Imager_req,
+        'Scalar::Util' => 1.00,
+       }
+       },
+       test =>
+       {
+       requires =>
+       {
+        "Test::More" => "0.47",
+        'Scalar::Util' => 1.00,
+       }

        },
       };
     $opts{PREREQ_PM} =
        },
       };
     $opts{PREREQ_PM} =


@@ -104,11 +148,6 @@ if ($probe_res) {
   $opts{LDDLFLAGS} = $probe_res->{LDDLFLAGS}
     if $probe_res->{LDDLFLAGS};
 
   $opts{LDDLFLAGS} = $probe_res->{LDDLFLAGS}
     if $probe_res->{LDDLFLAGS};
 

-  if ($MM_ver > 6.06) {
-    $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
-    $opts{ABSTRACT} = 'FreeType 2 font driver for Imager';
-  }
-  

   WriteMakefile(%opts);
 }
 else {
   WriteMakefile(%opts);
 }
 else {

diff --git a/GIF/GIF.pm b/GIF/GIF.pm
index ee8936a6d441de2e4679544a360fcf948e6f34ae..d7df5d5c2c7bb276feb27051e25b5e5fa7faf804 100644 (file)
--- a/GIF/GIF.pm
+++ b/GIF/GIF.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
 use vars qw($VERSION @ISA);
 
 BEGIN {

-  $VERSION = "0.91";
+  $VERSION = "0.92";

 
   require XSLoader;
   XSLoader::load('Imager::File::GIF', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::File::GIF', $VERSION);

diff --git a/GIF/Makefile.PL b/GIF/Makefile.PL
index 3eee679d2e8c517012a2695e33b98e59e93c4490..bc3841638eb42ede75cbba27aa065597e5fd72c8 100644 (file)
--- a/GIF/Makefile.PL
+++ b/GIF/Makefile.PL
@@ -15,8 +15,6 @@ GetOptions("incpath=s", \@incpaths,
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 

-my $MM_ver = eval $ExtUtils::MakeMaker::VERSION;
-

 my %opts = 
   (
    NAME => 'Imager::File::GIF',
 my %opts = 
   (
    NAME => 'Imager::File::GIF',


@@ -25,6 +23,35 @@ my %opts =
    clean => { FILES => 'testout' },
   );
 
    clean => { FILES => 'testout' },
   );
 

+if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+  $opts{LICENSE} = "perl_5";
+  $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
+  $opts{ABSTRACT} = 'GIF Image file support for Imager';
+  $opts{META_MERGE} =
+    {
+     'meta-spec' =>
+     {
+      version => "2",
+      url => "https://metacpan.org/pod/CPAN::Meta::Spec",
+     },
+     resources =>
+     {
+      homepage => "http://imager.perl.org/",
+      repository =>
+      {
+       type => "git",
+       url => "git://git.imager.perl.org/imager.git",
+       web => "http://git.imager.perl.org/imager.git",
+      },
+      bugtracker =>
+      {
+       web => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       mailto => 'bug-Imager@rt.cpan.org',
+      },
+     },
+    };
+}
+

 my @inc;
 if ($BUILDING_IMAGER) {
   unshift @inc, "-I..";
 my @inc;
 if ($BUILDING_IMAGER) {
   unshift @inc, "-I..";


@@ -39,23 +66,37 @@ else {
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.94" );
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.94" );

-  if ($MM_ver >= 6.46) {
-    $opts{META_MERGE} =
+  if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+    $opts{META_MERGE}{prereqs} =

       {
       {

-       configure_requires => 
+       configure =>

        {
        {

-       @Imager_req,
+       requires =>
+       {
+        @Imager_req,
+       },

        },
        },

-       build_requires => 
+       build =>

        {
        {

-       @Imager_req,
-       "Test::More" => "0.47",
+       requires =>
+       {
+        @Imager_req,
+        "Test::More" => "0.47",
+       }

        },
        },

-       resources =>
+       runtime =>

        {
        {

-       homepage => "http://imager.perl.org/",
-       repository => "git://git.imager.perl.org/imager.git",
-       bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       requires =>
+       {
+        @Imager_req,
+       }
+       },
+       test =>
+       {
+       requires =>
+       {
+        "Test::More" => "0.47",
+       }

        },
       };
     $opts{PREREQ_PM} =
        },
       };
     $opts{PREREQ_PM} =


@@ -88,12 +129,7 @@ if ($probe_res) {
   $opts{LIBS} = $probe_res->{LIBS};
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";
   $opts{LIBS} = $probe_res->{LIBS};
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";

-  
-  if ($MM_ver > 6.06) {
-    $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
-    $opts{ABSTRACT} = 'GIF Image file support';
-  }
-  
+

   WriteMakefile(%opts);
 }
 else {
   WriteMakefile(%opts);
 }
 else {

diff --git a/JPEG/JPEG.pm b/JPEG/JPEG.pm
index 972621154cf8e70ea760141dacba9f19945b0bff..ffedae649092b5b83033ee8f536c5c9c8bc152a9 100644 (file)
--- a/JPEG/JPEG.pm
+++ b/JPEG/JPEG.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
 use vars qw($VERSION @ISA);
 
 BEGIN {

-  $VERSION = "0.90";
+  $VERSION = "0.91";

 
   require XSLoader;
   XSLoader::load('Imager::File::JPEG', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::File::JPEG', $VERSION);

diff --git a/JPEG/Makefile.PL b/JPEG/Makefile.PL
index b87c484a24a2aa8e16b2ec3eefdc7ea5582c057c..14a13417f571bf25b327be2110de0a7ca9529ed4 100644 (file)
--- a/JPEG/Makefile.PL
+++ b/JPEG/Makefile.PL
@@ -15,8 +15,6 @@ GetOptions("incpath=s", \@incpaths,
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 

-my $MM_ver = eval $ExtUtils::MakeMaker::VERSION;
-

 my %opts = 
   (
    NAME => 'Imager::File::JPEG',
 my %opts = 
   (
    NAME => 'Imager::File::JPEG',


@@ -25,6 +23,35 @@ my %opts =
    clean => { FILES => 'testout' },
   );
 
    clean => { FILES => 'testout' },
   );
 

+if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+  $opts{LICENSE} = "perl_5";
+  $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
+  $opts{ABSTRACT} = 'JPEG Image file support for Imager';
+  $opts{META_MERGE} =
+    {
+     'meta-spec' =>
+     {
+      version => "2",
+      url => "https://metacpan.org/pod/CPAN::Meta::Spec",
+     },
+     resources =>
+     {
+      homepage => "http://imager.perl.org/",
+      repository =>
+      {
+       type => "git",
+       url => "git://git.imager.perl.org/imager.git",
+       web => "http://git.imager.perl.org/imager.git",
+      },
+      bugtracker =>
+      {
+       web => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       mailto => 'bug-Imager@rt.cpan.org',
+      },
+     },
+    };
+}
+

 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";
 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";


@@ -39,23 +66,37 @@ else {
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.86" );
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.86" );

-  if ($MM_ver >= 6.46) {
-    $opts{META_MERGE} =
+  if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+    $opts{META_MERGE}{prereqs} =

       {
       {

-       configure_requires => 
+       configure =>

        {
        {

-       @Imager_req,
+       requires =>
+       {
+        @Imager_req,
+       },

        },
        },

-       build_requires => 
+       build =>

        {
        {

-       @Imager_req,
-       "Test::More" => "0.47",
+       requires =>
+       {
+        @Imager_req,
+        "Test::More" => "0.47",
+       }

        },
        },

-       resources =>
+       runtime =>

        {
        {

-       homepage => "http://imager.perl.org/",
-       repository => "git://git.imager.perl.org/imager.git",
-       bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       requires =>
+       {
+        @Imager_req,
+       }
+       },
+       test =>
+       {
+       requires =>
+       {
+        "Test::More" => "0.47",
+       }

        },
       };
     $opts{PREREQ_PM} =
        },
       };
     $opts{PREREQ_PM} =


@@ -88,12 +129,7 @@ if ($probe_res) {
   $opts{LIBS} = $probe_res->{LIBS};
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";
   $opts{LIBS} = $probe_res->{LIBS};
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";

-  
-  if ($MM_ver > 6.06) {
-    $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
-    $opts{ABSTRACT} = 'JPEG Image file support';
-  }
-  
+

   WriteMakefile(%opts);
 }
 else {
   WriteMakefile(%opts);
 }
 else {

diff --git a/Makefile.PL b/Makefile.PL
index ffc7c33fcd78ab12023879194484add564ed8d48..2b14c27f55d43f71b46631e36395fc89004f1ec6 100644 (file)
--- a/Makefile.PL
+++ b/Makefile.PL
@@ -261,6 +261,25 @@ if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
        {
         "Parse::RecDescent" => 0
        },
        {
         "Parse::RecDescent" => 0
        },

+       requires =>
+       {
+       'Scalar::Util' => "1.00",
+       XSLoader => 0,
+       },
+      },
+      build =>
+      {
+       requires =>
+       {
+       XSLoader => 0,
+       },
+      },
+      test =>
+      {
+       requires =>
+       {
+       'Test::More' => "0.99",
+       },

       },
      },
      dynamic_config => 0,
       },
      },
      dynamic_config => 0,


@@ -289,6 +308,7 @@ if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
       bugtracker =>
       {
        web => "https://rt.cpan.org/Dist/Display.html?Name=Imager",
       bugtracker =>
       {
        web => "https://rt.cpan.org/Dist/Display.html?Name=Imager",

+       mailto => 'bug-Imager@rt.cpan.org',

       },
      },
     };
       },
      },
     };

diff --git a/PNG/Makefile.PL b/PNG/Makefile.PL
index df6e32667c5df306c13c30e6d17d8df2c86b9d5f..dc17470e929dcbbbaa7c71c7898fe10d2c3e8a03 100644 (file)
--- a/PNG/Makefile.PL
+++ b/PNG/Makefile.PL
@@ -15,8 +15,6 @@ GetOptions("incpath=s", \@incpaths,
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 

-my $MM_ver = eval $ExtUtils::MakeMaker::VERSION;
-

 my %opts = 
   (
    NAME => 'Imager::File::PNG',
 my %opts = 
   (
    NAME => 'Imager::File::PNG',


@@ -25,6 +23,35 @@ my %opts =
    clean => { FILES => 'testout' },
   );
 
    clean => { FILES => 'testout' },
   );
 

+if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+  $opts{LICENSE} = "perl_5";
+  $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
+  $opts{ABSTRACT} = 'PNG Image file support for Imager';
+  $opts{META_MERGE} =
+    {
+     'meta-spec' =>
+     {
+      version => "2",
+      url => "https://metacpan.org/pod/CPAN::Meta::Spec",
+     },
+     resources =>
+     {
+      homepage => "http://imager.perl.org/",
+      repository =>
+      {
+       type => "git",
+       url => "git://git.imager.perl.org/imager.git",
+       web => "http://git.imager.perl.org/imager.git",
+      },
+      bugtracker =>
+      {
+       web => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       mailto => 'bug-Imager@rt.cpan.org',
+      },
+     },
+    };
+}
+

 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";
 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";


@@ -39,23 +66,37 @@ else {
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.90" );
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.90" );

-  if ($MM_ver >= 6.46) {
-    $opts{META_MERGE} =
+  if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+    $opts{META_MERGE}{prereqs} =

       {
       {

-       configure_requires => 
+       configure =>
+       {
+       requires =>
+       {
+        @Imager_req,
+       },
+       },
+       build =>

        {
        {

-       @Imager_req,
+       requires =>
+       {
+        @Imager_req,
+        "Test::More" => "0.47",
+       }

        },
        },

-       build_requires => 
+       runtime =>

        {
        {

-       @Imager_req,
-       "Test::More" => "0.47",
+       requires =>
+       {
+        @Imager_req,
+       }

        },
        },

-       resources =>
+       test =>

        {
        {

-       homepage => "http://imager.perl.org/",
-       repository => "git://git.imager.perl.org/imager.git",
-       bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       requires =>
+       {
+        "Test::More" => "0.47",
+       }

        },
       };
     $opts{PREREQ_PM} =
        },
       };
     $opts{PREREQ_PM} =


@@ -135,12 +176,7 @@ if ($probe_res) {
   $opts{LIBS} = $probe_res->{LIBS};
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";
   $opts{LIBS} = $probe_res->{LIBS};
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";

-  
-  if ($MM_ver > 6.06) {
-    $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
-    $opts{ABSTRACT} = 'PNG Image file support';
-  }
-  
+

   WriteMakefile(%opts);
 }
 else {
   WriteMakefile(%opts);
 }
 else {

diff --git a/PNG/PNG.pm b/PNG/PNG.pm
index f145d0ee4d87d67b462c73841c69096954645905..c7ece8f2a948a6fb6316f70de9f96d4fb69aefbc 100644 (file)
--- a/PNG/PNG.pm
+++ b/PNG/PNG.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
 use vars qw($VERSION @ISA);
 
 BEGIN {

-  $VERSION = "0.93";
+  $VERSION = "0.94";

 
   require XSLoader;
   XSLoader::load('Imager::File::PNG', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::File::PNG', $VERSION);

diff --git a/T1/Makefile.PL b/T1/Makefile.PL
index fd8fa648a64a8cd12b38d2c5cf7561b77befad80..0d326971f12c5a875a8df3757c8cb4e818a55dc6 100644 (file)
--- a/T1/Makefile.PL
+++ b/T1/Makefile.PL
@@ -25,6 +25,35 @@ my %opts =
    clean => { FILES => 'testout' },
   );
 
    clean => { FILES => 'testout' },
   );
 

+if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+  $opts{LICENSE} = "perl_5";
+  $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
+  $opts{ABSTRACT} = 'T1Lib font driver for Imager';
+  $opts{META_MERGE} =
+    {
+     'meta-spec' =>
+     {
+      version => "2",
+      url => "https://metacpan.org/pod/CPAN::Meta::Spec",
+     },
+     resources =>
+     {
+      homepage => "http://imager.perl.org/",
+      repository =>
+      {
+       type => "git",
+       url => "git://git.imager.perl.org/imager.git",
+       web => "http://git.imager.perl.org/imager.git",
+      },
+      bugtracker =>
+      {
+       web => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       mailto => 'bug-Imager@rt.cpan.org',
+      },
+     },
+    };
+}
+

 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";
 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";


@@ -39,23 +68,37 @@ else {
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.95" );
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.95" );

-  if ($MM_ver >= 6.46) {
-    $opts{META_MERGE} =
+  if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+    $opts{META_MERGE}{prereqs} =

       {
       {

-       configure_requires => 
+       configure =>

        {
        {

-       @Imager_req,
+       requires =>
+       {
+        @Imager_req,
+       },

        },
        },

-       build_requires => 
+       build =>

        {
        {

-       @Imager_req,
-       "Test::More" => "0.47",
+       requires =>
+       {
+        @Imager_req,
+        "Test::More" => "0.47",
+       }

        },
        },

-       resources =>
+       runtime =>

        {
        {

-       homepage => "http://imager.perl.org/",
-       repository => "git://git.imager.perl.org/imager.git",
-       bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       requires =>
+       {
+        @Imager_req,
+       }
+       },
+       test =>
+       {
+       requires =>
+       {
+        "Test::More" => "0.47",
+       }

        },
       };
     $opts{PREREQ_PM} =
        },
       };
     $opts{PREREQ_PM} =


@@ -90,11 +133,6 @@ if ($probe_res) {
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";
 
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";
 

-  if ($MM_ver > 6.06) {
-    $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
-    $opts{ABSTRACT} = 'T1Lib font driver for Imager';
-  }
-  

   WriteMakefile(%opts);
 }
 else {
   WriteMakefile(%opts);
 }
 else {


@@ -120,4 +158,3 @@ T1_CloseLib();
 return 0;
 CODE
 }
 return 0;
 CODE
 }

-

diff --git a/T1/T1.pm b/T1/T1.pm
index 11ef74d5ca2375e3e174c69569906538a61dad98..cee3a3fae6c26fe0ac297e0666c88c1faf747695 100644 (file)
--- a/T1/T1.pm
+++ b/T1/T1.pm
@@ -6,7 +6,7 @@ use vars qw(@ISA $VERSION);
 use Scalar::Util ();
 
 BEGIN {
 use Scalar::Util ();
 
 BEGIN {

-  $VERSION = "1.024";
+  $VERSION = "1.025";

 
   require XSLoader;
   XSLoader::load('Imager::Font::T1', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::Font::T1', $VERSION);

diff --git a/TIFF/Makefile.PL b/TIFF/Makefile.PL
index 82fb46a5311be867543fc99d2097f58cfa06d6fc..86270259c1499b91335a26e1bc2c0a4ac0f87d2b 100644 (file)
--- a/TIFF/Makefile.PL
+++ b/TIFF/Makefile.PL
@@ -15,8 +15,6 @@ GetOptions("incpath=s", \@incpaths,
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 

-my $MM_ver = eval $ExtUtils::MakeMaker::VERSION;
-

 my $define = "";
 my $fp_rep = unpack("H*", pack("f", 1.25));
 if ($fp_rep eq "0000a03f" || $fp_rep eq "3fa00000") {
 my $define = "";
 my $fp_rep = unpack("H*", pack("f", 1.25));
 if ($fp_rep eq "0000a03f" || $fp_rep eq "3fa00000") {


@@ -32,6 +30,35 @@ my %opts =
    clean => { FILES => 'testout' },
   );
 
    clean => { FILES => 'testout' },
   );
 

+if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+  $opts{LICENSE} = "perl_5";
+  $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
+  $opts{ABSTRACT} = 'TIFF image file support for Imager';
+  $opts{META_MERGE} =
+    {
+     'meta-spec' =>
+     {
+      version => "2",
+      url => "https://metacpan.org/pod/CPAN::Meta::Spec",
+     },
+     resources =>
+     {
+      homepage => "http://imager.perl.org/",
+      repository =>
+      {
+       type => "git",
+       url => "git://git.imager.perl.org/imager.git",
+       web => "http://git.imager.perl.org/imager.git",
+      },
+      bugtracker =>
+      {
+       web => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       mailto => 'bug-Imager@rt.cpan.org',
+      },
+     },
+    };
+}
+

 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";
 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";


@@ -46,23 +73,37 @@ else {
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.94" );
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.94" );

-  if ($MM_ver >= 6.46) {
-    $opts{META_MERGE} =
+  if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+    $opts{META_MERGE}{prereqs} =

       {
       {

-       configure_requires => 
+       configure =>
+       {
+       requires =>
+       {
+        @Imager_req,
+       },
+       },
+       build =>

        {
        {

-       @Imager_req,
+       requires =>
+       {
+        @Imager_req,
+        "Test::More" => "0.47",
+       }

        },
        },

-       build_requires => 
+       runtime =>

        {
        {

-       @Imager_req,
-       "Test::More" => "0.47",
+       requires =>
+       {
+        @Imager_req,
+       }

        },
        },

-       resources =>
+       test =>

        {
        {

-       homepage => "http://imager.perl.org/",
-       repository => "git://git.imager.perl.org/imager.git",
-       bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       requires =>
+       {
+        "Test::More" => "0.47",
+       }

        },
       };
     $opts{PREREQ_PM} =
        },
       };
     $opts{PREREQ_PM} =


@@ -96,11 +137,6 @@ if ($probe_res) {
   $opts{DEFINE} .= " $probe_res->{DEFINE}";
   $opts{INC} = "@inc";
 
   $opts{DEFINE} .= " $probe_res->{DEFINE}";
   $opts{INC} = "@inc";
 

-  if ($MM_ver > 6.06) {
-    $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
-    $opts{ABSTRACT} = 'TIFF image file support for Imager';
-  }
-  

   WriteMakefile(%opts);
 }
 else {
   WriteMakefile(%opts);
 }
 else {

diff --git a/TIFF/TIFF.pm b/TIFF/TIFF.pm
index f31103a560d9747b8abb951ece4e79aec7b6adf6..48bcca8ab1c0d357ffa42811998665d83d10ed93 100644 (file)
--- a/TIFF/TIFF.pm
+++ b/TIFF/TIFF.pm
@@ -4,7 +4,7 @@ use Imager;
 use vars qw($VERSION @ISA);
 
 BEGIN {
 use vars qw($VERSION @ISA);
 
 BEGIN {

-  $VERSION = "0.89";
+  $VERSION = "0.91";

 
   require XSLoader;
   XSLoader::load('Imager::File::TIFF', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::File::TIFF', $VERSION);

diff --git a/W32/Makefile.PL b/W32/Makefile.PL
index c729a4ad93986f585e533367ee01d155d60d1d22..07a6609e089f8f8c5d2c9c2250e0906bcee74a4b 100644 (file)
--- a/W32/Makefile.PL
+++ b/W32/Makefile.PL
@@ -15,8 +15,6 @@ GetOptions("incpath=s", \@incpaths,
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 
 our $BUILDING_IMAGER;
 our %IMAGER_LIBS;
 

-my $MM_ver = eval $ExtUtils::MakeMaker::VERSION;
-

 my %opts = 
   (
    NAME => 'Imager::Font::W32',
 my %opts = 
   (
    NAME => 'Imager::Font::W32',


@@ -25,6 +23,35 @@ my %opts =
    clean => { FILES => 'testout' },
   );
 
    clean => { FILES => 'testout' },
   );
 

+if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+  $opts{LICENSE} = "perl_5";
+  $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
+  $opts{ABSTRACT} = 'Win32 font driver for Imager';
+  $opts{META_MERGE} =
+    {
+     'meta-spec' =>
+     {
+      version => "2",
+      url => "https://metacpan.org/pod/CPAN::Meta::Spec",
+     },
+     resources =>
+     {
+      homepage => "http://imager.perl.org/",
+      repository =>
+      {
+       type => "git",
+       url => "git://git.imager.perl.org/imager.git",
+       web => "http://git.imager.perl.org/imager.git",
+      },
+      bugtracker =>
+      {
+       web => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       mailto => 'bug-Imager@rt.cpan.org',
+      },
+     },
+    };
+}
+

 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";
 my @inc;
 if ($BUILDING_IMAGER) {
   push @inc, "-I..";


@@ -39,23 +66,37 @@ else {
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.95" );
 
   # Imager required configure through use
   my @Imager_req = ( Imager => "0.95" );

-  if ($MM_ver >= 6.46) {
-    $opts{META_MERGE} =
+  if (eval { ExtUtils::MakeMaker->VERSION('6.46'); 1 }) {
+    $opts{META_MERGE}{prereqs} =

       {
       {

-       configure_requires => 
+       configure =>
+       {
+       requires =>
+       {
+        @Imager_req,
+       },
+       },
+       build =>

        {
        {

-       @Imager_req,
+       requires =>
+       {
+        @Imager_req,
+        "Test::More" => "0.47",
+       }

        },
        },

-       build_requires => 
+       runtime =>

        {
        {

-       @Imager_req,
-       "Test::More" => "0.47",
+       requires =>
+       {
+        @Imager_req,
+       }

        },
        },

-       resources =>
+       test =>

        {
        {

-       homepage => "http://imager.perl.org/",
-       repository => "git://git.imager.perl.org/imager.git",
-       bugtracker => "http://rt.cpan.org/NoAuth/Bugs.html?Dist=Imager",
+       requires =>
+       {
+        "Test::More" => "0.47",
+       }

        },
       };
     $opts{PREREQ_PM} =
        },
       };
     $opts{PREREQ_PM} =


@@ -89,11 +130,6 @@ if ($probe_res) {
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";
 
   $opts{DEFINE} = $probe_res->{DEFINE};
   $opts{INC} = "@inc";
 

-  if ($MM_ver > 6.06) {
-    $opts{AUTHOR} = 'Tony Cook <tonyc@cpan.org>';
-    $opts{ABSTRACT} = 'Win32 font file support for Imager';
-  }
-  

   WriteMakefile(%opts);
 }
 else {
   WriteMakefile(%opts);
 }
 else {

diff --git a/W32/W32.pm b/W32/W32.pm
index 89feecea7dcf80c719aa8a10100e08f7b544ce4b..331006bc1a7eb0a606c08adcc7e9320605947971 100644 (file)
--- a/W32/W32.pm
+++ b/W32/W32.pm
@@ -5,7 +5,7 @@ use vars qw($VERSION @ISA);
 @ISA = qw(Imager::Font);
 
 BEGIN {
 @ISA = qw(Imager::Font);
 
 BEGIN {

-  $VERSION = "0.89";
+  $VERSION = "0.90";

 
   require XSLoader;
   XSLoader::load('Imager::Font::W32', $VERSION);
 
   require XSLoader;
   XSLoader::load('Imager::Font::W32', $VERSION);

diff --git a/t/950-kwalitee/070-mymeta.t b/t/950-kwalitee/070-mymeta.t
new file mode 100644 (file)
index 0000000..1421710
--- /dev/null
+++ b/t/950-kwalitee/070-mymeta.t
@@ -0,0 +1,19 @@
+#!perl -w
+use strict;
+use Test::More;
+plan skip_all => "Only run as part of the dist"
+  unless -f "MYMETA.json";
+eval "use CPAN::Meta 2.110580;";
+plan skip_all => "CPAN::Meta required for testing META.json"
+  if $@;
+plan skip_all => "Only if automated or author testing"
+  unless $ENV{AUTOMATED_TESTING} || -d ".git";
+plan tests => 1;
+
+my $meta;
+unless (ok(eval {
+  $meta = CPAN::Meta->load_file("MYMETA.json",
+                               { lazy_validation => 0 }) },
+          "loaded MYMETA.json successfully")) {
+  diag($@);
+}