From 17f2c6bafd50e81c0ef8aa39d3e01e1e2ef05d42 Mon Sep 17 00:00:00 2001
From: adam <adam>
Date: Fri, 20 Jun 2008 08:27:57 +0000
Subject: Changes 8.1.13: * 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.

---
 databases/postgresql81-client/Makefile   |  4 ++--
 databases/postgresql81-client/PLIST      |  9 ++++++++-
 databases/postgresql81-plperl/Makefile   |  4 ++--
 databases/postgresql81-plpython/Makefile |  3 +--
 databases/postgresql81-pltcl/Makefile    |  3 +--
 databases/postgresql81-server/Makefile   |  3 +--
 databases/postgresql81-server/PLIST      |  5 ++++-
 databases/postgresql81-tsearch2/Makefile |  3 +--
 databases/postgresql81/Makefile.common   |  4 ++--
 databases/postgresql81/distinfo          | 12 ++++++------
 databases/postgresql81/patches/patch-ab  | 10 +++++-----
 databases/postgresql81/patches/patch-ad  | 13 ++++++-------
 12 files changed, 39 insertions(+), 34 deletions(-)

diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile
index aa5f213f2a1..3deb3370bcc 100644
--- a/databases/postgresql81-client/Makefile
+++ b/databases/postgresql81-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.8 2008/01/18 05:06:29 tnn Exp $
+# $NetBSD: Makefile,v 1.9 2008/06/20 08:27:57 adam Exp $
 
 PKGNAME=	postgresql81-client-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -37,6 +36,7 @@ CONFIGURE_ARGS+=	--enable-thread-safety
 
 INSTALL_DIRS=	src/include
 INSTALL_DIRS+=	src/interfaces
+INSTALL_DIRS+=	src/port
 INSTALL_DIRS+=	src/bin
 INSTALL_DIRS+=	doc
 
diff --git a/databases/postgresql81-client/PLIST b/databases/postgresql81-client/PLIST
index 69c45357332..25894965b26 100644
--- a/databases/postgresql81-client/PLIST
+++ b/databases/postgresql81-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2008/01/07 20:14:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2008/06/20 08:27:58 adam Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -398,6 +398,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
@@ -1010,6 +1011,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
@@ -1026,6 +1029,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
@@ -1037,6 +1042,8 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-9.html
 ${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-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-4.html
diff --git a/databases/postgresql81-plperl/Makefile b/databases/postgresql81-plperl/Makefile
index f24af3b9b1b..9566b1ec08f 100644
--- a/databases/postgresql81-plperl/Makefile
+++ b/databases/postgresql81-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2008/01/18 05:06:30 tnn Exp $
+# $NetBSD: Makefile,v 1.7 2008/06/20 08:27:58 adam Exp $
 
 PKGNAME=	postgresql81-plperl-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../databases/postgresql81-server
@@ -13,6 +12,7 @@ CONFIGURE_ARGS+=	--with-perl
 
 BUILD_DIRS=		src/pl/plperl
 MAKE_FILE=		GNUmakefile
+BUILD_MAKE_FLAGS=	PGXS=1
 
 USE_TOOLS+=		perl
 USE_LIBTOOL=		yes
diff --git a/databases/postgresql81-plpython/Makefile b/databases/postgresql81-plpython/Makefile
index 1027953a4e2..171e571825e 100644
--- a/databases/postgresql81-plpython/Makefile
+++ b/databases/postgresql81-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2008/06/12 02:14:19 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/20 08:27:58 adam Exp $
 
 PKGNAME=	postgresql81-plpython-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../databases/postgresql81-server
diff --git a/databases/postgresql81-pltcl/Makefile b/databases/postgresql81-pltcl/Makefile
index 525c6d8908e..dbd34e74334 100644
--- a/databases/postgresql81-pltcl/Makefile
+++ b/databases/postgresql81-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2008/06/12 02:14:19 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/20 08:27:58 adam Exp $
 
 PKGNAME=	postgresql81-pltcl-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../databases/postgresql81-server
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 502aab5e27d..b90326be9bd 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2008/01/18 05:06:30 tnn Exp $
+# $NetBSD: Makefile,v 1.10 2008/06/20 08:27:58 adam Exp $
 
 PKGNAME=	postgresql81-server-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql81-server/PLIST b/databases/postgresql81-server/PLIST
index f1a3699c2aa..5f9c52e53ec 100644
--- a/databases/postgresql81-server/PLIST
+++ b/databases/postgresql81-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2008/01/07 20:14:24 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2008/06/20 08:27:58 adam Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
@@ -126,6 +126,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
@@ -302,6 +303,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
@@ -314,6 +316,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/postgresql81-tsearch2/Makefile b/databases/postgresql81-tsearch2/Makefile
index 0669545898c..99a8262e282 100644
--- a/databases/postgresql81-tsearch2/Makefile
+++ b/databases/postgresql81-tsearch2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2008/06/12 02:14:19 joerg Exp $
+# $NetBSD: Makefile,v 1.6 2008/06/20 08:27:58 adam Exp $
 
 PKGNAME=	postgresql81-tsearch2-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	Tsearch2 contrib module for fulltext indexing in PostgreSQL
 
 DEPENDS+=	postgresql81-server>=${BASE_VERS}:../../databases/postgresql81-server
diff --git a/databases/postgresql81/Makefile.common b/databases/postgresql81/Makefile.common
index 47eab420e84..1cbd903fa85 100644
--- a/databases/postgresql81/Makefile.common
+++ b/databases/postgresql81/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2008/04/23 12:40:40 ghen Exp $
+# $NetBSD: Makefile.common,v 1.17 2008/06/20 08:27:57 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}/../postgresql81/patches
 #
 # Note: Do not forget jdbc-postgresql81 when updating version
 #
-DIST_VERS?=		8.1.11
+DIST_VERS?=		8.1.13
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql81-client+=	postgresql81-client>=${BASE_VERS}
diff --git a/databases/postgresql81/distinfo b/databases/postgresql81/distinfo
index 7d392784f98..a274e51c95c 100644
--- a/databases/postgresql81/distinfo
+++ b/databases/postgresql81/distinfo
@@ -1,12 +1,12 @@
-$NetBSD: distinfo,v 1.11 2008/01/07 20:14:23 adam Exp $
+$NetBSD: distinfo,v 1.12 2008/06/20 08:27:57 adam Exp $
 
-SHA1 (postgresql-8.1.11.tar.bz2) = 73c0f09754fc8e3c7f8d7de49d70244b76927416
-RMD160 (postgresql-8.1.11.tar.bz2) = 9fb98eadc4f1015205970f26b31b68ea0378bda9
-Size (postgresql-8.1.11.tar.bz2) = 11735420 bytes
+SHA1 (postgresql-8.1.13.tar.bz2) = 6d4b771aa4011fa3e8aed726f1521b77cd91772a
+RMD160 (postgresql-8.1.13.tar.bz2) = fe9fab1b70fa93b4dc0bd19f63a590f75511e79e
+Size (postgresql-8.1.13.tar.bz2) = 11744780 bytes
 SHA1 (patch-aa) = a7112ce2e9fc28f638afcf2e196d3cdc0f4c254d
-SHA1 (patch-ab) = 5bf5f46e86025772cbdb9c9d22c942b40288f82f
+SHA1 (patch-ab) = 56e8bce0631e1007b2c2df8e740c0d48134b2242
 SHA1 (patch-ac) = cbd302a60d43171854c37171b57ee7bbf1194ad9
-SHA1 (patch-ad) = 51243fecc142d20e5353b8043e24f38007aa38d9
+SHA1 (patch-ad) = f9bf7bdc6a8e3d8e66be5c9b8ed8f5aaa2b41081
 SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6
 SHA1 (patch-af) = 89cb9318946cb7c34ad79dbae107ce66bd1c5022
 SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
diff --git a/databases/postgresql81/patches/patch-ab b/databases/postgresql81/patches/patch-ab
index 373b2041d9f..b059bcd89f4 100644
--- a/databases/postgresql81/patches/patch-ab
+++ b/databases/postgresql81/patches/patch-ab
@@ -1,6 +1,6 @@
-$NetBSD: patch-ab,v 1.2 2007/01/12 22:49:24 joerg Exp $
+$NetBSD: patch-ab,v 1.3 2008/06/20 08:27:57 adam Exp $
 
---- configure.orig	2007-01-06 05:29:02.000000000 +0000
+--- configure.orig	2008-06-09 03:17:31.000000000 +0200
 +++ configure
 @@ -1501,6 +1501,7 @@ case $host_os in
    darwin*) template=darwin ;;
@@ -10,7 +10,7 @@ $NetBSD: patch-ab,v 1.2 2007/01/12 22:49:24 joerg Exp $
      hpux*) template=hpux ;;
      irix*) template=irix ;;
   linux*|gnu*|k*bsd*-gnu)
-@@ -4753,9 +4754,7 @@ echo "${ECHO_T}$perl_useshrplib" >&6
+@@ -4807,9 +4808,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.2 2007/01/12 22:49:24 joerg Exp $
  echo "$as_me:$LINENO: result: $perl_embed_ldflags" >&5
  echo "${ECHO_T}$perl_embed_ldflags" >&6
  fi
-@@ -21604,17 +21603,12 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -21677,17 +21676,12 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
@@ -42,7 +42,7 @@ $NetBSD: patch-ab,v 1.2 2007/01/12 22:49:24 joerg Exp $
    ;
    return 0;
  }
-@@ -21659,17 +21653,12 @@ cat confdefs.h >>conftest.$ac_ext
+@@ -21732,17 +21726,12 @@ cat confdefs.h >>conftest.$ac_ext
  cat >>conftest.$ac_ext <<_ACEOF
  /* end confdefs.h.  */
  
diff --git a/databases/postgresql81/patches/patch-ad b/databases/postgresql81/patches/patch-ad
index a0e4fa1043a..fa694ab7da1 100644
--- a/databases/postgresql81/patches/patch-ad
+++ b/databases/postgresql81/patches/patch-ad
@@ -1,8 +1,8 @@
-$NetBSD: patch-ad,v 1.1.1.1 2006/03/20 14:45:49 uebayasi Exp $
+$NetBSD: patch-ad,v 1.2 2008/06/20 08:27:57 adam Exp $
 
---- src/backend/port/dynloader/netbsd.c.orig	2005-07-07 01:55:58.000000000 +0900
+--- src/backend/port/dynloader/netbsd.c.orig	2008-06-20 09:58:20.000000000 +0200
 +++ src/backend/port/dynloader/netbsd.c
-@@ -44,65 +44,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
+@@ -44,64 +44,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
  
  #include "dynloader.h"
  
@@ -25,7 +25,7 @@ $NetBSD: patch-ad,v 1.1.1.1 2006/03/20 14:45:49 uebayasi 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 2006/03/20 14:45:49 uebayasi 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 2006/03/20 14:45:49 uebayasi Exp $
 -BSD44_derived_dlclose(void *handle)
 +pg_dlclose(void *handle)
  {
--#if defined(__mips__)
--#else
+-#if defined(HAVE_DLOPEN)
 -	dlclose(handle);
 -#endif
  }
-- 
cgit v1.2.3