Changes 8.3.13:

* Force the default wal_sync_method to be fdatasync on Linux
* Fix assorted bugs in WAL replay logic for GIN indexes
* Fix recovery from base backup when the starting checkpoint WAL
  record is not in the same WAL segment as its redo point
* Fix persistent slowdown of autovacuum workers when multiple workers
  remain active for a long time
* Add support for detecting register-stack overrun on IA64
* Add a check for stack overflow in copyObject()
* Fix detection of page splits in temporary GiST indexes
* Avoid memory leakage while "ANALYZE"'ing complex index expressions
* Ensure an index that uses a whole-row Var still depends on its
  table
* Do not "inline" a SQL function with multiple OUT parameters
* Behave correctly if ORDER BY, LIMIT, FOR UPDATE, or WITH is
  attached to the VALUES part of INSERT ... VALUES
* Fix constant-folding of COALESCE() expressions
* Fix postmaster crash when connection acceptance (accept() or one of
  the calls made immediately after it) fails, and the postmaster was
  compiled with GSSAPI support
* Fix missed unlink of temporary files when log_temp_files is active
* Add print functionality for InhRelation nodes
* Fix incorrect calculation of distance from a point to a horizontal
  line segment
* Fix PL/pgSQL's handling of "simple" expressions to not fail in
  recursion or error-recovery cases
* Fix PL/Python's handling of set-returning functions
* Fix bug in "contrib/cube"'s GiST picksplit algorithm
* Don't emit "identifier will be truncated" notices in
  "contrib/dblink" except when creating new connections
* Fix potential coredump on missing public key in "contrib/pgcrypto"
* Fix memory leak in "contrib/xml2"'s XPath query functions
* Update time zone data files to tzdata release 2010o for DST law
  changes in Fiji and Samoa; also historical corrections for Hong
  Kong.

5 files changed, 48 insertions, 84 deletions

diff --git a/databases/postgresql83/Makefile b/databases/postgresql83/Makefile
index 69c0a702df8..c7c75690f9d 100644
--- a/databases/postgresql83/Makefile
+++ b/databases/postgresql83/Makefile
@@ -1,10 +1,10 @@
-# $NetBSD: Makefile,v 1.3 2008/06/12 02:14:20 joerg Exp $
+# $NetBSD: Makefile,v 1.4 2010/12/19 09:53:52 adam Exp $
 
-PKGNAME=	postgresql83-${BASE_VERS}
+PKGNAME=	${DISTNAME:C/-/83-/}
 COMMENT=	Robust, next generation, object-relational DBMS
 
-DEPENDS+=	postgresql83-client>=${BASE_VERS}:../../databases/postgresql83-client
-DEPENDS+=	postgresql83-server>=${BASE_VERS}:../../databases/postgresql83-server
+DEPENDS+=	postgresql83-client>=${PKGVERSION_NOREV}:../../databases/postgresql83-client
+DEPENDS+=	postgresql83-server>=${PKGVERSION_NOREV}:../../databases/postgresql83-server
 
 META_PACKAGE=	yes
 
diff --git a/databases/postgresql83/Makefile.common b/databases/postgresql83/Makefile.common
index ce4374d8575..d0dce1f0306 100644
--- a/databases/postgresql83/Makefile.common
+++ b/databases/postgresql83/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.15 2010/12/09 23:46:32 asau Exp $
+# $NetBSD: Makefile.common,v 1.16 2010/12/19 09:53:52 adam Exp $
 #
 # used by databases/postgresql83-adminpack/Makefile
 # used by databases/postgresql83-client/Makefile
@@ -12,53 +12,32 @@
 #
 # The PostgreSQL package naming scheme, aside from the obvious piecewise
 # packages, is as follows:
-#
 #	<lang>-postgresql	client-side interface to PostgreSQL
 #	postgresql-<lang>	server-side module for PostgreSQL backend
 
 .include "../../databases/postgresql83/Makefile.mirrors"
-.include "../../databases/postgresql83/options.mk"
 
-DISTNAME?=	postgresql-${DIST_VERS}
-CATEGORIES+=	databases
-MASTER_SITES?=	${PGSQL_MIRRORS:=source/v${DIST_VERS}/}
+DISTNAME=	postgresql-8.3.13
+CATEGORIES=	databases
+MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
 
 MAINTAINER?=	adam@NetBSD.org
-HOMEPAGE?=	http://www.postgresql.org/
+HOMEPAGE=	http://www.postgresql.org/
 
 CONFLICTS+=	postgresql-[0-9]*
-CONFLICTS+=	postgresql73-*
-CONFLICTS+=	postgresql74-*
-CONFLICTS+=	postgresql80-*
-CONFLICTS+=	postgresql81-*
-CONFLICTS+=	postgresql82-*
-CONFLICTS+=	postgresql84-*
+CONFLICTS+=	postgresql7[0-9]-*
+CONFLICTS+=	postgresql8[0-2]-*
+CONFLICTS+=	postgresql8[4-9]-*
 
 DISTINFO_FILE?=		${.CURDIR}/../postgresql83/distinfo
 COMMON_FILESDIR?=	${.CURDIR}/../postgresql83/files
 PATCHDIR?=		${.CURDIR}/../postgresql83/patches
 
-# Version numbering scheme:
-# DIST_VERS		version number on the postgresql distfile
-# BASE_VERS		pkgsrc-mangled version number (convert pl -> .)
-# Note: Do not forget jdbc-postgresql83 when updating version
-DIST_VERS?=		8.3.12
-BASE_VERS?=		${DIST_VERS}
-
-BUILDLINK_API_DEPENDS.postgresql83-client+=	postgresql83-client>=${BASE_VERS}
-
-GNU_CONFIGURE=		yes
+USE_PKGLOCALEDIR=	yes
 USE_TOOLS+=		bison gmake lex msgfmt
 PKG_SYSCONFSUBDIR=	postgresql
 
-# in 7.4.x/8.0.x, this is done by autoconf stuff which has leading whitespace
-USE_PKGLOCALEDIR=	yes
-SUBST_CLASSES+=		pglocale
-SUBST_FILES.pglocale=	configure config/programs.m4
-SUBST_STAGE.pglocale=	pre-configure
-SUBST_SED.pglocale=	-e 's|\( localedir[	 :]*=\).*|\1${PG_LOCALE_DIR}|'
-
 .include "../../mk/bsd.prefs.mk"
 
 PG_TEMPLATE.SunOS=	solaris
@@ -67,33 +46,18 @@ PG_TEMPLATE.IRIX=	irix5
 PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
 
-PG_SUBPREFIX=		# empty
-.if empty(PG_SUBPREFIX)
-PG_PREFIX=		${PREFIX}
-PLIST_SUBST+=		PG_SUBPREFIX=
-.else
-PG_PREFIX=		${PREFIX}/${PG_SUBPREFIX}
-BUILD_DEFS+=		PG_SUBPREFIX
-PLIST_SUBST+=		PG_SUBPREFIX=${PG_SUBPREFIX}/
-BUILDLINK_PASSTHRU_DIRS+=	${PG_PREFIX}
-.endif
-PG_DATA_DIR=		${PG_PREFIX}/share/postgresql
-PG_DOC_DIR=		${PG_PREFIX}/share/doc/postgresql
-PG_LOCALE_DIR=		${PG_PREFIX}/${PKGLOCALEDIR}/locale
-PG_ETC_DIR=		${PKG_SYSCONFDIR:S/^${PREFIX}\//${PG_PREFIX}\//}
-
-GNU_CONFIGURE_PREFIX=	${PG_PREFIX}
-CONFIGURE_ARGS+=	--sysconfdir=${PG_ETC_DIR}
-CONFIGURE_ARGS+=	--datadir=${PG_DATA_DIR}
-CONFIGURE_ARGS+=	--with-docdir=${PG_DOC_DIR}
+GNU_CONFIGURE=		yes
+CONFIGURE_ARGS+=	--sysconfdir=${PKG_SYSCONFDIR}
+CONFIGURE_ARGS+=	--datadir=${PREFIX}/share/postgresql
+CONFIGURE_ARGS+=	--with-docdir=${PREFIX}/share/doc/postgresql
 CONFIGURE_ARGS+=	--with-template=${PG_TEMPLATE.${OPSYS}}
-CONFIGURE_ARGS+=	--without-readline
-CONFIGURE_ARGS+=	--without-zlib
-CONFIGURE_ARGS+=	--enable-nls
 
+CONFIGURE_ARGS+=	--enable-nls
 CONFIGURE_ARGS+=	--without-perl
 CONFIGURE_ARGS+=	--without-python
+CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-tcl
+CONFIGURE_ARGS+=	--without-zlib
 
 # Enable Bonjour on Mac OS X
 .if ${OPSYS} == "Darwin"
@@ -110,8 +74,6 @@ USE_LIBLTDL?=		yes
 .endif
 USE_LIBLTDL?=		no
 
-FILES_SUBST+=		PG_PREFIX=${PG_PREFIX:Q}
-
 .include "../../devel/gettext-lib/buildlink3.mk"
 
 .if !defined(META_PACKAGE)
@@ -119,12 +81,10 @@ post-extract:
 	cp -f ${COMMON_FILESDIR}/Makefile.custom ${WRKSRC}/src/Makefile.custom
 	cp -f ${COMMON_FILESDIR}/Makefile.libtool ${WRKSRC}/src/Makefile.shlib
 .  if !empty(USE_LIBLTDL:M[yY][eE][sS])
-		template=${PG_TEMPLATE.${OPSYS}:Q}
 	cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
 		${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h
 	${ECHO} "static int dummy = 0;" \
 		> ${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.c
-	fi
 .  endif
 	touch ${WRKSRC}/src/template/dragonfly
 	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
@@ -145,15 +105,11 @@ post-extract:
 BUILD_DEFS+=	PGSQL_BLCKSZ
 
 .if defined(PGSQL_BLCKSZ)
-.PHONY: pgsql-blcksz
-pre-configure: pgsql-blcksz
-pgsql-blcksz:
-	for file in ${WRKSRC}/src/include/pg_config_manual.h; do	\
-		${SED} -e "/^#define[ 	]*BLCKSZ[ 	]*/s/^\(#define[ 	]*BLCKSZ\).*/\1	${PGSQL_BLCKSZ}/" $$file > $$file.new; \
-		${MV} -f $$file.new $$file;				\
-	done
+SUBST_CLASSES+=		blcksz
+SUBST_STAGE.blcksz=	pre-configure
+SUBST_MESSAGE.blcksz=	Adjusting BLCKSZ.
+SUBST_FILES.blcksz=	src/include/pg_config_manual.h
+SUBST_SED.blcksz=	-e 's,define BLCKSZ.*,define BLCKSZ ${PGSQL_BLCKSZ},'
 .endif
 
-
-# Help to generate PLIST
-PRINT_PLIST_AWK+=	{$$0 = "$${PG_SUBPREFIX}" $$0;}
+.include "../../databases/postgresql83/options.mk"
diff --git a/databases/postgresql83/distinfo b/databases/postgresql83/distinfo
index 8afbfaffb7e..a6d73328b03 100644
--- a/databases/postgresql83/distinfo
+++ b/databases/postgresql83/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.13 2010/10/07 15:52:40 adam Exp $
+$NetBSD: distinfo,v 1.14 2010/12/19 09:53:52 adam Exp $
 
-SHA1 (postgresql-8.3.12.tar.bz2) = 1c78ba53f4a37c8f9d12a4abe37ac47e0049f46a
-RMD160 (postgresql-8.3.12.tar.bz2) = 00fd0e09b2c300069e616d7f7a116b93b8c2e402
-Size (postgresql-8.3.12.tar.bz2) = 14273431 bytes
+SHA1 (postgresql-8.3.13.tar.bz2) = 59236fc88ede4aa756970e53575a50233ebb6c19
+RMD160 (postgresql-8.3.13.tar.bz2) = 029c77475a3412f10596fd36c85437233597b63c
+Size (postgresql-8.3.13.tar.bz2) = 14337117 bytes
 SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f
 SHA1 (patch-ab) = 7bf5635b0b93c3c0d33acd4e122e102c92ce7b76
 SHA1 (patch-ac) = 8e3a7021fdd01810d4ebcbd20002b28164b22279
@@ -12,4 +12,4 @@ SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
 SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
 SHA1 (patch-ai) = a2364b8e1e8a3094e1c5bfb0cad2d0babe0a8841
 SHA1 (patch-aj) = c389f9b8f39ddb61e58b5fe87ffabb789c71d4e0
-SHA1 (patch-an) = a1e7f421a101cf9ccddcaf3ce17aa1847cf76310
+SHA1 (patch-an) = 5981ccab104dd12f1b9baab8ca6c0ff32f873897
diff --git a/databases/postgresql83/options.mk b/databases/postgresql83/options.mk
index dc24ad3f30b..9e7aeaba67f 100644
--- a/databases/postgresql83/options.mk
+++ b/databases/postgresql83/options.mk
@@ -1,7 +1,7 @@
-# $NetBSD: options.mk,v 1.4 2010/11/03 14:36:39 adam Exp $
+# $NetBSD: options.mk,v 1.5 2010/12/19 09:53:52 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql83
-PKG_SUPPORTED_OPTIONS=	gssapi krb5 ldap pam
+PKG_SUPPORTED_OPTIONS=	gssapi kerberos ldap pam xml
 
 .include "../../mk/bsd.options.mk"
 
@@ -15,7 +15,7 @@ CONFIGURE_ARGS+=	--with-gssapi
 ###
 ### Kerberos5 authentication for the PostgreSQL backend.
 ###
-.if !empty(PKG_OPTIONS:Mkrb5)
+.if !empty(PKG_OPTIONS:Mkerberos)
 .  include "../../mk/krb5.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-krb5
 .endif
@@ -35,3 +35,11 @@ CONFIGURE_ARGS+=	--with-ldap
 .  include "../../mk/pam.buildlink3.mk"
 CONFIGURE_ARGS+=	--with-pam
 .endif
+
+###
+### XML support for the PostgreSQL backend.
+###
+.if !empty(PKG_OPTIONS:Mxml)
+.  include "../../textproc/libxml2/buildlink3.mk"
+CONFIGURE_ARGS+=	--with-libxml
+.endif
diff --git a/databases/postgresql83/patches/patch-an b/databases/postgresql83/patches/patch-an
index 9c1b09be63c..cdf24fcad1b 100644
--- a/databases/postgresql83/patches/patch-an
+++ b/databases/postgresql83/patches/patch-an
@@ -1,13 +1,13 @@
-$NetBSD: patch-an,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
+$NetBSD: patch-an,v 1.2 2010/12/19 09:53:53 adam Exp $
 
---- src/interfaces/ecpg/test/Makefile.regress.orig	2007-01-21 10:19:06.000000000 +0100
+--- src/interfaces/ecpg/test/Makefile.regress.orig	2010-12-14 03:51:20.000000000 +0000
 +++ src/interfaces/ecpg/test/Makefile.regress
-@@ -8,7 +8,7 @@ override LIBS := -lecpg -lpgtypes $(filt
- ECPG = ../../preproc/ecpg --regression -I$(srcdir)/../../include
+@@ -9,7 +9,7 @@ ECPG = ../../preproc/ecpg --regression -
  
  %: %.c
--	$(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
-+	${LIBTOOL} --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $^ $(LDFLAGS) $(LIBS) -o $@
+ 	$(CC) $(CPPFLAGS) $(CFLAGS) -c $< -o $*.o
+-	$(CC) $(CPPFLAGS) $(CFLAGS) $*.o $(LDFLAGS) $(LIBS) -o $@
++	${LIBTOOL} --mode=link $(CC) $(CPPFLAGS) $(CFLAGS) $*.o $(LDFLAGS) $(LIBS) -o $@
  
  %.c: %.pgc ../regression.h
  	$(ECPG) -o $@ -I$(srcdir) $<