aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--databases/p5-DBD-Pg-13/Makefile7
-rw-r--r--databases/p5-DBD-Pg-13/distinfo4
-rw-r--r--databases/p5-DBD-Pg-13/files/patch-Makefile.PL28
-rw-r--r--databases/p5-DBD-Pg-13/files/patch-Pg.pm60
-rw-r--r--databases/p5-DBD-Pg-13/pkg-plist1
-rw-r--r--databases/p5-DBD-Pg/Makefile7
-rw-r--r--databases/p5-DBD-Pg/distinfo4
-rw-r--r--databases/p5-DBD-Pg/files/patch-Makefile.PL28
-rw-r--r--databases/p5-DBD-Pg/files/patch-Pg.pm60
-rw-r--r--databases/p5-DBD-Pg/pkg-plist1
10 files changed, 66 insertions, 134 deletions
diff --git a/databases/p5-DBD-Pg-13/Makefile b/databases/p5-DBD-Pg-13/Makefile
index 7de655aaf1e9..ec95af4eb37e 100644
--- a/databases/p5-DBD-Pg-13/Makefile
+++ b/databases/p5-DBD-Pg-13/Makefile
@@ -6,14 +6,13 @@
#
PORTNAME= DBD-Pg
-PORTVERSION= 1.22
-PORTREVISION= 3
+PORTVERSION= 1.32
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
-MAINTAINER= fjoe@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Provides access to PostgreSQL databases through the DBI
LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
@@ -22,7 +21,7 @@ POSTGRESQL_PORT?= databases/postgresql7
PERL_CONFIGURE= yes
-MAN3= DBD::Pg.3 DBD::dbd-pg.3
+MAN3= DBD::Pg.3
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBD-Pg-13/distinfo b/databases/p5-DBD-Pg-13/distinfo
index 17450d3a9bc7..d2d4c830c2b6 100644
--- a/databases/p5-DBD-Pg-13/distinfo
+++ b/databases/p5-DBD-Pg-13/distinfo
@@ -1,2 +1,2 @@
-MD5 (DBD-Pg-1.22.tar.gz) = 2fc355b28ad5c7c05a46bf74fc88dd38
-SIZE (DBD-Pg-1.22.tar.gz) = 80896
+MD5 (DBD-Pg-1.32.tar.gz) = 9d6a936e6f755af677ceef59272a50ac
+SIZE (DBD-Pg-1.32.tar.gz) = 96233
diff --git a/databases/p5-DBD-Pg-13/files/patch-Makefile.PL b/databases/p5-DBD-Pg-13/files/patch-Makefile.PL
new file mode 100644
index 000000000000..55d0ef4802db
--- /dev/null
+++ b/databases/p5-DBD-Pg-13/files/patch-Makefile.PL
@@ -0,0 +1,28 @@
+--- Makefile.PL.orig Wed Sep 15 01:31:24 2004
++++ Makefile.PL Wed Sep 15 01:33:11 2004
+@@ -66,7 +66,7 @@
+ $dbi_arch_dir = dbd_dbi_arch_dir();
+ }
+
+-my $comp_opts = $Config{q{ccflags}};
++my $comp_opts = '';
+ if ($major_ver == 7) {
+ if ($minor_ver >= 2) {
+ $comp_opts .= " -DHAVE_PQescapeString";
+@@ -86,7 +86,7 @@
+ my %opts = (
+ NAME => 'DBD::Pg',
+ VERSION_FROM => 'Pg.pm',
+- INC => "-I$POSTGRES_INCLUDE -I$dbi_arch_dir",
++ INC => "-I$POSTGRES_INCLUDE -I$dbi_arch_dir $comp_opts",
+ 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 @@
+ PREREQ_PM => { 'Test::Simple' => '0.17', # Need Test::More.
+ 'Test::Harness' => '2.03', # Need TODO tests.
+ },
+- CCFLAGS => $comp_opts,
+ PERL_MALLOC_OK => 1,
+ );
+
diff --git a/databases/p5-DBD-Pg-13/files/patch-Pg.pm b/databases/p5-DBD-Pg-13/files/patch-Pg.pm
deleted file mode 100644
index 4998328890de..000000000000
--- a/databases/p5-DBD-Pg-13/files/patch-Pg.pm
+++ /dev/null
@@ -1,60 +0,0 @@
---- ./Pg.pm.orig Tue Aug 12 02:03:06 2003
-+++ ./Pg.pm Tue Aug 12 02:31:41 2003
-@@ -70,8 +70,8 @@
- sub pg_use_catalog {
- my $dbh = shift;
- my $version = DBD::Pg::pg_server_version($dbh);
-- $version =~ /^(\d+\.\d+)/;
-- return $1 < 7.3 ? "" : "pg_catalog.";
-+ $version =~ s/^(\d+\.\d+).*/$1/;
-+ return $version < 7.3 ? "" : "pg_catalog.";
- }
-
- 1;
-@@ -200,6 +200,7 @@
- my $wh = ""; # ();
- $wh = join( " AND ", '', @wh ) if (@wh);
- my $version = DBD::Pg::pg_server_version($dbh);
-+ $version =~ s/^(\d+\.\d+).*/$1/;
- my $showschema = $version < 7.3 ? "NULL::text" : "n.nspname";
- my $schemajoin = $version < 7.3 ? "" : "LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)";
- my $col_info_sql = qq{
-@@ -258,10 +259,10 @@
- my @wh = (); my @dat = (); # Used to hold data for the attributes.
-
- my $version = DBD::Pg::pg_server_version($dbh);
-- $version =~ /^(\d+)\.(\d)/;
-+ $version =~ s/^(\d+\.\d+).*/$1/;
-
- my @flds = qw/catname u.usename bc.relname/;
-- $flds[1] = 'n.nspname' unless ($1.$2 < 73);
-+ $flds[1] = 'n.nspname' unless ($version < 7.3);
-
- for my $idx (0 .. $#attrs) {
- next if ($flds[$idx] eq 'catname'); # Skip catalog
-@@ -600,6 +601,7 @@
- my $tbl_sql = ();
-
- my $version = DBD::Pg::pg_server_version($dbh);
-+ $version =~ s/^(\d+\.\d+).*/$1/;
- my $CATALOG = DBD::Pg::pg_use_catalog($dbh);
-
- if ( # Rules 19a
-@@ -804,6 +806,7 @@
- sub tables {
- my($dbh) = @_;
- my $version = DBD::Pg::pg_server_version($dbh);
-+ $version =~ s/^(\d+\.\d+).*/$1/;
-
- my $SQL = ($version < 7.3) ?
- "SELECT relname AS \"TABLE_NAME\"
-@@ -908,7 +911,8 @@
- # by pg_constraint. To maintain compatibility, check
- # version number and execute appropriate query.
-
-- my $version = pg_server_version( $dbh );
-+ my $version = DBD::Pg::pg_server_version( $dbh );
-+ $version =~ s/^(\d+\.\d+).*/$1/;
-
- my $con_query = $version < 7.3
- ? "SELECT rcsrc FROM pg_relcheck WHERE rcname = '${table}_$col_name'"
diff --git a/databases/p5-DBD-Pg-13/pkg-plist b/databases/p5-DBD-Pg-13/pkg-plist
index b8e59f5aa19b..b01f07e25fb4 100644
--- a/databases/p5-DBD-Pg-13/pkg-plist
+++ b/databases/p5-DBD-Pg-13/pkg-plist
@@ -1,5 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Pg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/dbd-pg.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.so
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index 7de655aaf1e9..ec95af4eb37e 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -6,14 +6,13 @@
#
PORTNAME= DBD-Pg
-PORTVERSION= 1.22
-PORTREVISION= 3
+PORTVERSION= 1.32
CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
-MAINTAINER= fjoe@FreeBSD.org
+MAINTAINER= ports@FreeBSD.org
COMMENT= Provides access to PostgreSQL databases through the DBI
LIB_DEPENDS= pq.3:${PORTSDIR}/${POSTGRESQL_PORT}
@@ -22,7 +21,7 @@ POSTGRESQL_PORT?= databases/postgresql7
PERL_CONFIGURE= yes
-MAN3= DBD::Pg.3 DBD::dbd-pg.3
+MAN3= DBD::Pg.3
.include <bsd.port.pre.mk>
diff --git a/databases/p5-DBD-Pg/distinfo b/databases/p5-DBD-Pg/distinfo
index 17450d3a9bc7..d2d4c830c2b6 100644
--- a/databases/p5-DBD-Pg/distinfo
+++ b/databases/p5-DBD-Pg/distinfo
@@ -1,2 +1,2 @@
-MD5 (DBD-Pg-1.22.tar.gz) = 2fc355b28ad5c7c05a46bf74fc88dd38
-SIZE (DBD-Pg-1.22.tar.gz) = 80896
+MD5 (DBD-Pg-1.32.tar.gz) = 9d6a936e6f755af677ceef59272a50ac
+SIZE (DBD-Pg-1.32.tar.gz) = 96233
diff --git a/databases/p5-DBD-Pg/files/patch-Makefile.PL b/databases/p5-DBD-Pg/files/patch-Makefile.PL
new file mode 100644
index 000000000000..55d0ef4802db
--- /dev/null
+++ b/databases/p5-DBD-Pg/files/patch-Makefile.PL
@@ -0,0 +1,28 @@
+--- Makefile.PL.orig Wed Sep 15 01:31:24 2004
++++ Makefile.PL Wed Sep 15 01:33:11 2004
+@@ -66,7 +66,7 @@
+ $dbi_arch_dir = dbd_dbi_arch_dir();
+ }
+
+-my $comp_opts = $Config{q{ccflags}};
++my $comp_opts = '';
+ if ($major_ver == 7) {
+ if ($minor_ver >= 2) {
+ $comp_opts .= " -DHAVE_PQescapeString";
+@@ -86,7 +86,7 @@
+ my %opts = (
+ NAME => 'DBD::Pg',
+ VERSION_FROM => 'Pg.pm',
+- INC => "-I$POSTGRES_INCLUDE -I$dbi_arch_dir",
++ INC => "-I$POSTGRES_INCLUDE -I$dbi_arch_dir $comp_opts",
+ 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 @@
+ PREREQ_PM => { 'Test::Simple' => '0.17', # Need Test::More.
+ 'Test::Harness' => '2.03', # Need TODO tests.
+ },
+- CCFLAGS => $comp_opts,
+ PERL_MALLOC_OK => 1,
+ );
+
diff --git a/databases/p5-DBD-Pg/files/patch-Pg.pm b/databases/p5-DBD-Pg/files/patch-Pg.pm
deleted file mode 100644
index 4998328890de..000000000000
--- a/databases/p5-DBD-Pg/files/patch-Pg.pm
+++ /dev/null
@@ -1,60 +0,0 @@
---- ./Pg.pm.orig Tue Aug 12 02:03:06 2003
-+++ ./Pg.pm Tue Aug 12 02:31:41 2003
-@@ -70,8 +70,8 @@
- sub pg_use_catalog {
- my $dbh = shift;
- my $version = DBD::Pg::pg_server_version($dbh);
-- $version =~ /^(\d+\.\d+)/;
-- return $1 < 7.3 ? "" : "pg_catalog.";
-+ $version =~ s/^(\d+\.\d+).*/$1/;
-+ return $version < 7.3 ? "" : "pg_catalog.";
- }
-
- 1;
-@@ -200,6 +200,7 @@
- my $wh = ""; # ();
- $wh = join( " AND ", '', @wh ) if (@wh);
- my $version = DBD::Pg::pg_server_version($dbh);
-+ $version =~ s/^(\d+\.\d+).*/$1/;
- my $showschema = $version < 7.3 ? "NULL::text" : "n.nspname";
- my $schemajoin = $version < 7.3 ? "" : "LEFT JOIN pg_catalog.pg_namespace n ON (n.oid = c.relnamespace)";
- my $col_info_sql = qq{
-@@ -258,10 +259,10 @@
- my @wh = (); my @dat = (); # Used to hold data for the attributes.
-
- my $version = DBD::Pg::pg_server_version($dbh);
-- $version =~ /^(\d+)\.(\d)/;
-+ $version =~ s/^(\d+\.\d+).*/$1/;
-
- my @flds = qw/catname u.usename bc.relname/;
-- $flds[1] = 'n.nspname' unless ($1.$2 < 73);
-+ $flds[1] = 'n.nspname' unless ($version < 7.3);
-
- for my $idx (0 .. $#attrs) {
- next if ($flds[$idx] eq 'catname'); # Skip catalog
-@@ -600,6 +601,7 @@
- my $tbl_sql = ();
-
- my $version = DBD::Pg::pg_server_version($dbh);
-+ $version =~ s/^(\d+\.\d+).*/$1/;
- my $CATALOG = DBD::Pg::pg_use_catalog($dbh);
-
- if ( # Rules 19a
-@@ -804,6 +806,7 @@
- sub tables {
- my($dbh) = @_;
- my $version = DBD::Pg::pg_server_version($dbh);
-+ $version =~ s/^(\d+\.\d+).*/$1/;
-
- my $SQL = ($version < 7.3) ?
- "SELECT relname AS \"TABLE_NAME\"
-@@ -908,7 +911,8 @@
- # by pg_constraint. To maintain compatibility, check
- # version number and execute appropriate query.
-
-- my $version = pg_server_version( $dbh );
-+ my $version = DBD::Pg::pg_server_version( $dbh );
-+ $version =~ s/^(\d+\.\d+).*/$1/;
-
- my $con_query = $version < 7.3
- ? "SELECT rcsrc FROM pg_relcheck WHERE rcname = '${table}_$col_name'"
diff --git a/databases/p5-DBD-Pg/pkg-plist b/databases/p5-DBD-Pg/pkg-plist
index b8e59f5aa19b..b01f07e25fb4 100644
--- a/databases/p5-DBD-Pg/pkg-plist
+++ b/databases/p5-DBD-Pg/pkg-plist
@@ -1,5 +1,4 @@
%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Pg.pm
-%%SITE_PERL%%/%%PERL_ARCH%%/DBD/dbd-pg.pod
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/.packlist
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.bs
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.so