Update postgresql-libpqxx to latest version 6

Keep version 4 as a separate port
Set license for the old version 3 port

PR:		225109
Submitted by:	Yuri Victorovich

9 files changed, 172 insertions, 20 deletions

diff --git a/databases/Makefile b/databases/Makefile
index a62b5545c9c7..b7fdb8f811a5 100644
--- a/databases/Makefile
+++ b/databases/Makefile
@@ -687,6 +687,7 @@
     SUBDIR += postgresql-libpgeasy
     SUBDIR += postgresql-libpqxx
     SUBDIR += postgresql-libpqxx3
+    SUBDIR += postgresql-libpqxx4
     SUBDIR += postgresql-mysql_fdw
     SUBDIR += postgresql-odbc
     SUBDIR += postgresql-orafce
@@ -808,6 +809,7 @@
     SUBDIR += py-pg8000
     SUBDIR += py-pg_pqueue
     SUBDIR += py-pgcli
+    SUBDIR += py-pglite
     SUBDIR += py-pgspecial
     SUBDIR += py-pgxnclient
     SUBDIR += py-pickledb
diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index 0cca69f5b2f7..19f88eb74716 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -2,10 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	libpqxx
-PORTVERSION=	4.0.1
-PORTREVISION=	1
+PORTVERSION=	6.0.0
 CATEGORIES=	databases
-MASTER_SITES=	http://pqxx.org/download/software/libpqxx/
 PKGNAMEPREFIX=	postgresql-
 DIST_SUBDIR=	postgresql
 
@@ -14,14 +12,17 @@ COMMENT=	New C++ interface for PostgreSQL
 
 LICENSE=	BSD3CLAUSE
 
-CONFLICTS=	postgresql-libpqxx-3.* postgresql-libpqxx3-3.*
-PORTSCOUT=	limit:^2\.
+CONFLICTS=	postgresql-libpqxx-[1-5].* postgresql-libpqxx3-3.* \
+		postgresql-libpqxx4-4.*
 
-USES+=		gmake libtool pathfix pgsql python:2.7,build shebangfix
+USES=		gmake libtool pathfix pgsql python:2.7,build shebangfix
+USE_GITHUB=	yes
+GH_ACCOUNT=	jtv
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
-PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 SHEBANG_FILES=	${WRKSRC}/tools/splitconfig
+INSTALL_TARGET=	install-strip
+PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
 CONFIGURE_ARGS=	--enable-shared \
 		--disable-dependency-tracking
diff --git a/databases/postgresql-libpqxx/distinfo b/databases/postgresql-libpqxx/distinfo
index 23b32e01115e..04347362d3e2 100644
--- a/databases/postgresql-libpqxx/distinfo
+++ b/databases/postgresql-libpqxx/distinfo
@@ -1,2 +1,3 @@
-SHA256 (postgresql/libpqxx-4.0.1.tar.gz) = 097ceda2797761ce517faa5bee186c883df1c407cb2aada613a16773afeedc38
-SIZE (postgresql/libpqxx-4.0.1.tar.gz) = 1582532
+TIMESTAMP = 1515770390
+SHA256 (postgresql/jtv-libpqxx-6.0.0_GH0.tar.gz) = 81cac92458efd799fadb0374107464320d93eba71de05aedf21afb9c8dda7c3a
+SIZE (postgresql/jtv-libpqxx-6.0.0_GH0.tar.gz) = 676528
diff --git a/databases/postgresql-libpqxx/pkg-plist b/databases/postgresql-libpqxx/pkg-plist
index c85e50ce1974..88362756d892 100644
--- a/databases/postgresql-libpqxx/pkg-plist
+++ b/databases/postgresql-libpqxx/pkg-plist
@@ -39,13 +39,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
@@ -55,9 +55,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
@@ -65,8 +62,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
@@ -83,10 +83,8 @@ 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
diff --git a/databases/postgresql-libpqxx3/Makefile b/databases/postgresql-libpqxx3/Makefile
index 7f56b7fdf596..84cbc70831cb 100644
--- a/databases/postgresql-libpqxx3/Makefile
+++ b/databases/postgresql-libpqxx3/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libpqxx
 PORTVERSION=	3.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	databases
 MASTER_SITES=	http://pqxx.org/download/software/${PORTNAME}/
 PKGNAMEPREFIX=	postgresql-
@@ -13,8 +13,11 @@ DIST_SUBDIR=	postgresql
 MAINTAINER=	20080111.freebsd.org@ab.ote.we.lv
 COMMENT=	New C++ interface for PostgreSQL
 
-CONFLICTS=	postgresql-libpqxx-[2-4].*
-PORTSCOUT=	limit:^2\.
+LICENSE=	BSD3CLAUSE
+
+CONFLICTS=	postgresql-libpqxx-2.* postgresql-libpqxx-[4-9].* \
+		postgresql-libpqxx4-4.*
+PORTSCOUT=	limit:^3\.
 
 USES+=		gmake libtool pathfix pgsql pkgconfig python:2.7,build shebangfix
 GNU_CONFIGURE=	yes
diff --git a/databases/postgresql-libpqxx4/Makefile b/databases/postgresql-libpqxx4/Makefile
new file mode 100644
index 000000000000..2ceeaab626fe
--- /dev/null
+++ b/databases/postgresql-libpqxx4/Makefile
@@ -0,0 +1,30 @@
+# Created by: Palle Girgensohn <girgen@pingpong.net>
+# $FreeBSD$
+
+PORTNAME=	libpqxx
+PORTVERSION=	4.0.1
+PORTREVISION=	1
+CATEGORIES=	databases
+MASTER_SITES=	http://pqxx.org/download/software/libpqxx/
+PKGNAMEPREFIX=	postgresql-
+PKGNAMESUFFIX=  4
+DIST_SUBDIR=	postgresql
+
+MAINTAINER=	pgsql@FreeBSD.org
+COMMENT=	New C++ interface for PostgreSQL
+
+LICENSE=	BSD3CLAUSE
+
+CONFLICTS=	postgresql-libpqxx-3.* postgresql-libpqxx3-3.* postgresql-libpqxx-6.*
+PORTSCOUT=	limit:^4\.
+
+USES+=		gmake libtool pathfix pgsql python:2.7,build shebangfix
+GNU_CONFIGURE=	yes
+USE_LDCONFIG=	yes
+PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
+SHEBANG_FILES=	${WRKSRC}/tools/splitconfig
+
+CONFIGURE_ARGS=	--enable-shared \
+		--disable-dependency-tracking
+
+.include <bsd.port.mk>
diff --git a/databases/postgresql-libpqxx4/distinfo b/databases/postgresql-libpqxx4/distinfo
new file mode 100644
index 000000000000..23b32e01115e
--- /dev/null
+++ b/databases/postgresql-libpqxx4/distinfo
@@ -0,0 +1,2 @@
+SHA256 (postgresql/libpqxx-4.0.1.tar.gz) = 097ceda2797761ce517faa5bee186c883df1c407cb2aada613a16773afeedc38
+SIZE (postgresql/libpqxx-4.0.1.tar.gz) = 1582532
diff --git a/databases/postgresql-libpqxx4/pkg-descr b/databases/postgresql-libpqxx4/pkg-descr
new file mode 100644
index 000000000000..5697d09a3e4d
--- /dev/null
+++ b/databases/postgresql-libpqxx4/pkg-descr
@@ -0,0 +1,18 @@
+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,
+are fairly C-like in their programming style, and fail to take
+advantage of the full power of the C++ language as it has matured
+since the acceptance of the Standard in 1996.  What libpqxx brings you
+is effective use of templates to reduce the inconvenience of dealing
+with type conversions; of standard C++ strings to keep you from having
+to worry about buffer allocation and overflow attacks; of exceptions
+to take the tedious and error-prone plumbing around error handling out
+of your hands; of constructors and destructors to bring resource
+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://pqxx.org/
diff --git a/databases/postgresql-libpqxx4/pkg-plist b/databases/postgresql-libpqxx4/pkg-plist
new file mode 100644
index 000000000000..c85e50ce1974
--- /dev/null
+++ b/databases/postgresql-libpqxx4/pkg-plist
@@ -0,0 +1,97 @@
+bin/pqxx-config
+include/pqxx/basic_connection
+include/pqxx/basic_connection.hxx
+include/pqxx/binarystring
+include/pqxx/binarystring.hxx
+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_base
+include/pqxx/connection_base.hxx
+include/pqxx/connectionpolicy
+include/pqxx/connectionpolicy.hxx
+include/pqxx/cursor
+include/pqxx/cursor.hxx
+include/pqxx/dbtransaction
+include/pqxx/dbtransaction.hxx
+include/pqxx/errorhandler
+include/pqxx/errorhandler.hxx
+include/pqxx/except
+include/pqxx/except.hxx
+include/pqxx/field
+include/pqxx/field.hxx
+include/pqxx/internal/callgate.hxx
+include/pqxx/internal/gates/connection-dbtransaction.hxx
+include/pqxx/internal/gates/connection-errorhandler.hxx
+include/pqxx/internal/gates/connection-largeobject.hxx
+include/pqxx/internal/gates/connection-notification_receiver.hxx
+include/pqxx/internal/gates/connection-parameterized_invocation.hxx
+include/pqxx/internal/gates/connection-pipeline.hxx
+include/pqxx/internal/gates/connection-prepare-invocation.hxx
+include/pqxx/internal/gates/connection-reactivation_avoidance_exemption.hxx
+include/pqxx/internal/gates/connection-sql_cursor.hxx
+include/pqxx/internal/gates/connection-transaction.hxx
+include/pqxx/internal/gates/errorhandler-connection.hxx
+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-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
+include/pqxx/largeobject
+include/pqxx/largeobject.hxx
+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
+include/pqxx/prepared_statement
+include/pqxx/prepared_statement.hxx
+include/pqxx/result
+include/pqxx/result.hxx
+include/pqxx/robusttransaction
+include/pqxx/robusttransaction.hxx
+include/pqxx/strconv
+include/pqxx/strconv.hxx
+include/pqxx/subtransaction
+include/pqxx/subtransaction.hxx
+include/pqxx/tablereader
+include/pqxx/tablereader.hxx
+include/pqxx/tablestream
+include/pqxx/tablestream.hxx
+include/pqxx/tablewriter
+include/pqxx/tablewriter.hxx
+include/pqxx/transaction
+include/pqxx/transaction.hxx
+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/util
+include/pqxx/util.hxx
+include/pqxx/version
+include/pqxx/version.hxx
+lib/libpqxx-%%PORTVERSION%%.so
+lib/libpqxx.a
+lib/libpqxx.so
+libdata/pkgconfig/libpqxx.pc