aboutsummaryrefslogtreecommitdiffstats
path: root/databases
diff options
context:
space:
mode:
authorvanilla <vanilla@FreeBSD.org>2001-04-19 13:44:03 +0800
committervanilla <vanilla@FreeBSD.org>2001-04-19 13:44:03 +0800
commit82aaa3b470ae2daa623c1e8c04cd1661ec31c948 (patch)
treece43c45ae0d8d931af46a4082ca7e3310d8f4cd8 /databases
parentf801d6e39d736b3904ccb2a151385ff33cb00442 (diff)
downloadfreebsd-ports-gnome-82aaa3b470ae2daa623c1e8c04cd1661ec31c948.tar.gz
freebsd-ports-gnome-82aaa3b470ae2daa623c1e8c04cd1661ec31c948.tar.zst
freebsd-ports-gnome-82aaa3b470ae2daa623c1e8c04cd1661ec31c948.zip
Add a patch for Pg.pm, and bump version.
Obtained from: scrappy
Diffstat (limited to 'databases')
-rw-r--r--databases/p5-DBD-Pg-13/Makefile14
-rw-r--r--databases/p5-DBD-Pg-13/files/patch-Pg.pm15
-rw-r--r--databases/p5-DBD-Pg/Makefile14
-rw-r--r--databases/p5-DBD-Pg/files/patch-Pg.pm15
4 files changed, 46 insertions, 12 deletions
diff --git a/databases/p5-DBD-Pg-13/Makefile b/databases/p5-DBD-Pg-13/Makefile
index e2a813050f4b..7d49ca266097 100644
--- a/databases/p5-DBD-Pg-13/Makefile
+++ b/databases/p5-DBD-Pg-13/Makefile
@@ -5,23 +5,25 @@
# $FreeBSD$
#
-PORTNAME= DBD-Pg
+PORTNAME= DBD-Pg
PORTVERSION= 0.96
-CATEGORIES= databases perl5
+PORTREVISION= 1
+CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
-MAINTAINER= demon@FreeBSD.org
+MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-CONFIGURE_ENV+= POSTGRES_INCLUDE=${PREFIX}/pgsql/include POSTGRES_LIB=${PREFIX}/pgsql/lib
+CONFIGURE_ENV+= POSTGRES_INCLUDE=${PREFIX}/pgsql/include \
+ POSTGRES_LIB=${PREFIX}/pgsql/lib
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3= DBD::Pg.3 DBD::dbd-pg.3
+MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3= DBD::Pg.3 DBD::dbd-pg.3
.include <bsd.port.mk>
diff --git a/databases/p5-DBD-Pg-13/files/patch-Pg.pm b/databases/p5-DBD-Pg-13/files/patch-Pg.pm
new file mode 100644
index 000000000000..e8d7d4826674
--- /dev/null
+++ b/databases/p5-DBD-Pg-13/files/patch-Pg.pm
@@ -0,0 +1,15 @@
+--- Pg.pm.orig Thu Apr 19 13:39:06 2001
++++ Pg.pm Thu Apr 19 13:40:13 2001
+@@ -82,8 +82,10 @@
+ $user = "" unless defined($user);
+ $auth = "" unless defined($auth);
+
+- $user = $ENV{DBI_USER} unless $user eq "";
+- $auth = $ENV{DBI_PASS} unless $auth eq "";
++ $user ||= $ENV{DBI_USER};
++ $auth ||= $ENV{DBI_PASS};
++ $user ||= "";
++ $auth ||= "";
+
+ my($dbh) = DBI::_new_dbh($drh, {
+ 'Name' => $Name,
diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index e2a813050f4b..7d49ca266097 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -5,23 +5,25 @@
# $FreeBSD$
#
-PORTNAME= DBD-Pg
+PORTNAME= DBD-Pg
PORTVERSION= 0.96
-CATEGORIES= databases perl5
+PORTREVISION= 1
+CATEGORIES= databases perl5
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
MASTER_SITE_SUBDIR= DBD
PKGNAMEPREFIX= p5-
-MAINTAINER= demon@FreeBSD.org
+MAINTAINER= demon@FreeBSD.org
BUILD_DEPENDS= ${LOCALBASE}/lib/perl5/site_perl/${PERL_VER}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
LIB_DEPENDS= pq.2:${PORTSDIR}/databases/postgresql7
RUN_DEPENDS= ${BUILD_DEPENDS}
PERL_CONFIGURE= yes
-CONFIGURE_ENV+= POSTGRES_INCLUDE=${PREFIX}/pgsql/include POSTGRES_LIB=${PREFIX}/pgsql/lib
+CONFIGURE_ENV+= POSTGRES_INCLUDE=${PREFIX}/pgsql/include \
+ POSTGRES_LIB=${PREFIX}/pgsql/lib
-MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
-MAN3= DBD::Pg.3 DBD::dbd-pg.3
+MANPREFIX= ${PREFIX}/lib/perl5/${PERL_VERSION}
+MAN3= DBD::Pg.3 DBD::dbd-pg.3
.include <bsd.port.mk>
diff --git a/databases/p5-DBD-Pg/files/patch-Pg.pm b/databases/p5-DBD-Pg/files/patch-Pg.pm
new file mode 100644
index 000000000000..e8d7d4826674
--- /dev/null
+++ b/databases/p5-DBD-Pg/files/patch-Pg.pm
@@ -0,0 +1,15 @@
+--- Pg.pm.orig Thu Apr 19 13:39:06 2001
++++ Pg.pm Thu Apr 19 13:40:13 2001
+@@ -82,8 +82,10 @@
+ $user = "" unless defined($user);
+ $auth = "" unless defined($auth);
+
+- $user = $ENV{DBI_USER} unless $user eq "";
+- $auth = $ENV{DBI_PASS} unless $auth eq "";
++ $user ||= $ENV{DBI_USER};
++ $auth ||= $ENV{DBI_PASS};
++ $user ||= "";
++ $auth ||= "";
+
+ my($dbh) = DBI::_new_dbh($drh, {
+ 'Name' => $Name,