Changes 8.3.3:

* Make pg_get_ruledef() parenthesize negative constants (Tom)
  Before this fix, a negative constant in a view or rule might be
  dumped as, say, -42::integer, which is subtly incorrect: it should
  be (-42)::integer due to operator precedence rules. Usually this
  would make little difference, but it could interact with another
  recent patch to cause PostgreSQL to reject what had been a valid
  "SELECT DISTINCT" view query. Since this could result in pg_dump
  output failing to reload, it is being treated as a high-priority
  fix. The only released versions in which dump output is actually
  incorrect are 8.3.1 and 8.2.7.
* Make "ALTER AGGREGATE ... OWNER TO" update pg_shdepend (Tom)
  This oversight could lead to problems if the aggregate was later
  involved in a "DROP OWNED" or "REASSIGN OWNED" operation.

6 files changed, 27 insertions, 52 deletions

diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile
index 27921b9090d..bb9e169f773 100644
--- a/databases/postgresql83-client/Makefile
+++ b/databases/postgresql83-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2008/03/24 18:48:35 rmind Exp $
+# $NetBSD: Makefile,v 1.3 2008/06/20 06:54:42 adam Exp $
 
 PKGNAME=	postgresql83-client-${BASE_VERS}
 COMMENT=	PostgreSQL database client programs
@@ -34,6 +34,7 @@ CONFIGURE_ARGS+=	--enable-thread-safety
 INSTALL_DIRS=	src/include
 INSTALL_DIRS+=	src/interfaces
 INSTALL_DIRS+=	src/bin
+INSTALL_DIRS+=	src/port
 INSTALL_DIRS+=	doc
 
 BUILD_DIRS=	${INSTALL_DIRS}
diff --git a/databases/postgresql83-client/PLIST b/databases/postgresql83-client/PLIST
index a5e076c2762..417e773c7c7 100644
--- a/databases/postgresql83-client/PLIST
+++ b/databases/postgresql83-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/04/05 16:39:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/06/20 06:54:42 adam Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -469,6 +469,7 @@ ${PG_SUBPREFIX}include/sql3types.h
 ${PG_SUBPREFIX}include/sqlca.h
 ${PG_SUBPREFIX}lib/libecpg.la
 ${PG_SUBPREFIX}lib/libecpg_compat.la
+${PG_SUBPREFIX}lib/libpgport.a
 ${PG_SUBPREFIX}lib/libpgtypes.la
 ${PG_SUBPREFIX}lib/libpq.la
 ${PG_SUBPREFIX}man/man1/clusterdb.1
@@ -1195,6 +1196,8 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-16.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-17.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-18.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-19.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-20.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-21.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-4.html
@@ -1211,6 +1214,8 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-12.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-13.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-14.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-15.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-16.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-17.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-4.html
@@ -1223,6 +1228,8 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-10.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-11.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-12.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-13.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-4.html
@@ -1239,8 +1246,12 @@ ${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-8.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-9.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-2.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-3.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 d2316d15683..6c503c9ef68 100644
--- a/databases/postgresql83-server/PLIST
+++ b/databases/postgresql83-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2008/04/05 16:39:27 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2008/06/20 06:54:42 adam Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
@@ -130,6 +130,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/La_Rioja
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Mendoza
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Rio_Gallegos
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/San_Juan
+${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/San_Luis
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Tucuman
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Argentina/Ushuaia
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Aruba
@@ -306,6 +307,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Dubai
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Dushanbe
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Gaza
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Harbin
+${PG_SUBPREFIX}share/postgresql/timezone/Asia/Ho_Chi_Minh
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Hong_Kong
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Hovd
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Irkutsk
@@ -318,6 +320,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kamchatka
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Karachi
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kashgar
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Katmandu
+${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kolkata
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Krasnoyarsk
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kuala_Lumpur
 ${PG_SUBPREFIX}share/postgresql/timezone/Asia/Kuching
diff --git a/databases/postgresql83/Makefile.common b/databases/postgresql83/Makefile.common
index 55a72cd6840..3fcb8b83887 100644
--- a/databases/postgresql83/Makefile.common
+++ b/databases/postgresql83/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2008/04/05 16:39:26 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2008/06/20 06:54:42 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.1
+DIST_VERS?=		8.3.3
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql83-client+=	postgresql83-client>=${BASE_VERS}
diff --git a/databases/postgresql83/distinfo b/databases/postgresql83/distinfo
index 8eebe9915e5..71470230fd9 100644
--- a/databases/postgresql83/distinfo
+++ b/databases/postgresql83/distinfo
@@ -1,10 +1,10 @@
-$NetBSD: distinfo,v 1.2 2008/04/05 16:39:27 adam Exp $
+$NetBSD: distinfo,v 1.3 2008/06/20 06:54:42 adam Exp $
 
-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 (postgresql-8.3.3.tar.bz2) = b933f26a70bef9a5971c0ff2f392e293eed138b2
+RMD160 (postgresql-8.3.3.tar.bz2) = 8cc31cae862e328c8372245c8f953a1773dcc1f8
+Size (postgresql-8.3.3.tar.bz2) = 14004538 bytes
 SHA1 (patch-aa) = a7112ce2e9fc28f638afcf2e196d3cdc0f4c254d
-SHA1 (patch-ab) = 8bc81e1f95cf8933a4da2e557539764054b51f5f
+SHA1 (patch-ab) = 61ed51b483b84c3ca88f8955713dff27f9070a6c
 SHA1 (patch-ac) = 8e3a7021fdd01810d4ebcbd20002b28164b22279
 SHA1 (patch-ad) = 5612e447bbb76e81f72d39ad0153b9f77d47f653
 SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6
diff --git a/databases/postgresql83/patches/patch-ab b/databases/postgresql83/patches/patch-ab
index c4ba986e814..2017473b549 100644
--- a/databases/postgresql83/patches/patch-ab
+++ b/databases/postgresql83/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2008/04/05 16:39:27 adam Exp $
+$NetBSD: patch-ab,v 1.3 2008/06/20 06:54:42 adam Exp $
 
---- configure.orig	2008-03-14 04:23:21.000000000 +0100
+--- configure.orig	2008-06-09 02:38:40.000000000 +0200
 +++ configure
 @@ -1510,6 +1510,7 @@ case $host_os in
    darwin*) template=darwin ;;
@@ -21,43 +21,3 @@ $NetBSD: patch-ab,v 1.2 2008/04/05 16:39:27 adam Exp $
  echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
  echo "${ECHO_T}$perl_embed_ldflags" >&6
  fi
-@@ -24263,16 +24262,12 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char gettext ();
-+#include <libintl.h>
-+
- int
- main ()
- {
--gettext ();
-+gettext ("");
-   ;
-   return 0;
- }
-@@ -24318,16 +24313,12 @@ cat >>conftest.$ac_ext <<_ACEOF
- /* end confdefs.h.  */
- 
- /* Override any gcc2 internal prototype to avoid an error.  */
--#ifdef __cplusplus
--extern "C"
--#endif
--/* We use char because int might match the return type of a gcc2
--   builtin and then its argument prototype would still apply.  */
--char gettext ();
-+#include <libintl.h>
-+
- int
- main ()
- {
--gettext ();
-+gettext ("");
-   ;
-   return 0;
- }