3 files changed, 25 insertions, 15 deletions
diff --git a/databases/postgresql-libpqxx3/files/patch-Makefile.in b/databases/postgresql-libpqxx3/files/patch-Makefile.in
index 414342128af2..3d2b02a8ec93 100644
--- a/databases/postgresql-libpqxx3/files/patch-Makefile.in
+++ b/databases/postgresql-libpqxx3/files/patch-Makefile.in
@@ -1,6 +1,6 @@
---- Makefile.in	2009-08-14 10:16:35.000000000 -0700
-+++ Makefile.in.new	2010-01-13 23:09:39.000000000 -0800
-@@ -226,7 +226,7 @@
+--- Makefile.in.orig	2011-09-12 11:39:56.000000000 +0200
++++ Makefile.in	2011-09-12 11:40:48.000000000 +0200
+@@ -270,7 +270,7 @@
  MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \
  	stamp-h.in
  
diff --git a/databases/postgresql-libpqxx3/files/patch-libpqxx.spec.in b/databases/postgresql-libpqxx3/files/patch-libpqxx.spec.in
deleted file mode 100644
index 3e9e115743bb..000000000000
--- a/databases/postgresql-libpqxx3/files/patch-libpqxx.spec.in
+++ /dev/null
@@ -1,12 +0,0 @@
-diff -urN libpqxx-3.0.2.dist/libpqxx.spec.in libpqxx-3.0.2/libpqxx.spec.in
---- libpqxx.spec.in	2009-07-03 22:38:38.000000000 -0700
-+++ libpqxx.spec.in.new	2010-01-13 21:24:41.000000000 -0800
-@@ -58,7 +58,7 @@
- %files devel
- %defattr(-, root, root)
- %{_libdir}/*a
--%{_libdir}/pkgconfig/libpqxx.pc
-+%{_prefix}/libdata/pkgconfig/libpqxx.pc
- %{_includedir}/*
- %{_bindir}/pqxx-config
- 
diff --git a/databases/postgresql-libpqxx3/files/patch-svn_1665 b/databases/postgresql-libpqxx3/files/patch-svn_1665
new file mode 100644
index 000000000000..eb1ffab8dc12
--- /dev/null
+++ b/databases/postgresql-libpqxx3/files/patch-svn_1665
@@ -0,0 +1,22 @@
+Index: /trunk/include/pqxx/util.hxx
+===================================================================
+--- ./include/pqxx/util.hxx	(revision 1638)
++++ ./include/pqxx/util.hxx	(revision 1665)
+@@ -33,4 +33,6 @@
+ #include <memory>
+ #endif
++
++#include "pqxx/strconv"
+ 
+ 
+Index: /trunk/include/pqxx/cursor.hxx
+===================================================================
+--- ./include/pqxx/cursor.hxx	(revision 1559)
++++ ./include/pqxx/cursor.hxx	(revision 1665)
+@@ -308,5 +308,5 @@
+ 	transaction_base &trans,
+ 	const PGSTD::string adopted_cursor) :
+-    m_cur(trans, adopted_cursor, up, op)
++    m_cur(trans, adopted_cursor, op)
+   {
+     // Put cursor in known position