Pullup ticket #3113 - requested by spz:

databases/postgresql82: security update databases/postgresql82-adminpack: security update databases/postgresql82-client: security update databases/postgresql82-plperl: security update databases/postgresql82-plpython: security update databases/postgresql82-pltcl: security update databases/postgresql82-server: security update databases/postgresql82-tsearch2: security update databases/postgresql83: security update databases/postgresql83-adminpack: security update databases/postgresql83-client: security update databases/postgresql83-plperl: security update databases/postgresql83-plpython: security update databases/postgresql83-pltcl: security update databases/postgresql83-server: security update databases/postgresql84: security update databases/postgresql84-adminpack: security update databases/postgresql84-client: security update databases/postgresql84-plperl: security update databases/postgresql84-plpython: security update databases/postgresql84-pltcl: security update databases/postgresql84-server: security update databases/postgresql82: security update databases/postgresql83: security update databases/postgresql84: security update Revisions pulled up: - databases/postgresql82-adminpack/Makefile 1.8 - databases/postgresql82-client/Makefile 1.13 - databases/postgresql82-client/PLIST 1.18 - databases/postgresql82-plperl/Makefile 1.10 - databases/postgresql82-plpython/Makefile 1.10 - databases/postgresql82-pltcl/Makefile 1.7 - databases/postgresql82-server/Makefile 1.11 - databases/postgresql82-server/PLIST 1.12 - databases/postgresql82-tsearch2/Makefile 1.8 - databases/postgresql82/Makefile.common 1.19-1.20 - databases/postgresql82/distinfo 1.19 - databases/postgresql82/patches/patch-ad delete - databases/postgresql82/patches/patch-ae delete - databases/postgresql83-adminpack/Makefile 1.4 - databases/postgresql83-client/Makefile 1.13-1.14 - databases/postgresql83-client/PLIST 1.12 - databases/postgresql83-plperl/Makefile 1.6 - databases/postgresql83-plpython/Makefile 1.7 - databases/postgresql83-pltcl/Makefile 1.4 - databases/postgresql83-server/Makefile 1.11 - databases/postgresql83-server/PLIST 1.10 - databases/postgresql83/Makefile.common 1.10-1.11 - databases/postgresql83/distinfo 1.11 - databases/postgresql83/patches/patch-ad delete - databases/postgresql83/patches/patch-ae delete - databases/postgresql84-adminpack/Makefile 1.3 - databases/postgresql84-client/Makefile 1.6-1.7 - databases/postgresql84-client/PLIST 1.5 - databases/postgresql84-plperl/Makefile 1.3 - databases/postgresql84-plpython/Makefile 1.4 - databases/postgresql84-pltcl/Makefile 1.3 - databases/postgresql84-server/Makefile 1.7 - databases/postgresql84-server/PLIST 1.4 - databases/postgresql84/Makefile.common 1.4-1.5 - databases/postgresql84/distinfo 1.4 - databases/postgresql84/patches/patch-ad delete - databases/postgresql84/patches/patch-ae delete - databases/postgresql84/patches/patch-ai 1.2 --- Module Name: pkgsrc Committed By: adam Date: Mon Apr 12 09:58:39 UTC 2010 Modified Files: pkgsrc/databases/postgresql84: Makefile.common distinfo pkgsrc/databases/postgresql84-adminpack: Makefile pkgsrc/databases/postgresql84-client: Makefile pkgsrc/databases/postgresql84-plperl: Makefile pkgsrc/databases/postgresql84-plpython: Makefile pkgsrc/databases/postgresql84-pltcl: Makefile pkgsrc/databases/postgresql84-server: Makefile PLIST pkgsrc/databases/postgresql84/patches: patch-ai Removed Files: pkgsrc/databases/postgresql84/patches: patch-ad patch-ae Log Message: Changes 8.4.3: * Add new configuration parameter ssl_renegotiation_limit to control how often we do session key renegotiation for an SSL connection * Fix possible deadlock during backend startup * Fix possible crashes due to not handling errors during relcache reload cleanly * Fix possible crash due to use of dangling pointer to a cached plan * Fix possible crash due to overenthusiastic invalidation of cached plan for "ROLLBACK" * Fix possible crashes when trying to recover from a failure in subtransaction start * Fix server memory leak associated with use of savepoints and a client encoding different from server's encoding * Fix incorrect WAL data emitted during end-of-recovery cleanup of a GIST index page split * Fix bug in WAL redo cleanup method for GIN indexes * Fix incorrect comparison of scan key in GIN index search * Make substring() for bit types treat any negative length as meaning "all the rest of the string" The previous coding treated only -1 that way, and would produce an invalid result value for other negative values, possibly leading to a crash (CVE-2010-0442). * Fix integer-to-bit-string conversions to handle the first fractional byte correctly when the output bit width is wider than the given integer by something other than a multiple of 8 bits * Fix some cases of pathologically slow regular expression matching * Fix bug occurring when trying to inline a SQL function that returns a set of a composite type that contains dropped columns * Fix bug with trying to update a field of an element of a composite-type array column * Avoid failure when "EXPLAIN" has to print a FieldStore or assignment ArrayRef expression These cases can arise now that "EXPLAIN VERBOSE" tries to print plan node target lists. * Avoid an unnecessary coercion failure in some cases where an undecorated literal string appears in a subquery within "UNION"/"INTERSECT"/"EXCEPT" This fixes a regression for some cases that worked before 8.4. * Avoid undesirable rowtype compatibility check failures in some cases where a whole-row Var has a rowtype that contains dropped columns * Fix the STOP WAL LOCATION entry in backup history files to report the next WAL segment's name when the end location is exactly at a segment boundary * Always pass the catalog ID to an option validator function specified in "CREATE FOREIGN DATA WRAPPER" * Fix some more cases of temporary-file leakage * Add support for doing FULL JOIN ON FALSE * Improve constraint exclusion processing of boolean-variable cases, in particular make it possible to exclude a partition that has a "bool_column = false" constraint * Prevent treating an INOUT cast as representing binary compatibility * Include column name in the message when warning about inability to grant or revoke column-level privileges This is more useful than before and helps to prevent confusion when a "REVOKE" generates multiple messages, which formerly appeared to be duplicates. * When reading "pg_hba.conf" and related files, do not treat @something as a file inclusion request if the @ appears inside quote marks; also, never treat @ by itself as a file inclusion request * Prevent infinite loop on some platforms if a directory is named as an inclusion target in "pg_hba.conf" and related files * Fix possible infinite loop if SSL_read or SSL_write fails without setting errno This is reportedly possible with some Windows versions of openssl. * Disallow GSSAPI authentication on local connections, since it requires a hostname to function correctly * Protect ecpg against applications freeing strings unexpectedly * Make ecpg report the proper SQLSTATE if the connection disappears * Fix translation of cell contents in psql \d output * Fix psql's numericlocale option to not format strings it shouldn't in latex and troff output formats * Fix a small per-query memory leak in psql * Make psql return the correct exit status (3) when ON_ERROR_STOP and --single-transaction are both specified and an error occurs during the implied "COMMIT" * Fix pg_dump's output of permissions for foreign servers * Fix possible crash in parallel pg_restore due to out-of-range dependency IDs * Fix plpgsql failure in one case where a composite column is set to NULL * Fix possible failure when calling PL/Perl functions from PL/PerlU or vice versa * Add volatile markings in PL/Python to avoid possible compiler-specific misbehavior * Ensure PL/Tcl initializes the Tcl interpreter fully The only known symptom of this oversight is that the Tcl clock command misbehaves if using Tcl 8.5 or later. * Prevent ExecutorEnd from being run on portals created within a failed transaction or subtransaction This is known to cause issues when using "contrib/auto_explain". * Prevent crash in "contrib/dblink" when too many key columns are specified to a dblink_build_sql_* function * Allow zero-dimensional arrays in "contrib/ltree" operations * Fix assorted crashes in "contrib/xml2" caused by sloppy memory management * Make building of "contrib/xml2" more robust on Windows * Fix race condition in Windows signal handling One known symptom of this bug is that rows in pg_listener could be dropped under heavy load. * Make the configure script report failure if the C compiler does not provide a working 64-bit integer datatype This case has been broken for some time, and no longer seems worth supporting, so just reject it at configure time instead. * Update time zone data files to tzdata release 2010e for DST law changes in Bangladesh, Chile, Fiji, Mexico, Paraguay, Samoa. --- Module Name: pkgsrc Committed By: taca Date: Thu Apr 15 03:25:25 UTC 2010 Modified Files: pkgsrc/databases/postgresql84-client: Makefile PLIST Log Message: Add missing some documentation files to PLIST. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: adam Date: Mon Apr 12 09:53:50 UTC 2010 Modified Files: pkgsrc/databases/postgresql83: Makefile.common distinfo pkgsrc/databases/postgresql83-adminpack: Makefile pkgsrc/databases/postgresql83-client: Makefile pkgsrc/databases/postgresql83-plperl: Makefile pkgsrc/databases/postgresql83-plpython: Makefile pkgsrc/databases/postgresql83-pltcl: Makefile pkgsrc/databases/postgresql83-server: Makefile PLIST Removed Files: pkgsrc/databases/postgresql83/patches: patch-ad patch-ae Log Message: Changes 8.3.10: * Add new configuration parameter ssl_renegotiation_limit to control how often we do session key renegotiation for an SSL connection * Fix possible deadlock during backend startup * Fix possible crashes due to not handling errors during relcache reload cleanly * Fix possible crash due to use of dangling pointer to a cached plan * Fix possible crashes when trying to recover from a failure in subtransaction start * Fix server memory leak associated with use of savepoints and a client encoding different from server's encoding * Fix incorrect WAL data emitted during end-of-recovery cleanup of a GIST index page split * Make substring() for bit types treat any negative length as meaning "all the rest of the string" The previous coding treated only -1 that way, and would produce an invalid result value for other negative values, possibly leading to a crash (CVE-2010-0442). * Fix integer-to-bit-string conversions to handle the first fractional byte correctly when the output bit width is wider than the given integer by something other than a multiple of 8 bits * Fix some cases of pathologically slow regular expression matching * Fix assorted crashes in xml processing caused by sloppy memory management * Fix bug with trying to update a field of an element of a composite-type array column * Fix the STOP WAL LOCATION entry in backup history files to report the next WAL segment's name when the end location is exactly at a segment boundary * Fix some more cases of temporary-file leakage This corrects a problem introduced in the previous minor release. One case that failed is when a plpgsql function returning set is called within another function's exception handler. * Improve constraint exclusion processing of boolean-variable cases, in particular make it possible to exclude a partition that has a "bool_column = false" constraint * When reading "pg_hba.conf" and related files, do not treat @something as a file inclusion request if the @ appears inside quote marks; also, never treat @ by itself as a file inclusion request * Prevent infinite loop on some platforms if a directory is named as an inclusion target in "pg_hba.conf" and related files * Fix possible infinite loop if SSL_read or SSL_write fails without setting errno This is reportedly possible with some Windows versions of openssl. * Disallow GSSAPI authentication on local connections, since it requires a hostname to function correctly * Make ecpg report the proper SQLSTATE if the connection disappears * Fix psql's numericlocale option to not format strings it shouldn't in latex and troff output formats * Make psql return the correct exit status (3) when ON_ERROR_STOP and --single-transaction are both specified and an error occurs during the implied "COMMIT" * Fix plpgsql failure in one case where a composite column is set to NULL * Fix possible failure when calling PL/Perl functions from PL/PerlU or vice versa * Add volatile markings in PL/Python to avoid possible compiler-specific misbehavior * Ensure PL/Tcl initializes the Tcl interpreter fully The only known symptom of this oversight is that the Tcl clock command misbehaves if using Tcl 8.5 or later. * Prevent crash in "contrib/dblink" when too many key columns are specified to a dblink_build_sql_* function * Allow zero-dimensional arrays in "contrib/ltree" operations * Fix assorted crashes in "contrib/xml2" caused by sloppy memory management * Make building of "contrib/xml2" more robust on Windows * Fix race condition in Windows signal handling One known symptom of this bug is that rows in pg_listener could be dropped under heavy load. * Update time zone data files to tzdata release 2010e for DST law changes in Bangladesh, Chile, Fiji, Mexico, Paraguay, Samoa. --- Module Name: pkgsrc Committed By: taca Date: Thu Apr 15 03:25:05 UTC 2010 Modified Files: pkgsrc/databases/postgresql83-client: Makefile PLIST Log Message: Add missing some documentation files to PLIST. Bump PKGREVISION. --- Module Name: pkgsrc Committed By: adam Date: Mon Apr 12 09:48:49 UTC 2010 Modified Files: pkgsrc/databases/postgresql82: Makefile.common distinfo pkgsrc/databases/postgresql82-adminpack: Makefile pkgsrc/databases/postgresql82-client: Makefile PLIST pkgsrc/databases/postgresql82-plperl: Makefile pkgsrc/databases/postgresql82-plpython: Makefile pkgsrc/databases/postgresql82-pltcl: Makefile pkgsrc/databases/postgresql82-server: Makefile PLIST pkgsrc/databases/postgresql82-tsearch2: Makefile Removed Files: pkgsrc/databases/postgresql82/patches: patch-ad patch-ae Log Message: Changes 8.2.16: * Add new configuration parameter ssl_renegotiation_limit to control how often we do session key renegotiation for an SSL connection * Fix possible deadlock during backend startup * Fix possible crashes due to not handling errors during relcache reload cleanly * Fix possible crashes when trying to recover from a failure in subtransaction start * Fix server memory leak associated with use of savepoints and a client encoding different from server's encoding * Fix incorrect WAL data emitted during end-of-recovery cleanup of a GIST index page split * Make substring() for bit types treat any negative length as meaning "all the rest of the string" The previous coding treated only -1 that way, and would produce an invalid result value for other negative values, possibly leading to a crash (CVE-2010-0442). * Fix integer-to-bit-string conversions to handle the first fractional byte correctly when the output bit width is wider than the given integer by something other than a multiple of 8 bits * Fix some cases of pathologically slow regular expression matching * Fix the STOP WAL LOCATION entry in backup history files to report the next WAL segment's name when the end location is exactly at a segment boundary * Fix some more cases of temporary-file leakage * Improve constraint exclusion processing of boolean-variable cases, in particular make it possible to exclude a partition that has a "bool_column = false" constraint * When reading "pg_hba.conf" and related files, do not treat @something as a file inclusion request if the @ appears inside quote marks; also, never treat @ by itself as a file inclusion request * Prevent infinite loop on some platforms if a directory is named as an inclusion target in "pg_hba.conf" and related files * Fix possible infinite loop if SSL_read or SSL_write fails without setting errno This is reportedly possible with some Windows versions of openssl. * Fix psql's numericlocale option to not format strings it shouldn't in latex and troff output formats * Make psql return the correct exit status (3) when ON_ERROR_STOP and --single-transaction are both specified and an error occurs during the implied "COMMIT" * Fix plpgsql failure in one case where a composite column is set to NULL * Fix possible failure when calling PL/Perl functions from PL/PerlU or vice versa * Add volatile markings in PL/Python to avoid possible compiler-specific misbehavior * Ensure PL/Tcl initializes the Tcl interpreter fully The only known symptom of this oversight is that the Tcl clock command misbehaves if using Tcl 8.5 or later. * Prevent crash in "contrib/dblink" when too many key columns are specified to a dblink_build_sql_* function * Fix assorted crashes in "contrib/xml2" caused by sloppy memory management * Make building of "contrib/xml2" more robust on Windows * Fix race condition in Windows signal handling One known symptom of this bug is that rows in pg_listener could be dropped under heavy load. * Update time zone data files to tzdata release 2010e for DST law changes in Bangladesh, Chile, Fiji, Mexico, Paraguay, Samoa. --- Module Name: pkgsrc Committed By: adam Date: Fri Apr 23 16:03:24 UTC 2010 Modified Files: pkgsrc/databases/postgresql82: Makefile.common pkgsrc/databases/postgresql83: Makefile.common pkgsrc/databases/postgresql84: Makefile.common Log Message: Fixed meta package building
author: tron <tron> 2010-05-12 21:20:05 +0000
committer: tron <tron> 2010-05-12 21:20:05 +0000
commit: d51e3344355b1149b0123eede29f11bdd85409b5 (patch)
tree: dd75af4a0a9c6d69159c50029ce36fffd161bba4 /databases
parent: 1bd8a1fdf95897f44154241ee86d98f2e0a48f35 (diff)
download: pkgsrc-d51e3344355b1149b0123eede29f11bdd85409b5.tar.gz
38 files changed, 136 insertions, 612 deletions
diff --git a/databases/postgresql82-adminpack/Makefile b/databases/postgresql82-adminpack/Makefile
index 7ee6c20cd42..36d643a3201 100644
--- a/databases/postgresql82-adminpack/Makefile
+++ b/databases/postgresql82-adminpack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2010/05/12 21:20:05 tron Exp $
 
 PKGNAME=	postgresql82-adminpack-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	Admin pack module for pgAdmin management
 
 DEPENDS+=	postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82-client/Makefile b/databases/postgresql82-client/Makefile
index 4e8620b926b..8b226715120 100644
--- a/databases/postgresql82-client/Makefile
+++ b/databases/postgresql82-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2010/05/12 21:20:05 tron Exp $
 
 PKGNAME=	postgresql82-client-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -20,7 +19,6 @@ CONFLICTS+=	postgresql82-docs-[0-9]*
 # 1. The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
 # NetBSD earler than 4.0 or DragonFly.
 # 2. configure with --enable-thread-safety fails on OpenBSD.
-#
 .if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-3].*)) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD"
 PGSQL_THREAD_SAFETY?=	no
@@ -83,7 +81,6 @@ PG_PGXS_FILES+=	src/nls-global.mk
 
 # On Solaris, avoid conflicts between "${SSLBASE}/include/openssl/des.h"
 # and "/usr/include/crypt.h" -- we want the definitions in the former.
-#
 .if ${OPSYS} == "SunOS"
 post-wrapper:
 	touch ${BUILDLINK_DIR}/include/crypt.h
diff --git a/databases/postgresql82-client/PLIST b/databases/postgresql82-client/PLIST
index ec0195c0396..eaaef7f8804 100644
--- a/databases/postgresql82-client/PLIST
+++ b/databases/postgresql82-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2009/12/16 21:18:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.17.4.1 2010/05/12 21:20:05 tron Exp $
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/af/LC_MESSAGES/libpq.mo
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/initdb.mo
 ${PG_SUBPREFIX}${PKGLOCALEDIR}/locale/cs/LC_MESSAGES/libpq.mo
@@ -1544,7 +1544,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/wal-intro.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/wal-reliability.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/wal.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/warm-standby.html
-${PG_SUBPREFIX}share/doc/postgresql/html/x71223.html
+${PG_SUBPREFIX}share/doc/postgresql/html/x71236.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/xaggr.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/xfunc-c.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/xfunc-internal.html
diff --git a/databases/postgresql82-plperl/Makefile b/databases/postgresql82-plperl/Makefile
index 76835612cb9..f00616f2a7e 100644
--- a/databases/postgresql82-plperl/Makefile
+++ b/databases/postgresql82-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2010/05/12 21:20:05 tron Exp $
 
 PKGNAME=	postgresql82-plperl-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82-plpython/Makefile b/databases/postgresql82-plpython/Makefile
index f7e0717f154..bd725a38130 100644
--- a/databases/postgresql82-plpython/Makefile
+++ b/databases/postgresql82-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.9 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.9.2.1 2010/05/12 21:20:05 tron Exp $
 
 PKGNAME=	postgresql82-plpython-${BASE_VERS}
-PKGREVISION=	2
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82-pltcl/Makefile b/databases/postgresql82-pltcl/Makefile
index f66b40ca9a4..d0a41634beb 100644
--- a/databases/postgresql82-pltcl/Makefile
+++ b/databases/postgresql82-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2010/01/17 12:02:10 wiz Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2010/05/12 21:20:05 tron Exp $
 
 PKGNAME=	postgresql82-pltcl-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82-server/Makefile b/databases/postgresql82-server/Makefile
index 08c0c681c61..f273f70b8e0 100644
--- a/databases/postgresql82-server/Makefile
+++ b/databases/postgresql82-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2010/01/22 20:12:11 adam Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2010/05/12 21:20:05 tron Exp $
 
 PKGNAME=	postgresql82-server-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql82-server/PLIST b/databases/postgresql82-server/PLIST
index a8836e7e50c..991510dc813 100644
--- a/databases/postgresql82-server/PLIST
+++ b/databases/postgresql82-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/12/16 21:18:31 adam Exp $
+@comment $NetBSD: PLIST,v 1.11.4.1 2010/05/12 21:20:05 tron Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
@@ -204,6 +204,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Managua
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Manaus
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Marigot
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Martinique
+${PG_SUBPREFIX}share/postgresql/timezone/America/Matamoros
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mazatlan
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mendoza
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Menominee
@@ -222,6 +223,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Nome
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Noronha
 ${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/Center
 ${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/New_Salem
+${PG_SUBPREFIX}share/postgresql/timezone/America/Ojinaga
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Panama
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Pangnirtung
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Paramaribo
@@ -240,6 +242,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Rio_Branco
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Rosario
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Santarem
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Santiago
+${PG_SUBPREFIX}share/postgresql/timezone/America/Santa_Isabel
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Santo_Domingo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Sao_Paulo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Scoresbysund
diff --git a/databases/postgresql82-tsearch2/Makefile b/databases/postgresql82-tsearch2/Makefile
index d234403bf44..ce3ba53d294 100644
--- a/databases/postgresql82-tsearch2/Makefile
+++ b/databases/postgresql82-tsearch2/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2010/01/17 12:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.7.2.1 2010/05/12 21:20:06 tron Exp $
 
 PKGNAME=	postgresql82-tsearch2-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	Tsearch2 contrib module for fulltext indexing in PostgreSQL
 
 DEPENDS+=	postgresql82-server>=${BASE_VERS}:../../databases/postgresql82-server
diff --git a/databases/postgresql82/Makefile.common b/databases/postgresql82/Makefile.common
index 392c4d3f344..493f1f58de3 100644
--- a/databases/postgresql82/Makefile.common
+++ b/databases/postgresql82/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.18 2009/12/16 21:18:31 adam Exp $
+# $NetBSD: Makefile.common,v 1.18.4.1 2010/05/12 21:20:05 tron Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -32,13 +32,10 @@ COMMON_FILESDIR?=	${.CURDIR}/../postgresql82/files
 PATCHDIR?=		${.CURDIR}/../postgresql82/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-postgresql82 when updating version
-#
-DIST_VERS?=		8.2.15
+DIST_VERS?=		8.2.16
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql82-client+=	postgresql82-client>=${BASE_VERS}
@@ -56,9 +53,10 @@ SUBST_SED.pglocale=	-e 's|\( localedir[	 :]*=\).*|\1${PG_LOCALE_DIR}|'
 
 .include "../../mk/bsd.prefs.mk"
 
-PGSQL_TEMPLATE.SunOS=		solaris
-.if !defined(PGSQL_TEMPLATE.${OPSYS})
-PGSQL_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
+PG_TEMPLATE.SunOS=	solaris
+PG_TEMPLATE.IRIX=	irix5
+.if !defined(PG_TEMPLATE.${OPSYS})
+PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
 
 PG_SUBPREFIX=		# empty
@@ -80,7 +78,7 @@ GNU_CONFIGURE_PREFIX=	${PG_PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PG_ETC_DIR}
 CONFIGURE_ARGS+=	--datadir=${PG_DATA_DIR}
 CONFIGURE_ARGS+=	--with-docdir=${PG_DOC_DIR}
-CONFIGURE_ARGS+=	--with-template=${PGSQL_TEMPLATE.${OPSYS}}
+CONFIGURE_ARGS+=	--with-template=${PG_TEMPLATE.${OPSYS}}
 CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-zlib
 CONFIGURE_ARGS+=	--enable-nls
@@ -100,7 +98,6 @@ BUILDLINK_TRANSFORM+=	rm:-ffast-math
 
 # USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl
 # to provide "dlopen" functionality for the PostgreSQL backend.
-#
 .if ${OPSYS} == "Interix"
 USE_LIBLTDL?=		yes
 .endif
@@ -110,59 +107,32 @@ FILES_SUBST+=		PG_PREFIX=${PG_PREFIX:Q}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
+.if !defined(META_PACKAGE)
 post-extract:
-	if ${TEST} -d ${WRKSRC}/src; then				\
-		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		\
-			${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		\
-			${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	\
-			${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
-	fi
+	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])
-	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		\
-			${WRKSRC}/src/backend/port/dynloader/$$template.h; \
-		${ECHO} "static int dummy = 0;"				\
-			 >${WRKSRC}/src/backend/port/dynloader/$$template.c
-	fi
+	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
+.endif
+	touch ${WRKSRC}/src/template/dragonfly
+	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
+		${WRKSRC}/src/backend/port/dynloader/dragonfly.c
+	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
+		${WRKSRC}/src/backend/port/dynloader/dragonfly.h
+	cp ${WRKSRC}/src/include/port/freebsd.h \
+		${WRKSRC}/src/include/port/dragonfly.h
+	cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+		${WRKSRC}/src/makefiles/Makefile.dragonfly
 .endif
-	if ${TEST} -d ${WRKSRC}/src/template; then			\
-		touch ${WRKSRC}/src/template/dragonfly;		\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then	\
-		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c	\
-			${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \
-		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		\
-			${WRKSRC}/src/include/port/dragonfly.h;		\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/makefiles; then			\
-		cp ${WRKSRC}/src/makefiles/Makefile.freebsd		\
-			${WRKSRC}/src/makefiles/Makefile.dragonfly;	\
-	fi
 
 # 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 (hardcoded in the
 # PostgreSQL sources).  Please don't change this value unless you know
 # what you are doing.
-#
 BUILD_DEFS+=	PGSQL_BLCKSZ
 
 .if defined(PGSQL_BLCKSZ)
diff --git a/databases/postgresql82/distinfo b/databases/postgresql82/distinfo
index ae8b68483f4..dff8ea7e895 100644
--- a/databases/postgresql82/distinfo
+++ b/databases/postgresql82/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.18 2009/12/16 21:18:31 adam Exp $
+$NetBSD: distinfo,v 1.18.4.1 2010/05/12 21:20:05 tron Exp $
 
-SHA1 (postgresql-8.2.15.tar.bz2) = 4de199b3223dba2164a9e56d998f6deb708f0f74
-RMD160 (postgresql-8.2.15.tar.bz2) = ae2556833810e6a8d28f8e101edc94e190b67536
-Size (postgresql-8.2.15.tar.bz2) = 12653038 bytes
+SHA1 (postgresql-8.2.16.tar.bz2) = 092e95438b6db24b65469433439c05dc6435d335
+RMD160 (postgresql-8.2.16.tar.bz2) = 5d3fe8ab522f3f0d744f902b3d31b2eab514e0f4
+Size (postgresql-8.2.16.tar.bz2) = 12637799 bytes
 SHA1 (patch-aa) = 850a02acbd718a01d3597a99e929e3b3f663f07c
 SHA1 (patch-ab) = d09e44921e9dd005e1b1dfbb5da4e56737ea05ab
 SHA1 (patch-ac) = cbd302a60d43171854c37171b57ee7bbf1194ad9
-SHA1 (patch-ad) = 84ce70fa661b44f267a502ea73fe01b84776c91c
-SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6
 SHA1 (patch-af) = 89cb9318946cb7c34ad79dbae107ce66bd1c5022
 SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
 SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
diff --git a/databases/postgresql82/patches/patch-ad b/databases/postgresql82/patches/patch-ad
deleted file mode 100644
index 46fd11c5049..00000000000
--- a/databases/postgresql82/patches/patch-ad
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/04/05 16:40:08 adam Exp $
-
---- src/backend/port/dynloader/netbsd.c.orig	2008-04-05 11:33:08.000000000 +0200
-+++ src/backend/port/dynloader/netbsd.c
-@@ -46,64 +46,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
- 
- #include "dynloader.h"
- 
--static char error_message[BUFSIZ];
-+#ifndef HAVE_DLOPEN
- 
- char *
--BSD44_derived_dlerror(void)
-+pg_dlerror(void)
- {
--	static char ret[BUFSIZ];
--
--	strcpy(ret, error_message);
--	error_message[0] = 0;
--	return (ret[0] == 0) ? NULL : ret;
-+	return "dynaloader unsupported";
- }
- 
- void *
--BSD44_derived_dlopen(const char *file, int num)
-+pg_dlopen(const char *file, int num)
- {
--#if !defined(HAVE_DLOPEN)
--	snprintf(error_message, sizeof(error_message),
--			 "dlopen (%s) not supported", file);
-+	elog(ERROR, "dynamic load not supported");
- 	return NULL;
--#else
--	void	   *vp;
--
--	if ((vp = dlopen((char *) file, num)) == NULL)
--		snprintf(error_message, sizeof(error_message),
--				 "dlopen (%s) failed: %s", file, dlerror());
--	return vp;
--#endif
- }
- 
- void *
--BSD44_derived_dlsym(void *handle, const char *name)
-+pg_dlsym(void *handle, const char *name)
- {
--#if !defined(HAVE_DLOPEN)
--	snprintf(error_message, sizeof(error_message),
--			 "dlsym (%s) failed", name);
- 	return NULL;
--#elif defined(__ELF__)
--	return dlsym(handle, name);
--#else
--	void	   *vp;
--	char		buf[BUFSIZ];
--
--	if (*name != '_')
--	{
--		snprintf(buf, sizeof(buf), "_%s", name);
--		name = buf;
--	}
--	if ((vp = dlsym(handle, (char *) name)) == NULL)
--		snprintf(error_message, sizeof(error_message),
--				 "dlsym (%s) failed", name);
--	return vp;
--#endif
- }
- 
- void
--BSD44_derived_dlclose(void *handle)
-+pg_dlclose(void *handle)
- {
--#if defined(HAVE_DLOPEN)
--	dlclose(handle);
--#endif
- }
-+
-+#endif /* ! HAVE_DLOPEN */
diff --git a/databases/postgresql82/patches/patch-ae b/databases/postgresql82/patches/patch-ae
deleted file mode 100644
index 5c0bb2f65d4..00000000000
--- a/databases/postgresql82/patches/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2006/12/09 15:34:13 adam Exp $
-
---- src/backend/port/dynloader/netbsd.h.orig	2005-01-01 07:00:32.000000000 +0900
-+++ src/backend/port/dynloader/netbsd.h
-@@ -21,19 +21,7 @@
- 
- #include "utils/dynamic_loader.h"
- 
--/*
-- * Dynamic Loader on NetBSD 1.0.
-- *
-- * this dynamic loader uses the system dynamic loading interface for shared
-- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
-- * library as the file to be dynamically loaded.
-- *
-- * agc - I know this is all a bit crufty, but it does work, is fairly
-- * portable, and works (the stipulation that the d.l. function must
-- * begin with an underscore is fairly tricky, and some versions of
-- * NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
-- */
--
-+#ifdef HAVE_DLOPEN
- /*
-  * In some older systems, the RTLD_NOW flag isn't defined and the mode
-  * argument to dlopen must always be 1.  The RTLD_GLOBAL flag is wanted
-@@ -47,14 +35,11 @@
- #define RTLD_GLOBAL 0
- #endif
- 
--#define		   pg_dlopen(f)    BSD44_derived_dlopen((f), RTLD_NOW | RTLD_GLOBAL)
--#define		   pg_dlsym		   BSD44_derived_dlsym
--#define		   pg_dlclose	   BSD44_derived_dlclose
--#define		   pg_dlerror	   BSD44_derived_dlerror
-+#define	   pg_dlopen(f)    dlopen((f), RTLD_NOW | RTLD_GLOBAL)
-+#define	   pg_dlsym		   dlsym
-+#define	   pg_dlclose	   dlclose
-+#define	   pg_dlerror	   dlerror
- 
--char	   *BSD44_derived_dlerror(void);
--void	   *BSD44_derived_dlopen(const char *filename, int num);
--void	   *BSD44_derived_dlsym(void *handle, const char *name);
--void		BSD44_derived_dlclose(void *handle);
-+#endif /* HAVE_DLOPEN */
- 
- #endif   /* PORT_PROTOS_H */
diff --git a/databases/postgresql83-adminpack/Makefile b/databases/postgresql83-adminpack/Makefile
index 0a4b1a7e2c7..2e902782b15 100644
--- a/databases/postgresql83-adminpack/Makefile
+++ b/databases/postgresql83-adminpack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2010/01/17 12:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2010/05/12 21:20:06 tron Exp $
 
 PKGNAME=	postgresql83-adminpack-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	Admin pack module for pgAdmin management
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql83-client/Makefile b/databases/postgresql83-client/Makefile
index 3f7eff688c8..2078eeb2ad5 100644
--- a/databases/postgresql83-client/Makefile
+++ b/databases/postgresql83-client/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.12 2010/01/21 12:45:28 adam Exp $
+# $NetBSD: Makefile,v 1.12.2.1 2010/05/12 21:20:06 tron Exp $
 
 PKGNAME=	postgresql83-client-${BASE_VERS}
-PKGREVISION=	2
+PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -17,7 +17,6 @@ CONFIGURE_ARGS+=	--with-zlib
 # 1. The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
 # NetBSD earler than 4.0 or DragonFly.
 # 2. configure with --enable-thread-safety fails on OpenBSD.
-#
 .if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-3].*)) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD"
 PGSQL_THREAD_SAFETY?=	no
diff --git a/databases/postgresql83-client/PLIST b/databases/postgresql83-client/PLIST
index cad2f8d0f25..2da59a20e11 100644
--- a/databases/postgresql83-client/PLIST
+++ b/databases/postgresql83-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2009/12/16 14:23:13 adam Exp $
+@comment $NetBSD: PLIST,v 1.11.4.1 2010/05/12 21:20:06 tron Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -1212,6 +1212,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-24.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-25.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-26.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-27.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-28.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-5.html
@@ -1236,6 +1237,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-20.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-21.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-22.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-23.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-24.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-5.html
@@ -1256,6 +1258,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-17.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-18.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-19.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-2.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-20.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-5.html
@@ -1271,6 +1274,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-12.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-13.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-14.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-15.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-16.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-4.html
@@ -1281,6 +1285,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-8.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-9.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-1.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-10.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-4.html
diff --git a/databases/postgresql83-plperl/Makefile b/databases/postgresql83-plperl/Makefile
index 667455affbc..5e37aa7d9ec 100644
--- a/databases/postgresql83-plperl/Makefile
+++ b/databases/postgresql83-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2010/01/17 12:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2010/05/12 21:20:06 tron Exp $
 
 PKGNAME=	postgresql83-plperl-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql83-plpython/Makefile b/databases/postgresql83-plpython/Makefile
index 73e6e5f22e5..714e8384e71 100644
--- a/databases/postgresql83-plpython/Makefile
+++ b/databases/postgresql83-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2010/05/12 21:20:06 tron Exp $
 
 PKGNAME=	postgresql83-plpython-${BASE_VERS}
-PKGREVISION=	2
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql83-pltcl/Makefile b/databases/postgresql83-pltcl/Makefile
index b348666fe48..20eb52412ec 100644
--- a/databases/postgresql83-pltcl/Makefile
+++ b/databases/postgresql83-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2010/01/17 12:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2010/05/12 21:20:06 tron Exp $
 
 PKGNAME=	postgresql83-pltcl-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql83-server/Makefile b/databases/postgresql83-server/Makefile
index b139ca9cce9..706b42777ec 100644
--- a/databases/postgresql83-server/Makefile
+++ b/databases/postgresql83-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2010/01/22 20:12:11 adam Exp $
+# $NetBSD: Makefile,v 1.10.2.1 2010/05/12 21:20:06 tron Exp $
 
 PKGNAME=	postgresql83-server-${BASE_VERS}
-PKGREVISION=	2
 COMMENT=	PostgreSQL database server programs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -32,7 +31,6 @@ BUILD_DIRS+=		src/pl
 # PostgreSQL's backend (pkg/28729).  This works on older and newer
 # versions of NetBSD as well since they don't have the bad interaction
 # between dlopen() and pthreads.
-#
 .if ${OPSYS} == "NetBSD"
 DLOPEN_REQUIRE_PTHREADS=	no
 .endif
@@ -40,7 +38,6 @@ DLOPEN_REQUIRE_PTHREADS=	no
 
 # If we're using libltdl to provide "dlopen" functionality, then add the
 # dependency and make sure that we link against -lltdl.
-#
 .if !empty(USE_LIBLTDL:M[yY][eE][sS])
 DL_LIBS+=	-lltdl
 .  include "../../devel/libltdl/buildlink3.mk"
@@ -54,7 +51,6 @@ PKG_SUPPORTED_OPTIONS=	gssapi krb5 ldap pam
 # PGGROUP	group of the database administrator
 # PGHOME	home directory of the database administrator and location of
 #		the databases
-#
 PGUSER?=		pgsql
 PGGROUP?=		pgsql
 PGHOME?=		${PREFIX}/${PGUSER}
@@ -79,7 +75,6 @@ RCD_SCRIPTS=		pgsql
 
 # Avoid conflict between "${SSLBASE}/include/openssl/des.h" and
 # "/usr/include/crypt.h" -- we want the definitions in the former.
-#
 post-wrapper:
 .if ${OPSYS} == "SunOS"
 	touch ${BUILDLINK_DIR}/include/crypt.h
diff --git a/databases/postgresql83-server/PLIST b/databases/postgresql83-server/PLIST
index 0a31e8e11ab..164680944a7 100644
--- a/databases/postgresql83-server/PLIST
+++ b/databases/postgresql83-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2010/01/21 12:45:28 adam Exp $
+@comment $NetBSD: PLIST,v 1.9.2.1 2010/05/12 21:20:06 tron Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
@@ -211,6 +211,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Managua
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Manaus
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Marigot
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Martinique
+${PG_SUBPREFIX}share/postgresql/timezone/America/Matamoros
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mazatlan
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mendoza
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Menominee
@@ -229,6 +230,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Nome
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Noronha
 ${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/Center
 ${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/New_Salem
+${PG_SUBPREFIX}share/postgresql/timezone/America/Ojinaga
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Panama
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Pangnirtung
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Paramaribo
@@ -247,6 +249,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Rio_Branco
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Rosario
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Santarem
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Santiago
+${PG_SUBPREFIX}share/postgresql/timezone/America/Santa_Isabel
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Santo_Domingo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Sao_Paulo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Scoresbysund
diff --git a/databases/postgresql83/Makefile.common b/databases/postgresql83/Makefile.common
index 84b0d681c17..7022b1afe6f 100644
--- a/databases/postgresql83/Makefile.common
+++ b/databases/postgresql83/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2009/12/16 14:23:13 adam Exp $
+# $NetBSD: Makefile.common,v 1.9.4.1 2010/05/12 21:20:06 tron Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -32,13 +32,10 @@ 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.9
+DIST_VERS?=		8.3.10
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql83-client+=	postgresql83-client>=${BASE_VERS}
@@ -56,10 +53,10 @@ SUBST_SED.pglocale=	-e 's|\( localedir[	 :]*=\).*|\1${PG_LOCALE_DIR}|'
 
 .include "../../mk/bsd.prefs.mk"
 
-PGSQL_TEMPLATE.SunOS=		solaris
-PGSQL_TEMPLATE.IRIX=		irix5
-.if !defined(PGSQL_TEMPLATE.${OPSYS})
-PGSQL_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
+PG_TEMPLATE.SunOS=	solaris
+PG_TEMPLATE.IRIX=	irix5
+.if !defined(PG_TEMPLATE.${OPSYS})
+PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
 
 PG_SUBPREFIX=		# empty
@@ -81,7 +78,7 @@ GNU_CONFIGURE_PREFIX=	${PG_PREFIX}
 CONFIGURE_ARGS+=	--sysconfdir=${PG_ETC_DIR}
 CONFIGURE_ARGS+=	--datadir=${PG_DATA_DIR}
 CONFIGURE_ARGS+=	--with-docdir=${PG_DOC_DIR}
-CONFIGURE_ARGS+=	--with-template=${PGSQL_TEMPLATE.${OPSYS}}
+CONFIGURE_ARGS+=	--with-template=${PG_TEMPLATE.${OPSYS}}
 CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-zlib
 CONFIGURE_ARGS+=	--enable-nls
@@ -100,7 +97,6 @@ BUILDLINK_TRANSFORM+=	rm:-ffast-math
 
 # USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl
 # to provide "dlopen" functionality for the PostgreSQL backend.
-#
 .if ${OPSYS} == "Interix"
 USE_LIBLTDL?=		yes
 .endif
@@ -110,59 +106,34 @@ FILES_SUBST+=		PG_PREFIX=${PG_PREFIX:Q}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
+.if !defined(META_PACKAGE)
 post-extract:
-	if ${TEST} -d ${WRKSRC}/src; then				\
-		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		\
-			${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		\
-			${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	\
-			${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
-	fi
+	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])
-	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		\
-			${WRKSRC}/src/backend/port/dynloader/$$template.h; \
-		${ECHO} "static int dummy = 0;"				\
-			 >${WRKSRC}/src/backend/port/dynloader/$$template.c
+		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
-	if ${TEST} -d ${WRKSRC}/src/template; then			\
-		touch ${WRKSRC}/src/template/dragonfly;		\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then	\
-		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c	\
-			${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \
-		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		\
-			${WRKSRC}/src/include/port/dragonfly.h;		\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/makefiles; then			\
-		cp ${WRKSRC}/src/makefiles/Makefile.freebsd		\
-			${WRKSRC}/src/makefiles/Makefile.dragonfly;	\
-	fi
+	touch ${WRKSRC}/src/template/dragonfly
+	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
+		${WRKSRC}/src/backend/port/dynloader/dragonfly.c
+	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
+		${WRKSRC}/src/backend/port/dynloader/dragonfly.h
+	cp ${WRKSRC}/src/include/port/freebsd.h \
+		${WRKSRC}/src/include/port/dragonfly.h
+	cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+		${WRKSRC}/src/makefiles/Makefile.dragonfly
+.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 (hardcoded in the
 # PostgreSQL sources).  Please don't change this value unless you know
 # what you are doing.
-#
 BUILD_DEFS+=	PGSQL_BLCKSZ
 
 .if defined(PGSQL_BLCKSZ)
diff --git a/databases/postgresql83/distinfo b/databases/postgresql83/distinfo
index efd87d12905..01902d2be57 100644
--- a/databases/postgresql83/distinfo
+++ b/databases/postgresql83/distinfo
@@ -1,13 +1,11 @@
-$NetBSD: distinfo,v 1.10 2010/01/21 12:45:28 adam Exp $
+$NetBSD: distinfo,v 1.10.2.1 2010/05/12 21:20:06 tron Exp $
 
-SHA1 (postgresql-8.3.9.tar.bz2) = 5403f13bb14fe568e2b46a3350d6e28808d93a2c
-RMD160 (postgresql-8.3.9.tar.bz2) = 0069606033d9572d7848a5914a274cabaed24007
-Size (postgresql-8.3.9.tar.bz2) = 14170569 bytes
+SHA1 (postgresql-8.3.10.tar.bz2) = 2ad430f4349eb42fbfe21a6a80a493f4068b519e
+RMD160 (postgresql-8.3.10.tar.bz2) = 12bb4ac6d0b0e53534582c7e4092bf91092e9345
+Size (postgresql-8.3.10.tar.bz2) = 14181794 bytes
 SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f
 SHA1 (patch-ab) = 7bf5635b0b93c3c0d33acd4e122e102c92ce7b76
 SHA1 (patch-ac) = 8e3a7021fdd01810d4ebcbd20002b28164b22279
-SHA1 (patch-ad) = 5612e447bbb76e81f72d39ad0153b9f77d47f653
-SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6
 SHA1 (patch-af) = fcb43276c1f3349f62acfc37ac0bd6ccaae96f29
 SHA1 (patch-ag) = 402d5d211af99efdfa35677299c97e91e14ed85d
 SHA1 (patch-ah) = 3640573195f66a46c37d9fca2648d6be39f5593b
diff --git a/databases/postgresql83/patches/patch-ad b/databases/postgresql83/patches/patch-ad
deleted file mode 100644
index 5af77647bb6..00000000000
--- a/databases/postgresql83/patches/patch-ad
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ad,v 1.2 2008/04/05 16:39:27 adam Exp $
-
---- src/backend/port/dynloader/netbsd.c.orig	2008-04-05 10:45:52.000000000 +0200
-+++ src/backend/port/dynloader/netbsd.c
-@@ -42,64 +42,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
- 
- #include "dynloader.h"
- 
--static char error_message[BUFSIZ];
-+#ifndef HAVE_DLOPEN
- 
- char *
--BSD44_derived_dlerror(void)
-+pg_dlerror(void)
- {
--	static char ret[BUFSIZ];
--
--	strcpy(ret, error_message);
--	error_message[0] = 0;
--	return (ret[0] == 0) ? NULL : ret;
-+	return "dynaloader unsupported";
- }
- 
- void *
--BSD44_derived_dlopen(const char *file, int num)
-+pg_dlopen(const char *file, int num)
- {
--#if !defined(HAVE_DLOPEN)
--	snprintf(error_message, sizeof(error_message),
--			 "dlopen (%s) not supported", file);
-+	elog(ERROR, "dynamic load not supported");
- 	return NULL;
--#else
--	void	   *vp;
--
--	if ((vp = dlopen((char *) file, num)) == NULL)
--		snprintf(error_message, sizeof(error_message),
--				 "dlopen (%s) failed: %s", file, dlerror());
--	return vp;
--#endif
- }
- 
- void *
--BSD44_derived_dlsym(void *handle, const char *name)
-+pg_dlsym(void *handle, const char *name)
- {
--#if !defined(HAVE_DLOPEN)
--	snprintf(error_message, sizeof(error_message),
--			 "dlsym (%s) failed", name);
- 	return NULL;
--#elif defined(__ELF__)
--	return dlsym(handle, name);
--#else
--	void	   *vp;
--	char		buf[BUFSIZ];
--
--	if (*name != '_')
--	{
--		snprintf(buf, sizeof(buf), "_%s", name);
--		name = buf;
--	}
--	if ((vp = dlsym(handle, (char *) name)) == NULL)
--		snprintf(error_message, sizeof(error_message),
--				 "dlsym (%s) failed", name);
--	return vp;
--#endif
- }
- 
- void
--BSD44_derived_dlclose(void *handle)
-+pg_dlclose(void *handle)
- {
--#if defined(HAVE_DLOPEN)
--	dlclose(handle);
--#endif
- }
-+
-+#endif /* ! HAVE_DLOPEN */
diff --git a/databases/postgresql83/patches/patch-ae b/databases/postgresql83/patches/patch-ae
deleted file mode 100644
index 3b1d83b0411..00000000000
--- a/databases/postgresql83/patches/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2008/03/04 12:41:37 adam Exp $
-
---- src/backend/port/dynloader/netbsd.h.orig	2005-01-01 07:00:32.000000000 +0900
-+++ src/backend/port/dynloader/netbsd.h
-@@ -21,19 +21,7 @@
- 
- #include "utils/dynamic_loader.h"
- 
--/*
-- * Dynamic Loader on NetBSD 1.0.
-- *
-- * this dynamic loader uses the system dynamic loading interface for shared
-- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
-- * library as the file to be dynamically loaded.
-- *
-- * agc - I know this is all a bit crufty, but it does work, is fairly
-- * portable, and works (the stipulation that the d.l. function must
-- * begin with an underscore is fairly tricky, and some versions of
-- * NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
-- */
--
-+#ifdef HAVE_DLOPEN
- /*
-  * In some older systems, the RTLD_NOW flag isn't defined and the mode
-  * argument to dlopen must always be 1.  The RTLD_GLOBAL flag is wanted
-@@ -47,14 +35,11 @@
- #define RTLD_GLOBAL 0
- #endif
- 
--#define		   pg_dlopen(f)    BSD44_derived_dlopen((f), RTLD_NOW | RTLD_GLOBAL)
--#define		   pg_dlsym		   BSD44_derived_dlsym
--#define		   pg_dlclose	   BSD44_derived_dlclose
--#define		   pg_dlerror	   BSD44_derived_dlerror
-+#define	   pg_dlopen(f)    dlopen((f), RTLD_NOW | RTLD_GLOBAL)
-+#define	   pg_dlsym		   dlsym
-+#define	   pg_dlclose	   dlclose
-+#define	   pg_dlerror	   dlerror
- 
--char	   *BSD44_derived_dlerror(void);
--void	   *BSD44_derived_dlopen(const char *filename, int num);
--void	   *BSD44_derived_dlsym(void *handle, const char *name);
--void		BSD44_derived_dlclose(void *handle);
-+#endif /* HAVE_DLOPEN */
- 
- #endif   /* PORT_PROTOS_H */
diff --git a/databases/postgresql84-adminpack/Makefile b/databases/postgresql84-adminpack/Makefile
index 8adacb361a0..d3f11139d3a 100644
--- a/databases/postgresql84-adminpack/Makefile
+++ b/databases/postgresql84-adminpack/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/01/17 12:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2010/05/12 21:20:07 tron Exp $
 
 PKGNAME=	postgresql84-adminpack-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	Admin pack module for pgAdmin management
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql84-client/Makefile b/databases/postgresql84-client/Makefile
index b0974069018..0868bdc0abc 100644
--- a/databases/postgresql84-client/Makefile
+++ b/databases/postgresql84-client/Makefile
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2010/02/05 14:50:38 gdt Exp $
+# $NetBSD: Makefile,v 1.5.2.1 2010/05/12 21:20:07 tron Exp $
 
 PKGNAME=	postgresql84-client-${BASE_VERS}
 PKGREVISION=	1
@@ -8,9 +8,6 @@ PKG_DESTDIR_SUPPORT=	user-destdir
 
 .include "../../databases/postgresql84/Makefile.common"
 
-# Couldn't find -lpgport, then rebuilt ok.
-MAKE_JOBS_SAFE=		no
-
 USE_TOOLS+=		gzip tar
 USE_LIBTOOL=		yes
 CONFIGURE_ARGS+=	--with-openssl
@@ -20,7 +17,6 @@ CONFIGURE_ARGS+=	--with-zlib
 # 1. The thread-safety test in ${WRSRC}/src/tools/thread does not pass on
 # NetBSD earler than 4.0 or DragonFly.
 # 2. configure with --enable-thread-safety fails on OpenBSD.
-#
 .if (${OPSYS} == "NetBSD" && !empty(OS_VERSION:M[0-3].*)) || \
     ${OPSYS} == "DragonFly" || ${OPSYS} == "OpenBSD"
 PGSQL_THREAD_SAFETY?=	no
diff --git a/databases/postgresql84-client/PLIST b/databases/postgresql84-client/PLIST
index 4346db762ba..3e32d89da15 100644
--- a/databases/postgresql84-client/PLIST
+++ b/databases/postgresql84-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2009/12/16 13:30:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.4.4.1 2010/05/12 21:20:07 tron Exp $
 ${PG_SUBPREFIX}bin/clusterdb
 ${PG_SUBPREFIX}bin/createdb
 ${PG_SUBPREFIX}bin/createlang
@@ -1232,6 +1232,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-24.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-25.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-26.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-27.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-28.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-7-4-5.html
@@ -1256,6 +1257,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-20.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-21.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-22.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-23.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-24.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-0-5.html
@@ -1276,6 +1278,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-17.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-18.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-19.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-2.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-1-20.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-5.html
@@ -1291,6 +1294,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-12.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-13.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-14.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-15.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-16.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-4.html
@@ -1301,6 +1305,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-8.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2-9.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-1.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-10.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-2.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-4.html
@@ -1312,6 +1317,7 @@ ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3-9.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4-1.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4-2.html
+${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4-3.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release-8-4.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/release.html
 ${PG_SUBPREFIX}share/doc/postgresql/html/resources.html
diff --git a/databases/postgresql84-plperl/Makefile b/databases/postgresql84-plperl/Makefile
index 9a89755471d..a5accfd66ab 100644
--- a/databases/postgresql84-plperl/Makefile
+++ b/databases/postgresql84-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/01/17 12:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2010/05/12 21:20:07 tron Exp $
 
 PKGNAME=	postgresql84-plperl-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql84-plpython/Makefile b/databases/postgresql84-plpython/Makefile
index 9e17655a31b..6ccb387ad90 100644
--- a/databases/postgresql84-plpython/Makefile
+++ b/databases/postgresql84-plpython/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.3 2010/02/10 19:17:34 joerg Exp $
+# $NetBSD: Makefile,v 1.3.2.1 2010/05/12 21:20:07 tron Exp $
 
 PKGNAME=	postgresql84-plpython-${BASE_VERS}
-PKGREVISION=	2
 COMMENT=	PL/Python procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql84-pltcl/Makefile b/databases/postgresql84-pltcl/Makefile
index c314e6d622e..accf0cf38e4 100644
--- a/databases/postgresql84-pltcl/Makefile
+++ b/databases/postgresql84-pltcl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2010/01/17 12:02:11 wiz Exp $
+# $NetBSD: Makefile,v 1.2.2.1 2010/05/12 21:20:07 tron Exp $
 
 PKGNAME=	postgresql84-pltcl-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PL/Tcl procedural language for the PostgreSQL backend
 
 PKG_DESTDIR_SUPPORT=	user-destdir
diff --git a/databases/postgresql84-server/Makefile b/databases/postgresql84-server/Makefile
index 1270c33e968..334eb6626d5 100644
--- a/databases/postgresql84-server/Makefile
+++ b/databases/postgresql84-server/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2010/01/22 20:12:11 adam Exp $
+# $NetBSD: Makefile,v 1.6.2.1 2010/05/12 21:20:07 tron Exp $
 
 PKGNAME=	postgresql84-server-${BASE_VERS}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database server programs
 
 PKG_DESTDIR_SUPPORT=	user-destdir
@@ -32,7 +31,6 @@ BUILD_DIRS+=		src/pl
 # PostgreSQL's backend (pkg/28729).  This works on older and newer
 # versions of NetBSD as well since they don't have the bad interaction
 # between dlopen() and pthreads.
-#
 .if ${OPSYS} == "NetBSD"
 DLOPEN_REQUIRE_PTHREADS=	no
 .endif
@@ -40,7 +38,6 @@ DLOPEN_REQUIRE_PTHREADS=	no
 
 # If we're using libltdl to provide "dlopen" functionality, then add the
 # dependency and make sure that we link against -lltdl.
-#
 .if !empty(USE_LIBLTDL:M[yY][eE][sS])
 DL_LIBS+=	-lltdl
 .  include "../../devel/libltdl/buildlink3.mk"
@@ -54,7 +51,6 @@ PKG_SUPPORTED_OPTIONS=	gssapi krb5 ldap pam
 # PGGROUP	group of the database administrator
 # PGHOME	home directory of the database administrator and location of
 #		the databases
-#
 PGUSER?=		pgsql
 PGGROUP?=		pgsql
 PGHOME?=		${PREFIX}/${PGUSER}
diff --git a/databases/postgresql84-server/PLIST b/databases/postgresql84-server/PLIST
index 6f3af02ed72..65bb9f6a36e 100644
--- a/databases/postgresql84-server/PLIST
+++ b/databases/postgresql84-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2009/12/16 13:30:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.3.4.1 2010/05/12 21:20:07 tron Exp $
 ${PG_SUBPREFIX}bin/postgres
 ${PG_SUBPREFIX}bin/postmaster
 ${PG_SUBPREFIX}lib/postgresql/ascii_and_mic.la
@@ -202,6 +202,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Managua
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Manaus
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Marigot
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Martinique
+${PG_SUBPREFIX}share/postgresql/timezone/America/Matamoros
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mazatlan
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Mendoza
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Menominee
@@ -220,6 +221,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Nome
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Noronha
 ${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/Center
 ${PG_SUBPREFIX}share/postgresql/timezone/America/North_Dakota/New_Salem
+${PG_SUBPREFIX}share/postgresql/timezone/America/Ojinaga
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Panama
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Pangnirtung
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Paramaribo
@@ -238,6 +240,7 @@ ${PG_SUBPREFIX}share/postgresql/timezone/America/Rio_Branco
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Rosario
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Santarem
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Santiago
+${PG_SUBPREFIX}share/postgresql/timezone/America/Santa_Isabel
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Santo_Domingo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Sao_Paulo
 ${PG_SUBPREFIX}share/postgresql/timezone/America/Scoresbysund
diff --git a/databases/postgresql84/Makefile.common b/databases/postgresql84/Makefile.common
index dbb1950e147..bd4aa5e8ee7 100644
--- a/databases/postgresql84/Makefile.common
+++ b/databases/postgresql84/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.3 2009/12/16 13:30:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.3.4.1 2010/05/12 21:20:06 tron Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -32,13 +32,10 @@ COMMON_FILESDIR?=	${.CURDIR}/../postgresql84/files
 PATCHDIR?=		${.CURDIR}/../postgresql84/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-postgresql84 when updating version
-#
-DIST_VERS?=		8.4.2
+DIST_VERS?=		8.4.3
 BASE_VERS?=		${DIST_VERS}
 
 BUILDLINK_API_DEPENDS.postgresql84-client+=	postgresql84-client>=${BASE_VERS}
@@ -49,10 +46,10 @@ PKG_SYSCONFSUBDIR=	postgresql
 
 .include "../../mk/bsd.prefs.mk"
 
-PGSQL_TEMPLATE.SunOS=		solaris
-PGSQL_TEMPLATE.IRIX=		irix5
-.if !defined(PGSQL_TEMPLATE.${OPSYS})
-PGSQL_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
+PG_TEMPLATE.SunOS=	solaris
+PG_TEMPLATE.IRIX=	irix5
+.if !defined(PG_TEMPLATE.${OPSYS})
+PG_TEMPLATE.${OPSYS}=	${LOWER_OPSYS}
 .endif
 
 PG_SUBPREFIX=		# empty
@@ -76,7 +73,7 @@ CONFIGURE_ARGS+=	--sysconfdir=${PG_ETC_DIR}
 CONFIGURE_ARGS+=	--datadir=${PG_DATA_DIR}
 CONFIGURE_ARGS+=	--localedir=${PG_LOCALE_DIR}
 CONFIGURE_ARGS+=	--with-docdir=${PG_DOC_DIR}
-CONFIGURE_ARGS+=	--with-template=${PGSQL_TEMPLATE.${OPSYS}}
+CONFIGURE_ARGS+=	--with-template=${PG_TEMPLATE.${OPSYS}}
 CONFIGURE_ARGS+=	--without-readline
 CONFIGURE_ARGS+=	--without-zlib
 CONFIGURE_ARGS+=	--enable-nls
@@ -95,7 +92,6 @@ BUILDLINK_TRANSFORM+=	rm:-ffast-math
 
 # USE_LIBLTDL is "yes" or "no" depending on whether we're using libltdl
 # to provide "dlopen" functionality for the PostgreSQL backend.
-#
 .if ${OPSYS} == "Interix"
 USE_LIBLTDL?=		yes
 .endif
@@ -105,59 +101,32 @@ FILES_SUBST+=		PG_PREFIX=${PG_PREFIX:Q}
 
 .include "../../devel/gettext-lib/buildlink3.mk"
 
+.if !defined(META_PACKAGE)
 post-extract:
-	if ${TEST} -d ${WRKSRC}/src; then				\
-		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		\
-			${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		\
-			${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	\
-			${WRKSRC}/src/interfaces/libpgtcl/GNUmakefile;	\
-	fi
+	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])
-	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		\
-			${WRKSRC}/src/backend/port/dynloader/$$template.h; \
-		${ECHO} "static int dummy = 0;"				\
-			 >${WRKSRC}/src/backend/port/dynloader/$$template.c
-	fi
+	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
+.endif
+	touch ${WRKSRC}/src/template/dragonfly
+	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c \
+		${WRKSRC}/src/backend/port/dynloader/dragonfly.c
+	cp ${WRKSRC}/src/backend/port/dynloader/freebsd.h \
+		${WRKSRC}/src/backend/port/dynloader/dragonfly.h
+	cp ${WRKSRC}/src/include/port/freebsd.h	\
+		${WRKSRC}/src/include/port/dragonfly.h
+	cp ${WRKSRC}/src/makefiles/Makefile.freebsd \
+		${WRKSRC}/src/makefiles/Makefile.dragonfly
 .endif
-	if ${TEST} -d ${WRKSRC}/src/template; then			\
-		touch ${WRKSRC}/src/template/dragonfly;		\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/backend/port/dynloader; then	\
-		cp ${WRKSRC}/src/backend/port/dynloader/freebsd.c	\
-			${WRKSRC}/src/backend/port/dynloader/dragonfly.c; \
-		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		\
-			${WRKSRC}/src/include/port/dragonfly.h;		\
-	fi
-	if ${TEST} -d ${WRKSRC}/src/makefiles; then			\
-		cp ${WRKSRC}/src/makefiles/Makefile.freebsd		\
-			${WRKSRC}/src/makefiles/Makefile.dragonfly;	\
-	fi
 
 # 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 (hardcoded in the
 # PostgreSQL sources).  Please don't change this value unless you know
 # what you are doing.
-#
 BUILD_DEFS+=	PGSQL_BLCKSZ
 
 .if defined(PGSQL_BLCKSZ)
diff --git a/databases/postgresql84/distinfo b/databases/postgresql84/distinfo
index 5aa7000162d..72b91dcf133 100644
--- a/databases/postgresql84/distinfo
+++ b/databases/postgresql84/distinfo
@@ -1,15 +1,13 @@
-$NetBSD: distinfo,v 1.3 2009/12/16 13:30:53 adam Exp $
+$NetBSD: distinfo,v 1.3.4.1 2010/05/12 21:20:06 tron Exp $
 
-SHA1 (postgresql-8.4.2.tar.bz2) = a617698ef3b41a74fe2c4af346172eb03e7f8a7f
-RMD160 (postgresql-8.4.2.tar.bz2) = 8d0030f185e9581bec6e2a0df903596579621bce
-Size (postgresql-8.4.2.tar.bz2) = 13600699 bytes
+SHA1 (postgresql-8.4.3.tar.bz2) = 5edad69e797620c4f27520cb1986bc78c173d67a
+RMD160 (postgresql-8.4.3.tar.bz2) = 4f8bba582138ea8d77059851c361d6f2fb838e52
+Size (postgresql-8.4.3.tar.bz2) = 13645257 bytes
 SHA1 (patch-aa) = aeeeaafb38e75d8e8f6639280e997ba4c905b45f
 SHA1 (patch-ab) = 3cf9c7f0f812d2e41681281538c3f707cec232c3
 SHA1 (patch-ac) = 0b82797d0b80bdd1e9b5f3de4989fe3848adf6cb
-SHA1 (patch-ad) = 5612e447bbb76e81f72d39ad0153b9f77d47f653
-SHA1 (patch-ae) = 8b3e47320dfe05d94b769c9b079fd7ca6d26f5d6
 SHA1 (patch-af) = a73769cf05223d2ee06249c9e69c85038c2cd936
 SHA1 (patch-ag) = 85dac95e40efc16270885087f868aeb76e1b9214
 SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
-SHA1 (patch-ai) = 46e896a71d09af71d6b0c8ae5a8b0d5f35424482
+SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
 SHA1 (patch-an) = a1e7f421a101cf9ccddcaf3ce17aa1847cf76310
diff --git a/databases/postgresql84/patches/patch-ad b/databases/postgresql84/patches/patch-ad
deleted file mode 100644
index 01ef2528733..00000000000
--- a/databases/postgresql84/patches/patch-ad
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-ad,v 1.1.1.1 2009/07/29 06:26:18 adam Exp $
-
---- src/backend/port/dynloader/netbsd.c.orig	2008-04-05 10:45:52.000000000 +0200
-+++ src/backend/port/dynloader/netbsd.c
-@@ -42,64 +42,30 @@ static char sccsid[] = "@(#)dl.c	5.4 (Be
- 
- #include "dynloader.h"
- 
--static char error_message[BUFSIZ];
-+#ifndef HAVE_DLOPEN
- 
- char *
--BSD44_derived_dlerror(void)
-+pg_dlerror(void)
- {
--	static char ret[BUFSIZ];
--
--	strcpy(ret, error_message);
--	error_message[0] = 0;
--	return (ret[0] == 0) ? NULL : ret;
-+	return "dynaloader unsupported";
- }
- 
- void *
--BSD44_derived_dlopen(const char *file, int num)
-+pg_dlopen(const char *file, int num)
- {
--#if !defined(HAVE_DLOPEN)
--	snprintf(error_message, sizeof(error_message),
--			 "dlopen (%s) not supported", file);
-+	elog(ERROR, "dynamic load not supported");
- 	return NULL;
--#else
--	void	   *vp;
--
--	if ((vp = dlopen((char *) file, num)) == NULL)
--		snprintf(error_message, sizeof(error_message),
--				 "dlopen (%s) failed: %s", file, dlerror());
--	return vp;
--#endif
- }
- 
- void *
--BSD44_derived_dlsym(void *handle, const char *name)
-+pg_dlsym(void *handle, const char *name)
- {
--#if !defined(HAVE_DLOPEN)
--	snprintf(error_message, sizeof(error_message),
--			 "dlsym (%s) failed", name);
- 	return NULL;
--#elif defined(__ELF__)
--	return dlsym(handle, name);
--#else
--	void	   *vp;
--	char		buf[BUFSIZ];
--
--	if (*name != '_')
--	{
--		snprintf(buf, sizeof(buf), "_%s", name);
--		name = buf;
--	}
--	if ((vp = dlsym(handle, (char *) name)) == NULL)
--		snprintf(error_message, sizeof(error_message),
--				 "dlsym (%s) failed", name);
--	return vp;
--#endif
- }
- 
- void
--BSD44_derived_dlclose(void *handle)
-+pg_dlclose(void *handle)
- {
--#if defined(HAVE_DLOPEN)
--	dlclose(handle);
--#endif
- }
-+
-+#endif /* ! HAVE_DLOPEN */
diff --git a/databases/postgresql84/patches/patch-ae b/databases/postgresql84/patches/patch-ae
deleted file mode 100644
index bc151f79a02..00000000000
--- a/databases/postgresql84/patches/patch-ae
+++ /dev/null
@@ -1,45 +0,0 @@
-$NetBSD: patch-ae,v 1.1.1.1 2009/07/29 06:26:18 adam Exp $
-
---- src/backend/port/dynloader/netbsd.h.orig	2005-01-01 07:00:32.000000000 +0900
-+++ src/backend/port/dynloader/netbsd.h
-@@ -21,19 +21,7 @@
- 
- #include "utils/dynamic_loader.h"
- 
--/*
-- * Dynamic Loader on NetBSD 1.0.
-- *
-- * this dynamic loader uses the system dynamic loading interface for shared
-- * libraries (ie. dlopen/dlsym/dlclose). The user must specify a shared
-- * library as the file to be dynamically loaded.
-- *
-- * agc - I know this is all a bit crufty, but it does work, is fairly
-- * portable, and works (the stipulation that the d.l. function must
-- * begin with an underscore is fairly tricky, and some versions of
-- * NetBSD (like 1.0, and 1.0A pre June 1995) have no dlerror.)
-- */
--
-+#ifdef HAVE_DLOPEN
- /*
-  * In some older systems, the RTLD_NOW flag isn't defined and the mode
-  * argument to dlopen must always be 1.  The RTLD_GLOBAL flag is wanted
-@@ -47,14 +35,11 @@
- #define RTLD_GLOBAL 0
- #endif
- 
--#define		   pg_dlopen(f)    BSD44_derived_dlopen((f), RTLD_NOW | RTLD_GLOBAL)
--#define		   pg_dlsym		   BSD44_derived_dlsym
--#define		   pg_dlclose	   BSD44_derived_dlclose
--#define		   pg_dlerror	   BSD44_derived_dlerror
-+#define	   pg_dlopen(f)    dlopen((f), RTLD_NOW | RTLD_GLOBAL)
-+#define	   pg_dlsym		   dlsym
-+#define	   pg_dlclose	   dlclose
-+#define	   pg_dlerror	   dlerror
- 
--char	   *BSD44_derived_dlerror(void);
--void	   *BSD44_derived_dlopen(const char *filename, int num);
--void	   *BSD44_derived_dlsym(void *handle, const char *name);
--void		BSD44_derived_dlclose(void *handle);
-+#endif /* HAVE_DLOPEN */
- 
- #endif   /* PORT_PROTOS_H */
diff --git a/databases/postgresql84/patches/patch-ai b/databases/postgresql84/patches/patch-ai
index b8029ca5c58..581abfbb900 100644
--- a/databases/postgresql84/patches/patch-ai
+++ b/databases/postgresql84/patches/patch-ai
@@ -1,6 +1,6 @@
-$NetBSD: patch-ai,v 1.1.1.1 2009/07/29 06:26:19 adam Exp $
+$NetBSD: patch-ai,v 1.1.1.1.6.1 2010/05/12 21:20:07 tron Exp $
 
---- src/timezone/zic.c.orig	2009-06-11 16:49:15.000000000 +0200
+--- src/timezone/zic.c.orig	2010-03-16 07:17:04.000000000 +0000
 +++ src/timezone/zic.c
 @@ -120,51 +120,51 @@ struct zone
  
@@ -69,7 +69,7 @@ $NetBSD: patch-ai,v 1.1.1.1 2009/07/29 06:26:19 adam Exp $
  static void setboundaries(void);
 -static pg_time_t tadd(const pg_time_t t1, long t2);
 +static pg_time_t tadd(const pg_time_t t1, const long t2);
- static void usage(void);
+ static void usage(FILE *stream, int status);
  static void writezone(const char *name, const char *string);
 -static int	yearistype(int year, const char *type);
 +static int	yearistype(const int year, const char *type);
author	tron <tron>	2010-05-12 21:20:05 +0000
committer	tron <tron>	2010-05-12 21:20:05 +0000
commit	d51e3344355b1149b0123eede29f11bdd85409b5 (patch)
tree	dd75af4a0a9c6d69159c50029ce36fffd161bba4 /databases
parent	1bd8a1fdf95897f44154241ee86d98f2e0a48f35 (diff)
download	pkgsrc-d51e3344355b1149b0123eede29f11bdd85409b5.tar.gz