Upgrade to 7.1.1

PR:		ports/27220
Submitted by:	maintainer

4 files changed, 43 insertions, 9 deletions

diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 28d8705..0cc0107 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	postgresql
-PORTVERSION=	7.1
-PORTREVISION=	2
+PORTVERSION=	7.1.1
 CATEGORIES=	databases
 MASTER_SITES=	ftp://ftp.iodynamics.com/pub/mirror/postgresql/%SUBDIR%/ \
 		ftp://ftp.postgresql.org/pub/%SUBDIR%/ \
diff --git a/databases/postgresql83-server/distinfo b/databases/postgresql83-server/distinfo
index bdec3e13..c4ab6e2 100644
--- a/databases/postgresql83-server/distinfo
+++ b/databases/postgresql83-server/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/postgresql-base-7.1.tar.gz) = fce51e036ea8aadafe42f35841e50cc6
-MD5 (postgresql/postgresql-opt-7.1.tar.gz) = dca8a70020caab1024afe4d0f203fef1
-MD5 (postgresql/postgresql-docs-7.1.tar.gz) = 8fd7a862909663a6034d4aeb70ea7b71
+MD5 (postgresql/postgresql-base-7.1.1.tar.gz) = 7f579a6274d5b5e251b256c7525f861b
+MD5 (postgresql/postgresql-opt-7.1.1.tar.gz) = 3b06dc74de6721a3fcd7c9d8c4c0bce8
+MD5 (postgresql/postgresql-docs-7.1.1.tar.gz) = 9daf2d044b0805aa2d47df769cfa4069
diff --git a/databases/postgresql83-server/files/patch-jdbc-getdate b/databases/postgresql83-server/files/patch-jdbc-getdate
new file mode 100644
index 0000000..744407a
--- /dev/null
+++ b/databases/postgresql83-server/files/patch-jdbc-getdate
@@ -0,0 +1,34 @@
+--- src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java~	Fri Feb 23 19:12:23 2001
++++ src/interfaces/jdbc/org/postgresql/jdbc2/ResultSet.java	Wed May  9 04:31:11 2001
+@@ -423,8 +423,13 @@
+     String s = getString(columnIndex);
+     if(s==null)
+       return null;
+-
+-    return java.sql.Date.valueOf(s);
++    // length == 10: SQL Date
++    // length >  10: SQL Timestamp, assumes PGDATESTYLE=ISO
++    try {
++      return java.sql.Date.valueOf((s.length() == 10) ? s : s.substring(0,10));
++    } catch (NumberFormatException e) {
++      throw new PSQLException("postgresql.res.baddate", s);
++    }
+   }
+ 
+   /**
+@@ -441,8 +446,13 @@
+ 
+     if(s==null)
+       return null; // SQL NULL
+-
+-    return java.sql.Time.valueOf(s);
++    // length == 8: SQL Time
++    // length >  8: SQL Timestamp
++    try {
++      return java.sql.Time.valueOf((s.length() == 8) ? s : s.substring(11,19));
++    } catch (NumberFormatException e) {
++      throw new PSQLException("postgresql.res.badtime",s);
++    }
+   }
+ 
+   /**
diff --git a/databases/postgresql83-server/pkg-plist.doc b/databases/postgresql83-server/pkg-plist.doc
index 34366ce..5f13201 100644
--- a/databases/postgresql83-server/pkg-plist.doc
+++ b/databases/postgresql83-server/pkg-plist.doc
@@ -152,12 +152,12 @@ share/doc/postgresql/html/libpqpp-copy.html
 share/doc/postgresql/html/libpqpp-exec.html
 share/doc/postgresql/html/libpqpp-notify.html
 share/doc/postgresql/html/lisp.html
-share/doc/postgresql/html/ln11307.html
+share/doc/postgresql/html/ln11330.html
 share/doc/postgresql/html/ln1274.html
-share/doc/postgresql/html/ln15103.html
+share/doc/postgresql/html/ln15154.html
 share/doc/postgresql/html/ln24.html
-share/doc/postgresql/html/ln24896.html
-share/doc/postgresql/html/ln37046.html
+share/doc/postgresql/html/ln24983.html
+share/doc/postgresql/html/ln37149.html
 share/doc/postgresql/html/ln8.html
 share/doc/postgresql/html/lo-funcs.html
 share/doc/postgresql/html/lo-implementation.html
@@ -471,6 +471,7 @@ share/doc/postgresql/html/user.html
 share/doc/postgresql/html/wal-configuration.html
 share/doc/postgresql/html/wal-implementation.html
 share/doc/postgresql/html/wal.html
+share/doc/postgresql/html/x14487.html
 share/doc/postgresql/html/xact-read-committed.html
 share/doc/postgresql/html/xact-serializable.html
 share/doc/postgresql/html/xaggr.html