Changes 8.3.1:

* Fix character string comparison for Windows locales that consider
  different character combinations as equal
* Repair corner-case bugs in "VACUUM FULL"
* Fix misbehavior of foreign key checks involving character or bit
  columns
* Avoid needless deadlock failures in no-op foreign-key checks
* Fix possible core dump when re-planning a prepared query
* Fix possible failure when re-planning a query that calls an
  SPI-using function
* Fix failure in row-wise comparisons involving columns of different
  datatypes
* Fix longstanding "LISTEN"/"NOTIFY" race condition
* Disallow "LISTEN" and "UNLISTEN" within a prepared transaction
* Disallow dropping a temporary table within a prepared transaction
* Fix rare crash when an error occurs during a query using a hash
  index
* Fix incorrect comparison of tsquery values
* Fix incorrect behavior of LIKE with non-ASCII characters in
  single-byte encodings
* Disable xmlvalidate

6 files changed, 24 insertions, 22 deletions

diff --git a/databases/postgresql83-client/PLIST b/databases/postgresql83-client/PLIST
index b94b6bd1351..a5e076c2762 100644
--- a/databases/postgresql83-client/PLIST
+++ b/databases/postgresql83-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/04 12:42:56 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/05 16:39:27 adam Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -1238,7 +1238,9 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-5.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-6.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-7.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/resources.html
diff --git a/databases/postgresql83-server/PLIST b/databases/postgresql83-server/PLIST
index 30445ff318c..d2316d15683 100644
--- a/databases/postgresql83-server/PLIST
+++ b/databases/postgresql83-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2008/03/04 12:43:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2008/04/05 16:39:27 adam Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
@@ -41,6 +41,7 @@ ${PG_SUBPREFIX}share/locale/it/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/ko/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/nb/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/nl/LC_MESSAGES/postgres.mo
+${PG_SUBPREFIX}share/locale/pl/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/pt_BR/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/ro/LC_MESSAGES/postgres.mo
 ${PG_SUBPREFIX}share/locale/ru/LC_MESSAGES/postgres.mo
diff --git a/databases/postgresql83/Makefile.common b/databases/postgresql83/Makefile.common
index 9ba1dec4f53..55a72cd6840 100644
--- a/databases/postgresql83/Makefile.common
+++ b/databases/postgresql83/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1.1.1 2008/03/04 12:41:36 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2008/04/05 16:39:26 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -37,7 +37,7 @@ PATCHDIR?=		${.CURDIR}/../postgresql83/patches
 #
 # Note: Do not forget jdbc-postgresql83 when updating version
 #
-DIST_VERS?=		8.3.0
+DIST_VERS?=		8.3.1
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql83-client+=	postgresql83-client>=${BASE_VERS}
diff --git a/databases/postgresql83/distinfo b/databases/postgresql83/distinfo
index ed5e5518dc3..8eebe9915e5 100644
--- a/databases/postgresql83/distinfo
+++ b/databases/postgresql83/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.1.1.1 2008/03/04 12:41:36 adam Exp $
+$NetBSD: distinfo,v 1.2 2008/04/05 16:39:27 adam Exp $
 
-SHA1 (postgresql-8.3.0.tar.bz2) = b221e9a82fdb10af1a2b527551a4e30b7ccb958d
-RMD160 (postgresql-8.3.0.tar.bz2) = 99f48d26d9b0fb0cfda0de7156ad6a9554017d9e
-Size (postgresql-8.3.0.tar.bz2) = 13923051 bytes
+SHA1 (postgresql-8.3.1.tar.bz2) = 7397e0d8fd3c420ee845d9ae4995ae347bfaea1d
+RMD160 (postgresql-8.3.1.tar.bz2) = 075efb67126f2b308d2a5fe4f9097fdbfbe94c89
+Size (postgresql-8.3.1.tar.bz2) = 13995572 bytes
 SHA1 (patch-aa) = a7112ce2e9fc28f638afcf2e196d3cdc0f4c254d
-SHA1 (patch-ab) = 205e4540767f91c6ce6d509bf71516989feef93d
+SHA1 (patch-ab) = 8bc81e1f95cf8933a4da2e557539764054b51f5f
 SHA1 (patch-ac) = 8e3a7021fdd01810d4ebcbd20002b28164b22279
-SHA1 (patch-ad) = 471ebd457a3e560766321eefdcd7df26b6e2d4b9
+SHA1 (patch-ad) = 5612e447bbb76e81f72d39ad0153b9f77d47f653
 SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6
 SHA1 (patch-af) = fcb43276c1f3349f62acfc37ac0bd6ccaae96f29
 SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
diff --git a/databases/postgresql83/patches/patch-ab b/databases/postgresql83/patches/patch-ab
index fe742a37bde..c4ba986e814 100644
--- a/databases/postgresql83/patches/patch-ab
+++ b/databases/postgresql83/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
+$NetBSD: patch-ab,v 1.2 2008/04/05 16:39:27 adam Exp $
 
---- configure.orig	2008-02-01 05:16:29.000000000 +0100
+--- configure.orig	2008-03-14 04:23:21.000000000 +0100
 +++ configure
 @@ -1510,6 +1510,7 @@ case $host_os in
    darwin*) template=darwin ;;
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
      hpux*) template=hpux ;;
      irix*) template=irix ;;
   linux*|gnu*|k*bsd*-gnu)
-@@ -5280,9 +5281,7 @@ echo "${ECHO_T}$perl_useshrplib" >&6
+@@ -5334,9 +5335,7 @@ echo "${ECHO_T}$perl_useshrplib" >&6
  
  echo "$as_me:$LINENO: checking for flags to link embedded Perl" >&5
  echo $ECHO_N "checking for flags to link embedded Perl... $ECHO_C" >&6
@@ -21,7 +21,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
  echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
  echo "${ECHO_T}$perl_embed_ldflags" >&6
  fi
-@@ -24190,16 +24189,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24263,16 +24262,12 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  /* Override any gcc2 internal prototype to avoid an error.  */
@@ -41,7 +41,7 @@ $NetBSD: patch-ab,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
    ;
    return 0;
  }
-@@ -24245,16 +24240,12 @@ cat >>conftest.$ac_ext <<_ACEOF
+@@ -24318,16 +24313,12 @@ cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
  /* Override any gcc2 internal prototype to avoid an error.  */
diff --git a/databases/postgresql83/patches/patch-ad b/databases/postgresql83/patches/patch-ad
index 4688dc1f498..5af77647bb6 100644
--- a/databases/postgresql83/patches/patch-ad
+++ b/databases/postgresql83/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
+$NetBSD: patch-ad,v 1.2 2008/04/05 16:39:27 adam Exp $
 
---- src/backend/port/dynloader/netbsd.c.orig	2007-03-26 23:44:11.000000000 +0200
+--- src/backend/port/dynloader/netbsd.c.orig	2008-04-05 10:45:52.000000000 +0200
 +++ src/backend/port/dynloader/netbsd.c
-@@ -42,65 +42,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
+@@ -42,64 +42,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
  
  #include "dynloader.h"
  
@@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
 -BSD44_derived_dlopen(const char *file, int num)
 +pg_dlopen(const char *file, int num)
  {
--#if defined(__mips__)
+-#if !defined(HAVE_DLOPEN)
 -	snprintf(error_message, sizeof(error_message),
 -			 "dlopen (%s) not supported", file);
 +	elog(ERROR, "dynamic load not supported");
@@ -44,7 +44,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
 -BSD44_derived_dlsym(void *handle, const char *name)
 +pg_dlsym(void *handle, const char *name)
  {
--#if defined(__mips__)
+-#if !defined(HAVE_DLOPEN)
 -	snprintf(error_message, sizeof(error_message),
 -			 "dlsym (%s) failed", name);
  	return NULL;
@@ -70,8 +70,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
 -BSD44_derived_dlclose(void *handle)
 +pg_dlclose(void *handle)
  {
--#if defined(__mips__)
--#else
+-#if defined(HAVE_DLOPEN)
 -	dlclose(handle);
 -#endif
  }