The PostgreSQL Global Development Group has released an update to all supported versions of our database system, including 9.5.4, 9.4.9, 9.3.14, 9.2.18 and 9.1.23. This release fixes two security issues. It also patches a number of other bugs reported over the last three months. Users who rely on security isolation between database users should update as soon as possible. Other users should plan to update at the next convenient downtime.

Security Issues
---------------
Two security holes have been closed by this release:

CVE-2016-5423: certain nested CASE expressions can cause the server to crash.
CVE-2016-5424: database and role names with embedded special characters can allow code injection during administrative operations like pg_dumpall.
The fix for the second issue also adds an option, -reuse-previous, to psql's \connect command. pg_dumpall will also refuse to handle database and role names containing line breaks after the update. For more information on these issues and how they affect backwards-compatibility, see the Release Notes.

Bug Fixes and Improvements
--------------------------
This update also fixes a number of bugs reported in the last few months. Some of these issues affect only version 9.5, but many affect all supported versions:

Fix misbehaviors of IS NULL/IS NOT NULL with composite values
Fix three areas where INSERT ... ON CONFLICT failed to work properly with other SQL features.
Make INET and CIDR data types properly reject bad IPv6 values
Prevent crash in "point ## lseg" operator for NaN input
Avoid possible crash in pg_get_expr()
Fix several one-byte buffer over-reads in to_number()
Don't needlessly plan query if WITH NO DATA is specified
Avoid crash-unsafe state in expensive heap_update() paths
Fix hint bit update during WAL replay of row locking operations
Avoid unnecessary "could not serialize access" with FOR KEY SHARE
Avoid crash in postgres -C when the specified variable is a null string
Fix two issues with logical decoding and subtransactions
Ensure that backends see up-to-date statistics for shared catalogs
Prevent possible failure when vacuuming multixact IDs in an upgraded database
When a manual ANALYZE specifies columns, don't reset changes_since_analyze
Fix ANALYZE's overestimation of n_distinct for columns with nulls
Fix bug in b-tree mark/restore processing
Fix building of large (bigger than shared_buffers) hash indexes
Prevent infinite loop in GiST index build with NaN values
Fix possible crash during a nearest-neighbor indexscan
Fix "PANIC: failed to add BRIN tuple" error
Prevent possible crash during background worker shutdown
Many fixes for issues in parallel pg_dump and pg_restore
Make pg_basebackup accept -Z 0 as no compression
Make regression tests safe for Danish and Welsh locales

42 files changed, 57 insertions, 624 deletions

diff --git a/databases/postgresql91-docs/Makefile b/databases/postgresql91-docs/Makefile
index 6fa9f7b26ff..e8a8adea0af 100644
--- a/databases/postgresql91-docs/Makefile
+++ b/databases/postgresql91-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.13 2016/07/09 06:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.14 2016/08/23 06:28:15 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/91-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql91/Makefile.common"
diff --git a/databases/postgresql91-docs/PLIST b/databases/postgresql91-docs/PLIST
index 31a5e54f502..1a1ad37e069 100644
--- a/databases/postgresql91-docs/PLIST
+++ b/databases/postgresql91-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.24 2016/05/23 14:27:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.25 2016/08/23 06:28:15 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1026,6 +1026,7 @@ share/doc/postgresql/html/release-9-1-20.html
 share/doc/postgresql/html/release-9-1-2.html
 share/doc/postgresql/html/release-9-1-21.html
 share/doc/postgresql/html/release-9-1-22.html
+share/doc/postgresql/html/release-9-1-23.html
 share/doc/postgresql/html/release-9-1-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
diff --git a/databases/postgresql91-plperl/Makefile b/databases/postgresql91-plperl/Makefile
index d33108f1ab9..431d2f8e2c4 100644
--- a/databases/postgresql91-plperl/Makefile
+++ b/databases/postgresql91-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.20 2016/07/09 06:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.21 2016/08/23 06:28:15 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/91-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql91-server>=${PKGVERSION_NOREV}:../../databases/postgresql91-server
diff --git a/databases/postgresql91/Makefile b/databases/postgresql91/Makefile
index b75d885f3a4..05ddc6d0d01 100644
--- a/databases/postgresql91/Makefile
+++ b/databases/postgresql91/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 06:38:01 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/23 06:28:15 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/91-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql91-client>=${PKGVERSION_NOREV}:../../databases/postgresql91-client
diff --git a/databases/postgresql91/Makefile.common b/databases/postgresql91/Makefile.common
index d8d288b3feb..a62cbe5aeb5 100644
--- a/databases/postgresql91/Makefile.common
+++ b/databases/postgresql91/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.33 2016/06/19 21:09:54 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.34 2016/08/23 06:28:15 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/postgresql91-pltcl/Makefile
 # used by databases/postgresql91-server/Makefile
 
-DISTNAME=	postgresql-9.1.22
+DISTNAME=	postgresql-9.1.23
 CATEGORIES=	databases
 MASTER_SITES=	${MASTER_SITE_PGSQL:=source/v${PKGVERSION_NOREV}/}
 EXTRACT_SUFX=	.tar.bz2
diff --git a/databases/postgresql91/distinfo b/databases/postgresql91/distinfo
index c44f78a3f07..c68b2d2879f 100644
--- a/databases/postgresql91/distinfo
+++ b/databases/postgresql91/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.29 2016/05/23 14:27:34 adam Exp $
+$NetBSD: distinfo,v 1.30 2016/08/23 06:28:15 adam Exp $
 
-SHA1 (postgresql-9.1.22.tar.bz2) = 563f6e00e89ddfd229235c4f29f3c37268291b2b
-RMD160 (postgresql-9.1.22.tar.bz2) = 0a0c2f3fa9ba3faf09d047968de31cc6ceaa9e6d
-SHA512 (postgresql-9.1.22.tar.bz2) = a2ed0a1f0d0920f6151d128a206c557b14832ab296dbf51c665309434a851b83eefd12a5a36c870ee0281371350b6b86ac6e81188c164c72407847cf9e70d691
-Size (postgresql-9.1.22.tar.bz2) = 15860904 bytes
+SHA1 (postgresql-9.1.23.tar.bz2) = 9b3c51c4b40d69e6d84c1a0ac464828b559f7362
+RMD160 (postgresql-9.1.23.tar.bz2) = 5ec47504950f42d7f6fa07059e5e5daa7caef1c3
+SHA512 (postgresql-9.1.23.tar.bz2) = 192f48ed8db510663c85c217afee8eff732d467fe10f600c9be834371ccb6a788acd380c582d80f0096a0b7d7ee0daa378d1fb8177281bf4e6e2fcc39fffdc67
+Size (postgresql-9.1.23.tar.bz2) = 15856178 bytes
 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-configure) = dab79533dac06a79a5aa8439d6b15830d8d2fba7
 SHA1 (patch-contrib_dblink_Makefile) = 4960ad57d42465fae203870548e4c53f8a32ce04
@@ -15,7 +15,3 @@ SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 1d3760f2d170837a395cfac
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 2b7448d6dd8550e2ea61f40728a2780068b93d07
 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
-SHA1 (patch-src_timezone_localtime.c) = a73769cf05223d2ee06249c9e69c85038c2cd936
-SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214
-SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64
-SHA1 (patch-src_timezone_zic.c) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
diff --git a/databases/postgresql91/patches/patch-src_timezone_localtime.c b/databases/postgresql91/patches/patch-src_timezone_localtime.c
deleted file mode 100644
index eea6dc38c3b..00000000000
--- a/databases/postgresql91/patches/patch-src_timezone_localtime.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_timezone_localtime.c,v 1.1.1.1 2011/09/15 08:27:39 adam Exp $
-
---- src/timezone/localtime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/localtime.c
-@@ -80,20 +80,20 @@ static pg_time_t detzcode64(const char *
- static int	differ_by_repeat(pg_time_t t1, pg_time_t t0);
- static const char *getzname(const char *strp);
- static const char *getqzname(const char *strp, int delim);
--static const char *getnum(const char *strp, int *nump, int min, int max);
-+static const char *getnum(const char *strp, int *nump, const int min, const int max);
- static const char *getsecs(const char *strp, long *secsp);
- static const char *getoffset(const char *strp, long *offsetp);
- static const char *getrule(const char *strp, struct rule * rulep);
- static void gmtload(struct state * sp);
--static struct pg_tm *gmtsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *gmtsub(const pg_time_t *timep, const long offset,
- 	   struct pg_tm * tmp);
--static struct pg_tm *localsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *localsub(const pg_time_t *timep, const long offset,
- 		 struct pg_tm * tmp, const pg_tz *tz);
- static int	increment_overflow(int *number, int delta);
--static pg_time_t transtime(pg_time_t janfirst, int year,
--		  const struct rule * rulep, long offset);
-+static pg_time_t transtime(pg_time_t janfirst, const int year,
-+		  const struct rule * rulep, const long offset);
- static int	typesequiv(const struct state * sp, int a, int b);
--static struct pg_tm *timesub(const pg_time_t *timep, long offset,
-+static struct pg_tm *timesub(const pg_time_t *timep, const long offset,
- 		const struct state * sp, struct pg_tm * tmp);
- 
- /* GMT timezone */
diff --git a/databases/postgresql91/patches/patch-src_timezone_private.h b/databases/postgresql91/patches/patch-src_timezone_private.h
deleted file mode 100644
index 45f458b5afb..00000000000
--- a/databases/postgresql91/patches/patch-src_timezone_private.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_timezone_private.h,v 1.1.1.1 2011/09/15 08:27:39 adam Exp $
-
---- src/timezone/private.h.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/private.h
-@@ -51,8 +51,8 @@ extern int	unlink(const char *filename);
- extern char *icalloc(int nelem, int elsize);
- extern char *icatalloc(char *old, const char *new);
- extern char *icpyalloc(const char *string);
--extern char *imalloc(int n);
--extern void *irealloc(void *pointer, int size);
-+extern char *imalloc(const int n);
-+extern void *irealloc(void *pointer, const int size);
- extern void icfree(char *pointer);
- extern void ifree(char *pointer);
- extern const char *scheck(const char *string, const char *format);
diff --git a/databases/postgresql91/patches/patch-src_timezone_strftime.c b/databases/postgresql91/patches/patch-src_timezone_strftime.c
deleted file mode 100644
index 11cbbca0070..00000000000
--- a/databases/postgresql91/patches/patch-src_timezone_strftime.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_timezone_strftime.c,v 1.1.1.1 2011/09/15 08:27:39 adam Exp $
-
---- src/timezone/strftime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/strftime.c
-@@ -89,7 +89,7 @@ static const struct lc_time_T C_time_loc
- };
- 
- static char *_add(const char *, char *, const char *);
--static char *_conv(int, const char *, char *, const char *);
-+static char *_conv(const int, const char *, char *, const char *);
- static char *_fmt(const char *, const struct pg_tm *, char *,
- 	 const char *, int *);
- static char *_yconv(const int, const int, const int, const int,
diff --git a/databases/postgresql91/patches/patch-src_timezone_zic.c b/databases/postgresql91/patches/patch-src_timezone_zic.c
deleted file mode 100644
index 5a5286d1397..00000000000
--- a/databases/postgresql91/patches/patch-src_timezone_zic.c
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-src_timezone_zic.c,v 1.1.1.1 2011/09/15 08:27:39 adam Exp $
-
---- src/timezone/zic.c.orig	2010-03-16 07:17:04.000000000 +0000
-+++ src/timezone/zic.c
-@@ -120,51 +120,51 @@ struct zone
- 
- extern int	link(const char *fromname, const char *toname);
- static void addtt(const pg_time_t starttime, int type);
--static int addtype(long gmtoff, const char *abbr, int isdst,
--		int ttisstd, int ttisgmt);
--static void leapadd(const pg_time_t t, int positive, int rolling, int count);
-+static int addtype(const long gmtoff, const char *abbr, const int isdst,
-+		const int ttisstd, const int ttisgmt);
-+static void leapadd(const pg_time_t t, const int positive, const int rolling, int count);
- static void adjleap(void);
- static void associate(void);
- static int	ciequal(const char *ap, const char *bp);
--static void convert(long val, char *buf);
-+static void convert(const long val, char *buf);
- static void dolink(const char *fromfile, const char *tofile);
- static void doabbr(char *abbr, const char *format,
--	   const char *letters, int isdst, int doquotes);
--static void eat(const char *name, int num);
--static void eats(const char *name, int num,
--	 const char *rname, int rnum);
--static long eitol(int i);
-+	   const char *letters, const int isdst, int doquotes);
-+static void eat(const char *name, const int num);
-+static void eats(const char *name, const int num,
-+	 const char *rname, const int rnum);
-+static long eitol(const int i);
- static void error(const char *message);
- static char **getfields(char *buf);
- static long gethms(const char *string, const char *errstrng,
--	   int signable);
-+	   const int signable);
- static void infile(const char *filename);
--static void inleap(char **fields, int nfields);
--static void inlink(char **fields, int nfields);
--static void inrule(char **fields, int nfields);
--static int	inzcont(char **fields, int nfields);
--static int	inzone(char **fields, int nfields);
--static int	inzsub(char **fields, int nfields, int iscont);
-+static void inleap(char **fields, const int nfields);
-+static void inlink(char **fields, const int nfields);
-+static void inrule(char **fields, const int nfields);
-+static int	inzcont(char **fields, const int nfields);
-+static int	inzone(char **fields, const int nfields);
-+static int	inzsub(char **fields, const int nfields, const int iscont);
- static int	itsabbr(const char *abbr, const char *word);
- static int	itsdir(const char *name);
- static int	lowerit(int c);
- static char *memcheck(char *tocheck);
- static int	mkdirs(char *filename);
- static void newabbr(const char *abbr);
--static long oadd(long t1, long t2);
--static void outzone(const struct zone * zp, int ntzones);
--static void puttzcode(long code, FILE *fp);
-+static long oadd(const long t1, const long t2);
-+static void outzone(const struct zone * zp, const int ntzones);
-+static void puttzcode(const long code, FILE *fp);
- static int	rcomp(const void *leftp, const void *rightp);
--static pg_time_t rpytime(const struct rule * rp, int wantedy);
-+static pg_time_t rpytime(const struct rule * rp, const int wantedy);
- static void rulesub(struct rule * rp,
- 		const char *loyearp, const char *hiyearp,
- 		const char *typep, const char *monthp,
- 		const char *dayp, const char *timep);
- 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(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);
- 
- static int	charcnt;
- static int	errors;
diff --git a/databases/postgresql92-docs/Makefile b/databases/postgresql92-docs/Makefile
index e871570586f..17247d681df 100644
--- a/databases/postgresql92-docs/Makefile
+++ b/databases/postgresql92-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2016/07/09 06:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/23 06:28:15 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/92-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql92/Makefile.common"
diff --git a/databases/postgresql92-docs/PLIST b/databases/postgresql92-docs/PLIST
index 2816858d256..57e1849789f 100644
--- a/databases/postgresql92-docs/PLIST
+++ b/databases/postgresql92-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.17 2016/05/23 14:27:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.18 2016/08/23 06:28:15 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1055,6 +1055,7 @@ share/doc/postgresql/html/release-9-1-20.html
 share/doc/postgresql/html/release-9-1-2.html
 share/doc/postgresql/html/release-9-1-21.html
 share/doc/postgresql/html/release-9-1-22.html
+share/doc/postgresql/html/release-9-1-23.html
 share/doc/postgresql/html/release-9-1-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -1072,6 +1073,7 @@ share/doc/postgresql/html/release-9-2-14.html
 share/doc/postgresql/html/release-9-2-15.html
 share/doc/postgresql/html/release-9-2-16.html
 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-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
diff --git a/databases/postgresql92-plperl/Makefile b/databases/postgresql92-plperl/Makefile
index 57d4877fd56..99ef6786adf 100644
--- a/databases/postgresql92-plperl/Makefile
+++ b/databases/postgresql92-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.14 2016/07/09 06:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.15 2016/08/23 06:28:15 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/92-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql92-server>=${PKGVERSION_NOREV}:../../databases/postgresql92-server
diff --git a/databases/postgresql92/Makefile b/databases/postgresql92/Makefile
index de9ba074a95..d791f54b45a 100644
--- a/databases/postgresql92/Makefile
+++ b/databases/postgresql92/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.12 2016/07/09 06:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2016/08/23 06:28:15 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/92-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql92-client>=${PKGVERSION_NOREV}:../../databases/postgresql92-client
diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common
index dd26a2631c6..ead7fc2729f 100644
--- a/databases/postgresql92/Makefile.common
+++ b/databases/postgresql92/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.24 2016/06/19 21:09:55 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.25 2016/08/23 06:28:15 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.17
+DISTNAME=	postgresql-9.2.18
 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 a78cf336c52..11d880ff505 100644
--- a/databases/postgresql92/distinfo
+++ b/databases/postgresql92/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2016/05/23 14:27:34 adam Exp $
+$NetBSD: distinfo,v 1.20 2016/08/23 06:28:15 adam Exp $
 
-SHA1 (postgresql-9.2.17.tar.bz2) = f6e7318e8d39ee963318561e46bb24b4cc1088cb
-RMD160 (postgresql-9.2.17.tar.bz2) = 3b916cd6ecb36f3494de895be963d593158d1709
-SHA512 (postgresql-9.2.17.tar.bz2) = a771c98c0de4e6c5790b9ee698ee8d259533d372b82ff3c9900c00cf79706ef29af6204de4292ff8ca4a3f3a13fec1991c4441c352c309bbf9cdd397579677b4
-Size (postgresql-9.2.17.tar.bz2) = 16497200 bytes
+SHA1 (postgresql-9.2.18.tar.bz2) = 703f237f2d70df3809733852a9c2421e5b4fdba9
+RMD160 (postgresql-9.2.18.tar.bz2) = 939d42d613dd25ac06e8e5eed82627e11663de7e
+SHA512 (postgresql-9.2.18.tar.bz2) = c311f621ac38e2dfaf5fd57a4500430333dcbb2d7f1719bc7d99fef54e06a22f93aea595391c3607d44c89c372d0e89daf18f8f295b33e3b21e5285fbbb87d5b
+Size (postgresql-9.2.18.tar.bz2) = 16448429 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747
@@ -16,7 +16,3 @@ SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 20578ab950465db07dab757
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 2b7448d6dd8550e2ea61f40728a2780068b93d07
 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
-SHA1 (patch-src_timezone_localtime.c) = 622f57bc1d10f07ab73f86765cbf587eece57085
-SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214
-SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64
-SHA1 (patch-src_timezone_zic.c) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
diff --git a/databases/postgresql92/patches/patch-src_timezone_localtime.c b/databases/postgresql92/patches/patch-src_timezone_localtime.c
deleted file mode 100644
index 6a3f081484a..00000000000
--- a/databases/postgresql92/patches/patch-src_timezone_localtime.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_timezone_localtime.c,v 1.1 2012/10/05 21:03:10 adam Exp $
-
---- src/timezone/localtime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/localtime.c
-@@ -81,20 +81,20 @@ static pg_time_t detzcode64(const char *
- static int	differ_by_repeat(pg_time_t t1, pg_time_t t0);
- static const char *getzname(const char *strp);
- static const char *getqzname(const char *strp, int delim);
--static const char *getnum(const char *strp, int *nump, int min, int max);
-+static const char *getnum(const char *strp, int *nump, const int min, const int max);
- static const char *getsecs(const char *strp, long *secsp);
- static const char *getoffset(const char *strp, long *offsetp);
- static const char *getrule(const char *strp, struct rule * rulep);
- static void gmtload(struct state * sp);
--static struct pg_tm *gmtsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *gmtsub(const pg_time_t *timep, const long offset,
- 	   struct pg_tm * tmp);
--static struct pg_tm *localsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *localsub(const pg_time_t *timep, const long offset,
- 		 struct pg_tm * tmp, const pg_tz *tz);
- static int	increment_overflow(int *number, int delta);
--static pg_time_t transtime(pg_time_t janfirst, int year,
--		  const struct rule * rulep, long offset);
-+static pg_time_t transtime(pg_time_t janfirst, const int year,
-+		  const struct rule * rulep, const long offset);
- static int	typesequiv(const struct state * sp, int a, int b);
--static struct pg_tm *timesub(const pg_time_t *timep, long offset,
-+static struct pg_tm *timesub(const pg_time_t *timep, const long offset,
- 		const struct state * sp, struct pg_tm * tmp);
- 
- /* GMT timezone */
diff --git a/databases/postgresql92/patches/patch-src_timezone_private.h b/databases/postgresql92/patches/patch-src_timezone_private.h
deleted file mode 100644
index 84fe15d265c..00000000000
--- a/databases/postgresql92/patches/patch-src_timezone_private.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_timezone_private.h,v 1.1 2012/10/05 21:03:10 adam Exp $
-
---- src/timezone/private.h.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/private.h
-@@ -51,8 +51,8 @@ extern int	unlink(const char *filename);
- extern char *icalloc(int nelem, int elsize);
- extern char *icatalloc(char *old, const char *new);
- extern char *icpyalloc(const char *string);
--extern char *imalloc(int n);
--extern void *irealloc(void *pointer, int size);
-+extern char *imalloc(const int n);
-+extern void *irealloc(void *pointer, const int size);
- extern void icfree(char *pointer);
- extern void ifree(char *pointer);
- extern const char *scheck(const char *string, const char *format);
diff --git a/databases/postgresql92/patches/patch-src_timezone_strftime.c b/databases/postgresql92/patches/patch-src_timezone_strftime.c
deleted file mode 100644
index 91eee8e1c43..00000000000
--- a/databases/postgresql92/patches/patch-src_timezone_strftime.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_timezone_strftime.c,v 1.1 2012/10/05 21:03:10 adam Exp $
-
---- src/timezone/strftime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/strftime.c
-@@ -89,7 +89,7 @@ static const struct lc_time_T C_time_loc
- };
- 
- static char *_add(const char *, char *, const char *);
--static char *_conv(int, const char *, char *, const char *);
-+static char *_conv(const int, const char *, char *, const char *);
- static char *_fmt(const char *, const struct pg_tm *, char *,
- 	 const char *, int *);
- static char *_yconv(const int, const int, const int, const int,
diff --git a/databases/postgresql92/patches/patch-src_timezone_zic.c b/databases/postgresql92/patches/patch-src_timezone_zic.c
deleted file mode 100644
index 1940fe22903..00000000000
--- a/databases/postgresql92/patches/patch-src_timezone_zic.c
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-src_timezone_zic.c,v 1.1 2012/10/05 21:03:10 adam Exp $
-
---- src/timezone/zic.c.orig	2010-03-16 07:17:04.000000000 +0000
-+++ src/timezone/zic.c
-@@ -120,51 +120,51 @@ struct zone
- 
- extern int	link(const char *fromname, const char *toname);
- static void addtt(const pg_time_t starttime, int type);
--static int addtype(long gmtoff, const char *abbr, int isdst,
--		int ttisstd, int ttisgmt);
--static void leapadd(const pg_time_t t, int positive, int rolling, int count);
-+static int addtype(const long gmtoff, const char *abbr, const int isdst,
-+		const int ttisstd, const int ttisgmt);
-+static void leapadd(const pg_time_t t, const int positive, const int rolling, int count);
- static void adjleap(void);
- static void associate(void);
- static int	ciequal(const char *ap, const char *bp);
--static void convert(long val, char *buf);
-+static void convert(const long val, char *buf);
- static void dolink(const char *fromfile, const char *tofile);
- static void doabbr(char *abbr, const char *format,
--	   const char *letters, int isdst, int doquotes);
--static void eat(const char *name, int num);
--static void eats(const char *name, int num,
--	 const char *rname, int rnum);
--static long eitol(int i);
-+	   const char *letters, const int isdst, int doquotes);
-+static void eat(const char *name, const int num);
-+static void eats(const char *name, const int num,
-+	 const char *rname, const int rnum);
-+static long eitol(const int i);
- static void error(const char *message);
- static char **getfields(char *buf);
- static long gethms(const char *string, const char *errstrng,
--	   int signable);
-+	   const int signable);
- static void infile(const char *filename);
--static void inleap(char **fields, int nfields);
--static void inlink(char **fields, int nfields);
--static void inrule(char **fields, int nfields);
--static int	inzcont(char **fields, int nfields);
--static int	inzone(char **fields, int nfields);
--static int	inzsub(char **fields, int nfields, int iscont);
-+static void inleap(char **fields, const int nfields);
-+static void inlink(char **fields, const int nfields);
-+static void inrule(char **fields, const int nfields);
-+static int	inzcont(char **fields, const int nfields);
-+static int	inzone(char **fields, const int nfields);
-+static int	inzsub(char **fields, const int nfields, const int iscont);
- static int	itsabbr(const char *abbr, const char *word);
- static int	itsdir(const char *name);
- static int	lowerit(int c);
- static char *memcheck(char *tocheck);
- static int	mkdirs(char *filename);
- static void newabbr(const char *abbr);
--static long oadd(long t1, long t2);
--static void outzone(const struct zone * zp, int ntzones);
--static void puttzcode(long code, FILE *fp);
-+static long oadd(const long t1, const long t2);
-+static void outzone(const struct zone * zp, const int ntzones);
-+static void puttzcode(const long code, FILE *fp);
- static int	rcomp(const void *leftp, const void *rightp);
--static pg_time_t rpytime(const struct rule * rp, int wantedy);
-+static pg_time_t rpytime(const struct rule * rp, const int wantedy);
- static void rulesub(struct rule * rp,
- 		const char *loyearp, const char *hiyearp,
- 		const char *typep, const char *monthp,
- 		const char *dayp, const char *timep);
- 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(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);
- 
- static int	charcnt;
- static int	errors;
diff --git a/databases/postgresql93-client/Makefile b/databases/postgresql93-client/Makefile
index 8b123959f2b..b20c237d109 100644
--- a/databases/postgresql93-client/Makefile
+++ b/databases/postgresql93-client/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2016/07/10 10:18:35 rillig Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/23 06:28:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/93-client-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database client programs
 
 .include "../../databases/postgresql93/Makefile.common"
diff --git a/databases/postgresql93-docs/Makefile b/databases/postgresql93-docs/Makefile
index 0a2cc316ce0..742f9a81228 100644
--- a/databases/postgresql93-docs/Makefile
+++ b/databases/postgresql93-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.6 2016/07/09 06:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.7 2016/08/23 06:28:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/93-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql93/Makefile.common"
diff --git a/databases/postgresql93-docs/PLIST b/databases/postgresql93-docs/PLIST
index 76fb3d6a2bf..3f481ece8a9 100644
--- a/databases/postgresql93-docs/PLIST
+++ b/databases/postgresql93-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.14 2016/05/23 14:27:34 adam Exp $
+@comment $NetBSD: PLIST,v 1.15 2016/08/23 06:28:16 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1076,6 +1076,7 @@ share/doc/postgresql/html/release-9-1-20.html
 share/doc/postgresql/html/release-9-1-2.html
 share/doc/postgresql/html/release-9-1-21.html
 share/doc/postgresql/html/release-9-1-22.html
+share/doc/postgresql/html/release-9-1-23.html
 share/doc/postgresql/html/release-9-1-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -1093,6 +1094,7 @@ share/doc/postgresql/html/release-9-2-13.html
 share/doc/postgresql/html/release-9-2-14.html
 share/doc/postgresql/html/release-9-2-16.html
 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-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
@@ -1107,6 +1109,7 @@ share/doc/postgresql/html/release-9-3-10.html
 share/doc/postgresql/html/release-9-3-11.html
 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-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-plperl/Makefile b/databases/postgresql93-plperl/Makefile
index 714ebbf1692..333aad0ec6e 100644
--- a/databases/postgresql93-plperl/Makefile
+++ b/databases/postgresql93-plperl/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.11 2016/07/09 06:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.12 2016/08/23 06:28:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/93-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql93-server>=${PKGVERSION_NOREV}:../../databases/postgresql93-server
diff --git a/databases/postgresql93/Makefile b/databases/postgresql93/Makefile
index 39e4f849efd..f774a682a40 100644
--- a/databases/postgresql93/Makefile
+++ b/databases/postgresql93/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.10 2016/07/09 06:38:02 wiz Exp $
+# $NetBSD: Makefile,v 1.11 2016/08/23 06:28:15 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/93-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql93-client>=${PKGVERSION_NOREV}:../../databases/postgresql93-client
diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index 4f02af7559b..d5f1ae558bc 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.20 2016/06/19 21:09:56 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.21 2016/08/23 06:28:15 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.13
+DISTNAME=	postgresql-9.3.14
 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 267000b3ce8..899d2fc0293 100644
--- a/databases/postgresql93/distinfo
+++ b/databases/postgresql93/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.19 2016/06/19 20:40:10 fhajny Exp $
+$NetBSD: distinfo,v 1.20 2016/08/23 06:28:15 adam Exp $
 
-SHA1 (postgresql-9.3.13.tar.bz2) = 5ee33e9b31c3686bd6c6fa0659f8766f5f70b53c
-RMD160 (postgresql-9.3.13.tar.bz2) = a4269b8eb9c818e5884acbe88c02551551fbbb33
-SHA512 (postgresql-9.3.13.tar.bz2) = 04658f95d723563c08249faf674f2119358059808c42045e05adaa28264b9ae054d4e81ae2bb6639995e007caa65d21d935ff988d5b0473dc517107ddd8c6ca3
-Size (postgresql-9.3.13.tar.bz2) = 17061824 bytes
+SHA1 (postgresql-9.3.14.tar.bz2) = a07cc4d1fd0fdd5ced85b75d821e1eec8eb9cb55
+RMD160 (postgresql-9.3.14.tar.bz2) = e7b6899874901d27f227524039c63823b0d23924
+SHA512 (postgresql-9.3.14.tar.bz2) = 97bd92ffdd661f7428c47a8bc87fde88a2b150e7d08bd577a7159ac65aec319d358495b883b95dff2069d24a8d15d1e7c10c3fae81fc76186bfef0127f257ac4
+Size (postgresql-9.3.14.tar.bz2) = 17042199 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9
@@ -19,7 +19,3 @@ SHA1 (patch-src_interfaces_libpq_Makefile) = 0066301bc8b31b9e26c79153427537bc386
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
-SHA1 (patch-src_timezone_localtime.c) = 622f57bc1d10f07ab73f86765cbf587eece57085
-SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214
-SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64
-SHA1 (patch-src_timezone_zic.c) = ed04d781845239ce5dc7c6fca406ce62c10a9605
diff --git a/databases/postgresql93/patches/patch-src_timezone_localtime.c b/databases/postgresql93/patches/patch-src_timezone_localtime.c
deleted file mode 100644
index afbb792ed70..00000000000
--- a/databases/postgresql93/patches/patch-src_timezone_localtime.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_timezone_localtime.c,v 1.1 2013/09/10 15:32:32 adam Exp $
-
---- src/timezone/localtime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/localtime.c
-@@ -81,20 +81,20 @@ static pg_time_t detzcode64(const char *
- static int	differ_by_repeat(pg_time_t t1, pg_time_t t0);
- static const char *getzname(const char *strp);
- static const char *getqzname(const char *strp, int delim);
--static const char *getnum(const char *strp, int *nump, int min, int max);
-+static const char *getnum(const char *strp, int *nump, const int min, const int max);
- static const char *getsecs(const char *strp, long *secsp);
- static const char *getoffset(const char *strp, long *offsetp);
- static const char *getrule(const char *strp, struct rule * rulep);
- static void gmtload(struct state * sp);
--static struct pg_tm *gmtsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *gmtsub(const pg_time_t *timep, const long offset,
- 	   struct pg_tm * tmp);
--static struct pg_tm *localsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *localsub(const pg_time_t *timep, const long offset,
- 		 struct pg_tm * tmp, const pg_tz *tz);
- static int	increment_overflow(int *number, int delta);
--static pg_time_t transtime(pg_time_t janfirst, int year,
--		  const struct rule * rulep, long offset);
-+static pg_time_t transtime(pg_time_t janfirst, const int year,
-+		  const struct rule * rulep, const long offset);
- static int	typesequiv(const struct state * sp, int a, int b);
--static struct pg_tm *timesub(const pg_time_t *timep, long offset,
-+static struct pg_tm *timesub(const pg_time_t *timep, const long offset,
- 		const struct state * sp, struct pg_tm * tmp);
- 
- /* GMT timezone */
diff --git a/databases/postgresql93/patches/patch-src_timezone_private.h b/databases/postgresql93/patches/patch-src_timezone_private.h
deleted file mode 100644
index 6bd3af86530..00000000000
--- a/databases/postgresql93/patches/patch-src_timezone_private.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_timezone_private.h,v 1.1 2013/09/10 15:32:32 adam Exp $
-
---- src/timezone/private.h.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/private.h
-@@ -51,8 +51,8 @@ extern int	unlink(const char *filename);
- extern char *icalloc(int nelem, int elsize);
- extern char *icatalloc(char *old, const char *new);
- extern char *icpyalloc(const char *string);
--extern char *imalloc(int n);
--extern void *irealloc(void *pointer, int size);
-+extern char *imalloc(const int n);
-+extern void *irealloc(void *pointer, const int size);
- extern void icfree(char *pointer);
- extern void ifree(char *pointer);
- extern const char *scheck(const char *string, const char *format);
diff --git a/databases/postgresql93/patches/patch-src_timezone_strftime.c b/databases/postgresql93/patches/patch-src_timezone_strftime.c
deleted file mode 100644
index 9189254ef0e..00000000000
--- a/databases/postgresql93/patches/patch-src_timezone_strftime.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_timezone_strftime.c,v 1.1 2013/09/10 15:32:32 adam Exp $
-
---- src/timezone/strftime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/strftime.c
-@@ -89,7 +89,7 @@ static const struct lc_time_T C_time_loc
- };
- 
- static char *_add(const char *, char *, const char *);
--static char *_conv(int, const char *, char *, const char *);
-+static char *_conv(const int, const char *, char *, const char *);
- static char *_fmt(const char *, const struct pg_tm *, char *,
- 	 const char *, int *);
- static char *_yconv(const int, const int, const int, const int,
diff --git a/databases/postgresql93/patches/patch-src_timezone_zic.c b/databases/postgresql93/patches/patch-src_timezone_zic.c
deleted file mode 100644
index 1ad4e609aec..00000000000
--- a/databases/postgresql93/patches/patch-src_timezone_zic.c
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-src_timezone_zic.c,v 1.1 2013/09/10 15:32:32 adam Exp $
-
---- src/timezone/zic.c.orig	2010-03-16 07:17:04.000000000 +0000
-+++ src/timezone/zic.c
-@@ -121,51 +121,51 @@ struct zone
- 
- extern int	link(const char *fromname, const char *toname);
- static void addtt(const pg_time_t starttime, int type);
--static int addtype(long gmtoff, const char *abbr, int isdst,
--		int ttisstd, int ttisgmt);
--static void leapadd(const pg_time_t t, int positive, int rolling, int count);
-+static int addtype(const long gmtoff, const char *abbr, const int isdst,
-+		const int ttisstd, const int ttisgmt);
-+static void leapadd(const pg_time_t t, const int positive, const int rolling, int count);
- static void adjleap(void);
- static void associate(void);
- static int	ciequal(const char *ap, const char *bp);
--static void convert(long val, char *buf);
-+static void convert(const long val, char *buf);
- static void dolink(const char *fromfile, const char *tofile);
- static void doabbr(char *abbr, const char *format,
--	   const char *letters, int isdst, int doquotes);
--static void eat(const char *name, int num);
--static void eats(const char *name, int num,
--	 const char *rname, int rnum);
--static long eitol(int i);
-+	   const char *letters, const int isdst, int doquotes);
-+static void eat(const char *name, const int num);
-+static void eats(const char *name, const int num,
-+	 const char *rname, const int rnum);
-+static long eitol(const int i);
- static void error(const char *message);
- static char **getfields(char *buf);
- static long gethms(const char *string, const char *errstrng,
--	   int signable);
-+	   const int signable);
- static void infile(const char *filename);
--static void inleap(char **fields, int nfields);
--static void inlink(char **fields, int nfields);
--static void inrule(char **fields, int nfields);
--static int	inzcont(char **fields, int nfields);
--static int	inzone(char **fields, int nfields);
--static int	inzsub(char **fields, int nfields, int iscont);
-+static void inleap(char **fields, const int nfields);
-+static void inlink(char **fields, const int nfields);
-+static void inrule(char **fields, const int nfields);
-+static int	inzcont(char **fields, const int nfields);
-+static int	inzone(char **fields, const int nfields);
-+static int	inzsub(char **fields, const int nfields, const int iscont);
- static int	itsabbr(const char *abbr, const char *word);
- static int	itsdir(const char *name);
- static int	lowerit(int c);
- static char *memcheck(char *tocheck);
- static int	mkdirs(char *filename);
- static void newabbr(const char *abbr);
--static long oadd(long t1, long t2);
--static void outzone(const struct zone * zp, int ntzones);
--static void puttzcode(long code, FILE *fp);
-+static long oadd(const long t1, const long t2);
-+static void outzone(const struct zone * zp, const int ntzones);
-+static void puttzcode(const long code, FILE *fp);
- static int	rcomp(const void *leftp, const void *rightp);
--static pg_time_t rpytime(const struct rule * rp, int wantedy);
-+static pg_time_t rpytime(const struct rule * rp, const int wantedy);
- static void rulesub(struct rule * rp,
- 		const char *loyearp, const char *hiyearp,
- 		const char *typep, const char *monthp,
- 		const char *dayp, const char *timep);
- 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(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);
- 
- static int	charcnt;
- static int	errors;
diff --git a/databases/postgresql94/Makefile b/databases/postgresql94/Makefile
index 98ae1ee355f..6651b194c86 100644
--- a/databases/postgresql94/Makefile
+++ b/databases/postgresql94/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.7 2016/08/14 16:56:29 is Exp $
+# $NetBSD: Makefile,v 1.8 2016/08/23 06:28:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/94-/}
-PKGREVISION=	#
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql94-client>=${PKGVERSION_NOREV}:../../databases/postgresql94-client
diff --git a/databases/postgresql95-docs/Makefile b/databases/postgresql95-docs/Makefile
index a9ed960d460..489099e46cc 100644
--- a/databases/postgresql95-docs/Makefile
+++ b/databases/postgresql95-docs/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.2 2016/07/09 06:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.3 2016/08/23 06:28:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/95-docs-/}
-PKGREVISION=	1
 COMMENT=	PostgreSQL database documentation
 
 .include "../../databases/postgresql95/Makefile.common"
diff --git a/databases/postgresql95-docs/PLIST b/databases/postgresql95-docs/PLIST
index 2e7b57d192f..6f368caf21c 100644
--- a/databases/postgresql95-docs/PLIST
+++ b/databases/postgresql95-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.3 2016/05/23 14:27:35 adam Exp $
+@comment $NetBSD: PLIST,v 1.4 2016/08/23 06:28:16 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1117,6 +1117,7 @@ share/doc/postgresql/html/release-9-1-2.html
 share/doc/postgresql/html/release-9-1-20.html
 share/doc/postgresql/html/release-9-1-21.html
 share/doc/postgresql/html/release-9-1-22.html
+share/doc/postgresql/html/release-9-1-23.html
 share/doc/postgresql/html/release-9-1-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -1134,6 +1135,7 @@ share/doc/postgresql/html/release-9-2-14.html
 share/doc/postgresql/html/release-9-2-15.html
 share/doc/postgresql/html/release-9-2-16.html
 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-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
@@ -1148,6 +1150,7 @@ share/doc/postgresql/html/release-9-3-10.html
 share/doc/postgresql/html/release-9-3-11.html
 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-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1165,10 +1168,12 @@ share/doc/postgresql/html/release-9-4-5.html
 share/doc/postgresql/html/release-9-4-6.html
 share/doc/postgresql/html/release-9-4-7.html
 share/doc/postgresql/html/release-9-4-8.html
+share/doc/postgresql/html/release-9-4-9.html
 share/doc/postgresql/html/release-9-4.html
 share/doc/postgresql/html/release-9-5-1.html
 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.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
diff --git a/databases/postgresql95-plperl/Makefile b/databases/postgresql95-plperl/Makefile
index b105bc89918..ab7ebfd6075 100644
--- a/databases/postgresql95-plperl/Makefile
+++ b/databases/postgresql95-plperl/Makefile
@@ -1,7 +1,6 @@
-#$ $NetBSD: Makefile,v 1.4 2016/07/09 06:38:03 wiz Exp $
+#$ $NetBSD: Makefile,v 1.5 2016/08/23 06:28:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/95-plperl-/}
-PKGREVISION=	1
 COMMENT=	PL/Perl procedural language for the PostgreSQL backend
 
 DEPENDS+=	postgresql95-server>=${PKGVERSION_NOREV}:../../databases/postgresql95-server
diff --git a/databases/postgresql95/Makefile b/databases/postgresql95/Makefile
index b24a660e58c..9747a604ff6 100644
--- a/databases/postgresql95/Makefile
+++ b/databases/postgresql95/Makefile
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.4 2016/07/09 06:38:03 wiz Exp $
+# $NetBSD: Makefile,v 1.5 2016/08/23 06:28:16 adam Exp $
 
 PKGNAME=	${DISTNAME:C/-/95-/}
-PKGREVISION=	1
 COMMENT=	Robust, next generation, object-relational DBMS
 
 DEPENDS+=	postgresql95-client>=${PKGVERSION_NOREV}:../../databases/postgresql95-client
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common
index 5cc134ce231..b793ea01467 100644
--- a/databases/postgresql95/Makefile.common
+++ b/databases/postgresql95/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.5 2016/06/19 21:09:57 fhajny Exp $
+# $NetBSD: Makefile.common,v 1.6 2016/08/23 06:28:16 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.3
+DISTNAME=	postgresql-9.5.4
 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 4bb25d0527e..9e4de4fe239 100644
--- a/databases/postgresql95/distinfo
+++ b/databases/postgresql95/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.3 2016/05/23 14:27:35 adam Exp $
+$NetBSD: distinfo,v 1.4 2016/08/23 06:28:16 adam Exp $
 
-SHA1 (postgresql-9.5.3.tar.bz2) = bd8dcbc8c4882468675dcc93263182a27d4ff201
-RMD160 (postgresql-9.5.3.tar.bz2) = f9193c48e6d0927d3e39c016db39dbafef8a8274
-SHA512 (postgresql-9.5.3.tar.bz2) = 7275dbde0c1b795f3a491d45464c69a97fbfd0e66a7fe62ba00e97747908df0df19bf65e104e10e049e31a8cf484c9d9f29eb75ff6a3875cb087559e25744c29
-Size (postgresql-9.5.3.tar.bz2) = 18455394 bytes
+SHA1 (postgresql-9.5.4.tar.bz2) = bdbbecf691354a689c599631256d41eaa8824c66
+RMD160 (postgresql-9.5.4.tar.bz2) = 496a4bb2b1417361a9880bfe527a77865f9c88e1
+SHA512 (postgresql-9.5.4.tar.bz2) = e5220bc967443d54b9dcff7ba5aefccedbe1c219f953eb0d67254c709d52b0e647d1dc473446640804165b596fc5b75fa4ff8d63696123b87d8096c3a7795c34
+Size (postgresql-9.5.4.tar.bz2) = 18496299 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
@@ -18,7 +18,3 @@ SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
-SHA1 (patch-src_timezone_localtime.c) = 622f57bc1d10f07ab73f86765cbf587eece57085
-SHA1 (patch-src_timezone_private.h) = 85dac95e40efc16270885087f868aeb76e1b9214
-SHA1 (patch-src_timezone_strftime.c) = 25102dce1b9b22385353af23500636fb18e3bf64
-SHA1 (patch-src_timezone_zic.c) = ed04d781845239ce5dc7c6fca406ce62c10a9605
diff --git a/databases/postgresql95/patches/patch-src_timezone_localtime.c b/databases/postgresql95/patches/patch-src_timezone_localtime.c
deleted file mode 100644
index 473d1c90aa0..00000000000
--- a/databases/postgresql95/patches/patch-src_timezone_localtime.c
+++ /dev/null
@@ -1,31 +0,0 @@
-$NetBSD: patch-src_timezone_localtime.c,v 1.1 2016/02/25 21:37:35 tnn Exp $
-
---- src/timezone/localtime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/localtime.c
-@@ -81,20 +81,20 @@ static pg_time_t detzcode64(const char *
- static int	differ_by_repeat(pg_time_t t1, pg_time_t t0);
- static const char *getzname(const char *strp);
- static const char *getqzname(const char *strp, int delim);
--static const char *getnum(const char *strp, int *nump, int min, int max);
-+static const char *getnum(const char *strp, int *nump, const int min, const int max);
- static const char *getsecs(const char *strp, long *secsp);
- static const char *getoffset(const char *strp, long *offsetp);
- static const char *getrule(const char *strp, struct rule * rulep);
- static void gmtload(struct state * sp);
--static struct pg_tm *gmtsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *gmtsub(const pg_time_t *timep, const long offset,
- 	   struct pg_tm * tmp);
--static struct pg_tm *localsub(const pg_time_t *timep, long offset,
-+static struct pg_tm *localsub(const pg_time_t *timep, const long offset,
- 		 struct pg_tm * tmp, const pg_tz *tz);
- static int	increment_overflow(int *number, int delta);
--static pg_time_t transtime(pg_time_t janfirst, int year,
--		  const struct rule * rulep, long offset);
-+static pg_time_t transtime(pg_time_t janfirst, const int year,
-+		  const struct rule * rulep, const long offset);
- static int	typesequiv(const struct state * sp, int a, int b);
--static struct pg_tm *timesub(const pg_time_t *timep, long offset,
-+static struct pg_tm *timesub(const pg_time_t *timep, const long offset,
- 		const struct state * sp, struct pg_tm * tmp);
- 
- /* GMT timezone */
diff --git a/databases/postgresql95/patches/patch-src_timezone_private.h b/databases/postgresql95/patches/patch-src_timezone_private.h
deleted file mode 100644
index 02d9bfa6144..00000000000
--- a/databases/postgresql95/patches/patch-src_timezone_private.h
+++ /dev/null
@@ -1,15 +0,0 @@
-$NetBSD: patch-src_timezone_private.h,v 1.1 2016/02/25 21:37:35 tnn Exp $
-
---- src/timezone/private.h.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/private.h
-@@ -51,8 +51,8 @@ extern int	unlink(const char *filename);
- extern char *icalloc(int nelem, int elsize);
- extern char *icatalloc(char *old, const char *new);
- extern char *icpyalloc(const char *string);
--extern char *imalloc(int n);
--extern void *irealloc(void *pointer, int size);
-+extern char *imalloc(const int n);
-+extern void *irealloc(void *pointer, const int size);
- extern void icfree(char *pointer);
- extern void ifree(char *pointer);
- extern const char *scheck(const char *string, const char *format);
diff --git a/databases/postgresql95/patches/patch-src_timezone_strftime.c b/databases/postgresql95/patches/patch-src_timezone_strftime.c
deleted file mode 100644
index bf87446d546..00000000000
--- a/databases/postgresql95/patches/patch-src_timezone_strftime.c
+++ /dev/null
@@ -1,13 +0,0 @@
-$NetBSD: patch-src_timezone_strftime.c,v 1.1 2016/02/25 21:37:35 tnn Exp $
-
---- src/timezone/strftime.c.orig	2009-06-11 16:49:15.000000000 +0200
-+++ src/timezone/strftime.c
-@@ -89,7 +89,7 @@ static const struct lc_time_T C_time_loc
- };
- 
- static char *_add(const char *, char *, const char *);
--static char *_conv(int, const char *, char *, const char *);
-+static char *_conv(const int, const char *, char *, const char *);
- static char *_fmt(const char *, const struct pg_tm *, char *,
- 	 const char *, int *);
- static char *_yconv(const int, const int, const int, const int,
diff --git a/databases/postgresql95/patches/patch-src_timezone_zic.c b/databases/postgresql95/patches/patch-src_timezone_zic.c
deleted file mode 100644
index 7c001f4cefe..00000000000
--- a/databases/postgresql95/patches/patch-src_timezone_zic.c
+++ /dev/null
@@ -1,78 +0,0 @@
-$NetBSD: patch-src_timezone_zic.c,v 1.1 2016/02/25 21:37:35 tnn Exp $
-
---- src/timezone/zic.c.orig	2010-03-16 07:17:04.000000000 +0000
-+++ src/timezone/zic.c
-@@ -121,51 +121,51 @@ struct zone
- 
- extern int	link(const char *fromname, const char *toname);
- static void addtt(const pg_time_t starttime, int type);
--static int addtype(long gmtoff, const char *abbr, int isdst,
--		int ttisstd, int ttisgmt);
--static void leapadd(const pg_time_t t, int positive, int rolling, int count);
-+static int addtype(const long gmtoff, const char *abbr, const int isdst,
-+		const int ttisstd, const int ttisgmt);
-+static void leapadd(const pg_time_t t, const int positive, const int rolling, int count);
- static void adjleap(void);
- static void associate(void);
- static int	ciequal(const char *ap, const char *bp);
--static void convert(long val, char *buf);
-+static void convert(const long val, char *buf);
- static void dolink(const char *fromfile, const char *tofile);
- static void doabbr(char *abbr, const char *format,
--	   const char *letters, int isdst, int doquotes);
--static void eat(const char *name, int num);
--static void eats(const char *name, int num,
--	 const char *rname, int rnum);
--static long eitol(int i);
-+	   const char *letters, const int isdst, int doquotes);
-+static void eat(const char *name, const int num);
-+static void eats(const char *name, const int num,
-+	 const char *rname, const int rnum);
-+static long eitol(const int i);
- static void error(const char *message);
- static char **getfields(char *buf);
- static long gethms(const char *string, const char *errstrng,
--	   int signable);
-+	   const int signable);
- static void infile(const char *filename);
--static void inleap(char **fields, int nfields);
--static void inlink(char **fields, int nfields);
--static void inrule(char **fields, int nfields);
--static int	inzcont(char **fields, int nfields);
--static int	inzone(char **fields, int nfields);
--static int	inzsub(char **fields, int nfields, int iscont);
-+static void inleap(char **fields, const int nfields);
-+static void inlink(char **fields, const int nfields);
-+static void inrule(char **fields, const int nfields);
-+static int	inzcont(char **fields, const int nfields);
-+static int	inzone(char **fields, const int nfields);
-+static int	inzsub(char **fields, const int nfields, const int iscont);
- static int	itsabbr(const char *abbr, const char *word);
- static int	itsdir(const char *name);
- static int	lowerit(int c);
- static char *memcheck(char *tocheck);
- static int	mkdirs(char *filename);
- static void newabbr(const char *abbr);
--static long oadd(long t1, long t2);
--static void outzone(const struct zone * zp, int ntzones);
--static void puttzcode(long code, FILE *fp);
-+static long oadd(const long t1, const long t2);
-+static void outzone(const struct zone * zp, const int ntzones);
-+static void puttzcode(const long code, FILE *fp);
- static int	rcomp(const void *leftp, const void *rightp);
--static pg_time_t rpytime(const struct rule * rp, int wantedy);
-+static pg_time_t rpytime(const struct rule * rp, const int wantedy);
- static void rulesub(struct rule * rp,
- 		const char *loyearp, const char *hiyearp,
- 		const char *typep, const char *monthp,
- 		const char *dayp, const char *timep);
- 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(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);
- 
- static int	charcnt;
- static int	errors;