Changes 8.1.5:

* Disallow aggregate functions in "UPDATE" commands, except within
  sub-SELECTs (Tom)
  The behavior of such an aggregate was unpredictable, and in 8.1.X
  could cause a crash, so it has been disabled. The SQL standard does
  not allow this either.
* Fix core dump when an untyped literal is taken as ANYARRAY
* Fix core dump in duration logging for extended query protocol when
  a "COMMIT" or "ROLLBACK" is executed
* Fix mishandling of AFTER triggers when query contains a SQL
  function returning multiple rows (Tom)
* Fix "ALTER TABLE ... TYPE" to recheck NOT NULL for USING clause
  (Tom)
* Fix string_to_array() to handle overlapping matches for the
  separator string
  For example, string_to_array('123xx456xxx789', 'xx').
* Fix to_timestamp() for AM/PM formats (Bruce)
* Fix autovacuum's calculation that decides whether "ANALYZE" is
  needed (Alvaro)
* Fix corner cases in pattern matching for psql's \d commands
* Fix index-corrupting bugs in /contrib/ltree (Teodor)
* Numerous robustness fixes in ecpg (Joachim Wieland)
* Fix backslash escaping in /contrib/dbmirror
* Minor fixes in /contrib/dblink and /contrib/tsearch2
* Efficiency improvements in hash tables and bitmap index scans (Tom)
* Fix instability of statistics collection on Win32 (Tom, Andrew)
* Fix statement_timeout to use the proper units on Win32 (Bruce)
  In previous Win32 8.1.X versions, the delay was off by a factor of
  100.
* Fixes for MSVC and Borland C++ compilers (Hiroshi Saito)
* Fixes for AIX and Intel compilers (Tom)

6 files changed, 39 insertions, 35 deletions

diff --git a/databases/postgresql81-client/Makefile b/databases/postgresql81-client/Makefile
index cc6224c0f8b..b8df3253960 100644
--- a/databases/postgresql81-client/Makefile
+++ b/databases/postgresql81-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.3 2006/03/28 19:48:22 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2006/10/18 16:33:21 adam Exp $
 
 PKGNAME=	postgresql81-client-${BASE_VERS}
 COMMENT=	PostgreSQL database client programs
@@ -65,13 +65,13 @@ USE_GNU_READLINE=	yes
 #
 .if ${OPSYS} == "SunOS"
 post-wrapper:
-	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
+	touch ${BUILDLINK_DIR}/include/crypt.h
 .endif
 
 pre-build:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
 	cd ${WRKSRC}/src/backend &&					\
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
 		../../src/include/parser/parse.h			\
 		../../src/include/utils/fmgroids.h
 
@@ -82,7 +82,7 @@ post-install:
 	do								\
 		${INSTALL_DATA} $$file ${PG_DOC_DIR}/$$file;		\
         done
-	${CP} -R ${WRKSRC}/doc/TODO.detail ${PG_DOC_DIR}
-	${CHOWN} -R ${DOCOWN}:${DOCGRP} ${PG_DOC_DIR}/TODO.detail
+	cp -R ${WRKSRC}/doc/TODO.detail ${PG_DOC_DIR}
+	chown -R ${DOCOWN}:${DOCGRP} ${PG_DOC_DIR}/TODO.detail
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql81-client/PLIST b/databases/postgresql81-client/PLIST
index 5e66a44c139..7f8cf939b75 100644
--- a/databases/postgresql81-client/PLIST
+++ b/databases/postgresql81-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2006/05/26 17:47:58 joerg Exp $
+@comment $NetBSD: PLIST,v 1.3 2006/10/18 16:33:21 adam Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -949,6 +949,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-12.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-13.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-14.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-15.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-16.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-3-4.html
@@ -963,6 +964,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-10.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-11.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-12.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-13.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-14.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
@@ -980,10 +982,12 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-5.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-6.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-7.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-8.html
+${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-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-3.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/resources.html
diff --git a/databases/postgresql81-server/Makefile b/databases/postgresql81-server/Makefile
index 576d8f7dd28..04933bfeba3 100644
--- a/databases/postgresql81-server/Makefile
+++ b/databases/postgresql81-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2006/04/23 00:12:37 jlam Exp $
+# $NetBSD: Makefile,v 1.5 2006/10/18 16:34:17 adam Exp $
 
 PKGNAME=	postgresql81-server-${BASE_VERS}
 COMMENT=	PostgreSQL database server programs
@@ -75,17 +75,17 @@ RCD_SCRIPTS=		pgsql
 #
 post-wrapper:
 .if ${OPSYS} == "SunOS"
-	${TOUCH} ${BUILDLINK_DIR}/include/crypt.h
+	touch ${BUILDLINK_DIR}/include/crypt.h
 .endif
 
 pre-build:
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
 	cd ${WRKSRC}/src/backend &&					\
-	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
+	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}	\
 		../../src/include/parser/parse.h			\
 		../../src/include/utils/fmgroids.h
 	${_PKG_SILENT}${_PKG_DEBUG}${_ULIMIT_CMD}			\
 	cd ${WRKSRC}/src/port &&					\
-       	${SETENV} ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
+       	env ${MAKE_ENV} ${MAKE_PROGRAM} ${BUILD_MAKE_FLAGS}
 
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql81/Makefile.common b/databases/postgresql81/Makefile.common
index 848b7c0f73a..0bdd700ad45 100644
--- a/databases/postgresql81/Makefile.common
+++ b/databases/postgresql81/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.6 2006/05/26 17:47:58 joerg Exp $
+# $NetBSD: Makefile.common,v 1.7 2006/10/18 16:31:24 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -13,7 +13,7 @@
 
 DISTNAME?=	postgresql-${DIST_VERS}
 CATEGORIES+=	databases
-MASTER_SITES?=  ${PGSQL_MIRRORS:=source/v${DIST_VERS}/}
+MASTER_SITES?=	${PGSQL_MIRRORS:=source/v${DIST_VERS}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	jlam@NetBSD.org
@@ -32,7 +32,7 @@ PATCHDIR?=		${.CURDIR}/../postgresql81/patches
 #
 # Note: Do not forget jdbc-postgresql81 when updating version
 #
-DIST_VERS?=		8.1.4
+DIST_VERS?=		8.1.5
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql81-client+=	postgresql81-client>=${BASE_VERS}
@@ -107,48 +107,48 @@ FILES_SUBST+=		PG_PREFIX=${PG_PREFIX:Q}
 
 post-extract:
 	if ${TEST} -d ${WRKSRC}/src; then				\
-		${RM} -f ${WRKSRC}/src/Makefile.custom;			\
-		${CP} -f ${COMMON_FILESDIR}/Makefile.custom		\
+		rm -f ${WRKSRC}/src/Makefile.custom;			\
+		cp -f ${COMMON_FILESDIR}/Makefile.custom		\
 			${WRKSRC}/src/Makefile.custom;			\
-		${RM} -f ${WRKSRC}/src/Makefile.shlib;			\
-		${CP} -f ${COMMON_FILESDIR}/Makefile.libtool		\
+		rm -f ${WRKSRC}/src/Makefile.shlib;			\
+		cp -f ${COMMON_FILESDIR}/Makefile.libtool		\
 			${WRKSRC}/src/Makefile.shlib;			\
 	fi
 	if ${TEST} -d ${WRKSRC}/src/interfaces/libpq; then		\
-		${RM} -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
-		${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpq		\
+		rm -f ${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
+		cp -f ${COMMON_FILESDIR}/GNUmakefile.libpq		\
 			${WRKSRC}/src/interfaces/libpq/GNUmakefile;	\
 	fi
 	if ${TEST} -d ${WRKSRC}/src/interfaces/libpgtcl; then		\
-		${RM} -f ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
-		${CP} -f ${COMMON_FILESDIR}/GNUmakefile.libpgtcl	\
+		rm -f ${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
+		cp -f ${COMMON_FILESDIR}/GNUmakefile.libpgtcl	\
 			${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
 	fi
 .if !empty(USE_LIBLTDL:M[yY][eE][sS])
 	if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then	\
 		template=${PGSQL_TEMPLATE.${OPSYS}:Q};			\
-		${RM} -f ${WRKSRC}/src/backend/port/dynloader/$$template.[ch]; \
-		${CP} -f ${COMMON_FILESDIR}/dynloader-ltdl.h		\
+		rm -f ${WRKSRC}/src/backend/port/dynloader/$$template.[ch]; \
+		cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h		\
 			${WRKSRC}/src/backend/port/dynloader/$$template.h; \
 		${ECHO} "static int dummy = 0;"				\
 			 >${WRKSRC}/src/backend/port/dynloader/$$template.c
 	fi
 .endif
 	if ${TEST} -d ${WRKSRC}/src/template; then			\
-		${TOUCH} ${WRKSRC}/src/template/dragonfly;		\
+		touch ${WRKSRC}/src/template/dragonfly;		\
 	fi
 	if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then	\
-		${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.c	\
+		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c	\
 			${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \
-		${CP} ${WRKSRC}/src/backend/port/dynloader/freebsd.h	\
+		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h	\
 			${WRKSRC}/src/backend/port/dynloader/dragonfly.h; \
 	fi
 	if ${TEST} -d ${WRKSRC}/src/include/port; then			\
-		${CP} ${WRKSRC}/src/include/port/freebsd.h		\
+		cp ${WRKSRC}/src/include/port/freebsd.h		\
 			${WRKSRC}/src/include/port/dragonfly.h;		\
 	fi
 	if ${TEST} -d ${WRKSRC}/src/makefiles; then			\
-		${CP} ${WRKSRC}/src/makefiles/Makefile.freebsd		\
+		cp ${WRKSRC}/src/makefiles/Makefile.freebsd		\
 			${WRKSRC}/src/makefiles/Makefile.dragonfly;	\
 	fi
 
@@ -158,7 +158,7 @@ post-extract:
 # PostgreSQL sources).  Please don't change this value unless you know
 # what you are doing.
 #
-BUILD_DEFS+=    PGSQL_BLCKSZ
+BUILD_DEFS+=	PGSQL_BLCKSZ
 
 .if defined(PGSQL_BLCKSZ)
 .PHONY: pgsql-blcksz
diff --git a/databases/postgresql81/distinfo b/databases/postgresql81/distinfo
index 718d10e565f..9c994f6e20e 100644
--- a/databases/postgresql81/distinfo
+++ b/databases/postgresql81/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.2 2006/05/26 17:47:58 joerg Exp $
+$NetBSD: distinfo,v 1.3 2006/10/18 16:31:24 adam Exp $
 
-SHA1 (postgresql-8.1.4.tar.bz2) = 1bba120ac841ae835ce2749e1f6959086b4530fd
-RMD160 (postgresql-8.1.4.tar.bz2) = 1bed120cb6aa26b2d8664e383f53974a9b0efda4
-Size (postgresql-8.1.4.tar.bz2) = 11609501 bytes
+SHA1 (postgresql-8.1.5.tar.bz2) = 6d819ad4e2344db1eac2aaab13f8034820ac8868
+RMD160 (postgresql-8.1.5.tar.bz2) = 02a8aab23e424b5006b24bf884d6920c4818f907
+Size (postgresql-8.1.5.tar.bz2) = 11616301 bytes
 SHA1 (patch-aa) = a7112ce2e9fc28f638afcf2e196d3cdc0f4c254d
 SHA1 (patch-ab) = 8d09f4e274aeb4ac2b15db73e7801376a5627d27
 SHA1 (patch-ac) = cbd302a60d43171854c37171b57ee7bbf1194ad9
diff --git a/databases/postgresql81/options.mk b/databases/postgresql81/options.mk
index 511ef82ff08..1360ae0094e 100644
--- a/databases/postgresql81/options.mk
+++ b/databases/postgresql81/options.mk
@@ -1,4 +1,4 @@
-# $NetBSD: options.mk,v 1.1.1.1 2006/03/20 14:45:49 uebayasi Exp $
+# $NetBSD: options.mk,v 1.2 2006/10/18 16:31:24 adam Exp $
 
 PKG_SUPPORTED_OPTIONS+=		pgsql-hier-query
 
@@ -9,7 +9,7 @@ PKG_SUPPORTED_OPTIONS+=		pgsql-hier-query
 ###
 .if !empty(PKG_OPTIONS:Mpam)
 .  include "../../mk/pam.buildlink3.mk"
-CONFIGURE_ARGS+=        --with-pam
+CONFIGURE_ARGS+=	--with-pam
 .endif
 
 ###