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

3 files changed, 17 insertions, 17 deletions

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