mirror of
https://git.FreeBSD.org/ports.git
synced 2025-01-27 10:03:20 +00:00
Update to 1.40
Require at least perl 5.6
This commit is contained in:
parent
e79c59c3fd
commit
57af09bfae
Notes:
svn2git
2021-03-31 03:12:20 +00:00
svn path=/head/; revision=130208
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= DBD-Pg
|
||||
PORTVERSION= 1.32
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.40
|
||||
CATEGORIES= databases perl5
|
||||
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
|
||||
MASTER_SITE_SUBDIR= DBD
|
||||
@ -16,6 +15,9 @@ PKGNAMEPREFIX= p5-
|
||||
MAINTAINER= perl@FreeBSD.org
|
||||
COMMENT= Provides access to PostgreSQL databases through the DBI
|
||||
|
||||
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
|
||||
USE_PGSQL= yes
|
||||
|
||||
PERL_CONFIGURE= yes
|
||||
@ -25,14 +27,7 @@ MAN3= DBD::Pg.3
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.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
|
||||
IGNORE= Needs DBI 1.38 which needs perl 5.6, install lang/perl5.8 and try again
|
||||
.endif
|
||||
|
||||
PG_CONFIG= ${LOCALBASE}/bin/pg_config
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (DBD-Pg-1.32.tar.gz) = 9d6a936e6f755af677ceef59272a50ac
|
||||
SIZE (DBD-Pg-1.32.tar.gz) = 96233
|
||||
MD5 (DBD-Pg-1.40.tar.gz) = ef28fba65de006dcfb4b94df1fbd8cc4
|
||||
SIZE (DBD-Pg-1.40.tar.gz) = 112984
|
||||
|
@ -1,14 +0,0 @@
|
||||
diff -ru dbdimp.c~ dbdimp.c
|
||||
--- dbdimp.c~ Sun Jan 2 20:01:43 2005
|
||||
+++ dbdimp.c Sun Jan 2 20:06:16 2005
|
||||
@@ -986,7 +986,9 @@
|
||||
int num_fields;
|
||||
char *value;
|
||||
char *p;
|
||||
- int i, pg_type, value_len, chopblanks, len;
|
||||
+ int i, pg_type, chopblanks;
|
||||
+ size_t value_len;
|
||||
+ STRLEN len;
|
||||
AV *av;
|
||||
D_imp_dbh_from_sth;
|
||||
|
@ -1,78 +0,0 @@
|
||||
diff -ru quote.c~ quote.c
|
||||
--- quote.c~ Sun Jan 2 20:01:43 2005
|
||||
+++ quote.c Sun Jan 2 20:04:39 2005
|
||||
@@ -9,7 +9,7 @@
|
||||
{
|
||||
const char *source = from;
|
||||
char *target = to;
|
||||
- unsigned int remaining = length;
|
||||
+ unsigned size_t remaining = length;
|
||||
|
||||
while (remaining > 0)
|
||||
{
|
||||
@@ -146,9 +146,9 @@
|
||||
unsigned char *
|
||||
PQunescapeBytea2(const unsigned char *strtext, size_t *retbuflen)
|
||||
{
|
||||
- size_t strtextlen, buflen;
|
||||
+ size_t strtextlen, buflen, i, j;
|
||||
unsigned char *buffer, *tmpbuf;
|
||||
- int i, j, byte;
|
||||
+ int byte;
|
||||
|
||||
if (strtext == NULL) {
|
||||
return NULL;
|
||||
@@ -393,7 +393,7 @@
|
||||
{
|
||||
char *result;
|
||||
char *dest;
|
||||
- int max_len = 0, i;
|
||||
+ size_t max_len = 0, i;
|
||||
|
||||
/* We are going to retun a quote_bytea() for backwards compat but
|
||||
we warn first */
|
||||
@@ -483,7 +483,7 @@
|
||||
void
|
||||
dequote_char(string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
/* TODO: chop_blanks if requested */
|
||||
*retlen = strlen(string);
|
||||
@@ -493,7 +493,7 @@
|
||||
void
|
||||
dequote_varchar (string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
*retlen = strlen(string);
|
||||
}
|
||||
@@ -503,7 +503,7 @@
|
||||
void
|
||||
dequote_bytea(string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
char *s, *p;
|
||||
int c1,c2,c3;
|
||||
@@ -542,7 +542,7 @@
|
||||
void
|
||||
dequote_sql_binary (string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
/* We are going to retun a dequote_bytea(), JIC */
|
||||
warn("Use of SQL_BINARY invalid in dequote()");
|
||||
@@ -556,7 +556,7 @@
|
||||
void
|
||||
dequote_bool (string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
switch(*string){
|
||||
case 'f': *string = '0'; break;
|
@ -1,3 +1,4 @@
|
||||
@comment $FreeBSD$
|
||||
%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Pg.pm
|
||||
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/.packlist
|
||||
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.bs
|
||||
|
@ -6,8 +6,7 @@
|
||||
#
|
||||
|
||||
PORTNAME= DBD-Pg
|
||||
PORTVERSION= 1.32
|
||||
PORTREVISION= 1
|
||||
PORTVERSION= 1.40
|
||||
CATEGORIES= databases perl5
|
||||
MASTER_SITES= ${MASTER_SITE_PERL_CPAN}
|
||||
MASTER_SITE_SUBDIR= DBD
|
||||
@ -16,6 +15,9 @@ PKGNAMEPREFIX= p5-
|
||||
MAINTAINER= perl@FreeBSD.org
|
||||
COMMENT= Provides access to PostgreSQL databases through the DBI
|
||||
|
||||
BUILD_DEPENDS= ${SITE_PERL}/${PERL_ARCH}/DBI.pm:${PORTSDIR}/databases/p5-DBI
|
||||
RUN_DEPENDS= ${BUILD_DEPENDS}
|
||||
|
||||
USE_PGSQL= yes
|
||||
|
||||
PERL_CONFIGURE= yes
|
||||
@ -25,14 +27,7 @@ MAN3= DBD::Pg.3
|
||||
.include <bsd.port.pre.mk>
|
||||
|
||||
.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
|
||||
IGNORE= Needs DBI 1.38 which needs perl 5.6, install lang/perl5.8 and try again
|
||||
.endif
|
||||
|
||||
PG_CONFIG= ${LOCALBASE}/bin/pg_config
|
||||
|
@ -1,2 +1,2 @@
|
||||
MD5 (DBD-Pg-1.32.tar.gz) = 9d6a936e6f755af677ceef59272a50ac
|
||||
SIZE (DBD-Pg-1.32.tar.gz) = 96233
|
||||
MD5 (DBD-Pg-1.40.tar.gz) = ef28fba65de006dcfb4b94df1fbd8cc4
|
||||
SIZE (DBD-Pg-1.40.tar.gz) = 112984
|
||||
|
@ -1,14 +0,0 @@
|
||||
diff -ru dbdimp.c~ dbdimp.c
|
||||
--- dbdimp.c~ Sun Jan 2 20:01:43 2005
|
||||
+++ dbdimp.c Sun Jan 2 20:06:16 2005
|
||||
@@ -986,7 +986,9 @@
|
||||
int num_fields;
|
||||
char *value;
|
||||
char *p;
|
||||
- int i, pg_type, value_len, chopblanks, len;
|
||||
+ int i, pg_type, chopblanks;
|
||||
+ size_t value_len;
|
||||
+ STRLEN len;
|
||||
AV *av;
|
||||
D_imp_dbh_from_sth;
|
||||
|
@ -1,78 +0,0 @@
|
||||
diff -ru quote.c~ quote.c
|
||||
--- quote.c~ Sun Jan 2 20:01:43 2005
|
||||
+++ quote.c Sun Jan 2 20:04:39 2005
|
||||
@@ -9,7 +9,7 @@
|
||||
{
|
||||
const char *source = from;
|
||||
char *target = to;
|
||||
- unsigned int remaining = length;
|
||||
+ unsigned size_t remaining = length;
|
||||
|
||||
while (remaining > 0)
|
||||
{
|
||||
@@ -146,9 +146,9 @@
|
||||
unsigned char *
|
||||
PQunescapeBytea2(const unsigned char *strtext, size_t *retbuflen)
|
||||
{
|
||||
- size_t strtextlen, buflen;
|
||||
+ size_t strtextlen, buflen, i, j;
|
||||
unsigned char *buffer, *tmpbuf;
|
||||
- int i, j, byte;
|
||||
+ int byte;
|
||||
|
||||
if (strtext == NULL) {
|
||||
return NULL;
|
||||
@@ -393,7 +393,7 @@
|
||||
{
|
||||
char *result;
|
||||
char *dest;
|
||||
- int max_len = 0, i;
|
||||
+ size_t max_len = 0, i;
|
||||
|
||||
/* We are going to retun a quote_bytea() for backwards compat but
|
||||
we warn first */
|
||||
@@ -483,7 +483,7 @@
|
||||
void
|
||||
dequote_char(string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
/* TODO: chop_blanks if requested */
|
||||
*retlen = strlen(string);
|
||||
@@ -493,7 +493,7 @@
|
||||
void
|
||||
dequote_varchar (string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
*retlen = strlen(string);
|
||||
}
|
||||
@@ -503,7 +503,7 @@
|
||||
void
|
||||
dequote_bytea(string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
char *s, *p;
|
||||
int c1,c2,c3;
|
||||
@@ -542,7 +542,7 @@
|
||||
void
|
||||
dequote_sql_binary (string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
/* We are going to retun a dequote_bytea(), JIC */
|
||||
warn("Use of SQL_BINARY invalid in dequote()");
|
||||
@@ -556,7 +556,7 @@
|
||||
void
|
||||
dequote_bool (string, retlen)
|
||||
char *string;
|
||||
- int *retlen;
|
||||
+ size_t *retlen;
|
||||
{
|
||||
switch(*string){
|
||||
case 'f': *string = '0'; break;
|
@ -1,3 +1,4 @@
|
||||
@comment $FreeBSD$
|
||||
%%SITE_PERL%%/%%PERL_ARCH%%/DBD/Pg.pm
|
||||
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/.packlist
|
||||
%%SITE_PERL%%/%%PERL_ARCH%%/auto/DBD/Pg/Pg.bs
|
||||
|
Loading…
Reference in New Issue
Block a user