Update to 1.41

Add docs

4 files changed, 22 insertions, 92 deletions

diff --git a/databases/p5-DBD-Pg/Makefile b/databases/p5-DBD-Pg/Makefile
index 4ce03272ceba..e3e638b53e14 100644
--- a/databases/p5-DBD-Pg/Makefile
+++ b/databases/p5-DBD-Pg/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	DBD-Pg
-PORTVERSION=	1.40
-PORTREVISION=	1
+PORTVERSION=	1.41
 CATEGORIES=	databases perl5
 MASTER_SITES=	${MASTER_SITE_PERL_CPAN}
 MASTER_SITE_SUBDIR=	DBD
@@ -25,6 +24,15 @@ PERL_CONFIGURE=	yes
 
 MAN3=		DBD::Pg.3
 
+.if !defined(NOPORTDOCS)
+PORTDOCS=	Changes README TODO
+
+post-install:
+	@${MKDIR} ${DOCSDIR}
+	@${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/|} ${DOCSDIR}
+	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+.endif
+
 .include <bsd.port.pre.mk>
 
 .if ${PERL_LEVEL} < 500600
diff --git a/databases/p5-DBD-Pg/distinfo b/databases/p5-DBD-Pg/distinfo
index ac996fb67f9b..57367839e219 100644
--- a/databases/p5-DBD-Pg/distinfo
+++ b/databases/p5-DBD-Pg/distinfo
@@ -1,2 +1,2 @@
-MD5 (DBD-Pg-1.40.tar.gz) = ef28fba65de006dcfb4b94df1fbd8cc4
-SIZE (DBD-Pg-1.40.tar.gz) = 112984
+MD5 (DBD-Pg-1.41.tar.gz) = 3f58b53877954f5a07a08e64f6a67287
+SIZE (DBD-Pg-1.41.tar.gz) = 118975
diff --git a/databases/p5-DBD-Pg/files/patch-11744 b/databases/p5-DBD-Pg/files/patch-11744
deleted file mode 100644
index c65e532a1a9b..000000000000
--- a/databases/p5-DBD-Pg/files/patch-11744
+++ /dev/null
@@ -1,66 +0,0 @@
-===================================================================
-RCS file: /usr/local/cvsroot/dbdpg/dbdpg/dbdimp.c,v
-retrieving revision 1.101
-retrieving revision 1.102
-diff -p --unified=3 -r1.101 -r1.102
---- dbdimp.c	2005/03/11 15:37:31	1.101
-+++ dbdimp.c	2005/03/15 01:51:13	1.102
-@@ -1034,6 +1019,7 @@ void dbd_st_split_statement (sth, imp_st
- 				newph->value = NULL;
- 				newph->quoted = NULL;
- 				newph->referenced = 0;
-+				newph->defaultval = 1;
- 				New(0, newph->fooname, newsize+1, char); /* freed in dbd_st_destroy */
- 				if (!newph->fooname)
- 					croak("No memory");
-@@ -1124,6 +1110,7 @@ void dbd_st_split_statement (sth, imp_st
- 			newph->value = NULL;
- 			newph->quoted = NULL;
- 			newph->referenced = 0;
-+			newph->defaultval = 1;
- 			newph->fooname = NULL;
- 			/* Let the correct segment point to it */
- 			while (!currseg->placeholder)
-@@ -1269,7 +1256,7 @@ int dbd_st_prepare_statement (sth, imp_s
- 			params = imp_sth->numphs;
- 			paramTypes = calloc(imp_sth->numphs, sizeof(*paramTypes));
- 			for (x=0,currph=imp_sth->ph; NULL != currph; currph=currph->nextph) {
--				paramTypes[x++] = currph->bind_type->type_id;
-+				paramTypes[x++] = currph->defaultval ? 0 : currph->bind_type->type_id;
- 			}
- 		}
- 		result = PQprepare(imp_dbh->conn, imp_sth->prepare_name, statement, params, paramTypes);
-@@ -1424,12 +1410,14 @@ int dbd_bind_ph (sth, imp_sth, ph_name,
- 		}
-  	}
- 	else if (NULL == currph->bind_type) { /* "sticky" data type */
-+		/* This is the default type, but we will honor defaultval if we can */
- 		currph->bind_type = pg_type_data(VARCHAROID);
- 		if (!currph->bind_type)
- 			croak("Default type is bad!!!!???");
- 	}
-
- 	if (pg_type || sql_type) {
-+		currph->defaultval = 0;
- 		/* Possible re-prepare, depending on whether the type name also changes */
- 		if (imp_sth->prepared_by_us && NULL != imp_sth->prepare_name)
- 			reprepare=1;
-@@ -1685,7 +1673,7 @@ int dbd_st_execute (sth, imp_sth) /* <=
- 			/* Populate paramTypes */
- 			paramTypes = calloc(imp_sth->numphs, sizeof(*paramTypes));
- 			for (x=0,currph=imp_sth->ph; NULL != currph; currph=currph->nextph) {
--				paramTypes[x++] = currph->bind_type->type_id;
-+				paramTypes[x++] = currph->defaultval ? 0 : currph->bind_type->type_id;
- 			}
-
- 			if (dbis->debug >= 10) {
---- dbdimp.h	2005/03/18 13:10:05	1.1
-+++ dbdimp.h	2005/03/18 13:10:32
-@@ -59,6 +59,7 @@
- 	char  *quoted;              /* quoted version of the value, for PQexec only */
- 	STRLEN quotedlen;           /* length of the quoted value */
- 	bool   referenced;          /* used for PREPARE AS construction */
-+	bool   defaultval;          /* is it using a generic 'default' value? */
- 	sql_type_info_t* bind_type; /* type information for this placeholder */
- 	struct ph_st *nextph;       /* more linked list goodness */
- };
diff --git a/databases/p5-DBD-Pg/files/patch-Makefile.PL b/databases/p5-DBD-Pg/files/patch-Makefile.PL
index 99fab94715ee..99aea72242fb 100644
--- a/databases/p5-DBD-Pg/files/patch-Makefile.PL
+++ b/databases/p5-DBD-Pg/files/patch-Makefile.PL
@@ -1,24 +1,12 @@
---- 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();
+--- Makefile.PL.orig	Tue Apr  5 03:50:36 2005
++++ Makefile.PL	Thu Apr  7 10:34:20 2005
+@@ -83,12 +83,12 @@
+   }
  }
  
--my $comp_opts = $Config{q{ccflags}};
-+my $comp_opts = '';
- if ($major_ver == 7) {
-     if ($minor_ver >= 2) {
-         $comp_opts .= " -DHAVE_PQescapeString";
-@@ -86,7 +85,7 @@
+-my $comp_opts = $Config{q{ccflags}} . " -DPGLIBVERSION=$serverversion";
++my $comp_opts = " -DPGLIBVERSION=$serverversion";
+ 
  my %opts = (
      NAME         => 'DBD::Pg',
      VERSION_FROM => 'Pg.pm',
@@ -26,12 +14,12 @@
 +    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 +93,6 @@
+     AUTHOR       => 'http://gborg.postgresql.org/project/dbdpg/',
+@@ -96,7 +96,6 @@
      PREREQ_PM    => { 'Test::Simple' => '0.17',  # Need Test::More.
                        'Test::Harness' => '2.03', # Need TODO tests.
                      },
 -    CCFLAGS      => $comp_opts,
      PERL_MALLOC_OK => 1,
+     clean        => { FILES => 'trace' },
  );
-