6 files changed, 46 insertions, 47 deletions

diff --git a/databases/postgresql-libpqxx30/Makefile b/databases/postgresql-libpqxx30/Makefile
index bc80187d58ac..03385aad4c28 100644
--- a/databases/postgresql-libpqxx30/Makefile
+++ b/databases/postgresql-libpqxx30/Makefile
@@ -6,10 +6,10 @@
 #
 
 PORTNAME=	libpqxx
-PORTVERSION=	2.5.5
+PORTVERSION=	2.6.6
 CATEGORIES=	databases
-MASTER_SITES=	${MASTER_SITE_PGSQL}
-MASTER_SITE_SUBDIR=	projects/gborg/libpqxx/stable
+MASTER_SITES=	ftp://thaiopensource.org/%SUBDIR%/
+MASTER_SITE_SUBDIR=	software/libpqxx
 PKGNAMEPREFIX=	postgresql-
 DIST_SUBDIR=	postgresql
 
diff --git a/databases/postgresql-libpqxx30/distinfo b/databases/postgresql-libpqxx30/distinfo
index 1221a8dc506f..a0f5bf9e46bc 100644
--- a/databases/postgresql-libpqxx30/distinfo
+++ b/databases/postgresql-libpqxx30/distinfo
@@ -1,3 +1,3 @@
-MD5 (postgresql/libpqxx-2.5.5.tar.gz) = db71975570ee31ecd0a11380dbaa8634
-SHA256 (postgresql/libpqxx-2.5.5.tar.gz) = 3a39bbe5cd5adb07dc049bdb6c05134dbcf1f710622ca713346d65d42b558239
-SIZE (postgresql/libpqxx-2.5.5.tar.gz) = 1566887
+MD5 (postgresql/libpqxx-2.6.6.tar.gz) = 65f6fd330b9f673eaac4408eb6ea58fa
+SHA256 (postgresql/libpqxx-2.6.6.tar.gz) = ee909daa0762229a1aec80a874d886f911b8bbda11ccaecd4a10a424ba0b234e
+SIZE (postgresql/libpqxx-2.6.6.tar.gz) = 1670359
diff --git a/databases/postgresql-libpqxx30/files/patch-Makefile.in b/databases/postgresql-libpqxx30/files/patch-Makefile.in
index ee6a7627048f..d1dd4d32ceef 100644
--- a/databases/postgresql-libpqxx30/files/patch-Makefile.in
+++ b/databases/postgresql-libpqxx30/files/patch-Makefile.in
@@ -1,9 +1,9 @@
---- Makefile.in.orig	Mon May 10 14:37:09 2004
-+++ Makefile.in	Wed Jun 23 21:47:42 2004
-@@ -196,7 +196,7 @@
- MAINTAINERCLEANFILES = Makefile.in aclocal.m4 config.h.in config.log configure \
- 	stamp-h.in
+--- Makefile.in~	Sat May 27 12:46:50 2006
++++ Makefile.in	Sun May 28 17:51:23 2006
+@@ -212,7 +212,7 @@
  
+ 
+ #includedir=$(prefix)/include
 -pkgconfigdir = $(libdir)/pkgconfig
 +pkgconfigdir = $(prefix)/libdata/pkgconfig
  pkgconfig_DATA = libpqxx.pc
diff --git a/databases/postgresql-libpqxx30/files/patch-configure b/databases/postgresql-libpqxx30/files/patch-configure
deleted file mode 100644
index 38d83fce85c5..000000000000
--- a/databases/postgresql-libpqxx30/files/patch-configure
+++ /dev/null
@@ -1,11 +0,0 @@
---- 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-libpqxx30/pkg-descr b/databases/postgresql-libpqxx30/pkg-descr
index 783a2761c86a..5697d09a3e4d 100644
--- a/databases/postgresql-libpqxx30/pkg-descr
+++ b/databases/postgresql-libpqxx30/pkg-descr
@@ -1,5 +1,5 @@
-Welcome to libpqxx, a C++ API to the PostgreSQL database management
-system.
+Welcome to libpqxx, the official C++ API to the PostgreSQL database
+management system.
 
 There are many similar libraries for PostgreSQL and for other
 databases, some of them database-independent.  Most of these, however,
@@ -15,4 +15,4 @@ management under control; and even basic object-orientation to give
 you some extra reliability features that would be hard to get with
 most other database interfaces.
 
-WWW: http://gborg.postgresql.org/project/libpqxx/
+WWW: http://pqxx.org/
diff --git a/databases/postgresql-libpqxx30/pkg-plist b/databases/postgresql-libpqxx30/pkg-plist
index e6fa01e7a589..b8bd9afa0b51 100644
--- a/databases/postgresql-libpqxx30/pkg-plist
+++ b/databases/postgresql-libpqxx30/pkg-plist
@@ -1,73 +1,83 @@
 bin/pqxx-config
-include/pqxx/pqxx
 include/pqxx/all.h
+include/pqxx/basic_connection
+include/pqxx/basic_connection.hxx
 include/pqxx/binarystring
 include/pqxx/binarystring.hxx
 include/pqxx/cachedresult.h
+include/pqxx/compiler-internal-post.hxx
+include/pqxx/compiler-internal-pre.hxx
+include/pqxx/compiler-public.hxx
+include/pqxx/config-public-compiler.h
 include/pqxx/connection
-include/pqxx/connection.hxx
 include/pqxx/connection.h
+include/pqxx/connection.hxx
 include/pqxx/connection_base
-include/pqxx/connection_base.hxx
 include/pqxx/connection_base.h
+include/pqxx/connection_base.hxx
 include/pqxx/connectionitf.h
+include/pqxx/connectionpolicy
+include/pqxx/connectionpolicy.hxx
 include/pqxx/cursor
-include/pqxx/cursor.hxx
 include/pqxx/cursor.h
+include/pqxx/cursor.hxx
 include/pqxx/dbtransaction
-include/pqxx/dbtransaction.hxx
 include/pqxx/dbtransaction.h
+include/pqxx/dbtransaction.hxx
 include/pqxx/except
-include/pqxx/except.hxx
 include/pqxx/except.h
+include/pqxx/except.hxx
 include/pqxx/isolation
-include/pqxx/isolation.hxx
 include/pqxx/isolation.h
+include/pqxx/isolation.hxx
 include/pqxx/largeobject
-include/pqxx/largeobject.hxx
 include/pqxx/largeobject.h
-include/pqxx/libcompiler.h
+include/pqxx/largeobject.hxx
 include/pqxx/libpq-forward.hxx
 include/pqxx/nontransaction
-include/pqxx/nontransaction.hxx
 include/pqxx/nontransaction.h
+include/pqxx/nontransaction.hxx
 include/pqxx/pipeline
 include/pqxx/pipeline.hxx
+include/pqxx/pqxx
+include/pqxx/prepared_statement
+include/pqxx/prepared_statement.hxx
 include/pqxx/result
-include/pqxx/result.hxx
 include/pqxx/result.h
+include/pqxx/result.hxx
 include/pqxx/robusttransaction
-include/pqxx/robusttransaction.hxx
 include/pqxx/robusttransaction.h
+include/pqxx/robusttransaction.hxx
+include/pqxx/subtransaction
+include/pqxx/subtransaction.hxx
 include/pqxx/tablereader
-include/pqxx/tablereader.hxx
 include/pqxx/tablereader.h
+include/pqxx/tablereader.hxx
 include/pqxx/tablestream
-include/pqxx/tablestream.hxx
 include/pqxx/tablestream.h
+include/pqxx/tablestream.hxx
 include/pqxx/tablewriter
-include/pqxx/tablewriter.hxx
 include/pqxx/tablewriter.h
+include/pqxx/tablewriter.hxx
 include/pqxx/transaction
-include/pqxx/transaction.hxx
 include/pqxx/transaction.h
+include/pqxx/transaction.hxx
 include/pqxx/transaction_base
-include/pqxx/transaction_base.hxx
 include/pqxx/transaction_base.h
+include/pqxx/transaction_base.hxx
 include/pqxx/transactionitf.h
 include/pqxx/transactor
-include/pqxx/transactor.hxx
 include/pqxx/transactor.h
+include/pqxx/transactor.hxx
 include/pqxx/trigger
-include/pqxx/trigger.hxx
 include/pqxx/trigger.h
+include/pqxx/trigger.hxx
 include/pqxx/util
-include/pqxx/util.hxx
 include/pqxx/util.h
-include/pqxx/config-public-compiler.h
+include/pqxx/util.hxx
+lib/libpqxx-2.6.6.so
 lib/libpqxx.a
 lib/libpqxx.la
 lib/libpqxx.so
-lib/libpqxx-%%PORTVERSION%%.so
 libdata/pkgconfig/libpqxx.pc
 @dirrm include/pqxx