From cc2f107ce97f150496665b3ec0501e6adef5597b Mon Sep 17 00:00:00 2001
From: joerg <joerg@pkgsrc.org>
Date: Fri, 23 Jan 2015 15:06:00 +0000
Subject: Apply strtoi fix for NetBSD/current to all PostgreSQL versions.

---
 databases/postgresql92/distinfo                           |  4 +++-
 .../patches/patch-src_backend_utils_adt_datetime.c        | 14 ++++++++++++++
 .../patch-src_interfaces_ecpg_pgtypeslib_interval.c       | 15 +++++++++++++++
 3 files changed, 32 insertions(+), 1 deletion(-)
 create mode 100644 databases/postgresql92/patches/patch-src_backend_utils_adt_datetime.c
 create mode 100644 databases/postgresql92/patches/patch-src_interfaces_ecpg_pgtypeslib_interval.c

(limited to 'databases/postgresql92')

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)
-- 
cgit v1.2.3