Apply strtoi fix for NetBSD/current to all PostgreSQL versions.

15 files changed, 160 insertions, 5 deletions

diff --git a/databases/postgresql84/distinfo b/databases/postgresql84/distinfo
index 07b7343632b..9903ca66aac 100644
--- a/databases/postgresql84/distinfo
+++ b/databases/postgresql84/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.30 2014/07/25 22:14:55 adam Exp $
+$NetBSD: distinfo,v 1.31 2015/01/23 15:06:00 joerg Exp $
 
 SHA1 (postgresql-8.4.22.tar.bz2) = 66a1286c4983121af35b76c97b97288013edc151
 RMD160 (postgresql-8.4.22.tar.bz2) = c46d1fd3405150f0ed25012dad1ef8110d2c2d64
@@ -14,5 +14,7 @@ SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
 SHA1 (patch-ao) = b098032408fc951865966710554667a249db6320
 SHA1 (patch-ba) = f8de4ee18a433b65a54280d047d18b161d3e9ca8
 SHA1 (patch-bb) = 22859530d2694cf4c347f5e4c02eff0483d536d1
+SHA1 (patch-src_backend_utils_adt_datetime.c) = a23fb1bf4c05faf818853643fcd851a9f796e13a
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 39d256ee9a429986ea4dc8b9eefff420a37d119c
 SHA1 (patch-src_pl_plperl_plperl.h) = 8d448cc8e0e0dbc4d15dad369d3ca7a796874ac2
 SHA1 (patch-src_pl_plpgsql_src_Makefile) = 1592ecb85d6ef1bd691f77b320f639b6fc822e14
diff --git a/databases/postgresql84/patches/patch-src_backend_utils_adt_datetime.c b/databases/postgresql84/patches/patch-src_backend_utils_adt_datetime.c
new file mode 100644
index 00000000000..818b6d292d4
--- /dev/null
+++ b/databases/postgresql84/patches/patch-src_backend_utils_adt_datetime.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_backend_utils_adt_datetime.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/backend/utils/adt/datetime.c.orig	2014-07-21 19:18:03.000000000 +0000
++++ src/backend/utils/adt/datetime.c
+@@ -29,6 +29,9 @@
+ #include "utils/memutils.h"
+ #include "utils/tzparser.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
+ 
+ static int DecodeNumber(int flen, char *field, bool haveTextMonth,
+ 			 int fmask, int *tmask,
diff --git a/databases/postgresql84/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql84/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
new file mode 100644
index 00000000000..0687a1a3d87
--- /dev/null
+++ b/databases/postgresql84/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-07-21 19:18:03.000000000 +0000
++++ src/interfaces/ecpg/pgtypeslib/interval.c
+@@ -14,6 +14,10 @@
+ #include "pgtypes_error.h"
+ #include "pgtypes_interval.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
++
+ /* copy&pasted from .../src/backend/utils/adt/datetime.c */
+ static int
+ strtoi(const char *nptr, char **endptr, int base)
diff --git a/databases/postgresql90/distinfo b/databases/postgresql90/distinfo
index c3a84e54db9..e007b1325c3 100644
--- a/databases/postgresql90/distinfo
+++ b/databases/postgresql90/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.22 2014/07/25 22:14:55 adam Exp $
+$NetBSD: distinfo,v 1.23 2015/01/23 15:06:01 joerg Exp $
 
 SHA1 (postgresql-9.0.18.tar.bz2) = f0d14ca3cd116ed88aa6ce96b22137fe37a31958
 RMD160 (postgresql-9.0.18.tar.bz2) = aa50ea194637449ad57fd86b9ea997516f5f0ebc
@@ -13,5 +13,7 @@ SHA1 (patch-ah) = 25102dce1b9b22385353af23500636fb18e3bf64
 SHA1 (patch-ai) = 0d6f536f7593e362ec216eafa73c718ad6bed8fc
 SHA1 (patch-ao) = 4d7c40d107d4c13c63ef2908d9a02be319863657
 SHA1 (patch-src_Makefile.shlib) = 72d6db917b7d6ba1dbf8037e03f83a7ce7c4d6c9
+SHA1 (patch-src_backend_utils_adt_datetime.c) = 02ec83af9d06565e0607b0635364b2dc501f1d7c
+SHA1 (patch-src_interfaces_ecpg_pgtypeslib_interval.c) = 2de11e149003e4a7205e44f58990afe8a24f80cb
 SHA1 (patch-src_makefiles_Makefile.solaris) = 0168f5bc105ffc89d5db40907a08966d8465f5a0
 SHA1 (patch-src_pl_plperl_plperl.h) = 8e2d954642cb68dc6c6fd08debd058d053566826
diff --git a/databases/postgresql90/patches/patch-src_backend_utils_adt_datetime.c b/databases/postgresql90/patches/patch-src_backend_utils_adt_datetime.c
new file mode 100644
index 00000000000..36f2a8310ef
--- /dev/null
+++ b/databases/postgresql90/patches/patch-src_backend_utils_adt_datetime.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_backend_utils_adt_datetime.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/backend/utils/adt/datetime.c.orig	2014-07-21 19:16:01.000000000 +0000
++++ src/backend/utils/adt/datetime.c
+@@ -29,6 +29,9 @@
+ #include "utils/memutils.h"
+ #include "utils/tzparser.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
+ 
+ static int DecodeNumber(int flen, char *field, bool haveTextMonth,
+ 			 int fmask, int *tmask,
diff --git a/databases/postgresql90/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql90/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
new file mode 100644
index 00000000000..2ceff121f57
--- /dev/null
+++ b/databases/postgresql90/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-07-21 19:16:01.000000000 +0000
++++ src/interfaces/ecpg/pgtypeslib/interval.c
+@@ -14,6 +14,10 @@
+ #include "pgtypes_error.h"
+ #include "pgtypes_interval.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
++
+ /* copy&pasted from .../src/backend/utils/adt/datetime.c */
+ static int
+ strtoi(const char *nptr, char **endptr, int base)
diff --git a/databases/postgresql91/distinfo b/databases/postgresql91/distinfo
index 6bbeb660e22..03760abfa04 100644
--- a/databases/postgresql91/distinfo
+++ b/databases/postgresql91/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.19 2014/07/25 22:14:56 adam Exp $
+$NetBSD: distinfo,v 1.20 2015/01/23 15:06:01 joerg Exp $
 
 SHA1 (postgresql-9.1.14.tar.bz2) = 88c4b33d49e834eddae9fbae3028f453b73ae2a6
 RMD160 (postgresql-9.1.14.tar.bz2) = cfb171bd9fe848d6ef2464e85b20da4da02d81f0
@@ -9,6 +9,8 @@ SHA1 (patch-contrib_dblink_Makefile) = 4960ad57d42465fae203870548e4c53f8a32ce04
 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_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_backend_utils_adt_datetime.c b/databases/postgresql91/patches/patch-src_backend_utils_adt_datetime.c
new file mode 100644
index 00000000000..29654b886d4
--- /dev/null
+++ b/databases/postgresql91/patches/patch-src_backend_utils_adt_datetime.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_backend_utils_adt_datetime.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/backend/utils/adt/datetime.c.orig	2014-07-21 19:14:13.000000000 +0000
++++ src/backend/utils/adt/datetime.c
+@@ -29,6 +29,9 @@
+ #include "utils/memutils.h"
+ #include "utils/tzparser.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
+ 
+ static int DecodeNumber(int flen, char *field, bool haveTextMonth,
+ 			 int fmask, int *tmask,
diff --git a/databases/postgresql91/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql91/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
new file mode 100644
index 00000000000..a779d807551
--- /dev/null
+++ b/databases/postgresql91/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-07-21 19:14:13.000000000 +0000
++++ src/interfaces/ecpg/pgtypeslib/interval.c
+@@ -14,6 +14,10 @@
+ #include "pgtypes_error.h"
+ #include "pgtypes_interval.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
++
+ /* copy&pasted from .../src/backend/utils/adt/datetime.c */
+ static int
+ strtoi(const char *nptr, char **endptr, int base)
diff --git a/databases/postgresql92/distinfo b/databases/postgresql92/distinfo
index 1b150a4c971..6802f351b47 100644
--- a/databases/postgresql92/distinfo
+++ b/databases/postgresql92/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.9 2014/07/25 22:14:56 adam Exp $
+$NetBSD: distinfo,v 1.10 2015/01/23 15:06:01 joerg Exp $
 
 SHA1 (postgresql-9.2.9.tar.bz2) = 8b27e654b4c5cc3193a9ca87b48d58e20799526a
 RMD160 (postgresql-9.2.9.tar.bz2) = 4214ea94dd3df1ba67a66f83b88f0cc8267066ce
@@ -10,6 +10,8 @@ SHA1 (patch-contrib_dblink_Makefile) = 4960ad57d42465fae203870548e4c53f8a32ce04
 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_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_backend_utils_adt_datetime.c b/databases/postgresql92/patches/patch-src_backend_utils_adt_datetime.c
new file mode 100644
index 00000000000..8de009bcc93
--- /dev/null
+++ b/databases/postgresql92/patches/patch-src_backend_utils_adt_datetime.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_backend_utils_adt_datetime.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/backend/utils/adt/datetime.c.orig	2014-07-21 19:12:31.000000000 +0000
++++ src/backend/utils/adt/datetime.c
+@@ -30,6 +30,9 @@
+ #include "utils/memutils.h"
+ #include "utils/tzparser.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
+ 
+ static int DecodeNumber(int flen, char *field, bool haveTextMonth,
+ 			 int fmask, int *tmask,
diff --git a/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
new file mode 100644
index 00000000000..c3c5a077fe1
--- /dev/null
+++ b/databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-07-21 19:12:31.000000000 +0000
++++ src/interfaces/ecpg/pgtypeslib/interval.c
+@@ -14,6 +14,10 @@
+ #include "pgtypes_error.h"
+ #include "pgtypes_interval.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
++
+ /* copy&pasted from .../src/backend/utils/adt/datetime.c */
+ static int
+ strtoi(const char *nptr, char **endptr, int base)
diff --git a/databases/postgresql94/distinfo b/databases/postgresql94/distinfo
index 655b948ae45..01138374556 100644
--- a/databases/postgresql94/distinfo
+++ b/databases/postgresql94/distinfo
@@ -1,4 +1,4 @@
-$NetBSD: distinfo,v 1.1 2015/01/14 21:01:18 adam Exp $
+$NetBSD: distinfo,v 1.2 2015/01/23 15:06:01 joerg Exp $
 
 SHA1 (postgresql-9.4.0.tar.bz2) = bdf7f4872c7dd6bfee5ba04de81bf5097b73d5d7
 RMD160 (postgresql-9.4.0.tar.bz2) = 6abafacc675f30214580405a1fa757064b8b9a2e
@@ -11,6 +11,8 @@ SHA1 (patch-contrib_uuid-ossp_uuid-ossp.c) = efaffec2f51de70823430ca162d499b2886
 SHA1 (patch-src_Makefile.global.in) = 984d3c8a64a9020765e1fd4f27abae625bc189a1
 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_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_backend_utils_adt_datetime.c b/databases/postgresql94/patches/patch-src_backend_utils_adt_datetime.c
new file mode 100644
index 00000000000..297836bf87b
--- /dev/null
+++ b/databases/postgresql94/patches/patch-src_backend_utils_adt_datetime.c
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_backend_utils_adt_datetime.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/backend/utils/adt/datetime.c.orig	2014-12-16 01:07:34.000000000 +0000
++++ src/backend/utils/adt/datetime.c
+@@ -31,6 +31,9 @@
+ #include "utils/memutils.h"
+ #include "utils/tzparser.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
+ 
+ static int DecodeNumber(int flen, char *field, bool haveTextMonth,
+ 			 int fmask, int *tmask,
diff --git a/databases/postgresql94/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c b/databases/postgresql94/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
new file mode 100644
index 00000000000..c5963ecdcb5
--- /dev/null
+++ b/databases/postgresql94/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_interfaces_ecpg_pgtypeslib_interval.c,v 1.1 2015/01/23 15:06:01 joerg Exp $
+
+--- src/interfaces/ecpg/pgtypeslib/interval.c.orig	2014-12-16 01:07:34.000000000 +0000
++++ src/interfaces/ecpg/pgtypeslib/interval.c
+@@ -14,6 +14,10 @@
+ #include "pgtypes_error.h"
+ #include "pgtypes_interval.h"
+ 
++#if defined(__NetBSD__)
++#define strtoi pg_strtoi
++#endif
++
+ /* copy&pasted from .../src/backend/utils/adt/datetime.c */
+ static int
+ strtoi(const char *nptr, char **endptr, int base)