Update libpqxx{,-doc} to version 2.5.4

Changes: Lots of bugfixes and compatibility issues addressed.

7 files changed, 291 insertions, 96 deletions

diff --git a/databases/libpqxx-doc/PLIST b/databases/libpqxx-doc/PLIST
index eef72688f59..ae5b55250e7 100644
--- a/databases/libpqxx-doc/PLIST
+++ b/databases/libpqxx-doc/PLIST
@@ -1,72 +1,4 @@
-@comment $NetBSD: PLIST,v 1.1.1.1 2004/01/07 13:38:34 is Exp $
-share/examples/libpqxx/test001.cxx
-share/examples/libpqxx/test002.cxx
-share/examples/libpqxx/test003.cxx
-share/examples/libpqxx/test004.cxx
-share/examples/libpqxx/test005.cxx
-share/examples/libpqxx/test006.cxx
-share/examples/libpqxx/test007.cxx
-share/examples/libpqxx/test008.cxx
-share/examples/libpqxx/test009.cxx
-share/examples/libpqxx/test010.cxx
-share/examples/libpqxx/test011.cxx
-share/examples/libpqxx/test012.cxx
-share/examples/libpqxx/test013.cxx
-share/examples/libpqxx/test014.cxx
-share/examples/libpqxx/test015.cxx
-share/examples/libpqxx/test016.cxx
-share/examples/libpqxx/test017.cxx
-share/examples/libpqxx/test018.cxx
-share/examples/libpqxx/test019.cxx
-share/examples/libpqxx/test020.cxx
-share/examples/libpqxx/test021.cxx
-share/examples/libpqxx/test022.cxx
-share/examples/libpqxx/test023.cxx
-share/examples/libpqxx/test024.cxx
-share/examples/libpqxx/test025.cxx
-share/examples/libpqxx/test026.cxx
-share/examples/libpqxx/test027.cxx
-share/examples/libpqxx/test028.cxx
-share/examples/libpqxx/test029.cxx
-share/examples/libpqxx/test030.cxx
-share/examples/libpqxx/test031.cxx
-share/examples/libpqxx/test032.cxx
-share/examples/libpqxx/test033.cxx
-share/examples/libpqxx/test034.cxx
-share/examples/libpqxx/test035.cxx
-share/examples/libpqxx/test036.cxx
-share/examples/libpqxx/test037.cxx
-share/examples/libpqxx/test038.cxx
-share/examples/libpqxx/test039.cxx
-share/examples/libpqxx/test040.cxx
-share/examples/libpqxx/test041.cxx
-share/examples/libpqxx/test042.cxx
-share/examples/libpqxx/test043.cxx
-share/examples/libpqxx/test044.cxx
-share/examples/libpqxx/test045.cxx
-share/examples/libpqxx/test046.cxx
-share/examples/libpqxx/test047.cxx
-share/examples/libpqxx/test048.cxx
-share/examples/libpqxx/test049.cxx
-share/examples/libpqxx/test050.cxx
-share/examples/libpqxx/test051.cxx
-share/examples/libpqxx/test052.cxx
-share/examples/libpqxx/test053.cxx
-share/examples/libpqxx/test054.cxx
-share/examples/libpqxx/test055.cxx
-share/examples/libpqxx/test056.cxx
-share/examples/libpqxx/test057.cxx
-share/examples/libpqxx/test058.cxx
-share/examples/libpqxx/test059.cxx
-share/examples/libpqxx/test060.cxx
-share/examples/libpqxx/test061.cxx
-share/examples/libpqxx/test062.cxx
-share/examples/libpqxx/test063.cxx
-share/examples/libpqxx/test064.cxx
-share/examples/libpqxx/test065.cxx
-share/examples/libpqxx/test066.cxx
-share/examples/libpqxx/test067.cxx
-share/examples/libpqxx/test068.cxx
+@comment $NetBSD: PLIST,v 1.2 2005/06/27 01:57:26 markd Exp $
 share/doc/html/libpqxx/Reference/all_8h-source.html
 share/doc/html/libpqxx/Reference/all_8h.html
 share/doc/html/libpqxx/Reference/annotated.html
@@ -76,15 +8,13 @@ share/doc/html/libpqxx/Reference/binarystring_8hxx.html
 share/doc/html/libpqxx/Reference/cachedresult_8cxx.html
 share/doc/html/libpqxx/Reference/cachedresult_8h-source.html
 share/doc/html/libpqxx/Reference/cachedresult_8h.html
-share/doc/html/libpqxx/Reference/classPGSTD_1_1back__insert__iterator_3_01pqxx_1_1tablewriter_01_4-members.html
-share/doc/html/libpqxx/Reference/classPGSTD_1_1back__insert__iterator_3_01pqxx_1_1tablewriter_01_4.html
 share/doc/html/libpqxx/Reference/classes.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1Cursor-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1Cursor.html
-share/doc/html/libpqxx/Reference/classpqxx_1_1PQAlloc-members.html
-share/doc/html/libpqxx/Reference/classpqxx_1_1PQAlloc.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1asyncconnection-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1asyncconnection.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1basic__fieldstream-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1basic__fieldstream.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1basic__ilostream-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1basic__ilostream.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1basic__lostream-members.html
@@ -105,10 +35,34 @@ share/doc/html/libpqxx/Reference/classpqxx_1_1connection-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1connection.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1connection__base-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1connection__base.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1cursor__base-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1cursor__base.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1dbtransaction-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1dbtransaction.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1field__streambuf-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1field__streambuf.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1icursor__iterator-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1icursor__iterator.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1icursorstream-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1icursorstream.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1in__doubt__error-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1in__doubt__error.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1Escaper-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1Escaper.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1PQAlloc-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1PQAlloc.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1disable__noticer-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1disable__noticer.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1namedclass-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1namedclass.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1scoped__noticer-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1scoped__noticer.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1transactionfocus-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1transactionfocus.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1unique-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1internal_1_1unique.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1items-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1items.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1largeobject-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1largeobject.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1largeobject__streambuf-members.html
@@ -119,12 +73,20 @@ share/doc/html/libpqxx/Reference/classpqxx_1_1lazyconnection-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1lazyconnection.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1nontransaction-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1nontransaction.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1nullconnection-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1nullconnection.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1pipeline-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1pipeline.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1result-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1result.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1const__fielditerator-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1const__fielditerator.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1const__iterator-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1const__iterator.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1const__reverse__fielditerator-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1const__reverse__fielditerator.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1const__reverse__iterator-members.html
+share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1const__reverse__iterator.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1field-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1field.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1result_1_1tuple-members.html
@@ -147,10 +109,16 @@ share/doc/html/libpqxx/Reference/classpqxx_1_1transactor-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1transactor.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1trigger-members.html
 share/doc/html/libpqxx/Reference/classpqxx_1_1trigger.html
-share/doc/html/libpqxx/Reference/classpqxx_1_1unique-members.html
-share/doc/html/libpqxx/Reference/classpqxx_1_1unique.html
 share/doc/html/libpqxx/Reference/compiler_8h-source.html
 share/doc/html/libpqxx/Reference/compiler_8h.html
+share/doc/html/libpqxx/Reference/config-internal-autotools_8h-source.html
+share/doc/html/libpqxx/Reference/config-internal-autotools_8h.html
+share/doc/html/libpqxx/Reference/config-internal-compiler_8h-source.html
+share/doc/html/libpqxx/Reference/config-internal-compiler_8h.html
+share/doc/html/libpqxx/Reference/config-internal-libpq_8h-source.html
+share/doc/html/libpqxx/Reference/config-internal-libpq_8h.html
+share/doc/html/libpqxx/Reference/config-public-compiler_8h-source.html
+share/doc/html/libpqxx/Reference/config-public-compiler_8h.html
 share/doc/html/libpqxx/Reference/config_8h-source.html
 share/doc/html/libpqxx/Reference/config_8h.html
 share/doc/html/libpqxx/Reference/connection_8cxx.html
@@ -168,11 +136,19 @@ share/doc/html/libpqxx/Reference/connectionitf_8h.html
 share/doc/html/libpqxx/Reference/cursor_8cxx.html
 share/doc/html/libpqxx/Reference/cursor_8h-source.html
 share/doc/html/libpqxx/Reference/cursor_8h.html
+share/doc/html/libpqxx/Reference/cursor_8hxx-source.html
+share/doc/html/libpqxx/Reference/cursor_8hxx.html
+share/doc/html/libpqxx/Reference/dbtransaction_8cxx.html
 share/doc/html/libpqxx/Reference/dbtransaction_8h-source.html
 share/doc/html/libpqxx/Reference/dbtransaction_8h.html
 share/doc/html/libpqxx/Reference/dbtransaction_8hxx-source.html
 share/doc/html/libpqxx/Reference/dbtransaction_8hxx.html
 share/doc/html/libpqxx/Reference/deprecated.html
+share/doc/html/libpqxx/Reference/dir_000000.html
+share/doc/html/libpqxx/Reference/dir_000001.html
+share/doc/html/libpqxx/Reference/dir_000002.html
+share/doc/html/libpqxx/Reference/dir_000002_000000.html
+share/doc/html/libpqxx/Reference/dirs.html
 share/doc/html/libpqxx/Reference/doxygen.css
 share/doc/html/libpqxx/Reference/doxygen.png
 share/doc/html/libpqxx/Reference/except_8h-source.html
@@ -181,18 +157,105 @@ share/doc/html/libpqxx/Reference/except_8hxx-source.html
 share/doc/html/libpqxx/Reference/except_8hxx.html
 share/doc/html/libpqxx/Reference/files.html
 share/doc/html/libpqxx/Reference/functions.html
+share/doc/html/libpqxx/Reference/functions_0x62.html
+share/doc/html/libpqxx/Reference/functions_0x63.html
+share/doc/html/libpqxx/Reference/functions_0x64.html
+share/doc/html/libpqxx/Reference/functions_0x65.html
+share/doc/html/libpqxx/Reference/functions_0x66.html
+share/doc/html/libpqxx/Reference/functions_0x67.html
+share/doc/html/libpqxx/Reference/functions_0x68.html
+share/doc/html/libpqxx/Reference/functions_0x69.html
+share/doc/html/libpqxx/Reference/functions_0x6c.html
+share/doc/html/libpqxx/Reference/functions_0x6d.html
+share/doc/html/libpqxx/Reference/functions_0x6e.html
+share/doc/html/libpqxx/Reference/functions_0x6f.html
+share/doc/html/libpqxx/Reference/functions_0x70.html
+share/doc/html/libpqxx/Reference/functions_0x71.html
+share/doc/html/libpqxx/Reference/functions_0x72.html
+share/doc/html/libpqxx/Reference/functions_0x73.html
+share/doc/html/libpqxx/Reference/functions_0x74.html
+share/doc/html/libpqxx/Reference/functions_0x75.html
+share/doc/html/libpqxx/Reference/functions_0x76.html
+share/doc/html/libpqxx/Reference/functions_0x77.html
+share/doc/html/libpqxx/Reference/functions_0x7e.html
 share/doc/html/libpqxx/Reference/functions_enum.html
 share/doc/html/libpqxx/Reference/functions_eval.html
 share/doc/html/libpqxx/Reference/functions_func.html
+share/doc/html/libpqxx/Reference/functions_func_0x62.html
+share/doc/html/libpqxx/Reference/functions_func_0x63.html
+share/doc/html/libpqxx/Reference/functions_func_0x64.html
+share/doc/html/libpqxx/Reference/functions_func_0x65.html
+share/doc/html/libpqxx/Reference/functions_func_0x66.html
+share/doc/html/libpqxx/Reference/functions_func_0x67.html
+share/doc/html/libpqxx/Reference/functions_func_0x68.html
+share/doc/html/libpqxx/Reference/functions_func_0x69.html
+share/doc/html/libpqxx/Reference/functions_func_0x6c.html
+share/doc/html/libpqxx/Reference/functions_func_0x6d.html
+share/doc/html/libpqxx/Reference/functions_func_0x6e.html
+share/doc/html/libpqxx/Reference/functions_func_0x6f.html
+share/doc/html/libpqxx/Reference/functions_func_0x70.html
+share/doc/html/libpqxx/Reference/functions_func_0x71.html
+share/doc/html/libpqxx/Reference/functions_func_0x72.html
+share/doc/html/libpqxx/Reference/functions_func_0x73.html
+share/doc/html/libpqxx/Reference/functions_func_0x74.html
+share/doc/html/libpqxx/Reference/functions_func_0x75.html
+share/doc/html/libpqxx/Reference/functions_func_0x77.html
+share/doc/html/libpqxx/Reference/functions_func_0x7e.html
 share/doc/html/libpqxx/Reference/functions_rela.html
+share/doc/html/libpqxx/Reference/functions_rela_0x63.html
+share/doc/html/libpqxx/Reference/functions_rela_0x64.html
+share/doc/html/libpqxx/Reference/functions_rela_0x65.html
+share/doc/html/libpqxx/Reference/functions_rela_0x66.html
+share/doc/html/libpqxx/Reference/functions_rela_0x68.html
+share/doc/html/libpqxx/Reference/functions_rela_0x69.html
+share/doc/html/libpqxx/Reference/functions_rela_0x6c.html
+share/doc/html/libpqxx/Reference/functions_rela_0x6e.html
+share/doc/html/libpqxx/Reference/functions_rela_0x6f.html
+share/doc/html/libpqxx/Reference/functions_rela_0x70.html
+share/doc/html/libpqxx/Reference/functions_rela_0x71.html
+share/doc/html/libpqxx/Reference/functions_rela_0x72.html
+share/doc/html/libpqxx/Reference/functions_rela_0x73.html
+share/doc/html/libpqxx/Reference/functions_rela_0x74.html
+share/doc/html/libpqxx/Reference/functions_rela_0x76.html
+share/doc/html/libpqxx/Reference/functions_rela_0x77.html
 share/doc/html/libpqxx/Reference/functions_type.html
 share/doc/html/libpqxx/Reference/functions_vars.html
 share/doc/html/libpqxx/Reference/globals.html
+share/doc/html/libpqxx/Reference/globals_0x63.html
+share/doc/html/libpqxx/Reference/globals_0x64.html
+share/doc/html/libpqxx/Reference/globals_0x65.html
+share/doc/html/libpqxx/Reference/globals_0x66.html
+share/doc/html/libpqxx/Reference/globals_0x68.html
+share/doc/html/libpqxx/Reference/globals_0x69.html
+share/doc/html/libpqxx/Reference/globals_0x6c.html
+share/doc/html/libpqxx/Reference/globals_0x6e.html
+share/doc/html/libpqxx/Reference/globals_0x6f.html
+share/doc/html/libpqxx/Reference/globals_0x70.html
+share/doc/html/libpqxx/Reference/globals_0x71.html
+share/doc/html/libpqxx/Reference/globals_0x72.html
+share/doc/html/libpqxx/Reference/globals_0x73.html
+share/doc/html/libpqxx/Reference/globals_0x74.html
+share/doc/html/libpqxx/Reference/globals_0x76.html
+share/doc/html/libpqxx/Reference/globals_0x77.html
 share/doc/html/libpqxx/Reference/globals_defs.html
+share/doc/html/libpqxx/Reference/globals_enum.html
+share/doc/html/libpqxx/Reference/globals_eval.html
 share/doc/html/libpqxx/Reference/globals_func.html
+share/doc/html/libpqxx/Reference/globals_func_0x64.html
+share/doc/html/libpqxx/Reference/globals_func_0x65.html
+share/doc/html/libpqxx/Reference/globals_func_0x66.html
+share/doc/html/libpqxx/Reference/globals_func_0x6e.html
+share/doc/html/libpqxx/Reference/globals_func_0x6f.html
+share/doc/html/libpqxx/Reference/globals_func_0x70.html
+share/doc/html/libpqxx/Reference/globals_func_0x71.html
+share/doc/html/libpqxx/Reference/globals_func_0x73.html
+share/doc/html/libpqxx/Reference/globals_func_0x74.html
 share/doc/html/libpqxx/Reference/globals_type.html
+share/doc/html/libpqxx/Reference/globals_vars.html
+share/doc/html/libpqxx/Reference/graph_legend.html
 share/doc/html/libpqxx/Reference/hierarchy.html
 share/doc/html/libpqxx/Reference/index.html
+share/doc/html/libpqxx/Reference/inherits.html
 share/doc/html/libpqxx/Reference/isolation_8h-source.html
 share/doc/html/libpqxx/Reference/isolation_8h.html
 share/doc/html/libpqxx/Reference/isolation_8hxx-source.html
@@ -204,8 +267,8 @@ share/doc/html/libpqxx/Reference/largeobject_8hxx-source.html
 share/doc/html/libpqxx/Reference/largeobject_8hxx.html
 share/doc/html/libpqxx/Reference/libcompiler_8h-source.html
 share/doc/html/libpqxx/Reference/libcompiler_8h.html
-share/doc/html/libpqxx/Reference/libconfig_8h-source.html
-share/doc/html/libpqxx/Reference/libconfig_8h.html
+share/doc/html/libpqxx/Reference/libpq-forward_8hxx-source.html
+share/doc/html/libpqxx/Reference/libpq-forward_8hxx.html
 share/doc/html/libpqxx/Reference/namespacePGSTD.html
 share/doc/html/libpqxx/Reference/namespacemembers.html
 share/doc/html/libpqxx/Reference/namespacemembers_enum.html
@@ -214,12 +277,16 @@ share/doc/html/libpqxx/Reference/namespacemembers_func.html
 share/doc/html/libpqxx/Reference/namespacemembers_type.html
 share/doc/html/libpqxx/Reference/namespacemembers_vars.html
 share/doc/html/libpqxx/Reference/namespacepqxx.html
+share/doc/html/libpqxx/Reference/namespacepqxx_1_1internal.html
+share/doc/html/libpqxx/Reference/namespacepqxx_1_1internal_1_1pq.html
 share/doc/html/libpqxx/Reference/namespaces.html
+share/doc/html/libpqxx/Reference/namespacestd.html
 share/doc/html/libpqxx/Reference/nontransaction_8cxx.html
 share/doc/html/libpqxx/Reference/nontransaction_8h-source.html
 share/doc/html/libpqxx/Reference/nontransaction_8h.html
 share/doc/html/libpqxx/Reference/nontransaction_8hxx-source.html
 share/doc/html/libpqxx/Reference/nontransaction_8hxx.html
+share/doc/html/libpqxx/Reference/oldcursor_8cxx.html
 share/doc/html/libpqxx/Reference/pages.html
 share/doc/html/libpqxx/Reference/pipeline_8cxx.html
 share/doc/html/libpqxx/Reference/pipeline_8hxx-source.html
@@ -243,8 +310,14 @@ share/doc/html/libpqxx/Reference/structPGSTD_1_1numeric__limits-members.html
 share/doc/html/libpqxx/Reference/structPGSTD_1_1numeric__limits.html
 share/doc/html/libpqxx/Reference/structpqxx_1_1Cursor_1_1unknown__position-members.html
 share/doc/html/libpqxx/Reference/structpqxx_1_1Cursor_1_1unknown__position.html
+share/doc/html/libpqxx/Reference/structpqxx_1_1internal_1_1deref__ptr-members.html
+share/doc/html/libpqxx/Reference/structpqxx_1_1internal_1_1deref__ptr.html
+share/doc/html/libpqxx/Reference/structpqxx_1_1internal_1_1dereference-members.html
+share/doc/html/libpqxx/Reference/structpqxx_1_1internal_1_1dereference.html
 share/doc/html/libpqxx/Reference/structpqxx_1_1isolation__traits-members.html
 share/doc/html/libpqxx/Reference/structpqxx_1_1isolation__traits.html
+share/doc/html/libpqxx/Reference/structpqxx_1_1nonnoticer-members.html
+share/doc/html/libpqxx/Reference/structpqxx_1_1nonnoticer.html
 share/doc/html/libpqxx/Reference/structpqxx_1_1noticer-members.html
 share/doc/html/libpqxx/Reference/structpqxx_1_1noticer.html
 share/doc/html/libpqxx/Reference/tablereader_8cxx.html
@@ -298,7 +371,93 @@ share/doc/html/libpqxx/Tutorial/ch03s06.html
 share/doc/html/libpqxx/Tutorial/ch03s07.html
 share/doc/html/libpqxx/Tutorial/index.html
 share/doc/html/libpqxx/Tutorial/pr01.html
+share/examples/libpqxx/test000.cxx
+share/examples/libpqxx/test001.cxx
+share/examples/libpqxx/test002.cxx
+share/examples/libpqxx/test003.cxx
+share/examples/libpqxx/test004.cxx
+share/examples/libpqxx/test005.cxx
+share/examples/libpqxx/test006.cxx
+share/examples/libpqxx/test007.cxx
+share/examples/libpqxx/test008.cxx
+share/examples/libpqxx/test009.cxx
+share/examples/libpqxx/test010.cxx
+share/examples/libpqxx/test011.cxx
+share/examples/libpqxx/test012.cxx
+share/examples/libpqxx/test013.cxx
+share/examples/libpqxx/test014.cxx
+share/examples/libpqxx/test015.cxx
+share/examples/libpqxx/test016.cxx
+share/examples/libpqxx/test017.cxx
+share/examples/libpqxx/test018.cxx
+share/examples/libpqxx/test019.cxx
+share/examples/libpqxx/test020.cxx
+share/examples/libpqxx/test021.cxx
+share/examples/libpqxx/test022.cxx
+share/examples/libpqxx/test023.cxx
+share/examples/libpqxx/test024.cxx
+share/examples/libpqxx/test025.cxx
+share/examples/libpqxx/test026.cxx
+share/examples/libpqxx/test027.cxx
+share/examples/libpqxx/test028.cxx
+share/examples/libpqxx/test029.cxx
+share/examples/libpqxx/test030.cxx
+share/examples/libpqxx/test031.cxx
+share/examples/libpqxx/test032.cxx
+share/examples/libpqxx/test033.cxx
+share/examples/libpqxx/test034.cxx
+share/examples/libpqxx/test035.cxx
+share/examples/libpqxx/test036.cxx
+share/examples/libpqxx/test037.cxx
+share/examples/libpqxx/test038.cxx
+share/examples/libpqxx/test039.cxx
+share/examples/libpqxx/test040.cxx
+share/examples/libpqxx/test041.cxx
+share/examples/libpqxx/test042.cxx
+share/examples/libpqxx/test043.cxx
+share/examples/libpqxx/test044.cxx
+share/examples/libpqxx/test045.cxx
+share/examples/libpqxx/test046.cxx
+share/examples/libpqxx/test047.cxx
+share/examples/libpqxx/test048.cxx
+share/examples/libpqxx/test049.cxx
+share/examples/libpqxx/test050.cxx
+share/examples/libpqxx/test051.cxx
+share/examples/libpqxx/test052.cxx
+share/examples/libpqxx/test053.cxx
+share/examples/libpqxx/test054.cxx
+share/examples/libpqxx/test055.cxx
+share/examples/libpqxx/test056.cxx
+share/examples/libpqxx/test057.cxx
+share/examples/libpqxx/test058.cxx
+share/examples/libpqxx/test059.cxx
+share/examples/libpqxx/test060.cxx
+share/examples/libpqxx/test061.cxx
+share/examples/libpqxx/test062.cxx
+share/examples/libpqxx/test063.cxx
+share/examples/libpqxx/test064.cxx
+share/examples/libpqxx/test065.cxx
+share/examples/libpqxx/test066.cxx
+share/examples/libpqxx/test067.cxx
+share/examples/libpqxx/test068.cxx
+share/examples/libpqxx/test069.cxx
+share/examples/libpqxx/test070.cxx
+share/examples/libpqxx/test071.cxx
+share/examples/libpqxx/test072.cxx
+share/examples/libpqxx/test073.cxx
+share/examples/libpqxx/test074.cxx
+share/examples/libpqxx/test075.cxx
+share/examples/libpqxx/test076.cxx
+share/examples/libpqxx/test077.cxx
+share/examples/libpqxx/test078.cxx
+share/examples/libpqxx/test079.cxx
+share/examples/libpqxx/test080.cxx
+share/examples/libpqxx/test081.cxx
+share/examples/libpqxx/test082.cxx
+share/examples/libpqxx/test083.cxx
+share/examples/libpqxx/test084.cxx
+share/examples/libpqxx/test085.cxx
+@dirrm share/examples/libpqxx
 @dirrm share/doc/html/libpqxx/Tutorial
 @dirrm share/doc/html/libpqxx/Reference
 @dirrm share/doc/html/libpqxx
-@dirrm share/examples/libpqxx
diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile
index 24732b4d2ed..1f04415dda8 100644
--- a/databases/libpqxx/Makefile
+++ b/databases/libpqxx/Makefile
@@ -1,26 +1,26 @@
-# $NetBSD: Makefile,v 1.14 2005/04/11 21:45:12 tv Exp $
+# $NetBSD: Makefile,v 1.15 2005/06/27 01:57:26 markd Exp $
 #
 
 .include "../../databases/libpqxx/Makefile.common"
 
-PKGREVISION=		2
 COMMENT=		C++ interface to postgresql-lib
 
 NOT_FOR_PLATFORM=	NetBSD-*-pc532
 
 USE_LANGUAGES=		c c++
 USE_LIBTOOL=		yes
-USE_PKGLOCALEDIR=	yes
 PKGCONFIG_OVERRIDE+=	libpqxx.pc.in
-
 GNU_CONFIGURE=		yes
-CONFIGURE_ARGS+=	--with-postgres-lib=${PGSQL_PREFIX}/lib
-CONFIGURE_ARGS+=	--with-postgres-include=${PGSQL_PREFIX}/include/postgresql
+
+.include "../../mk/bsd.prefs.mk"
+
+.if ${OPSYS} == "NetBSD"
+# No strerror_r
+CONFIGURE_ARGS+=	--disable-thread-safety
+.endif
 
 # Avoid an ICE in gcc2 on sparc64
 CONFIGURE_ENV+=		F77=${FALSE}
 
-PGSQL_VERSION_REQD=	73
-
 .include "../../mk/pgsql.buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"
diff --git a/databases/libpqxx/Makefile.common b/databases/libpqxx/Makefile.common
index bc13eef8472..b840c487b69 100644
--- a/databases/libpqxx/Makefile.common
+++ b/databases/libpqxx/Makefile.common
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile.common,v 1.1 2004/01/07 13:32:40 is Exp $
+# $NetBSD: Makefile.common,v 1.2 2005/06/27 01:57:26 markd Exp $
 #
 
-LIBPQXX_VERSION=	2.1.3
+LIBPQXX_VERSION=	2.5.4
 DISTNAME=		libpqxx-${LIBPQXX_VERSION}
 CATEGORIES=		databases
 MASTER_SITES=		ftp://gborg.postgresql.org/pub/libpqxx/stable/
diff --git a/databases/libpqxx/PLIST b/databases/libpqxx/PLIST
index c31b247a5db..a38caf294fc 100644
--- a/databases/libpqxx/PLIST
+++ b/databases/libpqxx/PLIST
@@ -1,10 +1,10 @@
-@comment $NetBSD: PLIST,v 1.2 2004/09/22 08:09:22 jlam Exp $
+@comment $NetBSD: PLIST,v 1.3 2005/06/27 01:57:26 markd Exp $
+bin/pqxx-config
 include/pqxx/all.h
 include/pqxx/binarystring
 include/pqxx/binarystring.hxx
 include/pqxx/cachedresult.h
-include/pqxx/compiler.h
-include/pqxx/config.h
+include/pqxx/config-public-compiler.h
 include/pqxx/connection
 include/pqxx/connection.h
 include/pqxx/connection.hxx
@@ -12,7 +12,9 @@ include/pqxx/connection_base
 include/pqxx/connection_base.h
 include/pqxx/connection_base.hxx
 include/pqxx/connectionitf.h
+include/pqxx/cursor
 include/pqxx/cursor.h
+include/pqxx/cursor.hxx
 include/pqxx/dbtransaction
 include/pqxx/dbtransaction.h
 include/pqxx/dbtransaction.hxx
@@ -26,10 +28,12 @@ include/pqxx/largeobject
 include/pqxx/largeobject.h
 include/pqxx/largeobject.hxx
 include/pqxx/libcompiler.h
-include/pqxx/libconfig.h
+include/pqxx/libpq-forward.hxx
 include/pqxx/nontransaction
 include/pqxx/nontransaction.h
 include/pqxx/nontransaction.hxx
+include/pqxx/pipeline
+include/pqxx/pipeline.hxx
 include/pqxx/pqxx
 include/pqxx/result
 include/pqxx/result.h
diff --git a/databases/libpqxx/buildlink3.mk b/databases/libpqxx/buildlink3.mk
new file mode 100644
index 00000000000..7fd1e5d855c
--- /dev/null
+++ b/databases/libpqxx/buildlink3.mk
@@ -0,0 +1,18 @@
+# $NetBSD: buildlink3.mk,v 1.1 2005/06/27 01:57:26 markd Exp $
+
+BUILDLINK_DEPTH:=	${BUILDLINK_DEPTH}+
+LIBPQXX_BUILDLINK3_MK:=	${LIBPQXX_BUILDLINK3_MK}+
+
+.if !empty(BUILDLINK_DEPTH:M+)
+BUILDLINK_DEPENDS+=	libpqxx
+.endif
+
+BUILDLINK_PACKAGES:=	${BUILDLINK_PACKAGES:Nlibpqxx}
+BUILDLINK_PACKAGES+=	libpqxx
+
+.if !empty(LIBPQXX_BUILDLINK3_MK:M+)
+BUILDLINK_DEPENDS.libpqxx+=	libpqxx>=2.5.0
+BUILDLINK_PKGSRCDIR.libpqxx?=	../../databases/libpqxx
+.endif	# LIBPQXX_BUILDLINK3_MK
+
+BUILDLINK_DEPTH:=     ${BUILDLINK_DEPTH:S/+$//}
diff --git a/databases/libpqxx/distinfo b/databases/libpqxx/distinfo
index d665190d073..cadf2f519cf 100644
--- a/databases/libpqxx/distinfo
+++ b/databases/libpqxx/distinfo
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.2 2005/02/23 16:33:06 agc Exp $
+$NetBSD: distinfo,v 1.3 2005/06/27 01:57:26 markd Exp $
 
-SHA1 (libpqxx-2.1.3.tar.gz) = e297663acc6210a0217f2d6a75b4ae27c36d6074
-RMD160 (libpqxx-2.1.3.tar.gz) = 72b8bcc9b870e6912bb8bfbb3c2d357a10385168
-Size (libpqxx-2.1.3.tar.gz) = 673575 bytes
+SHA1 (libpqxx-2.5.4.tar.gz) = 257465032ea8b2301c284847fc9372de3dd451d8
+RMD160 (libpqxx-2.5.4.tar.gz) = 23f428d818aa7df9c302e7a486c8a47d2523a418
+Size (libpqxx-2.5.4.tar.gz) = 1564221 bytes
+SHA1 (patch-aa) = fbf80bd805bedf094a79e0ab76e9a7f543e67117
diff --git a/databases/libpqxx/patches/patch-aa b/databases/libpqxx/patches/patch-aa
new file mode 100644
index 00000000000..9d5b900c344
--- /dev/null
+++ b/databases/libpqxx/patches/patch-aa
@@ -0,0 +1,13 @@
+$NetBSD: patch-aa,v 1.1 2005/06/27 01:57:26 markd Exp $
+
+--- configure.orig	2005-06-21 22:51:02.000000000 +1200
++++ configure
+@@ -19403,7 +19403,7 @@ ac_compiler_gnu=$ac_cv_cxx_compiler_gnu
+ 
+ 
+ # 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"