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.

22 files changed, 135 insertions, 333 deletions

diff --git a/databases/postgresql84-adminpack/Makefile b/databases/postgresql84-adminpack/Makefile
index 57504c466b5..b2e1a64e91b 100644
--- a/databases/postgresql84-adminpack/Makefile
+++ b/databases/postgresql84-adminpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2010/12/19 09:53:41 adam Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/15 08:14:15 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-adminpack-/}
 COMMENT=	Admin pack module for pgAdmin management
@@ -9,12 +9,10 @@ DEPENDS+=	postgresql84-server>=${PKGVERSION_NOREV}:../../databases/postgresql84-
 
 .include "../../databases/postgresql84/Makefile.common"
 
-USE_LIBTOOL=		yes
-PKG_LIBTOOL=		${PKG_SHLIBTOOL}
-
 BUILD_DIRS=		contrib/adminpack
-REQD_DIRS+=		${PG_SUBPREFIX}share/doc/postgresql/contrib
-REQD_DIRS+=		${PG_SUBPREFIX}share/postgresql/contrib
+BUILD_MAKE_FLAGS=	PGXS=1
+REQD_DIRS+=		share/doc/postgresql/contrib
+REQD_DIRS+=		share/postgresql/contrib
 
 .include "../../databases/postgresql84-client/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql84-adminpack/PLIST b/databases/postgresql84-adminpack/PLIST
index d9714d368fc..959dd53e56d 100644
--- a/databases/postgresql84-adminpack/PLIST
+++ b/databases/postgresql84-adminpack/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/19 09:53:41 adam Exp $
-lib/postgresql/adminpack.la
+@comment $NetBSD: PLIST,v 1.3 2011/02/15 08:14:15 adam Exp $
+lib/postgresql/adminpack.so
 share/postgresql/contrib/adminpack.sql
 share/postgresql/contrib/uninstall_adminpack.sql
diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index 3aac5e717dc..235bcc92f11 100644
--- a/databases/postgresql84-client/Makefile
+++ b/databases/postgresql84-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2011/02/08 15:50:07 brook Exp $
+# $NetBSD: Makefile,v 1.13 2011/02/15 08:14:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-client-/}
 COMMENT=	PostgreSQL database client programs
@@ -8,7 +8,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../databases/postgresql84/Makefile.common"
 
 USE_TOOLS+=		gzip tar
-USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--with-openssl
 CONFIGURE_ARGS+=	--with-readline
 CONFIGURE_ARGS+=	--with-zlib
diff --git a/databases/postgresql84-client/PLIST b/databases/postgresql84-client/PLIST
index ae1d334bdc1..e269da8ccdf 100644
--- a/databases/postgresql84-client/PLIST
+++ b/databases/postgresql84-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2010/12/19 09:53:41 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2011/02/15 08:14:16 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -491,11 +491,23 @@ include/postgresql/server/utils/xml.h
 include/postgresql/server/windowapi.h
 include/sql3types.h
 include/sqlca.h
-lib/libecpg.la
-lib/libecpg_compat.la
+lib/libecpg.a
+lib/libecpg.so
+lib/libecpg.so.6
+lib/libecpg.so.6.1
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.3
+lib/libecpg_compat.so.3.1
 lib/libpgport.a
-lib/libpgtypes.la
-lib/libpq.la
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.3
+lib/libpgtypes.so.3.1
+lib/libpq.a
+lib/libpq.so
+lib/libpq.so.5
+lib/libpq.so.5.2
 lib/postgresql/pgxs/config/install-sh
 lib/postgresql/pgxs/config/mkinstalldirs
 lib/postgresql/pgxs/src/Makefile.global
@@ -1298,6 +1310,7 @@ share/doc/postgresql/html/release-8-2-17.html
 share/doc/postgresql/html/release-8-2-18.html
 share/doc/postgresql/html/release-8-2-19.html
 share/doc/postgresql/html/release-8-2-2.html
+share/doc/postgresql/html/release-8-2-20.html
 share/doc/postgresql/html/release-8-2-3.html
 share/doc/postgresql/html/release-8-2-4.html
 share/doc/postgresql/html/release-8-2-5.html
@@ -1311,6 +1324,7 @@ share/doc/postgresql/html/release-8-3-10.html
 share/doc/postgresql/html/release-8-3-11.html
 share/doc/postgresql/html/release-8-3-12.html
 share/doc/postgresql/html/release-8-3-13.html
+share/doc/postgresql/html/release-8-3-14.html
 share/doc/postgresql/html/release-8-3-2.html
 share/doc/postgresql/html/release-8-3-3.html
 share/doc/postgresql/html/release-8-3-4.html
@@ -1326,6 +1340,7 @@ share/doc/postgresql/html/release-8-4-3.html
 share/doc/postgresql/html/release-8-4-4.html
 share/doc/postgresql/html/release-8-4-5.html
 share/doc/postgresql/html/release-8-4-6.html
+share/doc/postgresql/html/release-8-4-7.html
 share/doc/postgresql/html/release-8-4.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/resources.html
diff --git a/databases/postgresql84-dblink/Makefile b/databases/postgresql84-dblink/Makefile
index 244f2b7cf83..10e76fddd6d 100644
--- a/databases/postgresql84-dblink/Makefile
+++ b/databases/postgresql84-dblink/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/12/19 09:53:42 adam Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/15 08:14:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-dblink-/}
 COMMENT=	dblink module for remote database connections
@@ -9,14 +9,13 @@ DEPENDS+=	postgresql84-server>=${PKGVERSION_NOREV}:../../databases/postgresql84-
 
 .include "../../databases/postgresql84/Makefile.common"
 
-USE_LIBTOOL=		yes
-PKG_LIBTOOL=		${PKG_SHLIBTOOL}
-
+CONFIGURE_ARGS+=	--with-openssl
 BUILD_DIRS=		src/interfaces/libpq
 BUILD_DIRS+=		contrib/dblink
+BUILD_MAKE_FLAGS=	PGXS=1
 INSTALL_DIRS=		contrib/dblink
-REQD_DIRS+=		${PG_SUBPREFIX}share/doc/postgresql/contrib
-REQD_DIRS+=		${PG_SUBPREFIX}share/postgresql/contrib
+REQD_DIRS+=		share/doc/postgresql/contrib
+REQD_DIRS+=		share/postgresql/contrib
 
 .include "../../databases/postgresql84-client/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql84-dblink/PLIST b/databases/postgresql84-dblink/PLIST
index da26c74656a..7da5b22d9a2 100644
--- a/databases/postgresql84-dblink/PLIST
+++ b/databases/postgresql84-dblink/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2010/08/04 06:04:41 mbalmer Exp $
-lib/postgresql/dblink.la
+@comment $NetBSD: PLIST,v 1.2 2011/02/15 08:14:16 adam Exp $
+lib/postgresql/dblink.so
 share/postgresql/contrib/dblink.sql
 share/postgresql/contrib/uninstall_dblink.sql
diff --git a/databases/postgresql84-pgcrypto/Makefile b/databases/postgresql84-pgcrypto/Makefile
index b8b5c51b113..bb629ea0e1c 100644
--- a/databases/postgresql84-pgcrypto/Makefile
+++ b/databases/postgresql84-pgcrypto/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2010/12/19 09:53:42 adam Exp $
+# $NetBSD: Makefile,v 1.3 2011/02/15 08:14:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-pgcrypto-/}
 COMMENT=	Module providing cryptographic functions for PostgreSQL
@@ -9,10 +9,10 @@ DEPENDS+=	postgresql84-server>=${PKGVERSION_NOREV}:../../databases/postgresql84-
 
 .include "../../databases/postgresql84/Makefile.common"
 
-USE_LIBTOOL=		yes
-PKG_LIBTOOL=		${PKG_SHLIBTOOL}
+CONFIGURE_ARGS+=	--with-zlib
 
 BUILD_DIRS=		contrib/pgcrypto
+BUILD_MAKE_FLAGS=	PGXS=1
 REQD_DIRS+=		${PG_SUBPREFIX}share/doc/postgresql/contrib
 REQD_DIRS+=		${PG_SUBPREFIX}share/postgresql/contrib
 
diff --git a/databases/postgresql84-pgcrypto/PLIST b/databases/postgresql84-pgcrypto/PLIST
index 2bc9ab69eb0..61a138fb515 100644
--- a/databases/postgresql84-pgcrypto/PLIST
+++ b/databases/postgresql84-pgcrypto/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/19 09:53:42 adam Exp $
-lib/postgresql/pgcrypto.la
+@comment $NetBSD: PLIST,v 1.3 2011/02/15 08:14:16 adam Exp $
+lib/postgresql/pgcrypto.so
 share/postgresql/contrib/pgcrypto.sql
 share/postgresql/contrib/uninstall_pgcrypto.sql
diff --git a/databases/postgresql84-plperl/Makefile b/databases/postgresql84-plperl/Makefile
index 512f4a90b6c..5c683d8f3d6 100644
--- a/databases/postgresql84-plperl/Makefile
+++ b/databases/postgresql84-plperl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.6 2010/12/19 09:53:42 adam Exp $
+# $NetBSD: Makefile,v 1.7 2011/02/15 08:14:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-plperl-/}
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
@@ -9,15 +9,13 @@ DEPENDS+=	postgresql84-server>=${PKGVERSION_NOREV}:../../databases/postgresql84-
 
 .include "../../databases/postgresql84/Makefile.common"
 
-USE_LIBTOOL=		yes
-PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 USE_TOOLS+=		perl
 PERL5_CONFIGURE=	no
 CONFIGURE_ARGS+=	--with-perl
 
 BUILD_DIRS=		src/pl/plperl
-MAKE_FILE=		GNUmakefile
 BUILD_MAKE_FLAGS=	PGXS=1
+MAKE_FILE=		GNUmakefile
 
 .include "../../databases/postgresql84-client/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/databases/postgresql84-plperl/PLIST b/databases/postgresql84-plperl/PLIST
index 9ba47bb2f25..3e8390cb3ff 100644
--- a/databases/postgresql84-plperl/PLIST
+++ b/databases/postgresql84-plperl/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2010/12/19 09:53:42 adam Exp $
-lib/postgresql/plperl.la
-share/locale/de/LC_MESSAGES/plperl0-8.4.mo
-share/locale/es/LC_MESSAGES/plperl0-8.4.mo
-share/locale/fr/LC_MESSAGES/plperl0-8.4.mo
-share/locale/it/LC_MESSAGES/plperl0-8.4.mo
-share/locale/ja/LC_MESSAGES/plperl0-8.4.mo
-share/locale/pt_BR/LC_MESSAGES/plperl0-8.4.mo
-share/locale/tr/LC_MESSAGES/plperl0-8.4.mo
-share/locale/zh_CN/LC_MESSAGES/plperl0-8.4.mo
+@comment $NetBSD: PLIST,v 1.5 2011/02/15 08:14:16 adam Exp $
+lib/postgresql/plperl.so
+share/locale/de/LC_MESSAGES/plperl-8.4.mo
+share/locale/es/LC_MESSAGES/plperl-8.4.mo
+share/locale/fr/LC_MESSAGES/plperl-8.4.mo
+share/locale/it/LC_MESSAGES/plperl-8.4.mo
+share/locale/ja/LC_MESSAGES/plperl-8.4.mo
+share/locale/pt_BR/LC_MESSAGES/plperl-8.4.mo
+share/locale/tr/LC_MESSAGES/plperl-8.4.mo
+share/locale/zh_CN/LC_MESSAGES/plperl-8.4.mo
diff --git a/databases/postgresql84-plpython/Makefile b/databases/postgresql84-plpython/Makefile
index 51a78af9813..3e6142aa36c 100644
--- a/databases/postgresql84-plpython/Makefile
+++ b/databases/postgresql84-plpython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/19 09:53:42 adam Exp $
+# $NetBSD: Makefile,v 1.6 2011/02/15 08:14:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-plpython-/}
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
@@ -9,12 +9,11 @@ DEPENDS+=	postgresql84-server>=${PKGVERSION_NOREV}:../../databases/postgresql84-
 
 .include "../../databases/postgresql84/Makefile.common"
 
-USE_LIBTOOL=		yes
-PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 CONFIGURE_ARGS+=	--with-python
 CONFIGURE_ENV+=		PYTHON="${PYTHONBIN}"
 
 BUILD_DIRS=		src/pl/plpython
+BUILD_MAKE_FLAGS=	PGXS=1
 
 .include "../../databases/postgresql84-client/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/databases/postgresql84-plpython/PLIST b/databases/postgresql84-plpython/PLIST
index 7ae057b8d72..68e63d18b13 100644
--- a/databases/postgresql84-plpython/PLIST
+++ b/databases/postgresql84-plpython/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.4 2010/12/19 09:53:42 adam Exp $
-lib/postgresql/plpython.la
-share/locale/de/LC_MESSAGES/plpython0-8.4.mo
-share/locale/es/LC_MESSAGES/plpython0-8.4.mo
-share/locale/fr/LC_MESSAGES/plpython0-8.4.mo
-share/locale/it/LC_MESSAGES/plpython0-8.4.mo
-share/locale/ja/LC_MESSAGES/plpython0-8.4.mo
-share/locale/pt_BR/LC_MESSAGES/plpython0-8.4.mo
-share/locale/tr/LC_MESSAGES/plpython0-8.4.mo
-share/locale/zh_CN/LC_MESSAGES/plpython0-8.4.mo
+@comment $NetBSD: PLIST,v 1.5 2011/02/15 08:14:16 adam Exp $
+lib/postgresql/plpython.so
+share/locale/de/LC_MESSAGES/plpython-8.4.mo
+share/locale/es/LC_MESSAGES/plpython-8.4.mo
+share/locale/fr/LC_MESSAGES/plpython-8.4.mo
+share/locale/it/LC_MESSAGES/plpython-8.4.mo
+share/locale/ja/LC_MESSAGES/plpython-8.4.mo
+share/locale/pt_BR/LC_MESSAGES/plpython-8.4.mo
+share/locale/tr/LC_MESSAGES/plpython-8.4.mo
+share/locale/zh_CN/LC_MESSAGES/plpython-8.4.mo
diff --git a/databases/postgresql84-pltcl/Makefile b/databases/postgresql84-pltcl/Makefile
index 123cacf8295..57d0d05dd84 100644
--- a/databases/postgresql84-pltcl/Makefile
+++ b/databases/postgresql84-pltcl/Makefile
@@ -1,22 +1,21 @@
-# $NetBSD: Makefile,v 1.4 2010/12/19 09:53:42 adam Exp $
+# $NetBSD: Makefile,v 1.5 2011/02/15 08:14:17 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-pltcl-/}
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	postgresql84-server>=${PKGVERSION}:../../databases/postgresql84-server
+DEPENDS+=	postgresql84-server>=${PKGVERSION_NOREV}:../../databases/postgresql84-server
 
 .include "../../databases/postgresql84/Makefile.common"
 
-USE_LIBTOOL=		yes
-PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 CONFIGURE_ARGS+=	--with-tcl
 CONFIGURE_ARGS+=	--with-tclconfig="${BUILDLINK_PREFIX.tcl}/lib"
 CONFIGURE_ENV+=		TCLSH="${TCLSH}"
 TCLSH=			${BUILDLINK_PREFIX.tcl}/bin/tclsh
 
 BUILD_DIRS=		src/pl/tcl
+BUILD_MAKE_FLAGS=	PGXS=1
 
 .include "../../databases/postgresql84-client/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/databases/postgresql84-pltcl/PLIST b/databases/postgresql84-pltcl/PLIST
index f25b6941513..19ea756b7fb 100644
--- a/databases/postgresql84-pltcl/PLIST
+++ b/databases/postgresql84-pltcl/PLIST
@@ -1,14 +1,14 @@
-@comment $NetBSD: PLIST,v 1.4 2010/12/19 09:53:42 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2011/02/15 08:14:17 adam Exp $
 bin/pltcl_delmod
 bin/pltcl_listmod
 bin/pltcl_loadmod
-lib/postgresql/pltcl.la
+lib/postgresql/pltcl.so
+share/locale/de/LC_MESSAGES/pltcl-8.4.mo
+share/locale/es/LC_MESSAGES/pltcl-8.4.mo
+share/locale/fr/LC_MESSAGES/pltcl-8.4.mo
+share/locale/it/LC_MESSAGES/pltcl-8.4.mo
+share/locale/ja/LC_MESSAGES/pltcl-8.4.mo
+share/locale/pt_BR/LC_MESSAGES/pltcl-8.4.mo
+share/locale/tr/LC_MESSAGES/pltcl-8.4.mo
+share/locale/zh_CN/LC_MESSAGES/pltcl-8.4.mo
 share/postgresql/unknown.pltcl
-share/locale/de/LC_MESSAGES/pltcl0-8.4.mo
-share/locale/es/LC_MESSAGES/pltcl0-8.4.mo
-share/locale/fr/LC_MESSAGES/pltcl0-8.4.mo
-share/locale/it/LC_MESSAGES/pltcl0-8.4.mo
-share/locale/ja/LC_MESSAGES/pltcl0-8.4.mo
-share/locale/pt_BR/LC_MESSAGES/pltcl0-8.4.mo
-share/locale/tr/LC_MESSAGES/pltcl0-8.4.mo
-share/locale/zh_CN/LC_MESSAGES/pltcl0-8.4.mo
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index b49f1c2bd5a..b848b3feb04 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.9 2010/12/19 09:53:43 adam Exp $
+# $NetBSD: Makefile,v 1.10 2011/02/15 08:14:17 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/84-server-/}
 COMMENT=	PostgreSQL database server programs
@@ -10,10 +10,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 .include "../../databases/postgresql84/Makefile.common"
 
-# Use shlibtool (invoked as "$(LIBTOOL)") to build modules.
-USE_LIBTOOL=		yes
-PKG_LIBTOOL=		${PKG_SHLIBTOOL}
-
 CONFIGURE_ARGS+=	--with-openssl
 
 INSTALL_DIRS=	src/backend
diff --git a/databases/postgresql84-server/PLIST b/databases/postgresql84-server/PLIST
index b15119d2a44..6a2de5e83f4 100644
--- a/databases/postgresql84-server/PLIST
+++ b/databases/postgresql84-server/PLIST
@@ -1,53 +1,53 @@
-@comment $NetBSD: PLIST,v 1.7 2010/12/19 09:53:43 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2011/02/15 08:14:17 adam Exp $
 bin/postgres
 bin/postmaster
-lib/postgresql/ascii_and_mic.la
-lib/postgresql/cyrillic_and_mic.la
-lib/postgresql/dict_snowball.la
-lib/postgresql/euc_cn_and_mic.la
-lib/postgresql/euc_jis_2004_and_shift_jis_2004.la
-lib/postgresql/euc_jp_and_sjis.la
-lib/postgresql/euc_kr_and_mic.la
-lib/postgresql/euc_tw_and_big5.la
-lib/postgresql/latin2_and_win1250.la
-lib/postgresql/latin_and_mic.la
-lib/postgresql/plpgsql.la
-lib/postgresql/utf8_and_ascii.la
-lib/postgresql/utf8_and_big5.la
-lib/postgresql/utf8_and_cyrillic.la
-lib/postgresql/utf8_and_euc_cn.la
-lib/postgresql/utf8_and_euc_jis_2004.la
-lib/postgresql/utf8_and_euc_jp.la
-lib/postgresql/utf8_and_euc_kr.la
-lib/postgresql/utf8_and_euc_tw.la
-lib/postgresql/utf8_and_gb18030.la
-lib/postgresql/utf8_and_gbk.la
-lib/postgresql/utf8_and_iso8859.la
-lib/postgresql/utf8_and_iso8859_1.la
-lib/postgresql/utf8_and_johab.la
-lib/postgresql/utf8_and_shift_jis_2004.la
-lib/postgresql/utf8_and_sjis.la
-lib/postgresql/utf8_and_uhc.la
-lib/postgresql/utf8_and_win.la
+lib/postgresql/ascii_and_mic.so
+lib/postgresql/cyrillic_and_mic.so
+lib/postgresql/dict_snowball.so
+lib/postgresql/euc_cn_and_mic.so
+lib/postgresql/euc_jis_2004_and_shift_jis_2004.so
+lib/postgresql/euc_jp_and_sjis.so
+lib/postgresql/euc_kr_and_mic.so
+lib/postgresql/euc_tw_and_big5.so
+lib/postgresql/latin2_and_win1250.so
+lib/postgresql/latin_and_mic.so
+lib/postgresql/plpgsql.so
+lib/postgresql/utf8_and_ascii.so
+lib/postgresql/utf8_and_big5.so
+lib/postgresql/utf8_and_cyrillic.so
+lib/postgresql/utf8_and_euc_cn.so
+lib/postgresql/utf8_and_euc_jis_2004.so
+lib/postgresql/utf8_and_euc_jp.so
+lib/postgresql/utf8_and_euc_kr.so
+lib/postgresql/utf8_and_euc_tw.so
+lib/postgresql/utf8_and_gb18030.so
+lib/postgresql/utf8_and_gbk.so
+lib/postgresql/utf8_and_iso8859.so
+lib/postgresql/utf8_and_iso8859_1.so
+lib/postgresql/utf8_and_johab.so
+lib/postgresql/utf8_and_shift_jis_2004.so
+lib/postgresql/utf8_and_sjis.so
+lib/postgresql/utf8_and_uhc.so
+lib/postgresql/utf8_and_win.so
 share/examples/rc.d/pgsql
-share/locale/de/LC_MESSAGES/plpgsql0-8.4.mo
+share/locale/de/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/de/LC_MESSAGES/postgres-8.4.mo
-share/locale/es/LC_MESSAGES/plpgsql0-8.4.mo
+share/locale/es/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/es/LC_MESSAGES/postgres-8.4.mo
-share/locale/fr/LC_MESSAGES/plpgsql0-8.4.mo
+share/locale/fr/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/fr/LC_MESSAGES/postgres-8.4.mo
-share/locale/it/LC_MESSAGES/plpgsql0-8.4.mo
-share/locale/ja/LC_MESSAGES/plpgsql0-8.4.mo
+share/locale/it/LC_MESSAGES/plpgsql-8.4.mo
+share/locale/ja/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/ja/LC_MESSAGES/postgres-8.4.mo
-share/locale/ko/LC_MESSAGES/plpgsql0-8.4.mo
+share/locale/ko/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/ko/LC_MESSAGES/postgres-8.4.mo
-share/locale/pt_BR/LC_MESSAGES/plpgsql0-8.4.mo
+share/locale/pt_BR/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/pt_BR/LC_MESSAGES/postgres-8.4.mo
-share/locale/ro/LC_MESSAGES/plpgsql0-8.4.mo
+share/locale/ro/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/tr/LC_MESSAGES/postgres-8.4.mo
-share/locale/zh_CN/LC_MESSAGES/plpgsql0-8.4.mo
+share/locale/zh_CN/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/zh_CN/LC_MESSAGES/postgres-8.4.mo
-share/locale/zh_TW/LC_MESSAGES/plpgsql0-8.4.mo
+share/locale/zh_TW/LC_MESSAGES/plpgsql-8.4.mo
 share/locale/zh_TW/LC_MESSAGES/postgres-8.4.mo
 share/postgresql/conversion_create.sql
 share/postgresql/information_schema.sql
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) $<