Fix build with modern GCC

6 files changed, 60 insertions, 5 deletions

diff --git a/databases/libpqxx/distinfo b/databases/libpqxx/distinfo
index 469a538117c..fffa9b18c5c 100644
--- a/databases/libpqxx/distinfo
+++ b/databases/libpqxx/distinfo
@@ -1,7 +1,11 @@
-$NetBSD: distinfo,v 1.5 2006/08/23 11:45:26 ghen Exp $
+$NetBSD: distinfo,v 1.6 2011/11/24 14:14:57 joerg Exp $
 
 SHA1 (libpqxx-2.5.5.tar.gz) = e7ee3d9ea5acfccf2779bf39fe29d0228bd6479a
 RMD160 (libpqxx-2.5.5.tar.gz) = 28d05558982f0c1b2df9eac3ca01a47b5bdee832
 Size (libpqxx-2.5.5.tar.gz) = 1566887 bytes
 SHA1 (patch-aa) = fbf80bd805bedf094a79e0ab76e9a7f543e67117
-SHA1 (patch-ab) = dbfd4f1769d428edeb43a64346f150daf0352924
+SHA1 (patch-ab) = 22dbd7aa70f082cf20fd99843a5a2811505722f8
+SHA1 (patch-src_binarystring.cxx) = 98b46c3bf806fd0689126729a211c71b132969bd
+SHA1 (patch-src_largeobject.cxx) = d293ece542785cdcca20eda1722392cd2d8bacc8
+SHA1 (patch-src_result.cxx) = 698f74c603d8c3ffb066f16755ee8de6da6fae39
+SHA1 (patch-src_util.cxx) = 70a78a8db2e78842b6aa5cb4d23eb73f4bd87c55
diff --git a/databases/libpqxx/patches/patch-ab b/databases/libpqxx/patches/patch-ab
index d64f5f283f5..a7abf3315a2 100644
--- a/databases/libpqxx/patches/patch-ab
+++ b/databases/libpqxx/patches/patch-ab
@@ -1,9 +1,12 @@
-$NetBSD: patch-ab,v 1.1 2006/01/02 17:20:18 joerg Exp $
+$NetBSD: patch-ab,v 1.2 2011/11/24 14:14:58 joerg Exp $
 
---- src/connection_base.cxx.orig	2006-01-02 17:01:56.000000000 +0000
+--- src/connection_base.cxx.orig	2005-06-28 08:53:14.000000000 +0000
 +++ src/connection_base.cxx
-@@ -21,6 +21,7 @@
+@@ -19,8 +19,10 @@
+ 
+ #include <algorithm>
  #include <cstdio>
++#include <cstring>
  #include <ctime>
  #include <stdexcept>
 +#include <sys/time.h>
diff --git a/databases/libpqxx/patches/patch-src_binarystring.cxx b/databases/libpqxx/patches/patch-src_binarystring.cxx
new file mode 100644
index 00000000000..36a2acb9511
--- /dev/null
+++ b/databases/libpqxx/patches/patch-src_binarystring.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_binarystring.cxx,v 1.1 2011/11/24 14:14:58 joerg Exp $
+
+--- src/binarystring.cxx.orig	2011-11-24 00:12:09.000000000 +0000
++++ src/binarystring.cxx
+@@ -18,6 +18,7 @@
+ 
+ #include <new>
+ #include <stdexcept>
++#include <cstring>
+ 
+ #include "libpq-fe.h"
+ 
diff --git a/databases/libpqxx/patches/patch-src_largeobject.cxx b/databases/libpqxx/patches/patch-src_largeobject.cxx
new file mode 100644
index 00000000000..30a0f795012
--- /dev/null
+++ b/databases/libpqxx/patches/patch-src_largeobject.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_largeobject.cxx,v 1.1 2011/11/24 14:14:58 joerg Exp $
+
+--- src/largeobject.cxx.orig	2011-11-24 00:12:56.000000000 +0000
++++ src/largeobject.cxx
+@@ -18,6 +18,7 @@
+ #include "pqxx/compiler.h"
+ 
+ #include <cerrno>
++#include <cstring>
+ #include <stdexcept>
+ 
+ #include "libpq-fe.h"
diff --git a/databases/libpqxx/patches/patch-src_result.cxx b/databases/libpqxx/patches/patch-src_result.cxx
new file mode 100644
index 00000000000..ffd5295e968
--- /dev/null
+++ b/databases/libpqxx/patches/patch-src_result.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_result.cxx,v 1.1 2011/11/24 14:14:58 joerg Exp $
+
+--- src/result.cxx.orig	2011-11-24 00:13:16.000000000 +0000
++++ src/result.cxx
+@@ -18,6 +18,7 @@
+ #include "pqxx/compiler.h"
+ 
+ #include <stdexcept>
++#include <cstdlib>
+ 
+ #include "libpq-fe.h"
+ 
diff --git a/databases/libpqxx/patches/patch-src_util.cxx b/databases/libpqxx/patches/patch-src_util.cxx
new file mode 100644
index 00000000000..9130b917c1a
--- /dev/null
+++ b/databases/libpqxx/patches/patch-src_util.cxx
@@ -0,0 +1,12 @@
+$NetBSD: patch-src_util.cxx,v 1.1 2011/11/24 14:14:58 joerg Exp $
+
+--- src/util.cxx.orig	2011-11-24 00:13:51.000000000 +0000
++++ src/util.cxx
+@@ -25,6 +25,7 @@
+ #endif
+ 
+ #include <cerrno>
++#include <cstring>
+ #include <new>
+ #include <sstream>
+