Updating to 2.5.5

Approved by: ade, seanc (implicit)

5 files changed, 15 insertions, 16 deletions

diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index 895ffb20e6eb..9a231a313052 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	libpqxx
-PORTVERSION=	2.4.2
-PORTREVISION=	1
+PORTVERSION=	2.5.5
 CATEGORIES=	databases
 MASTER_SITES=	ftp://gborg.postgresql.org/pub/libpqxx/stable/
 PKGNAMEPREFIX=	postgresql-
diff --git a/databases/postgresql-libpqxx/distinfo b/databases/postgresql-libpqxx/distinfo
index 88e1c0a7d8e7..4fc1fbf15230 100644
--- a/databases/postgresql-libpqxx/distinfo
+++ b/databases/postgresql-libpqxx/distinfo
@@ -1,2 +1,2 @@
-MD5 (postgresql/libpqxx-2.4.2.tar.gz) = f58b366c1a84ed838d76b0febee36e1a
-SIZE (postgresql/libpqxx-2.4.2.tar.gz) = 843633
+MD5 (postgresql/libpqxx-2.5.5.tar.gz) = db71975570ee31ecd0a11380dbaa8634
+SIZE (postgresql/libpqxx-2.5.5.tar.gz) = 1566887
diff --git a/databases/postgresql-libpqxx/files/patch-configure b/databases/postgresql-libpqxx/files/patch-configure
new file mode 100644
index 000000000000..38d83fce85c5
--- /dev/null
+++ b/databases/postgresql-libpqxx/files/patch-configure
@@ -0,0 +1,11 @@
+--- configure~	Fri Jul  1 09:52:28 2005
++++ configure	Tue Jul 12 00:15:36 2005
+@@ -19403,7 +19403,7 @@
+ 
+ 
+ # Add options to compiler command line, if compiler accepts it
+-function add_compiler_opts() {
++add_compiler_opts() {
+ 	for option in $* ; do
+ 		SAVE_CXXFLAGS="$CXXFLAGS"
+ 		CXXFLAGS="$CXXFLAGS $option"
diff --git a/databases/postgresql-libpqxx/files/patch-src-util-cxx b/databases/postgresql-libpqxx/files/patch-src-util-cxx
deleted file mode 100644
index 0b66608ad94c..000000000000
--- a/databases/postgresql-libpqxx/files/patch-src-util-cxx
+++ /dev/null
@@ -1,11 +0,0 @@
---- src/util.cxx.orig	Sun Nov  7 15:53:59 2004
-+++ src/util.cxx	Sun Nov  7 15:54:02 2004
-@@ -24,6 +24,8 @@
- #include <new>
- #include <sstream>
- 
-+#include <unistd.h>
-+
- #ifdef _WIN32
- #include <windows.h>
- #endif
diff --git a/databases/postgresql-libpqxx/pkg-plist b/databases/postgresql-libpqxx/pkg-plist
index bab88d7cc79b..e6fa01e7a589 100644
--- a/databases/postgresql-libpqxx/pkg-plist
+++ b/databases/postgresql-libpqxx/pkg-plist
@@ -27,6 +27,7 @@ include/pqxx/largeobject
 include/pqxx/largeobject.hxx
 include/pqxx/largeobject.h
 include/pqxx/libcompiler.h
+include/pqxx/libpq-forward.hxx
 include/pqxx/nontransaction
 include/pqxx/nontransaction.hxx
 include/pqxx/nontransaction.h
@@ -64,7 +65,6 @@ include/pqxx/util
 include/pqxx/util.hxx
 include/pqxx/util.h
 include/pqxx/config-public-compiler.h
-include/pqxx/config-public-libpq.h
 lib/libpqxx.a
 lib/libpqxx.la
 lib/libpqxx.so