This release fixes a number of issues reported by users over the last two months. Most database administrators should plan to upgrade at the next available downtime, unless they have been affected directly by the fixed issues.

26 files changed, 94 insertions, 68 deletions

diff --git a/databases/postgresql91-docs/PLIST b/databases/postgresql91-docs/PLIST
index 5ee3024c989..31a5e54f502 100644
--- a/databases/postgresql91-docs/PLIST
+++ b/databases/postgresql91-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.23 2016/04/09 12:51:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.24 2016/05/23 14:27:34 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1025,6 +1025,7 @@ share/doc/postgresql/html/release-9-1-19.html
 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-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-server/PLIST b/databases/postgresql91-server/PLIST
index 6a6c49110b6..38e22f58679 100644
--- a/databases/postgresql91-server/PLIST
+++ b/databases/postgresql91-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/04/09 12:51:45 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/05/23 14:27:34 adam Exp $
 bin/postgres
 bin/postmaster
 lib/postgresql/ascii_and_mic.so
@@ -385,6 +385,7 @@ share/postgresql/timezone/Asia/Tel_Aviv
 share/postgresql/timezone/Asia/Thimbu
 share/postgresql/timezone/Asia/Thimphu
 share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Tomsk
 share/postgresql/timezone/Asia/Ujung_Pandang
 share/postgresql/timezone/Asia/Ulaanbaatar
 share/postgresql/timezone/Asia/Ulan_Bator
@@ -511,6 +512,7 @@ share/postgresql/timezone/Europe/Istanbul
 share/postgresql/timezone/Europe/Jersey
 share/postgresql/timezone/Europe/Kaliningrad
 share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Kirov
 share/postgresql/timezone/Europe/Lisbon
 share/postgresql/timezone/Europe/Ljubljana
 share/postgresql/timezone/Europe/London
diff --git a/databases/postgresql91/Makefile.common b/databases/postgresql91/Makefile.common
index 9f0d776acb3..53153802433 100644
--- a/databases/postgresql91/Makefile.common
+++ b/databases/postgresql91/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.30 2016/04/09 12:51:44 adam Exp $
+# $NetBSD: Makefile.common,v 1.31 2016/05/23 14:27:34 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -23,7 +23,7 @@
 # used by databases/postgresql91-server/Makefile
 # used by databases/postgresql91-upgrade/Makefile
 
-DISTNAME=	postgresql-9.1.21
+DISTNAME=	postgresql-9.1.22
 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 7c7622a6d86..c44f78a3f07 100644
--- a/databases/postgresql91/distinfo
+++ b/databases/postgresql91/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.28 2016/04/09 12:51:44 adam Exp $
+$NetBSD: distinfo,v 1.29 2016/05/23 14:27:34 adam Exp $
 
-SHA1 (postgresql-9.1.21.tar.bz2) = f61eb6f08debdecc04565103324cf7d7f80fb73e
-RMD160 (postgresql-9.1.21.tar.bz2) = 81e10c927a7409fec3c9b2087615693066f1c1d4
-SHA512 (postgresql-9.1.21.tar.bz2) = 75a96ce2c080b2e657b6f591e18c4778635a9f8c74870bbe7c99cb82bf1dfaad124942214ab6e3079b565c41b7fc77af1a4a49672e7ddba075374402c8832a5b
-Size (postgresql-9.1.21.tar.bz2) = 15850128 bytes
+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 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-configure) = dab79533dac06a79a5aa8439d6b15830d8d2fba7
 SHA1 (patch-contrib_dblink_Makefile) = 4960ad57d42465fae203870548e4c53f8a32ce04
@@ -11,7 +11,7 @@ SHA1 (patch-contrib_dblink_dblink.c) = 4d7c40d107d4c13c63ef2908d9a02be319863657
 SHA1 (patch-src_Makefile.shlib) = 2370e3c4260ba7f947b0c15b9bdc43e4820e01a4
 SHA1 (patch-src_backend_Makefile) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5
 SHA1 (patch-src_backend_utils_adt_datetime.c) = 9d3c6c23b5af92c17ea643ed986b5648f3381cb4
-SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = b9c340552b0a0838229cffdada2efad12ba51d56
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 1d3760f2d170837a395cfacffaa08373ea54ba53
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 2b7448d6dd8550e2ea61f40728a2780068b93d07
 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
diff --git a/databases/postgresql91/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql91/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
index a779d807551..fe8fc1ea6e3 100644
--- a/databases/postgresql91/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
+++ b/databases/postgresql91/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.2 2016/05/23 14:27:34 adam Exp $
 
---- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-07-21 19:14:13.000000000 +0000
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2016-05-23 13:15:10.000000000 +0000
 +++ src/interfaces/ecpg/pgtypeslib/interval.c
 @@ -14,6 +14,10 @@
  #include "pgtypes_error.h"
@@ -12,4 +12,4 @@ $NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:
 +
  /* copy&pasted from .../src/backend/utils/adt/datetime.c */
  static int
- strtoi(const char *nptr, char **endptr, int base)
+ strtoint(const char *nptr, char **endptr, int base)
diff --git a/databases/postgresql92-docs/PLIST b/databases/postgresql92-docs/PLIST
index 5b5c6bdf19b..2816858d256 100644
--- a/databases/postgresql92-docs/PLIST
+++ b/databases/postgresql92-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.16 2016/04/09 12:51:46 adam Exp $
+@comment $NetBSD: PLIST,v 1.17 2016/05/23 14:27:34 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1054,6 +1054,7 @@ share/doc/postgresql/html/release-9-1-19.html
 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-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -1070,6 +1071,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-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-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-server/PLIST b/databases/postgresql92-server/PLIST
index 24336debf77..cbf5a2c4d16 100644
--- a/databases/postgresql92-server/PLIST
+++ b/databases/postgresql92-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.9 2016/04/09 12:51:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.10 2016/05/23 14:27:34 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -384,6 +384,7 @@ share/postgresql/timezone/Asia/Tel_Aviv
 share/postgresql/timezone/Asia/Thimbu
 share/postgresql/timezone/Asia/Thimphu
 share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Tomsk
 share/postgresql/timezone/Asia/Ujung_Pandang
 share/postgresql/timezone/Asia/Ulaanbaatar
 share/postgresql/timezone/Asia/Ulan_Bator
@@ -510,6 +511,7 @@ share/postgresql/timezone/Europe/Istanbul
 share/postgresql/timezone/Europe/Jersey
 share/postgresql/timezone/Europe/Kaliningrad
 share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Kirov
 share/postgresql/timezone/Europe/Lisbon
 share/postgresql/timezone/Europe/Ljubljana
 share/postgresql/timezone/Europe/London
diff --git a/databases/postgresql92/Makefile.common b/databases/postgresql92/Makefile.common
index e900829a97d..229f4a9f273 100644
--- a/databases/postgresql92/Makefile.common
+++ b/databases/postgresql92/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.21 2016/04/09 12:51:46 adam Exp $
+# $NetBSD: Makefile.common,v 1.22 2016/05/23 14:27:34 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -23,7 +23,7 @@
 # used by databases/postgresql92-server/Makefile
 # used by databases/postgresql92-upgrade/Makefile
 
-DISTNAME=	postgresql-9.2.16
+DISTNAME=	postgresql-9.2.17
 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 b5f904be15b..a78cf336c52 100644
--- a/databases/postgresql92/distinfo
+++ b/databases/postgresql92/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.18 2016/04/09 12:51:46 adam Exp $
+$NetBSD: distinfo,v 1.19 2016/05/23 14:27:34 adam Exp $
 
-SHA1 (postgresql-9.2.16.tar.bz2) = cac510b58c7d91683315d0b3ee92b019223851a5
-RMD160 (postgresql-9.2.16.tar.bz2) = d9bc7d80d0d7f6cd2032c2cf3a38cad1ab43c184
-SHA512 (postgresql-9.2.16.tar.bz2) = 0f0b317473b4b42ae4261993c704a7c6cd28c7e6bd83e77a81850695655baa473d7d52e97441ee5500d646d405c84145a54f42b9bae89a0ddfebb0418d608820
-Size (postgresql-9.2.16.tar.bz2) = 16490199 bytes
+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 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = c7e5aaff1c47d2e33df7692a412ef984c77ffcc0
 SHA1 (patch-configure) = 21b27add570cff1a24c440201eb1ed49f8223747
@@ -12,7 +12,7 @@ SHA1 (patch-contrib_dblink_dblink.c) = 245ce06df88837ba88142aea1d0ba787d65ddb45
 SHA1 (patch-src_Makefile.shlib) = fedf35f38439a724fa6522e1aaef110c9909866a
 SHA1 (patch-src_backend_Makefile) = 76ddd3015d93b19cdd6000eaffc4f53cbd4965b5
 SHA1 (patch-src_backend_utils_adt_datetime.c) = b220c39272bf8d2bda95119adcbab5b2495990d8
-SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 6ebfdb674b38019d0605e0b0b9f3950480e13a30
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 20578ab950465db07dab757db2fae4c4570cbbe1
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 2b7448d6dd8550e2ea61f40728a2780068b93d07
 SHA1 (patch-src_pl_plperl_plperl.h) = bd663fa80a47f7b82ce689060750fa6e631fbc61
diff --git a/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
index c3c5a077fe1..79dd4080216 100644
--- a/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
+++ b/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.2 2016/05/23 14:27:34 adam Exp $
 
---- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-07-21 19:12:31.000000000 +0000
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2016-05-23 12:13:46.000000000 +0000
 +++ src/interfaces/ecpg/pgtypeslib/interval.c
 @@ -14,6 +14,10 @@
  #include "pgtypes_error.h"
@@ -12,4 +12,4 @@ $NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:
 +
  /* copy&pasted from .../src/backend/utils/adt/datetime.c */
  static int
- strtoi(const char *nptr, char **endptr, int base)
+ strtoint(const char *nptr, char **endptr, int base)
diff --git a/databases/postgresql93-docs/PLIST b/databases/postgresql93-docs/PLIST
index 0efcf5e5c92..76fb3d6a2bf 100644
--- a/databases/postgresql93-docs/PLIST
+++ b/databases/postgresql93-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.13 2016/04/09 12:51:47 adam Exp $
+@comment $NetBSD: PLIST,v 1.14 2016/05/23 14:27:34 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1075,6 +1075,7 @@ share/doc/postgresql/html/release-9-1-19.html
 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-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -1091,6 +1092,7 @@ share/doc/postgresql/html/release-9-2-12.html
 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-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
@@ -1104,6 +1106,7 @@ share/doc/postgresql/html/release-9-3-1.html
 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-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 fdde6e182b8..61928401b53 100644
--- a/databases/postgresql93-server/PLIST
+++ b/databases/postgresql93-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.7 2016/04/09 12:51:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.8 2016/05/23 14:27:35 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -384,6 +384,7 @@ share/postgresql/timezone/Asia/Tel_Aviv
 share/postgresql/timezone/Asia/Thimbu
 share/postgresql/timezone/Asia/Thimphu
 share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Tomsk
 share/postgresql/timezone/Asia/Ujung_Pandang
 share/postgresql/timezone/Asia/Ulaanbaatar
 share/postgresql/timezone/Asia/Ulan_Bator
@@ -510,6 +511,7 @@ share/postgresql/timezone/Europe/Istanbul
 share/postgresql/timezone/Europe/Jersey
 share/postgresql/timezone/Europe/Kaliningrad
 share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Kirov
 share/postgresql/timezone/Europe/Lisbon
 share/postgresql/timezone/Europe/Ljubljana
 share/postgresql/timezone/Europe/London
diff --git a/databases/postgresql93/Makefile.common b/databases/postgresql93/Makefile.common
index 31c75a54d39..4ea457f9d42 100644
--- a/databases/postgresql93/Makefile.common
+++ b/databases/postgresql93/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.17 2016/04/09 12:51:47 adam Exp $
+# $NetBSD: Makefile.common,v 1.18 2016/05/23 14:27:34 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -23,7 +23,7 @@
 # used by databases/postgresql93-server/Makefile
 # used by databases/postgresql93-upgrade/Makefile
 
-DISTNAME=	postgresql-9.3.12
+DISTNAME=	postgresql-9.3.13
 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 247a0e7832d..470a2d7dad4 100644
--- a/databases/postgresql93/distinfo
+++ b/databases/postgresql93/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.17 2016/04/09 12:51:47 adam Exp $
+$NetBSD: distinfo,v 1.18 2016/05/23 14:27:34 adam Exp $
 
-SHA1 (postgresql-9.3.12.tar.bz2) = bef0af2df93129be4736632519f5e1a1dc62c9e3
-RMD160 (postgresql-9.3.12.tar.bz2) = 8c2a262274b0178b9ba69d414ee4c801acc6d799
-SHA512 (postgresql-9.3.12.tar.bz2) = d88cb167ca78bd8588e3ff9b3f13b77f661e3ddec7e5b726cc0a46512db2584b15ce5f691fe7e4ab84855f102cb88014245921a38f5da41ad19e762a88968883
-Size (postgresql-9.3.12.tar.bz2) = 17052755 bytes
+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 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 3de7635fe18532a05a619941fecad7bcda6c51b9
@@ -13,7 +13,7 @@ SHA1 (patch-src_Makefile.global.in) = 53e29e000d7fb71e2625aacd32324e9d7001b5b2
 SHA1 (patch-src_Makefile.shlib) = 69f980184fd8dbd821221a1c6ac3a88408f2c4cf
 SHA1 (patch-src_backend_Makefile) = deba6bc07ba2e4b8ef8f04f20efb2bdd54cb917e
 SHA1 (patch-src_backend_utils_adt_datetime.c) = cb404b369b39f7e55765a490f8448b870f237511
-SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 606aeea232784ae07f4051ff93b6e352da2178b7
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 98a49b9fc6677c4c930b574249f015727391938c
 SHA1 (patch-src_interfaces_libpq_Makefile) = 0066301bc8b31b9e26c79153427537bc3865ef4d
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
diff --git a/databases/postgresql93/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql93/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
index ec14de46c1e..a2c98f057d6 100644
--- a/databases/postgresql93/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
+++ b/databases/postgresql93/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/20 13:16:02 ryoon Exp $
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.2 2016/05/23 14:27:34 adam Exp $
 
---- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-07-21 19:10:42.000000000 +0000
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2016-05-23 11:09:27.000000000 +0000
 +++ src/interfaces/ecpg/pgtypeslib/interval.c
 @@ -14,6 +14,10 @@
  #include "pgtypes_error.h"
@@ -12,4 +12,4 @@ $NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/20 13:16:
 +
  /* copy&pasted from .../src/backend/utils/adt/datetime.c */
  static int
- strtoi(const char *nptr, char **endptr, int base)
+ strtoint(const char *nptr, char **endptr, int base)
diff --git a/databases/postgresql94-docs/PLIST b/databases/postgresql94-docs/PLIST
index 81fc91289e0..79d7f643e45 100644
--- a/databases/postgresql94-docs/PLIST
+++ b/databases/postgresql94-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.8 2016/04/09 12:51:48 adam Exp $
+@comment $NetBSD: PLIST,v 1.9 2016/05/23 14:27:35 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -1095,6 +1095,7 @@ share/doc/postgresql/html/release-9-1-19.html
 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-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -1111,6 +1112,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-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-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
@@ -1124,6 +1126,7 @@ share/doc/postgresql/html/release-9-3-1.html
 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-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1140,6 +1143,7 @@ share/doc/postgresql/html/release-9-4-4.html
 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.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/resources.html
diff --git a/databases/postgresql94-server/PLIST b/databases/postgresql94-server/PLIST
index 30204ae389f..4288e8cb728 100644
--- a/databases/postgresql94-server/PLIST
+++ b/databases/postgresql94-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.4 2016/04/09 12:51:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.5 2016/05/23 14:27:35 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -384,6 +384,7 @@ share/postgresql/timezone/Asia/Tel_Aviv
 share/postgresql/timezone/Asia/Thimbu
 share/postgresql/timezone/Asia/Thimphu
 share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Tomsk
 share/postgresql/timezone/Asia/Ujung_Pandang
 share/postgresql/timezone/Asia/Ulaanbaatar
 share/postgresql/timezone/Asia/Ulan_Bator
@@ -510,6 +511,7 @@ share/postgresql/timezone/Europe/Istanbul
 share/postgresql/timezone/Europe/Jersey
 share/postgresql/timezone/Europe/Kaliningrad
 share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Kirov
 share/postgresql/timezone/Europe/Lisbon
 share/postgresql/timezone/Europe/Ljubljana
 share/postgresql/timezone/Europe/London
diff --git a/databases/postgresql94/Makefile.common b/databases/postgresql94/Makefile.common
index 00bcddf5e0c..8f16550b43f 100644
--- a/databases/postgresql94/Makefile.common
+++ b/databases/postgresql94/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.9 2016/04/09 12:51:48 adam Exp $
+# $NetBSD: Makefile.common,v 1.10 2016/05/23 14:27:35 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -23,7 +23,7 @@
 # used by databases/postgresql94-server/Makefile
 # used by databases/postgresql94-upgrade/Makefile
 
-DISTNAME=	postgresql-9.4.7
+DISTNAME=	postgresql-9.4.8
 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 e148c265be3..a81adac94a2 100644
--- a/databases/postgresql94/distinfo
+++ b/databases/postgresql94/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.10 2016/04/09 12:51:48 adam Exp $
+$NetBSD: distinfo,v 1.11 2016/05/23 14:27:35 adam Exp $
 
-SHA1 (postgresql-9.4.7.tar.bz2) = 780c3c6bfac0860d9ca8ba8ef6c154bb38714215
-RMD160 (postgresql-9.4.7.tar.bz2) = a9dcc6952e4b74c192454e6ba2f3bc86e507cf8b
-SHA512 (postgresql-9.4.7.tar.bz2) = e61d74a4a9caeb7d4a3fb9509b37aaeb5bd563d61d20739edd777ec990c92011286a7485f275178f9f8c1ebb8c84a98290e2b5351b11e0f9a1baa781f323e374
-Size (postgresql-9.4.7.tar.bz2) = 17746987 bytes
+SHA1 (postgresql-9.4.8.tar.bz2) = 4e119e2667c8c4c3b35544dfefd7a4d9aaac3eef
+RMD160 (postgresql-9.4.8.tar.bz2) = 4fff9db57db1fed43250ad28a32c5dd7abf790a9
+SHA512 (postgresql-9.4.8.tar.bz2) = d1cc8a02ed7eb0af365479cee43b3cd33fade69e07eb82343cd562efda5a460e405836e1fb2492a8cb22a71d14038216868cb48694400b3c31a56c4aee0bcac4
+Size (postgresql-9.4.8.tar.bz2) = 17740626 bytes
 SHA1 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
@@ -13,7 +13,7 @@ SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
 SHA1 (patch-src_Makefile.shlib) = 69f980184fd8dbd821221a1c6ac3a88408f2c4cf
 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca
 SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289
-SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 614aa5dbe586b8681a3a2852d4f84860dbbd1b49
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = af0971de415b6b44ae3520cfc9bd6ffd5dcdeb62
 SHA1 (patch-src_interfaces_libpq_Makefile) = 0066301bc8b31b9e26c79153427537bc3865ef4d
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
diff --git a/databases/postgresql94/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql94/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
index c5963ecdcb5..de519df44ac 100644
--- a/databases/postgresql94/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
+++ b/databases/postgresql94/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.2 2016/05/23 14:27:35 adam Exp $
 
---- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-12-16 01:07:34.000000000 +0000
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2016-05-09 20:52:03.000000000 +0000
 +++ src/interfaces/ecpg/pgtypeslib/interval.c
 @@ -14,6 +14,10 @@
  #include "pgtypes_error.h"
@@ -12,4 +12,4 @@ $NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:
 +
  /* copy&pasted from .../src/backend/utils/adt/datetime.c */
  static int
- strtoi(const char *nptr, char **endptr, int base)
+ strtoint(const char *nptr, char **endptr, int base)
diff --git a/databases/postgresql95-client/PLIST b/databases/postgresql95-client/PLIST
index bfd04b87656..30b2cdd7c2d 100644
--- a/databases/postgresql95-client/PLIST
+++ b/databases/postgresql95-client/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/04/09 12:51:49 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/05/23 14:27:35 adam Exp $
 bin/clusterdb
 bin/createdb
 bin/createlang
@@ -782,6 +782,7 @@ share/locale/pt_BR/LC_MESSAGES/pg_controldata-9.5.mo
 share/locale/pt_BR/LC_MESSAGES/pg_ctl-9.5.mo
 share/locale/pt_BR/LC_MESSAGES/pg_dump-9.5.mo
 share/locale/pt_BR/LC_MESSAGES/pg_resetxlog-9.5.mo
+share/locale/pt_BR/LC_MESSAGES/pg_rewind-9.5.mo
 share/locale/pt_BR/LC_MESSAGES/pgscripts-9.5.mo
 share/locale/pt_BR/LC_MESSAGES/psql-9.5.mo
 share/locale/ro/LC_MESSAGES/pg_config-9.5.mo
diff --git a/databases/postgresql95-docs/PLIST b/databases/postgresql95-docs/PLIST
index 63af05de63b..2e7b57d192f 100644
--- a/databases/postgresql95-docs/PLIST
+++ b/databases/postgresql95-docs/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/04/09 12:51:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/05/23 14:27:35 adam Exp $
 man/man1/clusterdb.1
 man/man1/createdb.1
 man/man1/createlang.1
@@ -358,9 +358,7 @@ share/doc/postgresql/html/catalog-pg-pltemplate.html
 share/doc/postgresql/html/catalog-pg-policy.html
 share/doc/postgresql/html/catalog-pg-proc.html
 share/doc/postgresql/html/catalog-pg-range.html
-share/doc/postgresql/html/catalog-pg-replication-origin-status.html
 share/doc/postgresql/html/catalog-pg-replication-origin.html
-share/doc/postgresql/html/catalog-pg-replication-slots.html
 share/doc/postgresql/html/catalog-pg-rewrite.html
 share/doc/postgresql/html/catalog-pg-seclabel.html
 share/doc/postgresql/html/catalog-pg-shdepend.html
@@ -1118,6 +1116,7 @@ share/doc/postgresql/html/release-9-1-19.html
 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-3.html
 share/doc/postgresql/html/release-9-1-4.html
 share/doc/postgresql/html/release-9-1-5.html
@@ -1134,6 +1133,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-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-2.html
 share/doc/postgresql/html/release-9-2-3.html
 share/doc/postgresql/html/release-9-2-4.html
@@ -1147,6 +1147,7 @@ share/doc/postgresql/html/release-9-3-1.html
 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-2.html
 share/doc/postgresql/html/release-9-3-3.html
 share/doc/postgresql/html/release-9-3-4.html
@@ -1163,9 +1164,11 @@ share/doc/postgresql/html/release-9-4-4.html
 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.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.html
 share/doc/postgresql/html/release.html
 share/doc/postgresql/html/replication-origins.html
@@ -1528,6 +1531,8 @@ share/doc/postgresql/html/view-pg-matviews.html
 share/doc/postgresql/html/view-pg-policies.html
 share/doc/postgresql/html/view-pg-prepared-statements.html
 share/doc/postgresql/html/view-pg-prepared-xacts.html
+share/doc/postgresql/html/view-pg-replication-origin-status.html
+share/doc/postgresql/html/view-pg-replication-slots.html
 share/doc/postgresql/html/view-pg-roles.html
 share/doc/postgresql/html/view-pg-rules.html
 share/doc/postgresql/html/view-pg-seclabels.html
diff --git a/databases/postgresql95-server/PLIST b/databases/postgresql95-server/PLIST
index 0e2fc7adf20..ed76477b4b9 100644
--- a/databases/postgresql95-server/PLIST
+++ b/databases/postgresql95-server/PLIST
@@ -1,4 +1,4 @@
-@comment $NetBSD: PLIST,v 1.2 2016/04/09 12:51:50 adam Exp $
+@comment $NetBSD: PLIST,v 1.3 2016/05/23 14:27:35 adam Exp $
 bin/postgres
 bin/postmaster
 include/postgresql/server/plpgsql.h
@@ -385,6 +385,7 @@ share/postgresql/timezone/Asia/Tel_Aviv
 share/postgresql/timezone/Asia/Thimbu
 share/postgresql/timezone/Asia/Thimphu
 share/postgresql/timezone/Asia/Tokyo
+share/postgresql/timezone/Asia/Tomsk
 share/postgresql/timezone/Asia/Ujung_Pandang
 share/postgresql/timezone/Asia/Ulaanbaatar
 share/postgresql/timezone/Asia/Ulan_Bator
@@ -511,6 +512,7 @@ share/postgresql/timezone/Europe/Istanbul
 share/postgresql/timezone/Europe/Jersey
 share/postgresql/timezone/Europe/Kaliningrad
 share/postgresql/timezone/Europe/Kiev
+share/postgresql/timezone/Europe/Kirov
 share/postgresql/timezone/Europe/Lisbon
 share/postgresql/timezone/Europe/Ljubljana
 share/postgresql/timezone/Europe/London
diff --git a/databases/postgresql95/Makefile.common b/databases/postgresql95/Makefile.common
index 7709848e59c..a1427c0f035 100644
--- a/databases/postgresql95/Makefile.common
+++ b/databases/postgresql95/Makefile.common
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile.common,v 1.2 2016/04/09 12:51:49 adam Exp $
+# $NetBSD: Makefile.common,v 1.3 2016/05/23 14:27:35 adam Exp $
 #
 # This Makefile fragment is included by all PostgreSQL packages built from
 # the main sources of the PostgreSQL distribution except jdbc-postgresql.
@@ -23,7 +23,7 @@
 # used by databases/postgresql95-server/Makefile
 # used by databases/postgresql95-upgrade/Makefile
 
-DISTNAME=	postgresql-9.5.2
+DISTNAME=	postgresql-9.5.3
 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 3f29179370e..4bb25d0527e 100644
--- a/databases/postgresql95/distinfo
+++ b/databases/postgresql95/distinfo
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.2 2016/04/09 12:51:49 adam Exp $
+$NetBSD: distinfo,v 1.3 2016/05/23 14:27:35 adam Exp $
 
-SHA1 (postgresql-9.5.2.tar.bz2) = e139e5607fafd96926463123f7751086adaad724
-RMD160 (postgresql-9.5.2.tar.bz2) = 89cf1a346814999846c14c048cbf263590977975
-SHA512 (postgresql-9.5.2.tar.bz2) = ba31dddee8a960a4b1a97394eae5ea7efaa5e74e21c755882efcef90404676c6052dff55f40b585932e4f752cbcda5ceac0e29d601ea6651cfbab7a49190381a
-Size (postgresql-9.5.2.tar.bz2) = 18446616 bytes
+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 (patch-config_missing) = c2d7d742922ba6861e7660c75b7b53f09e564813
 SHA1 (patch-config_perl.m4) = e035132b1c281a75752d570ac5e29a11176c25c5
 SHA1 (patch-configure) = 59fe9a768caf8a5d308acac60c28bc6bb2c40632
@@ -13,7 +13,7 @@ SHA1 (patch-src_Makefile.global.in) = 2ab3affedc77b202f6749964287438d6179ca23a
 SHA1 (patch-src_Makefile.shlib) = 46b3a8591678f92892d3837cd31fa44e8a7e21b3
 SHA1 (patch-src_backend_Makefile) = b70b38ea23af6cdde9d2349f2441a429078cfaca
 SHA1 (patch-src_backend_utils_adt_datetime.c) = d1ea70986634d3bfb663eff789425252656e1289
-SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 614aa5dbe586b8681a3a2852d4f84860dbbd1b49
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = a15012ae34d4ecd1eb2bc29e4d2c40098ea236fd
 SHA1 (patch-src_interfaces_libpq_Makefile) = 61bcf84eb69b6ec9faabab0b61913766f4b20f8c
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_GNUmakefile) = 6ee3e431f46ce5c2a94df499504b2b8bd458bbef
diff --git a/databases/postgresql95/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql95/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
index 2df7ed544af..4caf773c5cf 100644
--- a/databases/postgresql95/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
+++ b/databases/postgresql95/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -1,6 +1,6 @@
-$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2016/02/25 21:37:35 tnn Exp $
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.2 2016/05/23 14:27:35 adam Exp $
 
---- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-12-16 01:07:34.000000000 +0000
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2016-05-09 20:50:23.000000000 +0000
 +++ src/interfaces/ecpg/pgtypeslib/interval.c
 @@ -14,6 +14,10 @@
  #include "pgtypes_error.h"
@@ -12,4 +12,4 @@ $NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2016/02/25 21:37:
 +
  /* copy&pasted from .../src/backend/utils/adt/datetime.c */
  static int
- strtoi(const char *nptr, char **endptr, int base)
+ strtoint(const char *nptr, char **endptr, int base)