Changes 8.4.7:

* Avoid failures when "EXPLAIN" tries to display a simple-form CASE
  expression.
* Fix assignment to an array slice that is before the existing range
  of subscripts.
* Avoid unexpected conversion overflow in planner for very distant
  date values.
* Fix pg_restore's text output for large objects (BLOBs) when
  standard_conforming_strings is on.
* Fix erroneous parsing of tsquery values containing ... &
  !(subexpression) | ...
* Fix buffer overrun in "contrib/intarray"'s input function for the
  query_int type.
* Fix bug in "contrib/seg"'s GiST picksplit algorithm.

6 files changed, 19 insertions, 220 deletions

diff --git a/databases/postgresql84/Makefile.common b/databases/postgresql84/Makefile.common
index c51bc713f98..673a24ee254 100644
--- a/databases/postgresql84/Makefile.common
+++ b/databases/postgresql84/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.10 2010/12/19 09:53:41 adam Exp $
+# $NetBSD: Makefile.common,v 1.11 2011/02/15 08:14:15 adam Exp $
 #
 # used by databases/postgresql84-adminpack/Makefile
 # used by databases/postgresql84-client/Makefile
@@ -19,7 +19,7 @@
 
 .include "../../databases/postgresql84/Makefile.mirrors"
 
-DISTNAME=	postgresql-8.4.6
+DISTNAME=	postgresql-8.4.7
 CATEGORIES=	databases
 MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -60,11 +60,6 @@ CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-tcl
 CONFIGURE_ARGS+=	--without-zlib
 
-# Enable Bonjour on Mac OS X
-.if ${OPSYS} == "Darwin"
-CONFIGURE_ARGS+=	--with-bonjour
-.endif
-
 # PGSQL_BLCKSZ is the size in bytes of a PostgreSQL disk page or block.
 # This also limits the size of a tuple.  The valid values are powers
 # of 2 up to 32768, and the default size is 8196.  Please don't change
@@ -88,8 +83,6 @@ USE_LIBLTDL?=		no
 
 .if !defined(META_PACKAGE)
 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])
 	cp -f ${COMMON_FILESDIR}/dynloader-ltdl.h \
 		${WRKSRC}/src/backend/port/dynloader/${PG_TEMPLATE.${OPSYS}:Q}.h
diff --git a/databases/postgresql84/distinfo b/databases/postgresql84/distinfo
index 411f96cac2c..d491bedf5ed 100644
--- a/databases/postgresql84/distinfo
+++ b/databases/postgresql84/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2011/01/20 12:38:49 markd Exp $
+$NetBSD: distinfo,v 1.10 2011/02/15 08:14:15 adam Exp $
 
-SHA1 (postgresql-8.4.6.tar.bz2) = 17cef72e99cea533caab28a463a082b523a423f7
-RMD160 (postgresql-8.4.6.tar.bz2) = 62b21be252c532d62e6096a5e8280e3728c8f504
-Size (postgresql-8.4.6.tar.bz2) = 14130201 bytes
+SHA1 (postgresql-8.4.7.tar.bz2) = 078c2fc6c3e7d6832012eab790de805ea6526060
+RMD160 (postgresql-8.4.7.tar.bz2) = 15721cddd4ee916d44ed7e656c0570ef4cb6c102
+Size (postgresql-8.4.7.tar.bz2) = 14133535 bytes
 SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f
 SHA1 (patch-ab) = a273a453e88e54467028c2a45e63bbbb304e227a
 SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb
@@ -11,5 +11,4 @@ SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936
 SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214
 SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
 SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
-SHA1 (patch-an) = 62fd4c0f9594381f85ce84954e88efc9048b7cb9
 SHA1 (patch-ao) = 045a25457da09aff30ac93f1c299064c9f6079a8
diff --git a/databases/postgresql84/files/Makefile.custom b/databases/postgresql84/files/Makefile.custom
deleted file mode 100644
index 35a2580f7a0..00000000000
--- a/databases/postgresql84/files/Makefile.custom
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile.custom,v 1.1.1.1 2009/07/29 06:26:17 adam Exp $
-#
-# This file is included at the end of Makefile.global, which is included
-# by every sub-Makefile in the build tree.  Makefiles for shared
-# libraries include Makefile.global then Makefile.shlib.
-#
-
-# Override any OS-specific locations for where to put SQL man pages.
-sqlmansect = 7
-
-# Override installation paths to avoid logic in Makefile.global.
-includedir = $(prefix)/include
-libdir = $(exec_prefix)/lib
-pkglibdir = $(libdir)/postgresql
-pkgincludedir = $(includedir)/postgresql
-
-# INSTALLED_LIBPQ is passed in from the environment and tells the build
-# system how to link to an installed libpq.*.
-#
-ifdef INSTALLED_LIBPQ
-libpq = -lpq
-else
-ifdef LIBTOOL
-libpq = $(libpq_builddir)/libpq.la
-endif
-ifdef PGFILEDESC
-libpq = -L$(libpq_builddir)/.libs -lpq
-endif
-endif
-
-# In pkgsrc, libpython is always present as a shared library.
-shared_libpython = yes
-
-# $(libpq_builddir)/libpq.a is used in several places as a dependency,
-# but if we're building with libtool, then we don't actually want to
-# create that file since it will mess up the re-linking process.
-# Declare it to be phony to prevent GNU make from thinking it's a
-# target.
-#
-ifdef LIBTOOL
-.PHONY: $(libpq_builddir)/libpq.a
-endif
diff --git a/databases/postgresql84/files/Makefile.libtool b/databases/postgresql84/files/Makefile.libtool
deleted file mode 100644
index ba8a318edd9..00000000000
--- a/databases/postgresql84/files/Makefile.libtool
+++ /dev/null
@@ -1,149 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.libtool
-#    Common rules for buildling libtool archives
-#
-# IDENTIFICATION
-#    $NetBSD: Makefile.libtool,v 1.3 2010/08/04 06:00:55 mbalmer Exp $
-#
-#-------------------------------------------------------------------------
-
-##
-## Hacks/workarounds for makefiles in certain directories
-##
-
-# The following directories are building loadable shared modules, not
-# shared libraries.
-#
-ifneq (,$(findstring src/backend/utils/mb/conversion_procs/,$(subdir)))
-shmodule	= yes
-else
-ifneq (,$(findstring src/backend/snowball,$(subdir)))
-shmodule	= yes
-else
-ifneq (,$(findstring src/pl/,$(subdir)))
-shmodule	= yes
-else
-ifneq (,$(findstring contrib/adminpack,$(subdir)))
-shmodule	= yes
-else
-ifneq (,$(findstring contrib/pgcrypto,$(subdir)))
-shmodule	= yes
-else
-ifneq (,$(findstring contrib/dblink,$(subdir)))
-shmodule       = yes
-else
-shmodule	= no
-endif
-endif
-endif
-endif
-endif
-endif
-
-# Fix dependencies in some makefiles that assume the target matches
-# %.o so that when built for libtool, the target matches the corresponding
-# %.lo.
-#
-ifeq ($(subdir), src/interfaces/ecpg/ecpglib)
-path.lo: path.c $(top_builddir)/src/port/pg_config_paths.h
-endif
-
-ifeq ($(subdir), src/interfaces/libpq)
-fe-connect.lo: fe-connect.c $(top_builddir)/src/port/pg_config_paths.h
-endif
-
-ifeq ($(subdir), src/pl/plpgsql/src)
-pl_gram.lo pl_handler.lo pl_comp.lo pl_exec.lo pl_funcs.lo: plpgsql.h
-pl_gram.lo: $(srcdir)/pl_scan.c
-endif
-
-
-##
-## VARIABLE DEFINITIONS
-##
-
-# Loadable shared modules are named differently from shared libraries
-# and are installed into $(pkglibdir).
-#
-ifeq ($(shmodule),yes)
-ltlib		= $(NAME)$(DLSUFFIX)
-ltmodule	= -module
-rpathdir	= $(pkglibdir)
-else
-ltlib		= lib$(NAME)$(DLSUFFIX)
-ltmodule	=
-endif
-
-DLSUFFIX	= .la
-SO_MAJOR_VERSION?=0
-SO_MINOR_VERSION?=0
-
-LTCOMPILE	= $(LIBTOOL) --mode=compile $(CC) $(CFLAGS) $(CPPFLAGS)
-LTLINK		= $(LIBTOOL) --mode=link $(CC) $(LDFLAGS) $(ltmodule) -rpath $(rpathdir) -version-info $(SO_MAJOR_VERSION):$(SO_MINOR_VERSION)
-LTOBJS		= $(OBJS:%.o=%.lo)
-
-# Define INSTALL_SHLIB and shlib for the benefit of Makefiles for
-# loadable modules that have their own target for installing the
-# module.
-#
-INSTALL_LTLIB	= $(LIBTOOL) --mode=install $(INSTALL)
-INSTALL_STLIB	= $(INSTALL_LTLIB)
-INSTALL_SHLIB	= $(INSTALL_LTLIB)
-shlib		= $(ltlib)
-
-%.lo : %.c
-	$(LTCOMPILE) -c $< -o $@
-
-
-##
-## BUILD
-##
-
-.PHONY: all-lib all-static-lib all-shared-lib all-la-lib
-all-lib all-static-lib all-shared-lib: all-la-lib
-
-all-la-lib: $(ltlib)
-
-$(ltlib): $(LTOBJS)
-	$(LTLINK) -o $@ $(LTOBJS) $(SHLIB_LINK)
-
-
-##
-## INSTALL
-##
-
-.PHONY: install-lib install-lib-static install-lib-shared installdirs-lib install-lib-la
-install-lib install-static-lib install-shared-lib: install-lib-la
-
-install-lib-la: $(ltlib)
-ifeq ($(shmodule),yes)
-	$(INSTALL_LTLIB) $< $(DESTDIR)$(pkglibdir)/$(shlib)
-else
-	$(INSTALL_LTLIB) $< $(DESTDIR)$(libdir)/$(ltlib)
-endif
-
-installdirs-lib:
-ifeq ($(shmodule),yes)
-	$(mkinstalldirs) '$(DESTDIR)$(pkglibdir)'
-else
-	$(mkinstalldirs) '$(DESTDIR)$(libdir)'
-endif
-
-
-##
-## UNINSTALL
-##
-
-.PHONY: uninstall-lib
-uninstall-lib:
-	$(LIBTOOL) --mode=uninstall rm -f $(DESTDIR)$(libdir)/$(ltlib)
-
-
-##
-## CLEAN
-##
-
-.PHONY: clean-lib
-clean-lib:
-	$(LIBTOOL) --mode=clean rm -f $(ltlib) $(LTOBJS)
diff --git a/databases/postgresql84/options.mk b/databases/postgresql84/options.mk
index 3d1c0c1ab10..49d8e454a1c 100644
--- a/databases/postgresql84/options.mk
+++ b/databases/postgresql84/options.mk
@@ -1,11 +1,22 @@
-# $NetBSD: options.mk,v 1.5 2010/12/19 09:53:41 adam Exp $
+# $NetBSD: options.mk,v 1.6 2011/02/15 08:14:15 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql84
-PKG_SUPPORTED_OPTIONS=	gssapi kerberos ldap pam xml
+PKG_SUPPORTED_OPTIONS=	bonjour gssapi kerberos ldap pam xml
 
 .include "../../mk/bsd.options.mk"
 
 ###
+### Bonjour support.
+###
+.if !empty(PKG_OPTIONS:Mbonjour)
+CONFIGURE_ARGS+=	--with-bonjour
+.  if ${OPSYS} != "Darwin"
+LIBS+=			-ldns_sd
+.  endif
+.  include "../../net/mDNSResponder/buildlink3.mk"
+.endif
+
+###
 ### GSSAPI authentication for the PostgreSQL backend.
 ###
 .if !empty(PKG_OPTIONS:Mgssapi)
diff --git a/databases/postgresql84/patches/patch-an b/databases/postgresql84/patches/patch-an
deleted file mode 100644
index 67f712d6ab1..00000000000
--- a/databases/postgresql84/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.2 2010/12/19 09:53:41 adam Exp $
-
---- src/interfaces/ecpg/test/Makefile.regress.orig	2010-12-14 02:59:19.000000000 +0000
-+++ src/interfaces/ecpg/test/Makefile.regress
-@@ -9,7 +9,7 @@ ECPG = ../../preproc/ecpg --regression -
- 
- %: %.c
- 	$(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) $<