Update libpqxx to 6.2.2

patch-ab no longer needed just since 15 Jan 2018(!)

5 years worth of changes including:
- C++11 is now required. Your compiler must have shared_ptr, noexcept, etc.
- Removed pqxx::items. Use the new C++11 initialiser syntax.
- Removed maketemporary. We weren't using it.
- Can now be built outside the source tree.
- New, simpler, lambda-friendly transactor framework.
- New, simpler, prepared statements and parameterised statements.
- Result rows can be passed around independently.
- New exec0(): perform query, expect zero rows of data.
- New exec1(): perform query, expect (and return) a single row of data.
- New exec_n(): perform query, expect exactly n rows of data.
- No longer defines Visual Studio's NOMINMAX in headers.
- Much faster configure script.
- Most configuration items are gone.
- Retired all existing capability flags.
- Documentation on readthedocs.org, thanks Tim Sheerman-Chase.
- Expose SQLSTATE error codes in sql_error exceptions.
- Adds a first-generation parser for SQL arrays.

9 files changed, 534 insertions, 75 deletions

diff --git a/databases/libpqxx/Makefile b/databases/libpqxx/Makefile
index 70aabb6f58c..64c76909506 100644
--- a/databases/libpqxx/Makefile
+++ b/databases/libpqxx/Makefile
@@ -1,25 +1,29 @@
-# $NetBSD: Makefile,v 1.33 2017/01/01 14:43:26 wiz Exp $
+# $NetBSD: Makefile,v 1.34 2018/05/03 12:58:24 prlw1 Exp $
 
-PYTHON_VERSIONS_INCOMPATIBLE=	34 35 36 # not yet ported as of 4.0.1
-
-PKGREVISION= 1
-.include "../../databases/libpqxx/Makefile.common"
+DISTNAME=		libpqxx-6.2.2
+CATEGORIES=		databases
+MASTER_SITES=		${MASTER_SITE_GITHUB:=jtv/}
+GITHUB_PROJECT=		libpqxx
 
+MAINTAINER=		is@NetBSD.org
+HOMEPAGE=		http://pqxx.org/development/libpqxx/
 COMMENT=		C++ interface to postgresql-lib
+LICENSE=		modified-bsd
 
-# Apparently (at least as of 2004) this package's shared libraries are
-# messed up on a.out platforms. But AFAIK we don't have any in pkgsrc
-# any more. Leave this here for documentation just in case.
-#   - dholland 20150101
-#NOT_FOR_PLATFORM=	${AOUTPLATFORMS}
-
-USE_LANGUAGES=		c c++
+USE_LANGUAGES=		c c++11
 USE_LIBTOOL=		yes
 PKGCONFIG_OVERRIDE+=	libpqxx.pc.in
 GNU_CONFIGURE=		yes
+USE_TOOLS+=		autoconf gmake
 
 PYTHON_FOR_BUILD_ONLY=	yes
 REPLACE_PYTHON+=	tools/splitconfig
+REPLACE_PYTHON+=	tools/template2mak.py
+
+pre-configure:
+	cd ${WRKSRC} && autoconf
+
+.include "options.mk"
 
 .include "../../lang/python/application.mk"
 .include "../../mk/pgsql.buildlink3.mk"
diff --git a/databases/libpqxx/Makefile.common b/databases/libpqxx/Makefile.common
deleted file mode 100644
index ad71f078c9f..00000000000
--- a/databases/libpqxx/Makefile.common
+++ /dev/null
@@ -1,16 +0,0 @@
-# $NetBSD: Makefile.common,v 1.6 2013/02/12 04:35:24 hiramatsu Exp $
-
-# used by databases/libpqxx/Makefile
-# used by databases/libpqxx-doc/Makefile
-
-LIBPQXX_VERSION=	4.0.1
-DISTNAME=		libpqxx-${LIBPQXX_VERSION}
-CATEGORIES=		databases
-MASTER_SITES=		http://pqxx.org/download/software/libpqxx/
-
-MAINTAINER=		is@NetBSD.org
-HOMEPAGE=		http://pqxx.org/development/libpqxx/
-LICENSE=		modified-bsd
-
-DISTINFO_FILE=	${.CURDIR}/../../databases/libpqxx/distinfo
-PATCHDIR=	${.CURDIR}/../../databases/libpqxx/patches
diff --git a/databases/libpqxx/PLIST b/databases/libpqxx/PLIST
index d9f093551d1..368d4b36ba3 100644
--- a/databases/libpqxx/PLIST
+++ b/databases/libpqxx/PLIST
@@ -1,5 +1,7 @@
-@comment $NetBSD: PLIST,v 1.5 2013/02/12 04:35:24 hiramatsu Exp $
+@comment $NetBSD: PLIST,v 1.6 2018/05/03 12:58:24 prlw1 Exp $
 bin/pqxx-config
+include/pqxx/array
+include/pqxx/array.hxx
 include/pqxx/basic_connection
 include/pqxx/basic_connection.hxx
 include/pqxx/binarystring
@@ -40,13 +42,13 @@ include/pqxx/internal/gates/icursor_iterator-icursorstream.hxx
 include/pqxx/internal/gates/icursorstream-icursor_iterator.hxx
 include/pqxx/internal/gates/result-connection.hxx
 include/pqxx/internal/gates/result-creation.hxx
+include/pqxx/internal/gates/result-row.hxx
 include/pqxx/internal/gates/result-sql_cursor.hxx
 include/pqxx/internal/gates/transaction-subtransaction.hxx
 include/pqxx/internal/gates/transaction-tablereader.hxx
 include/pqxx/internal/gates/transaction-tablewriter.hxx
 include/pqxx/internal/gates/transaction-transactionfocus.hxx
 include/pqxx/internal/libpq-forward.hxx
-include/pqxx/internal/result_data.hxx
 include/pqxx/internal/statement_parameters.hxx
 include/pqxx/isolation
 include/pqxx/isolation.hxx
@@ -56,9 +58,6 @@ include/pqxx/nontransaction
 include/pqxx/nontransaction.hxx
 include/pqxx/notification
 include/pqxx/notification.hxx
-include/pqxx/notify-listen
-include/pqxx/notify-listen.hxx
-include/pqxx/performance.hxx
 include/pqxx/pipeline
 include/pqxx/pipeline.hxx
 include/pqxx/pqxx
@@ -66,8 +65,11 @@ include/pqxx/prepared_statement
 include/pqxx/prepared_statement.hxx
 include/pqxx/result
 include/pqxx/result.hxx
+include/pqxx/result_iterator.hxx
 include/pqxx/robusttransaction
 include/pqxx/robusttransaction.hxx
+include/pqxx/row
+include/pqxx/row.hxx
 include/pqxx/strconv
 include/pqxx/strconv.hxx
 include/pqxx/subtransaction
@@ -84,13 +86,429 @@ include/pqxx/transaction_base
 include/pqxx/transaction_base.hxx
 include/pqxx/transactor
 include/pqxx/transactor.hxx
-include/pqxx/trigger
-include/pqxx/trigger.hxx
-include/pqxx/tuple
-include/pqxx/tuple.hxx
+include/pqxx/types
+include/pqxx/types.hxx
 include/pqxx/util
 include/pqxx/util.hxx
 include/pqxx/version
 include/pqxx/version.hxx
 lib/libpqxx.la
 lib/pkgconfig/libpqxx.pc
+${PLIST.doc}share/doc/libpqxx/Reference/a00002_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00005_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00008_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00011_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00014_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00017_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00020_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00023_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00026_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00029_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00032_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00035_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00038_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00041_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00044_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00047_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00050_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00053_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00056_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00059_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00062_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00065_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00068_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00071_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00074_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00077_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00080_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00083_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00086_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00089_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00092_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00095_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00098_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00101_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00104_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00107_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00110_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00113_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00116_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00119_source.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00227.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00228.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00229.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00230.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00231.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00232.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00233.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00234.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00235.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00236.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00238.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00239.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00240.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00241.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00242.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00799.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00802.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00803.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00806.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00807.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00810.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00811.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00814.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00815.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00818.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00819.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00822.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00823.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00826.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00827.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00830.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00831.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00834.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00835.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00838.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00839.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00842.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00843.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00846.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00847.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00850.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00851.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00854.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00855.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00858.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00859.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00862.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00863.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00866.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00867.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00870.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00871.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00874.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00875.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00878.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00879.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00882.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00883.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00886.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00887.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00890.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00891.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00894.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00895.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00898.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00899.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00902.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00903.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00906.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00907.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00910.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00911.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00914.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00915.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00918.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00919.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00922.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00923.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00926.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00927.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00930.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00931.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00934.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00935.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00938.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00939.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00942.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00943.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00946.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00947.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00950.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00951.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00954.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00955.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00958.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00959.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00962.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00963.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00966.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00967.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00970.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00971.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00974.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00975.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00978.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00979.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00982.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00983.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00986.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00987.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00990.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00991.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00994.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00995.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00998.html
+${PLIST.doc}share/doc/libpqxx/Reference/a00999.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01002.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01003.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01006.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01007.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01010.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01011.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01014.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01015.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01018.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01019.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01022.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01023.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01026.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01027.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01030.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01031.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01034.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01035.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01038.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01039.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01042.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01043.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01046.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01047.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01050.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01051.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01054.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01055.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01058.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01059.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01062.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01063.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01066.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01067.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01070.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01071.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01074.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01075.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01078.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01079.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01082.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01091.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01094.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01095.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01098.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01099.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01102.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01103.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01106.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01107.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01110.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01111.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01114.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01115.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01118.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01119.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01122.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01123.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01126.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01127.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01130.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01134.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01135.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01138.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01139.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01142.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01143.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01146.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01147.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01150.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01151.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01154.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01155.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01158.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01159.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01162.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01163.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01166.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01167.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01170.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01171.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01174.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01175.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01178.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01179.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01182.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01183.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01186.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01187.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01190.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01191.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01194.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01195.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01198.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01199.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01202.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01203.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01206.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01207.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01210.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01211.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01214.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01215.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01218.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01407.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01408.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01409.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01410.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01411.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01412.html
+${PLIST.doc}share/doc/libpqxx/Reference/a01413.html
+${PLIST.doc}share/doc/libpqxx/Reference/annotated.html
+${PLIST.doc}share/doc/libpqxx/Reference/classes.html
+${PLIST.doc}share/doc/libpqxx/Reference/dir_000000.html
+${PLIST.doc}share/doc/libpqxx/Reference/dir_000001.html
+${PLIST.doc}share/doc/libpqxx/Reference/dir_000002.html
+${PLIST.doc}share/doc/libpqxx/Reference/doxygen.css
+${PLIST.doc}share/doc/libpqxx/Reference/doxygen.png
+${PLIST.doc}share/doc/libpqxx/Reference/functions.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_0x7e.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_b.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_c.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_d.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_e.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_enum.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_eval.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_f.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_0x7e.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_b.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_c.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_d.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_e.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_f.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_g.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_h.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_i.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_l.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_m.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_n.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_o.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_p.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_q.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_r.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_s.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_t.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_u.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_func_w.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_g.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_h.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_i.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_j.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_l.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_m.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_n.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_o.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_p.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_q.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_r.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_rela.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_s.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_t.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_type.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_u.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_v.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_vars.html
+${PLIST.doc}share/doc/libpqxx/Reference/functions_w.html
+${PLIST.doc}share/doc/libpqxx/Reference/graph_legend.html
+${PLIST.doc}share/doc/libpqxx/Reference/hierarchy.html
+${PLIST.doc}share/doc/libpqxx/Reference/index.html
+${PLIST.doc}share/doc/libpqxx/Reference/inherits.html
+${PLIST.doc}share/doc/libpqxx/Reference/modules.html
+${PLIST.doc}share/doc/libpqxx/Reference/namespacemembers.html
+${PLIST.doc}share/doc/libpqxx/Reference/namespacemembers_enum.html
+${PLIST.doc}share/doc/libpqxx/Reference/namespacemembers_eval.html
+${PLIST.doc}share/doc/libpqxx/Reference/namespacemembers_func.html
+${PLIST.doc}share/doc/libpqxx/Reference/namespacemembers_type.html
+${PLIST.doc}share/doc/libpqxx/Reference/namespacemembers_vars.html
+${PLIST.doc}share/doc/libpqxx/Reference/namespaces.html
+${PLIST.doc}share/doc/libpqxx/Reference/pages.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/ch01.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/ch02.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/ch03.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/ch03s02.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/ch03s03.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/ch03s04.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/ch03s05.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/ch03s06.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/ch03s07.html
+${PLIST.doc}share/doc/libpqxx/Tutorial/index.html
+${PLIST.doc}share/examples/libpqxx/runner.cxx
+${PLIST.doc}share/examples/libpqxx/test00.cxx
+${PLIST.doc}share/examples/libpqxx/test01.cxx
+${PLIST.doc}share/examples/libpqxx/test02.cxx
+${PLIST.doc}share/examples/libpqxx/test04.cxx
+${PLIST.doc}share/examples/libpqxx/test07.cxx
+${PLIST.doc}share/examples/libpqxx/test10.cxx
+${PLIST.doc}share/examples/libpqxx/test11.cxx
+${PLIST.doc}share/examples/libpqxx/test12.cxx
+${PLIST.doc}share/examples/libpqxx/test13.cxx
+${PLIST.doc}share/examples/libpqxx/test14.cxx
+${PLIST.doc}share/examples/libpqxx/test15.cxx
+${PLIST.doc}share/examples/libpqxx/test16.cxx
+${PLIST.doc}share/examples/libpqxx/test17.cxx
+${PLIST.doc}share/examples/libpqxx/test18.cxx
+${PLIST.doc}share/examples/libpqxx/test20.cxx
+${PLIST.doc}share/examples/libpqxx/test21.cxx
+${PLIST.doc}share/examples/libpqxx/test23.cxx
+${PLIST.doc}share/examples/libpqxx/test26.cxx
+${PLIST.doc}share/examples/libpqxx/test29.cxx
+${PLIST.doc}share/examples/libpqxx/test30.cxx
+${PLIST.doc}share/examples/libpqxx/test31.cxx
+${PLIST.doc}share/examples/libpqxx/test32.cxx
+${PLIST.doc}share/examples/libpqxx/test33.cxx
+${PLIST.doc}share/examples/libpqxx/test34.cxx
+${PLIST.doc}share/examples/libpqxx/test35.cxx
+${PLIST.doc}share/examples/libpqxx/test36.cxx
+${PLIST.doc}share/examples/libpqxx/test37.cxx
+${PLIST.doc}share/examples/libpqxx/test39.cxx
+${PLIST.doc}share/examples/libpqxx/test46.cxx
+${PLIST.doc}share/examples/libpqxx/test48.cxx
+${PLIST.doc}share/examples/libpqxx/test49.cxx
+${PLIST.doc}share/examples/libpqxx/test50.cxx
+${PLIST.doc}share/examples/libpqxx/test51.cxx
+${PLIST.doc}share/examples/libpqxx/test52.cxx
+${PLIST.doc}share/examples/libpqxx/test53.cxx
+${PLIST.doc}share/examples/libpqxx/test54.cxx
+${PLIST.doc}share/examples/libpqxx/test55.cxx
+${PLIST.doc}share/examples/libpqxx/test56.cxx
+${PLIST.doc}share/examples/libpqxx/test57.cxx
+${PLIST.doc}share/examples/libpqxx/test58.cxx
+${PLIST.doc}share/examples/libpqxx/test59.cxx
+${PLIST.doc}share/examples/libpqxx/test60.cxx
+${PLIST.doc}share/examples/libpqxx/test61.cxx
+${PLIST.doc}share/examples/libpqxx/test62.cxx
+${PLIST.doc}share/examples/libpqxx/test63.cxx
+${PLIST.doc}share/examples/libpqxx/test64.cxx
+${PLIST.doc}share/examples/libpqxx/test65.cxx
+${PLIST.doc}share/examples/libpqxx/test66.cxx
+${PLIST.doc}share/examples/libpqxx/test67.cxx
+${PLIST.doc}share/examples/libpqxx/test69.cxx
+${PLIST.doc}share/examples/libpqxx/test70.cxx
+${PLIST.doc}share/examples/libpqxx/test71.cxx
+${PLIST.doc}share/examples/libpqxx/test72.cxx
+${PLIST.doc}share/examples/libpqxx/test73.cxx
+${PLIST.doc}share/examples/libpqxx/test74.cxx
+${PLIST.doc}share/examples/libpqxx/test75.cxx
+${PLIST.doc}share/examples/libpqxx/test76.cxx
+${PLIST.doc}share/examples/libpqxx/test77.cxx
+${PLIST.doc}share/examples/libpqxx/test78.cxx
+${PLIST.doc}share/examples/libpqxx/test79.cxx
+${PLIST.doc}share/examples/libpqxx/test82.cxx
+${PLIST.doc}share/examples/libpqxx/test83.cxx
+${PLIST.doc}share/examples/libpqxx/test84.cxx
+${PLIST.doc}share/examples/libpqxx/test86.cxx
+${PLIST.doc}share/examples/libpqxx/test87.cxx
+${PLIST.doc}share/examples/libpqxx/test88.cxx
+${PLIST.doc}share/examples/libpqxx/test89.cxx
+${PLIST.doc}share/examples/libpqxx/test90.cxx
+${PLIST.doc}share/examples/libpqxx/test92.cxx
+${PLIST.doc}share/examples/libpqxx/test93.cxx
+${PLIST.doc}share/examples/libpqxx/test94.cxx
diff --git a/databases/libpqxx/buildlink3.mk b/databases/libpqxx/buildlink3.mk
index ac9bbc66362..8f902167c94 100644
--- a/databases/libpqxx/buildlink3.mk
+++ b/databases/libpqxx/buildlink3.mk
@@ -1,12 +1,11 @@
-# $NetBSD: buildlink3.mk,v 1.8 2012/05/07 01:53:18 dholland Exp $
+# $NetBSD: buildlink3.mk,v 1.9 2018/05/03 12:58:24 prlw1 Exp $
 
 BUILDLINK_TREE+=	libpqxx
 
 .if !defined(LIBPQXX_BUILDLINK3_MK)
 LIBPQXX_BUILDLINK3_MK:=
 
-BUILDLINK_API_DEPENDS.libpqxx+=	libpqxx>=2.5.0
-BUILDLINK_ABI_DEPENDS.libpqxx+=	libpqxx>=2.5.4nb1
+BUILDLINK_API_DEPENDS.libpqxx+=	libpqxx>=6.2.2
 BUILDLINK_PKGSRCDIR.libpqxx?=	../../databases/libpqxx
 .endif # LIBPQXX_BUILDLINK3_MK
 
diff --git a/databases/libpqxx/distinfo b/databases/libpqxx/distinfo
index d15f132da70..7792760d4df 100644
--- a/databases/libpqxx/distinfo
+++ b/databases/libpqxx/distinfo
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2015/11/03 01:56:14 agc Exp $
+$NetBSD: distinfo,v 1.10 2018/05/03 12:58:24 prlw1 Exp $
 
-SHA1 (libpqxx-4.0.1.tar.gz) = 4748835bd1a90fb34e6e577788006a416c2acb60
-RMD160 (libpqxx-4.0.1.tar.gz) = 7fae516d6aa59dac0d2403c6a979c5c3d9fb3fce
-SHA512 (libpqxx-4.0.1.tar.gz) = 00204985097ef8bb0a3376d6ba541dbb471d7c52d7135f6244a9f4acbf6c8e5254d6f813e4411421e49bb56f4a520fc6ac67e300141d724396ce0ac11bd3a95e
-Size (libpqxx-4.0.1.tar.gz) = 1582532 bytes
-SHA1 (patch-ab) = ec82ac6e1a6cd3fbb3b9e0e4f4296b73b4efde5e
-SHA1 (patch-src_largeobject.cxx) = f34e2a7d7e20bb155f8629327243d48021757a40
+SHA1 (libpqxx-6.2.2.tar.gz) = da04b8dbaa61a90d5f6a7afe07a7b42863a29d8a
+RMD160 (libpqxx-6.2.2.tar.gz) = 41308f00a9ab30a2e5b5b1abe2c0b9ad11eb06d5
+SHA512 (libpqxx-6.2.2.tar.gz) = 76e7bddbdc0bad8e35cecea466afe7f6b6b118e6167cb0695ddf64cb9275e543b9d3f24d2e3913812d4ff6be205ccc6017acbd777df9b1b0ceeb9719e4bb6abd
+Size (libpqxx-6.2.2.tar.gz) = 684226 bytes
+SHA1 (patch-configure.ac) = 0805f942c61fc0d69d33f8de4a7240ed603ec4f9
+SHA1 (patch-tools_extract__version) = 7d40f2d5e6eda1169e6d4098382aa5034b468aff
diff --git a/databases/libpqxx/patches/patch-ab b/databases/libpqxx/patches/patch-ab
deleted file mode 100644
index 80ef0a77ba6..00000000000
--- a/databases/libpqxx/patches/patch-ab
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-ab,v 1.3 2013/02/12 04:35:24 hiramatsu Exp $
-
-Include sys/time.h to get struct timeval in all cases.
-
---- src/connection_base.cxx.orig	2013-02-11 10:35:50.000000000 +0000
-+++ src/connection_base.cxx
-@@ -24,6 +24,7 @@
- #include <cstring>
- #include <ctime>
- #include <stdexcept>
-+#include <sys/time.h>
- 
- #ifdef PQXX_HAVE_SYS_SELECT_H
- #include <sys/select.h>
diff --git a/databases/libpqxx/patches/patch-configure.ac b/databases/libpqxx/patches/patch-configure.ac
new file mode 100644
index 00000000000..176bbd6f4b1
--- /dev/null
+++ b/databases/libpqxx/patches/patch-configure.ac
@@ -0,0 +1,55 @@
+$NetBSD: patch-configure.ac,v 1.1 2018/05/03 12:58:24 prlw1 Exp $
+
+https://github.com/jtv/libpqxx/commit/0cca4d15c069cfba4cef47205c3cd493b5f01e15
+https://github.com/jtv/libpqxx/pull/89
+
+--- configure.ac.orig	2018-04-02 14:50:23.000000000 +0000
++++ configure.ac
+@@ -38,19 +38,16 @@ AC_ARG_ENABLE(
+ 	documentation,
+ 	[AS_HELP_STRING([--enable-documentation], [Generate documentation])],
+ 	[],
+-	[enable_documentation=yes])
+-if test "$enable_documentation" = "yes"
+-then
+-AC_PATH_PROG([DOXYGEN], [doxygen])
+-AM_CONDITIONAL([BUILD_REFERENCE], [/bin/true])
+-AC_CHECK_PROG(HAVE_DOT, dot, yes, no)
+-AC_PATH_PROG([XMLTO], [xmlto])
+-AM_CONDITIONAL([BUILD_TUTORIAL], [/bin/true])
+-else
+-AM_CONDITIONAL(BUILD_REFERENCE, [/bin/false])
+-AM_CONDITIONAL(BUILD_TUTORIAL, [/bin/false])
+-fi
+-
++	[enable_documentation=auto])
++AC_ARG_VAR([DOXYGEN], [Path to doxygen needed to build reference documentation])
++AC_PATH_TOOL([DOXYGEN], [doxygen], [nodoxygen])
++AC_ARG_VAR([HAVE_DOT], [Variable used by doxygen to declare availibility of dot])
++AC_CHECK_TOOL([HAVE_DOT], [dot], [YES], [NO])
++AC_ARG_VAR([XMLTO], [Path to xmlto needed to build tutorial documentation])
++AC_PATH_TOOL([XMLTO], [xmlto], [noxmlto])
++AS_IF([test "$enable_documentation" = "yes" && test "$DOXYGEN" = "nodoxygen" -o "$XMLTO" = "noxmlto"], [AC_MSG_ERROR([could not files tools necessary to build documentation])])
++AM_CONDITIONAL([BUILD_REFERENCE], [test "$enable_documentation" != "no" -a "$DOXYGEN" != "nodoxygen"])
++AM_CONDITIONAL([BUILD_TUTORIAL], [test "$enable_documentation" != "no" -a "$XMLTO" != "xmlto"])
+ 
+ AM_MAINTAINER_MODE
+ 
+@@ -309,7 +306,7 @@ AC_ARG_WITH(
+         [--with-postgres-include=DIR],
+         [Use PostgreSQL includes from DIR.  Defaults to querying pg_config.])],
+     AS_IF(
+-        [test "x$with_postgres_include" == "xyes"],
++        [test "x$with_postgres_include" = "xyes"],
+         [with_postgres_include=""]))
+ AS_IF(
+     [test -z "$with_postgres_include"],
+@@ -325,7 +322,7 @@ AC_ARG_WITH(
+         [--with-postgres-lib=DIR],
+         [Use PostgreSQL libraries from DIR.  Defaults to querying pg_config.])],
+     AS_IF(
+-        [test "x$with_postgres_lib" == "xyes"],
++        [test "x$with_postgres_lib" = "xyes"],
+         [with_postgres_lib=""]))
+ AS_IF(
+     [test -z "$with_postgres_lib"],
diff --git a/databases/libpqxx/patches/patch-src_largeobject.cxx b/databases/libpqxx/patches/patch-src_largeobject.cxx
deleted file mode 100644
index 759a7435f3c..00000000000
--- a/databases/libpqxx/patches/patch-src_largeobject.cxx
+++ /dev/null
@@ -1,14 +0,0 @@
-$NetBSD: patch-src_largeobject.cxx,v 1.2 2013/02/12 04:35:24 hiramatsu Exp $
-
-Fix build with modern GCC.
-
---- src/largeobject.cxx.orig	2013-02-11 10:36:16.000000000 +0000
-+++ src/largeobject.cxx
-@@ -18,6 +18,7 @@
- #include "pqxx/compiler-internal.hxx"
- 
- #include <cerrno>
-+#include <cstring>
- #include <stdexcept>
- 
- #include "libpq-fe.h"
diff --git a/databases/libpqxx/patches/patch-tools_extract__version b/databases/libpqxx/patches/patch-tools_extract__version
new file mode 100644
index 00000000000..61584c1d4ad
--- /dev/null
+++ b/databases/libpqxx/patches/patch-tools_extract__version
@@ -0,0 +1,27 @@
+$NetBSD: patch-tools_extract__version,v 1.1 2018/05/03 12:58:24 prlw1 Exp $
+
+https://github.com/jtv/libpqxx/pull/89
+
+--- tools/extract_version.orig	2018-04-02 14:50:23.000000000 +0000
++++ tools/extract_version
+@@ -53,17 +53,17 @@ case "$ARG" in
+ 
+ -a|--abi)
+ 	# Print just the ABI version (major & minor).
+-	sed $srcdir/VERSION -e 's/^\([^.]*\.[^.]*\)\..*/\1/'
++	sed -e 's/^\([^.]*\.[^.]*\)\..*/\1/' $srcdir/VERSION
+ 	;;
+ 
+ -M|--major)
+ 	# Print the major version number.
+-	sed $srcdir/VERSION -e 's/^\([^.]*\)\..*/\1/'
++	sed -e 's/^\([^.]*\)\..*/\1/' $srcdir/VERSION
+ 	;;
+ 
+ -m|--minor)
+ 	# Print the minor version number.
+-	sed $srcdir/VERSION -e 's/^[^.]*\.\([^.]*\)\..*/\1/'
++	sed -e 's/^[^.]*\.\([^.]*\)\..*/\1/' $srcdir/VERSION
+ 	;;
+ 
+ *)