Changes 8.3.14:

* 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.

19 files changed, 88 insertions, 344 deletions

diff --git a/databases/postgresql83-adminpack/Makefile b/databases/postgresql83-adminpack/Makefile
index a2f1f488e45..0120099cdba 100644
--- a/databases/postgresql83-adminpack/Makefile
+++ b/databases/postgresql83-adminpack/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/19 09:53:53 adam Exp $
+# $NetBSD: Makefile,v 1.6 2011/02/15 09:06:32 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/83-adminpack-/}
 COMMENT=	Admin pack module for pgAdmin management
@@ -9,12 +9,10 @@ DEPENDS+=	postgresql83-server>=${PKGVERSION_NOREV}:../../databases/postgresql83-
 
 .include "../../databases/postgresql83/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/postgresql83-client/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/postgresql83-adminpack/PLIST b/databases/postgresql83-adminpack/PLIST
index 8fb15d9466a..0208067a360 100644
--- a/databases/postgresql83-adminpack/PLIST
+++ b/databases/postgresql83-adminpack/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/19 09:53:53 adam Exp $
-lib/postgresql/adminpack.la
+@comment $NetBSD: PLIST,v 1.3 2011/02/15 09:06:32 adam Exp $
+lib/postgresql/adminpack.so
 share/postgresql/contrib/adminpack.sql
 share/postgresql/contrib/uninstall_adminpack.sql
diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile
index 6b1f19bb80b..23652af1ee4 100644
--- a/databases/postgresql83-client/Makefile
+++ b/databases/postgresql83-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.20 2011/02/08 15:50:07 brook Exp $
+# $NetBSD: Makefile,v 1.21 2011/02/15 09:06:32 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/83-client-/}
 COMMENT=	PostgreSQL database client programs
@@ -8,7 +8,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 .include "../../databases/postgresql83/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/postgresql83-client/PLIST b/databases/postgresql83-client/PLIST
index 44d1ddd7e8d..357975e3e59 100644
--- a/databases/postgresql83-client/PLIST
+++ b/databases/postgresql83-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.15 2010/12/19 09:53:53 adam Exp $
+@comment $NetBSD: PLIST,v 1.16 2011/02/15 09:06:32 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -467,11 +467,23 @@ include/postgresql/server/utils/varbit.h
 include/postgresql/server/utils/xml.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.0
+lib/libecpg_compat.a
+lib/libecpg_compat.so
+lib/libecpg_compat.so.3
+lib/libecpg_compat.so.3.0
 lib/libpgport.a
-lib/libpgtypes.la
-lib/libpq.la
+lib/libpgtypes.a
+lib/libpgtypes.so
+lib/libpgtypes.so.3
+lib/libpgtypes.so.3.0
+lib/libpq.a
+lib/libpq.so
+lib/libpq.so.5
+lib/libpq.so.5.1
 lib/postgresql/pgxs/config/install-sh
 lib/postgresql/pgxs/config/mkinstalldirs
 lib/postgresql/pgxs/src/Makefile.global
@@ -1268,6 +1280,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
@@ -1281,6 +1294,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
diff --git a/databases/postgresql83-plperl/Makefile b/databases/postgresql83-plperl/Makefile
index 3b29e2786b3..3a594ea0c69 100644
--- a/databases/postgresql83-plperl/Makefile
+++ b/databases/postgresql83-plperl/Makefile
@@ -1,23 +1,21 @@
-# $NetBSD: Makefile,v 1.9 2010/12/19 09:53:53 adam Exp $
+# $NetBSD: Makefile,v 1.10 2011/02/15 09:06:32 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/83-plperl-/}
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
 
-DEPENDS+=	postgresql83-server>=${PKGVERSION}:../../databases/postgresql83-server
+DEPENDS+=	postgresql83-server>=${PKGVERSION_NOREV}:../../databases/postgresql83-server
 
 .include "../../databases/postgresql83/Makefile.common"
 
 USE_TOOLS+=		perl
-USE_LIBTOOL=		yes
-PKG_LIBTOOL=		${PKG_SHLIBTOOL}
 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/postgresql83-client/buildlink3.mk"
 .include "../../lang/perl5/module.mk"
diff --git a/databases/postgresql83-plperl/PLIST b/databases/postgresql83-plperl/PLIST
index c84f06309cf..8313db34845 100644
--- a/databases/postgresql83-plperl/PLIST
+++ b/databases/postgresql83-plperl/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/19 09:53:53 adam Exp $
-lib/postgresql/plperl.la
+@comment $NetBSD: PLIST,v 1.3 2011/02/15 09:06:32 adam Exp $
+lib/postgresql/plperl.so
diff --git a/databases/postgresql83-plpython/Makefile b/databases/postgresql83-plpython/Makefile
index 2e038925cb4..38dc3245217 100644
--- a/databases/postgresql83-plpython/Makefile
+++ b/databases/postgresql83-plpython/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.8 2010/12/19 09:53:54 adam Exp $
+# $NetBSD: Makefile,v 1.9 2011/02/15 09:06:33 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/83-plpython-/}
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
@@ -9,12 +9,11 @@ DEPENDS+=	postgresql83-server>=${PKGVERSION_NOREV}:../../databases/postgresql83-
 
 .include "../../databases/postgresql83/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/postgresql83-client/buildlink3.mk"
 .include "../../lang/python/extension.mk"
diff --git a/databases/postgresql83-plpython/PLIST b/databases/postgresql83-plpython/PLIST
index 149fc3778e6..a5d33bf3015 100644
--- a/databases/postgresql83-plpython/PLIST
+++ b/databases/postgresql83-plpython/PLIST
@@ -1,2 +1,2 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/19 09:53:54 adam Exp $
-lib/postgresql/plpython.la
+@comment $NetBSD: PLIST,v 1.3 2011/02/15 09:06:33 adam Exp $
+lib/postgresql/plpython.so
diff --git a/databases/postgresql83-pltcl/Makefile b/databases/postgresql83-pltcl/Makefile
index 194d5aec3b0..50c7376ff0e 100644
--- a/databases/postgresql83-pltcl/Makefile
+++ b/databases/postgresql83-pltcl/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/12/19 09:53:54 adam Exp $
+# $NetBSD: Makefile,v 1.6 2011/02/15 09:06:33 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/83-pltcl-/}
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
@@ -9,14 +9,13 @@ DEPENDS+=	postgresql83-server>=${PKGVERSION_NOREV}:../../databases/postgresql83-
 
 .include "../../databases/postgresql83/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/postgresql83-client/buildlink3.mk"
 .include "../../lang/tcl/buildlink3.mk"
diff --git a/databases/postgresql83-pltcl/PLIST b/databases/postgresql83-pltcl/PLIST
index ab52ccc2d58..e4b8f12b8dc 100644
--- a/databases/postgresql83-pltcl/PLIST
+++ b/databases/postgresql83-pltcl/PLIST
@@ -1,6 +1,6 @@
-@comment $NetBSD: PLIST,v 1.2 2010/12/19 09:53:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2011/02/15 09:06:33 adam Exp $
 bin/pltcl_delmod
 bin/pltcl_listmod
 bin/pltcl_loadmod
-lib/postgresql/pltcl.la
+lib/postgresql/pltcl.so
 share/postgresql/unknown.pltcl
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index 1268bb4126f..6b12a4ac9b8 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.13 2010/12/19 09:53:54 adam Exp $
+# $NetBSD: Makefile,v 1.14 2011/02/15 09:06:33 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/83-server-/}
 COMMENT=	PostgreSQL database server programs
@@ -10,10 +10,6 @@ NOT_FOR_PLATFORM=	*-*-mips
 
 .include "../../databases/postgresql83/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/postgresql83-server/PLIST b/databases/postgresql83-server/PLIST
index cf5fe639a25..510a6882590 100644
--- a/databases/postgresql83-server/PLIST
+++ b/databases/postgresql83-server/PLIST
@@ -1,34 +1,34 @@
-@comment $NetBSD: PLIST,v 1.13 2010/12/19 09:53:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2011/02/15 09:06:33 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_euc_jis_2004.la
-lib/postgresql/utf8_and_cyrillic.la
-lib/postgresql/utf8_and_euc_cn.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_euc_jis_2004.so
+lib/postgresql/utf8_and_cyrillic.so
+lib/postgresql/utf8_and_euc_cn.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/af/LC_MESSAGES/postgres.mo
 share/locale/cs/LC_MESSAGES/postgres.mo
diff --git a/databases/postgresql83/Makefile.common b/databases/postgresql83/Makefile.common
index d0dce1f0306..d5a0d7c6400 100644
--- a/databases/postgresql83/Makefile.common
+++ b/databases/postgresql83/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.16 2010/12/19 09:53:52 adam Exp $
+# $NetBSD: Makefile.common,v 1.17 2011/02/15 09:06:31 adam Exp $
 #
 # used by databases/postgresql83-adminpack/Makefile
 # used by databases/postgresql83-client/Makefile
@@ -17,7 +17,7 @@
 
 .include "../../databases/postgresql83/Makefile.mirrors"
 
-DISTNAME=	postgresql-8.3.13
+DISTNAME=	postgresql-8.3.14
 CATEGORIES=	databases
 MASTER_SITES=	${PGSQL_MIRRORS:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
@@ -59,11 +59,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
-
 # PostgreSQL explicitly forbids any use of -ffast-math
 BUILDLINK_TRANSFORM+=	rm:-ffast-math
 
@@ -78,8 +73,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/postgresql83/distinfo b/databases/postgresql83/distinfo
index a6d73328b03..95efe3fd480 100644
--- a/databases/postgresql83/distinfo
+++ b/databases/postgresql83/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.14 2010/12/19 09:53:52 adam Exp $
+$NetBSD: distinfo,v 1.15 2011/02/15 09:06:32 adam Exp $
 
-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 (postgresql-8.3.14.tar.bz2) = aec29d9be73e90b88b2d1d5eadff8fffc5681e59
+RMD160 (postgresql-8.3.14.tar.bz2) = 353996ca82141186f67d59a8ae37b91586413807
+Size (postgresql-8.3.14.tar.bz2) = 14345092 bytes
 SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f
 SHA1 (patch-ab) = 7bf5635b0b93c3c0d33acd4e122e102c92ce7b76
 SHA1 (patch-ac) = 8e3a7021fdd01810d4ebcbd20002b28164b22279
@@ -12,4 +12,3 @@ SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
 SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
 SHA1 (patch-ai) = a2364b8e1e8a3094e1c5bfb0cad2d0babe0a8841
 SHA1 (patch-aj) = c389f9b8f39ddb61e58b5fe87ffabb789c71d4e0
-SHA1 (patch-an) = 5981ccab104dd12f1b9baab8ca6c0ff32f873897
diff --git a/databases/postgresql83/files/Makefile.custom b/databases/postgresql83/files/Makefile.custom
deleted file mode 100644
index c6913ff1f4d..00000000000
--- a/databases/postgresql83/files/Makefile.custom
+++ /dev/null
@@ -1,42 +0,0 @@
-# $NetBSD: Makefile.custom,v 1.1.1.1 2008/03/04 12:41:36 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/postgresql83/files/Makefile.libtool b/databases/postgresql83/files/Makefile.libtool
deleted file mode 100644
index 8905fd7bff5..00000000000
--- a/databases/postgresql83/files/Makefile.libtool
+++ /dev/null
@@ -1,141 +0,0 @@
-#-------------------------------------------------------------------------
-#
-# Makefile.libtool
-#    Common rules for buildling libtool archives
-#
-# IDENTIFICATION
-#    $NetBSD: Makefile.libtool,v 1.2 2010/01/21 12:45:28 adam 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
-shmodule	= no
-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/postgresql83/options.mk b/databases/postgresql83/options.mk
index 9e7aeaba67f..b1e256e3b4c 100644
--- a/databases/postgresql83/options.mk
+++ b/databases/postgresql83/options.mk
@@ -1,11 +1,22 @@
-# $NetBSD: options.mk,v 1.5 2010/12/19 09:53:52 adam Exp $
+# $NetBSD: options.mk,v 1.6 2011/02/15 09:06:32 adam Exp $
 
 PKG_OPTIONS_VAR=	PKG_OPTIONS.postgresql83
-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/postgresql83/patches/patch-aj b/databases/postgresql83/patches/patch-aj
deleted file mode 100644
index e4f50e1cac8..00000000000
--- a/databases/postgresql83/patches/patch-aj
+++ /dev/null
@@ -1,66 +0,0 @@
-$NetBSD: patch-aj,v 1.2 2010/01/21 12:45:28 adam Exp $
-
---- src/makefiles/pgxs.mk	2010-01-21 12:58:01.000000000 +0100
-+++ src/makefiles/pgxs.mk.orig	2010-01-18 10:08:33.000000000 +0100
-@@ -121,9 +117,6 @@
- ifdef PROGRAM
- 	$(INSTALL_PROGRAM) $(PROGRAM)$(X) '$(DESTDIR)$(bindir)'
- endif # PROGRAM
--ifdef MODULE_big
--	$(INSTALL_SHLIB) $(shlib) '$(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)'
--endif # MODULE_big
- ifdef SCRIPTS
- 	@for file in $(addprefix $(srcdir)/, $(SCRIPTS)); do \
- 	  echo "$(INSTALL_SCRIPT) $$file '$(DESTDIR)$(bindir)'"; \
-@@ -137,6 +130,10 @@
- 	done
- endif # SCRIPTS_built
- 
-+ifdef MODULE_big
-+install: install-lib
-+endif # MODULE_big
-+
- 
- installdirs:
- ifneq (,$(DATA)$(DATA_built))
-@@ -145,7 +142,7 @@
- ifneq (,$(DATA_TSEARCH))
- 	$(mkinstalldirs) '$(DESTDIR)$(datadir)/tsearch_data'
- endif
--ifneq (,$(MODULES)$(MODULE_big))
-+ifneq (,$(MODULES))
- 	$(mkinstalldirs) '$(DESTDIR)$(pkglibdir)'
- endif
- ifdef DOCS
-@@ -157,6 +154,10 @@
- 	$(mkinstalldirs) '$(DESTDIR)$(bindir)'
- endif
- 
-+ifdef MODULE_big
-+installdirs: installdirs-lib
-+endif # MODULE_big
-+
- 
- uninstall:
- ifneq (,$(DATA)$(DATA_built))
-@@ -174,9 +175,6 @@
- ifdef PROGRAM
- 	rm -f '$(DESTDIR)$(bindir)/$(PROGRAM)$(X)'
- endif
--ifdef MODULE_big
--	rm -f '$(DESTDIR)$(pkglibdir)/$(MODULE_big)$(DLSUFFIX)'
--endif
- ifdef SCRIPTS
- 	rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS))
- endif
-@@ -184,6 +182,10 @@
- 	rm -f $(addprefix '$(DESTDIR)$(bindir)'/, $(SCRIPTS_built))
- endif
- 
-+ifdef MODULE_big
-+uninstall: uninstall-lib
-+endif # MODULE_big
-+
- 
- clean:
- ifdef MODULES
diff --git a/databases/postgresql83/patches/patch-an b/databases/postgresql83/patches/patch-an
deleted file mode 100644
index cdf24fcad1b..00000000000
--- a/databases/postgresql83/patches/patch-an
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-an,v 1.2 2010/12/19 09:53:53 adam Exp $
-
---- src/interfaces/ecpg/test/Makefile.regress.orig	2010-12-14 03:51:20.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) $<