The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 9.6.2, 9.5.6, 9.4.11, 9.3.16, and 9.2.20. This release includes fixes that prevent data corruption issues in index builds and in certain write-ahead-log replay situations, which are detailed below. It also patches over 75 other bugs reported over the last three months.

23 files changed, 90 insertions, 56 deletions

diff --git a/databases/postgresql92-docs/PLIST b/databases/postgresql92-docs/PLIST
index c42986697b5..959e03c2cfe 100644
--- a/databases/postgresql92-docs/PLIST
+++ b/databases/postgresql92-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.19 2016/10/29 19:41:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.20 2017/02/11 10:18:51 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -427,6 +427,7 @@ share/doc/postgresql/html/disk-usage.html
 share/doc/postgresql/html/diskusage.html
 share/doc/postgresql/html/dml-delete.html
 share/doc/postgresql/html/dml-insert.html
+share/doc/postgresql/html/dml-returning.html
 share/doc/postgresql/html/dml-update.html
 share/doc/postgresql/html/dml.html
 share/doc/postgresql/html/docguide-authoring.html
@@ -1077,6 +1078,7 @@ share/doc/postgresql/html/release-9-2-17.html
 share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
+share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
diff --git a/databases/postgresql92-server/PLIST b/databases/postgresql92-server/PLIST
index 484f1379e8a..49732a6aaab 100644
--- a/databases/postgresql92-server/PLIST
+++ b/databases/postgresql92-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/10/29 19:41:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2017/02/11 10:18:52 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -308,6 +308,7 @@ share/postgresql/timezone/Asia/Aqtau
 share/postgresql/timezone/Asia/Aqtobe
 share/postgresql/timezone/Asia/Ashgabat
 share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Atyrau
 share/postgresql/timezone/Asia/Baghdad
 share/postgresql/timezone/Asia/Bahrain
 share/postgresql/timezone/Asia/Baku
@@ -328,6 +329,7 @@ share/postgresql/timezone/Asia/Dhaka
 share/postgresql/timezone/Asia/Dili
 share/postgresql/timezone/Asia/Dubai
 share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Famagusta
 share/postgresql/timezone/Asia/Gaza
 share/postgresql/timezone/Asia/Harbin
 share/postgresql/timezone/Asia/Hebron
@@ -533,6 +535,7 @@ share/postgresql/timezone/Europe/Rome
 share/postgresql/timezone/Europe/Samara
 share/postgresql/timezone/Europe/San_Marino
 share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Saratov
 share/postgresql/timezone/Europe/Simferopol
 share/postgresql/timezone/Europe/Skopje
 share/postgresql/timezone/Europe/Sofia
diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common
index 5d921dfaa66..b0c2426cc56 100644
--- a/databases/postgresql92/Makefile.common
+++ b/databases/postgresql92/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.26 2016/10/29 19:41:53 adam Exp $
+# $NetBSD: Makefile.common,v 1.27 2017/02/11 10:18:51 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql92-pltcl/Makefile
 # used by databases/postgresql92-server/Makefile
 
-DISTNAME=	postgresql-9.2.19
+DISTNAME=	postgresql-9.2.20
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql92/distinfo b/databases/postgresql92/distinfo
index a8cd62d31ea..f1929556ded 100644
--- a/databases/postgresql92/distinfo
+++ b/databases/postgresql92/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2016/10/29 19:41:53 adam Exp $
+$NetBSD: distinfo,v 1.22 2017/02/11 10:18:51 adam Exp $
 
-SHA1 (postgresql-9.2.19.tar.bz2) = 0444ba612dde02031704838b21560139d996f7f0
-RMD160 (postgresql-9.2.19.tar.bz2) = 481cd06f5fe445f2bcc64a11f2e8da8b1b79a161
-SHA512 (postgresql-9.2.19.tar.bz2) = d3b4c5578bf6d6580028e775bff81a921258cb53b6b06567d96a352d14f3b63063adb480b2f5e2029baf8a034e14b5cd75eebc04f1ed7b16c849e1a5ec1f4867
-Size (postgresql-9.2.19.tar.bz2) = 16466698 bytes
+SHA1 (postgresql-9.2.20.tar.bz2) = 3388c43fea446b223b8e6b0c843a7a2a7f1726a7
+RMD160 (postgresql-9.2.20.tar.bz2) = 9362f8b7dfe7173585e75bd53b5e6d6391e6f5df
+SHA512 (postgresql-9.2.20.tar.bz2) = 16f7861e0372481dbc5c69ac977bab46f592045f32951a245f3677121261640fcc169a75e730d592e36c15c9a120e7d06755550bdabf121ad89d76a17535d0f9
+Size (postgresql-9.2.20.tar.bz2) = 16480653 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747
diff --git a/databases/postgresql93-docs/PLIST b/databases/postgresql93-docs/PLIST
index 7e3b1762881..b1ae92e5836 100644
--- a/databases/postgresql93-docs/PLIST
+++ b/databases/postgresql93-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2016/10/29 19:41:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2017/02/11 10:18:52 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -440,6 +440,7 @@ share/doc/postgresql/html/disk-usage.html
 share/doc/postgresql/html/diskusage.html
 share/doc/postgresql/html/dml-delete.html
 share/doc/postgresql/html/dml-insert.html
+share/doc/postgresql/html/dml-returning.html
 share/doc/postgresql/html/dml-update.html
 share/doc/postgresql/html/dml.html
 share/doc/postgresql/html/docguide-authoring.html
@@ -1098,6 +1099,7 @@ share/doc/postgresql/html/release-9-2-17.html
 share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
+share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -1113,6 +1115,7 @@ share/doc/postgresql/html/release-9-3-12.html
 share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
+share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
diff --git a/databases/postgresql93-server/PLIST b/databases/postgresql93-server/PLIST
index efad17a986a..8c07c498273 100644
--- a/databases/postgresql93-server/PLIST
+++ b/databases/postgresql93-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2016/10/29 19:41:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2017/02/11 10:18:52 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -308,6 +308,7 @@ share/postgresql/timezone/Asia/Aqtau
 share/postgresql/timezone/Asia/Aqtobe
 share/postgresql/timezone/Asia/Ashgabat
 share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Atyrau
 share/postgresql/timezone/Asia/Baghdad
 share/postgresql/timezone/Asia/Bahrain
 share/postgresql/timezone/Asia/Baku
@@ -328,6 +329,7 @@ share/postgresql/timezone/Asia/Dhaka
 share/postgresql/timezone/Asia/Dili
 share/postgresql/timezone/Asia/Dubai
 share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Famagusta
 share/postgresql/timezone/Asia/Gaza
 share/postgresql/timezone/Asia/Harbin
 share/postgresql/timezone/Asia/Hebron
@@ -533,6 +535,7 @@ share/postgresql/timezone/Europe/Rome
 share/postgresql/timezone/Europe/Samara
 share/postgresql/timezone/Europe/San_Marino
 share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Saratov
 share/postgresql/timezone/Europe/Simferopol
 share/postgresql/timezone/Europe/Skopje
 share/postgresql/timezone/Europe/Sofia
diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index 3c6d8f89d89..0810886e097 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.22 2016/10/29 19:41:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.23 2017/02/11 10:18:52 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql93-pltcl/Makefile
 # used by databases/postgresql93-server/Makefile
 
-DISTNAME=	postgresql-9.3.15
+DISTNAME=	postgresql-9.3.16
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql93/distinfo b/databases/postgresql93/distinfo
index b06bf9d0f6f..d600e8a6abf 100644
--- a/databases/postgresql93/distinfo
+++ b/databases/postgresql93/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.21 2016/10/29 19:41:54 adam Exp $
+$NetBSD: distinfo,v 1.22 2017/02/11 10:18:52 adam Exp $
 
-SHA1 (postgresql-9.3.15.tar.bz2) = 8f04a3e71eded0e44086bae94be6205c246f2f89
-RMD160 (postgresql-9.3.15.tar.bz2) = b1c613167aa612ab0ea9fd1d17d0a7570662d6a8
-SHA512 (postgresql-9.3.15.tar.bz2) = 35c30cdb5599f99c94ab921f9f5e7671a8c0b7bca8fe3b616630ae13d6eda8d329e77e7e802da6a83cb09c3c9ca10fa8ce0de8a184e6fff471130e1cd68ce762
-Size (postgresql-9.3.15.tar.bz2) = 17059932 bytes
+SHA1 (postgresql-9.3.16.tar.bz2) = 6b2078f456fa18011fd4ba4c9b6dcf66c1e144e5
+RMD160 (postgresql-9.3.16.tar.bz2) = 46ed5c3532ca7c62d9b12b54e2431c4e9d4e3359
+SHA512 (postgresql-9.3.16.tar.bz2) = 2e379aca5db79ab5795e6f1e4ff8b21b1aa284cfb0d34655430d8b959cebac7982ee6eda66833a1fb208a36a51251c946565982cd5dff619ab334603ded530e7
+Size (postgresql-9.3.16.tar.bz2) = 17108969 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9
diff --git a/databases/postgresql94-docs/PLIST b/databases/postgresql94-docs/PLIST
index 65f5f6f9416..c756f466a2c 100644
--- a/databases/postgresql94-docs/PLIST
+++ b/databases/postgresql94-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.11 2016/10/29 19:41:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.12 2017/02/11 10:18:52 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -445,6 +445,7 @@ share/doc/postgresql/html/disk-usage.html
 share/doc/postgresql/html/diskusage.html
 share/doc/postgresql/html/dml-delete.html
 share/doc/postgresql/html/dml-insert.html
+share/doc/postgresql/html/dml-returning.html
 share/doc/postgresql/html/dml-update.html
 share/doc/postgresql/html/dml.html
 share/doc/postgresql/html/docguide-authoring.html
@@ -1118,6 +1119,7 @@ share/doc/postgresql/html/release-9-2-17.html
 share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
+share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -1133,6 +1135,7 @@ share/doc/postgresql/html/release-9-3-12.html
 share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
+share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1144,6 +1147,7 @@ share/doc/postgresql/html/release-9-3-9.html
 share/doc/postgresql/html/release-9-3.html
 share/doc/postgresql/html/release-9-4-1.html
 share/doc/postgresql/html/release-9-4-10.html
+share/doc/postgresql/html/release-9-4-11.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
diff --git a/databases/postgresql94-server/PLIST b/databases/postgresql94-server/PLIST
index 4d5c670ce49..a8da4a2d9ba 100644
--- a/databases/postgresql94-server/PLIST
+++ b/databases/postgresql94-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.6 2016/10/29 19:41:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.7 2017/02/11 10:18:52 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -308,6 +308,7 @@ share/postgresql/timezone/Asia/Aqtau
 share/postgresql/timezone/Asia/Aqtobe
 share/postgresql/timezone/Asia/Ashgabat
 share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Atyrau
 share/postgresql/timezone/Asia/Baghdad
 share/postgresql/timezone/Asia/Bahrain
 share/postgresql/timezone/Asia/Baku
@@ -328,6 +329,7 @@ share/postgresql/timezone/Asia/Dhaka
 share/postgresql/timezone/Asia/Dili
 share/postgresql/timezone/Asia/Dubai
 share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Famagusta
 share/postgresql/timezone/Asia/Gaza
 share/postgresql/timezone/Asia/Harbin
 share/postgresql/timezone/Asia/Hebron
@@ -533,6 +535,7 @@ share/postgresql/timezone/Europe/Rome
 share/postgresql/timezone/Europe/Samara
 share/postgresql/timezone/Europe/San_Marino
 share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Saratov
 share/postgresql/timezone/Europe/Simferopol
 share/postgresql/timezone/Europe/Skopje
 share/postgresql/timezone/Europe/Sofia
diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index c45633bd1a5..267cc202712 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.14 2016/10/29 19:41:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.15 2017/02/11 10:18:52 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql94-pltcl/Makefile
 # used by databases/postgresql94-server/Makefile
 
-DISTNAME=	postgresql-9.4.10
+DISTNAME=	postgresql-9.4.11
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql94/distinfo b/databases/postgresql94/distinfo
index 855d0c0e8d0..5ed9e82f950 100644
--- a/databases/postgresql94/distinfo
+++ b/databases/postgresql94/distinfo
@@ -1,14 +1,14 @@
-$NetBSD: distinfo,v 1.13 2016/10/29 19:41:54 adam Exp $
+$NetBSD: distinfo,v 1.14 2017/02/11 10:18:52 adam Exp $
 
-SHA1 (postgresql-9.4.10.tar.bz2) = d1ebec7f076a6b9de29d7f726b0932ac542f2bd1
-RMD160 (postgresql-9.4.10.tar.bz2) = 40d7b38f3bce9e5404825c653e9bb2b851f84374
-SHA512 (postgresql-9.4.10.tar.bz2) = 2fcf47769b22c69bc82c9d6edc317e18dfcb4a96534e012bae4355e5088afa83da98b21e08a07766794f0a166888acbd16705a806464ea11711ed97c3b4012fb
-Size (postgresql-9.4.10.tar.bz2) = 17802812 bytes
+SHA1 (postgresql-9.4.11.tar.bz2) = 3ec451a9ecfb7cad107b76be3acd2279726c8df6
+RMD160 (postgresql-9.4.11.tar.bz2) = 28bc7a27c07d97f83787c2cb273cb2f139670c27
+SHA512 (postgresql-9.4.11.tar.bz2) = a3ed866d82ab4b90c2a7ec2abec0308015845947f42b76e420cce8f268e1c374806a9fab00ba0563d742a53014a30fa0eaa90804a09fd162b76fcbfbeff6b70f
+Size (postgresql-9.4.11.tar.bz2) = 17832915 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
 SHA1 (patch-contrib_dblink_dblink.c) = a6f87ab9f2c28a72608d70267b71bd77437b0921
-SHA1 (patch-contrib_uuid-ossp_uuid-ossp.c) = efaffec2f51de70823430ca162d499b2886a9190
+SHA1 (patch-contrib_uuid-ossp_uuid-ossp.c) = b18da04850bc7c14f8fc80e0c86429ed1cc075c8
 SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
 SHA1 (patch-src_Makefile.shlib) = 69f980184fd8dbd821221a1c6ac3a88408f2c4cf
 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca
diff --git a/databases/postgresql94/patches/patch-contrib_uuid-ossp_uuid-ossp.c b/databases/postgresql94/patches/patch-contrib_uuid-ossp_uuid-ossp.c
index 93a82e34f61..a832000af7f 100644
--- a/databases/postgresql94/patches/patch-contrib_uuid-ossp_uuid-ossp.c
+++ b/databases/postgresql94/patches/patch-contrib_uuid-ossp_uuid-ossp.c
@@ -1,18 +1,18 @@
-$NetBSD: patch-contrib_uuid-ossp_uuid-ossp.c,v 1.1 2015/01/14 21:01:18 adam Exp $
+$NetBSD: patch-contrib_uuid-ossp_uuid-ossp.c,v 1.2 2017/02/11 10:18:52 adam Exp $
 
 Explicitly define HAVE_UUID_H and HAVE_UUID_OSSP.
 
---- contrib/uuid-ossp/uuid-ossp.c.orig	2015-01-14 20:54:38.000000000 +0000
+--- contrib/uuid-ossp/uuid-ossp.c.orig	2017-02-06 21:49:02.000000000 +0000
 +++ contrib/uuid-ossp/uuid-ossp.c
-@@ -26,6 +26,7 @@
+@@ -30,6 +30,7 @@
   */
  #define uuid_hash bsd_uuid_hash
  
 +#define HAVE_UUID_H
- #ifdef HAVE_UUID_H
+ #if defined(HAVE_UUID_H)
  #include <uuid.h>
- #endif
-@@ -42,6 +43,7 @@
+ #elif defined(HAVE_OSSP_UUID_H)
+@@ -46,6 +47,7 @@
   * Some BSD variants offer md5 and sha1 implementations but Linux does not,
   * so we use a copy of the ones from pgcrypto.  Not needed with OSSP, though.
   */
diff --git a/databases/postgresql95-contrib/Makefile b/databases/postgresql95-contrib/Makefile
index 746801cc29d..f1bc90a768e 100644
--- a/databases/postgresql95-contrib/Makefile
+++ b/databases/postgresql95-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2016/11/21 01:42:54 tnn Exp $
+# $NetBSD: Makefile,v 1.3 2017/02/11 10:18:52 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/95-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql95/Makefile.common"
diff --git a/databases/postgresql95-docs/PLIST b/databases/postgresql95-docs/PLIST
index 4fe1f9e2863..ea5f76f7a3a 100644
--- a/databases/postgresql95-docs/PLIST
+++ b/databases/postgresql95-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.5 2016/10/29 19:41:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.6 2017/02/11 10:18:52 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -464,6 +464,7 @@ share/doc/postgresql/html/disk-usage.html
 share/doc/postgresql/html/diskusage.html
 share/doc/postgresql/html/dml-delete.html
 share/doc/postgresql/html/dml-insert.html
+share/doc/postgresql/html/dml-returning.html
 share/doc/postgresql/html/dml-update.html
 share/doc/postgresql/html/dml.html
 share/doc/postgresql/html/docguide-authoring.html
@@ -1139,6 +1140,7 @@ share/doc/postgresql/html/release-9-2-17.html
 share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
+share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -1154,6 +1156,7 @@ share/doc/postgresql/html/release-9-3-12.html
 share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
+share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1165,6 +1168,7 @@ share/doc/postgresql/html/release-9-3-9.html
 share/doc/postgresql/html/release-9-3.html
 share/doc/postgresql/html/release-9-4-1.html
 share/doc/postgresql/html/release-9-4-10.html
+share/doc/postgresql/html/release-9-4-11.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -1179,6 +1183,7 @@ share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
 share/doc/postgresql/html/release-9-5-5.html
+share/doc/postgresql/html/release-9-5-6.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
diff --git a/databases/postgresql95-server/PLIST b/databases/postgresql95-server/PLIST
index 3017c597de5..6f987b6875a 100644
--- a/databases/postgresql95-server/PLIST
+++ b/databases/postgresql95-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/10/29 19:41:54 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2017/02/11 10:18:53 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -309,6 +309,7 @@ share/postgresql/timezone/Asia/Aqtau
 share/postgresql/timezone/Asia/Aqtobe
 share/postgresql/timezone/Asia/Ashgabat
 share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Atyrau
 share/postgresql/timezone/Asia/Baghdad
 share/postgresql/timezone/Asia/Bahrain
 share/postgresql/timezone/Asia/Baku
@@ -329,6 +330,7 @@ share/postgresql/timezone/Asia/Dhaka
 share/postgresql/timezone/Asia/Dili
 share/postgresql/timezone/Asia/Dubai
 share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Famagusta
 share/postgresql/timezone/Asia/Gaza
 share/postgresql/timezone/Asia/Harbin
 share/postgresql/timezone/Asia/Hebron
@@ -534,6 +536,7 @@ share/postgresql/timezone/Europe/Rome
 share/postgresql/timezone/Europe/Samara
 share/postgresql/timezone/Europe/San_Marino
 share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Saratov
 share/postgresql/timezone/Europe/Simferopol
 share/postgresql/timezone/Europe/Skopje
 share/postgresql/timezone/Europe/Sofia
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common
index e1158680e5c..b3edd818215 100644
--- a/databases/postgresql95/Makefile.common
+++ b/databases/postgresql95/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.7 2016/10/29 19:41:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.8 2017/02/11 10:18:52 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql95-pltcl/Makefile
 # used by databases/postgresql95-server/Makefile
 
-DISTNAME=	postgresql-9.5.5
+DISTNAME=	postgresql-9.5.6
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql95/distinfo b/databases/postgresql95/distinfo
index 00e960515e3..baa88530c25 100644
--- a/databases/postgresql95/distinfo
+++ b/databases/postgresql95/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.6 2016/11/21 01:42:54 tnn Exp $
+$NetBSD: distinfo,v 1.7 2017/02/11 10:18:52 adam Exp $
 
-SHA1 (postgresql-9.5.5.tar.bz2) = daf67622692f066d78150a2c4ffae1ec6568ced8
-RMD160 (postgresql-9.5.5.tar.bz2) = 87a90023bdae604f1356e9f0e5a9b7f4c333c847
-SHA512 (postgresql-9.5.5.tar.bz2) = 727ab57796cd393ec3755e9aabf515ebbdc3152b4062c20e64511e866a7e7038ba5c5e2843f13f3a79e2263296451f0e93108346b6f638611fba2449394e338e
-Size (postgresql-9.5.5.tar.bz2) = 18525082 bytes
+SHA1 (postgresql-9.5.6.tar.bz2) = f4260f9be4e6259f347df86ba16f4cf9ed71f46d
+RMD160 (postgresql-9.5.6.tar.bz2) = d52a6aaa014322814426097bb482effacc916a33
+SHA512 (postgresql-9.5.6.tar.bz2) = fabaeb2d4841ca2f2fd7b0f9c90368debc91f569ade5ad4dc9250c27d790a97ed58a670319f0fe59404fce7e986e8dafb1408edbe6fc149531bdb230b1b913fe
+Size (postgresql-9.5.6.tar.bz2) = 18598551 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
diff --git a/databases/postgresql96-contrib/Makefile b/databases/postgresql96-contrib/Makefile
index 380807fa22f..32cad810e6f 100644
--- a/databases/postgresql96-contrib/Makefile
+++ b/databases/postgresql96-contrib/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2016/11/23 15:22:48 fhajny Exp $
+# $NetBSD: Makefile,v 1.3 2017/02/11 10:18:53 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/96-contrib-/}
-PKGREVISION=	1
 COMMENT=	Contrib subtree of tools and plug-ins
 
 .include "../../databases/postgresql96/Makefile.common"
diff --git a/databases/postgresql96-docs/PLIST b/databases/postgresql96-docs/PLIST
index c7c4bd3975d..145c7b1a34b 100644
--- a/databases/postgresql96-docs/PLIST
+++ b/databases/postgresql96-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/10/29 19:41:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/02/11 10:18:53 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -469,6 +469,7 @@ share/doc/postgresql/html/disk-usage.html
 share/doc/postgresql/html/diskusage.html
 share/doc/postgresql/html/dml-delete.html
 share/doc/postgresql/html/dml-insert.html
+share/doc/postgresql/html/dml-returning.html
 share/doc/postgresql/html/dml-update.html
 share/doc/postgresql/html/dml.html
 share/doc/postgresql/html/docguide-authoring.html
@@ -1153,6 +1154,7 @@ share/doc/postgresql/html/release-9-2-17.html
 share/doc/postgresql/html/release-9-2-18.html
 share/doc/postgresql/html/release-9-2-19.html
 share/doc/postgresql/html/release-9-2-2.html
+share/doc/postgresql/html/release-9-2-20.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
 share/doc/postgresql/html/release-9-2-5.html
@@ -1168,6 +1170,7 @@ share/doc/postgresql/html/release-9-3-12.html
 share/doc/postgresql/html/release-9-3-13.html
 share/doc/postgresql/html/release-9-3-14.html
 share/doc/postgresql/html/release-9-3-15.html
+share/doc/postgresql/html/release-9-3-16.html
 share/doc/postgresql/html/release-9-3-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1179,6 +1182,7 @@ share/doc/postgresql/html/release-9-3-9.html
 share/doc/postgresql/html/release-9-3.html
 share/doc/postgresql/html/release-9-4-1.html
 share/doc/postgresql/html/release-9-4-10.html
+share/doc/postgresql/html/release-9-4-11.html
 share/doc/postgresql/html/release-9-4-2.html
 share/doc/postgresql/html/release-9-4-3.html
 share/doc/postgresql/html/release-9-4-4.html
@@ -1193,8 +1197,10 @@ share/doc/postgresql/html/release-9-5-2.html
 share/doc/postgresql/html/release-9-5-3.html
 share/doc/postgresql/html/release-9-5-4.html
 share/doc/postgresql/html/release-9-5-5.html
+share/doc/postgresql/html/release-9-5-6.html
 share/doc/postgresql/html/release-9-5.html
 share/doc/postgresql/html/release-9-6-1.html
+share/doc/postgresql/html/release-9-6-2.html
 share/doc/postgresql/html/release-9-6.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
diff --git a/databases/postgresql96-server/PLIST b/databases/postgresql96-server/PLIST
index b1e688f7c70..7d9eaff26ef 100644
--- a/databases/postgresql96-server/PLIST
+++ b/databases/postgresql96-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1 2016/10/29 19:41:55 adam Exp $
+@comment $NetBSD: PLIST,v 1.2 2017/02/11 10:18:53 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -44,6 +44,7 @@ share/locale/it/LC_MESSAGES/postgres-9.6.mo
 share/locale/ja/LC_MESSAGES/plpgsql-9.6.mo
 share/locale/ja/LC_MESSAGES/postgres-9.6.mo
 share/locale/ko/LC_MESSAGES/plpgsql-9.6.mo
+share/locale/ko/LC_MESSAGES/postgres-9.6.mo
 share/locale/pl/LC_MESSAGES/plpgsql-9.6.mo
 share/locale/pl/LC_MESSAGES/postgres-9.6.mo
 share/locale/pt_BR/LC_MESSAGES/plpgsql-9.6.mo
@@ -309,6 +310,7 @@ share/postgresql/timezone/Asia/Aqtau
 share/postgresql/timezone/Asia/Aqtobe
 share/postgresql/timezone/Asia/Ashgabat
 share/postgresql/timezone/Asia/Ashkhabad
+share/postgresql/timezone/Asia/Atyrau
 share/postgresql/timezone/Asia/Baghdad
 share/postgresql/timezone/Asia/Bahrain
 share/postgresql/timezone/Asia/Baku
@@ -329,6 +331,7 @@ share/postgresql/timezone/Asia/Dhaka
 share/postgresql/timezone/Asia/Dili
 share/postgresql/timezone/Asia/Dubai
 share/postgresql/timezone/Asia/Dushanbe
+share/postgresql/timezone/Asia/Famagusta
 share/postgresql/timezone/Asia/Gaza
 share/postgresql/timezone/Asia/Harbin
 share/postgresql/timezone/Asia/Hebron
@@ -534,6 +537,7 @@ share/postgresql/timezone/Europe/Rome
 share/postgresql/timezone/Europe/Samara
 share/postgresql/timezone/Europe/San_Marino
 share/postgresql/timezone/Europe/Sarajevo
+share/postgresql/timezone/Europe/Saratov
 share/postgresql/timezone/Europe/Simferopol
 share/postgresql/timezone/Europe/Skopje
 share/postgresql/timezone/Europe/Sofia
diff --git a/databases/postgresql96/Makefile.common b/databases/postgresql96/Makefile.common
index 20c1767b238..7df2de80ab7 100644
--- a/databases/postgresql96/Makefile.common
+++ b/databases/postgresql96/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.1 2016/10/29 19:41:54 adam Exp $
+# $NetBSD: Makefile.common,v 1.2 2017/02/11 10:18:53 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -16,7 +16,7 @@
 # used by databases/postgresql96-pltcl/Makefile
 # used by databases/postgresql96-server/Makefile
 
-DISTNAME=	postgresql-9.6.1
+DISTNAME=	postgresql-9.6.2
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql96/distinfo b/databases/postgresql96/distinfo
index 44e3de86726..f5b19b876e6 100644
--- a/databases/postgresql96/distinfo
+++ b/databases/postgresql96/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2016/11/23 15:22:48 fhajny Exp $
+$NetBSD: distinfo,v 1.3 2017/02/11 10:18:53 adam Exp $
 
-SHA1 (postgresql-9.6.1.tar.bz2) = 4209970c9aaf91ebb2a3b8a2e359419e5192b4ad
-RMD160 (postgresql-9.6.1.tar.bz2) = 5981c45f58ac5b2d3f2b7c21103b2a5ffc950224
-SHA512 (postgresql-9.6.1.tar.bz2) = f27af67f9a96f6327150330bf091a803e10eabbac4e488cf5e4d72907e2eb1dbde7282fe0b89fd75711fd8bdcdb3688b5a9eac1e4d6871f4e8681c9c8b0e7c45
-Size (postgresql-9.6.1.tar.bz2) = 19260568 bytes
+SHA1 (postgresql-9.6.2.tar.bz2) = 0ff14271b42233666c4831ac0152b2ea069fdf9d
+RMD160 (postgresql-9.6.2.tar.bz2) = b066967d367e15b88a1f6854dfe4f8324084098a
+SHA512 (postgresql-9.6.2.tar.bz2) = 7c9d61a591408e29d7dc70d6b28ecdf06edf7f8fbf4e014e60a1e4f841fd5734c74a820094f6153e10ef633d48ea73f2a85194f6d2cd519a8f7087a261e9e02b
+Size (postgresql-9.6.2.tar.bz2) = 19478040 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632