Make it work for perl 5.005_03

Pointed out by:	kris
Pointy hat to:	fjoe

4 files changed, 34 insertions, 10 deletions

diff --git a/databases/p5-DBD-Pg-13/Makefile b/databases/p5-DBD-Pg-13/Makefile
index 4e34e4817ffd..cbe0533a378f 100644
--- a/databases/p5-DBD-Pg-13/Makefile
+++ b/databases/p5-DBD-Pg-13/Makefile
@@ -28,6 +28,9 @@ MAN3=		DBD::Pg.3
 .if ${PERL_LEVEL} < 500600
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
+post-patch:
+	@${PERL} -i -pe '$$_ = "" if /5.006001/' \
+		${WRKSRC}/Pg.pm ${WRKSRC}/Makefile.PL
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
diff --git a/databases/p5-DBD-Pg-13/files/patch-Makefile.PL b/databases/p5-DBD-Pg-13/files/patch-Makefile.PL
index 55d0ef4802db..99fab94715ee 100644
--- a/databases/p5-DBD-Pg-13/files/patch-Makefile.PL
+++ b/databases/p5-DBD-Pg-13/files/patch-Makefile.PL
@@ -1,6 +1,15 @@
---- Makefile.PL.orig	Wed Sep 15 01:31:24 2004
-+++ Makefile.PL	Wed Sep 15 01:33:11 2004
-@@ -66,7 +66,7 @@
+--- Makefile.PL.orig	Thu Feb 19 04:46:40 2004
++++ Makefile.PL	Fri Oct 15 13:25:34 2004
+@@ -33,7 +32,7 @@
+ require App::Info::Handler::Prompt;
+ my $p = App::Info::Handler::Prompt->new;
+ my $pg = App::Info::RDBMS::PostgreSQL->new(on_unknown => $p);
+-my ($major_ver, $minor_ver, $patch) = map {$pg->$_} qw/major_version minor_version patch_version/;
++my ($major_ver, $minor_ver, $patch) = map {$pg->$_()} qw/major_version minor_version patch_version/;
+ 
+ if ((!$ENV{POSTGRES_INCLUDE} or !$ENV{POSTGRES_LIB}) and !$ENV{POSTGRES_HOME}) {
+     $POSTGRES_INCLUDE = $pg->inc_dir;
+@@ -66,7 +65,7 @@
    $dbi_arch_dir = dbd_dbi_arch_dir();
  }
  
@@ -9,7 +18,7 @@
  if ($major_ver == 7) {
      if ($minor_ver >= 2) {
          $comp_opts .= " -DHAVE_PQescapeString";
-@@ -86,7 +86,7 @@
+@@ -86,7 +85,7 @@
  my %opts = (
      NAME         => 'DBD::Pg',
      VERSION_FROM => 'Pg.pm',
@@ -18,7 +27,7 @@
      OBJECT       => "Pg\$(OBJ_EXT) dbdimp\$(OBJ_EXT) quote\$(OBJ_EXT) types\$(OBJ_EXT)",
      LIBS         => ["-L$POSTGRES_LIB -lpq"],
      AUTHOR       => 'http://gborg.postgresql.org/project/dbdpg/projdisplay.php',
-@@ -94,7 +94,6 @@
+@@ -94,7 +93,6 @@
      PREREQ_PM    => { 'Test::Simple' => '0.17',  # Need Test::More.
                        'Test::Harness' => '2.03', # Need TODO tests.
                      },
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index 4e34e4817ffd..cbe0533a378f 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -28,6 +28,9 @@ MAN3=		DBD::Pg.3
 .if ${PERL_LEVEL} < 500600
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI-137
+post-patch:
+	@${PERL} -i -pe '$$_ = "" if /5.006001/' \
+		${WRKSRC}/Pg.pm ${WRKSRC}/Makefile.PL
 .else
 BUILD_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
 RUN_DEPENDS+=	${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
diff --git a/databases/p5-DBD-Pg/files/patch-Makefile.PL b/databases/p5-DBD-Pg/files/patch-Makefile.PL
index 55d0ef4802db..99fab94715ee 100644
--- a/databases/p5-DBD-Pg/files/patch-Makefile.PL
+++ b/databases/p5-DBD-Pg/files/patch-Makefile.PL
@@ -1,6 +1,15 @@
---- Makefile.PL.orig	Wed Sep 15 01:31:24 2004
-+++ Makefile.PL	Wed Sep 15 01:33:11 2004
-@@ -66,7 +66,7 @@
+--- Makefile.PL.orig	Thu Feb 19 04:46:40 2004
++++ Makefile.PL	Fri Oct 15 13:25:34 2004
+@@ -33,7 +32,7 @@
+ require App::Info::Handler::Prompt;
+ my $p = App::Info::Handler::Prompt->new;
+ my $pg = App::Info::RDBMS::PostgreSQL->new(on_unknown => $p);
+-my ($major_ver, $minor_ver, $patch) = map {$pg->$_} qw/major_version minor_version patch_version/;
++my ($major_ver, $minor_ver, $patch) = map {$pg->$_()} qw/major_version minor_version patch_version/;
+ 
+ if ((!$ENV{POSTGRES_INCLUDE} or !$ENV{POSTGRES_LIB}) and !$ENV{POSTGRES_HOME}) {
+     $POSTGRES_INCLUDE = $pg->inc_dir;
+@@ -66,7 +65,7 @@
    $dbi_arch_dir = dbd_dbi_arch_dir();
  }
  
@@ -9,7 +18,7 @@
  if ($major_ver == 7) {
      if ($minor_ver >= 2) {
          $comp_opts .= " -DHAVE_PQescapeString";
-@@ -86,7 +86,7 @@
+@@ -86,7 +85,7 @@
  my %opts = (
      NAME         => 'DBD::Pg',
      VERSION_FROM => 'Pg.pm',
@@ -18,7 +27,7 @@
      OBJECT       => "Pg\$(OBJ_EXT) dbdimp\$(OBJ_EXT) quote\$(OBJ_EXT) types\$(OBJ_EXT)",
      LIBS         => ["-L$POSTGRES_LIB -lpq"],
      AUTHOR       => 'http://gborg.postgresql.org/project/dbdpg/projdisplay.php',
-@@ -94,7 +94,6 @@
+@@ -94,7 +93,6 @@
      PREREQ_PM    => { 'Test::Simple' => '0.17',  # Need Test::More.
                        'Test::Harness' => '2.03', # Need TODO tests.
                      },