1
0
mirror of https://git.FreeBSD.org/ports.git synced 2025-01-11 07:22:22 +00:00

- Update to 1.32.

- - - - - - - - - Reset MAINTAINER to ports@.
This commit is contained in:
Max Khon 2004-10-12 07:41:14 +00:00
parent 08a10fb4a8
commit f11c2b778e
Notes: svn2git 2021-03-31 03:12:20 +00:00
svn path=/head/; revision=118850
10 changed files with 66 additions and 134 deletions

View File

@ -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>

View File

@ -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

View File

@ -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,
);

View File

@ -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'"

View File

@ -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

View File

@ -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>

View File

@ -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

View File

@ -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,
);

View File

@ -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'"

View File

@ -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