diff --git a/databases/postgresql-libpqxx/Makefile b/databases/postgresql-libpqxx/Makefile
index bbaac70b416d..ca2b51e0b5ca 100644
--- a/databases/postgresql-libpqxx/Makefile
+++ b/databases/postgresql-libpqxx/Makefile
@@ -1,30 +1,27 @@
 PORTNAME=	libpqxx
-PORTVERSION=	7.9.2
+DISTVERSION=	7.9.2
+PORTREVISION=	1
 CATEGORIES=	databases
 PKGNAMEPREFIX=	postgresql-
 DIST_SUBDIR=	postgresql
 
 MAINTAINER=	pgsql@FreeBSD.org
 COMMENT=	New C++ interface for PostgreSQL
 WWW=		http://pqxx.org/
 
 LICENSE=	BSD3CLAUSE
+LICENSE_FILE=	${WRKSRC}/COPYING
 
-CONFLICTS=	postgresql-libpqxx-[1-5].* postgresql-libpqxx3-3.* \
-		postgresql-libpqxx4-4.*
+USES=		cmake compiler:c++17-lang pathfix pkgconfig pgsql
+USE_LDCONFIG=	yes
 
-USES=		compiler:c++17-lang gmake libtool pathfix pgsql python:build shebangfix
 USE_GITHUB=	yes
 GH_ACCOUNT=	jtv
-GNU_CONFIGURE=	yes
-USE_LDCONFIG=	yes
-SHEBANG_FILES=	${WRKSRC}/tools/splitconfig.py
-INSTALL_TARGET=	install-strip
-PLIST_SUB=	PORTVERSION=${PORTVERSION:R}
 
-CONFIGURE_ARGS=	--enable-shared \
-		--disable-documentation \
-		--disable-dependency-tracking
-CXXFLAGS+=	-std=c++17
+PLIST_SUB=	DISTVERSION=${DISTVERSION:R}
+
+CMAKE_OFF=	BUILD_TEST
+CMAKE_ON=	BUILD_SHARED_LIBS \
+		CMAKE_SKIP_RPATH
 
 .include <bsd.port.mk>
diff --git a/databases/postgresql-libpqxx/pkg-plist b/databases/postgresql-libpqxx/pkg-plist
index 578af99171d9..b9ec279b3e0e 100644
--- a/databases/postgresql-libpqxx/pkg-plist
+++ b/databases/postgresql-libpqxx/pkg-plist
@@ -1,112 +1,115 @@
 include/pqxx/array
 include/pqxx/array.hxx
 include/pqxx/binarystring
 include/pqxx/binarystring.hxx
 include/pqxx/blob
 include/pqxx/blob.hxx
 include/pqxx/composite
 include/pqxx/composite.hxx
 include/pqxx/config-public-compiler.h
 include/pqxx/connection
 include/pqxx/connection.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/array-composite.hxx
 include/pqxx/internal/callgate.hxx
 include/pqxx/internal/concat.hxx
 include/pqxx/internal/conversions.hxx
 include/pqxx/internal/encoding_group.hxx
 include/pqxx/internal/encodings.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-pipeline.hxx
 include/pqxx/internal/gates/connection-sql_cursor.hxx
 include/pqxx/internal/gates/connection-stream_from.hxx
 include/pqxx/internal/gates/connection-stream_to.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-pipeline.hxx
 include/pqxx/internal/gates/result-sql_cursor.hxx
 include/pqxx/internal/gates/transaction-sql_cursor.hxx
 include/pqxx/internal/gates/transaction-transaction_focus.hxx
 include/pqxx/internal/header-post.hxx
 include/pqxx/internal/header-pre.hxx
 include/pqxx/internal/ignore-deprecated-post.hxx
 include/pqxx/internal/ignore-deprecated-pre.hxx
 include/pqxx/internal/libpq-forward.hxx
 include/pqxx/internal/result_iter.hxx
 include/pqxx/internal/result_iterator.hxx
 include/pqxx/internal/sql_cursor.hxx
 include/pqxx/internal/statement_parameters.hxx
 include/pqxx/internal/stream_query.hxx
 include/pqxx/internal/stream_query_impl.hxx
 include/pqxx/internal/stream_iterator.hxx
 include/pqxx/internal/wait.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/params
 include/pqxx/params.hxx
 include/pqxx/pipeline
 include/pqxx/pipeline.hxx
 include/pqxx/pqxx
 include/pqxx/prepared_statement
 include/pqxx/prepared_statement.hxx
 include/pqxx/range
 include/pqxx/range.hxx
 include/pqxx/result
 include/pqxx/result.hxx
 include/pqxx/robusttransaction
 include/pqxx/robusttransaction.hxx
 include/pqxx/row
 include/pqxx/row.hxx
 include/pqxx/separated_list
 include/pqxx/separated_list.hxx
 include/pqxx/strconv
 include/pqxx/strconv.hxx
 include/pqxx/stream_from
 include/pqxx/stream_from.hxx
 include/pqxx/stream_to
 include/pqxx/stream_to.hxx
 include/pqxx/subtransaction
 include/pqxx/subtransaction.hxx
 include/pqxx/time
 include/pqxx/time.hxx
 include/pqxx/transaction
 include/pqxx/transaction.hxx
 include/pqxx/transaction_base
 include/pqxx/transaction_base.hxx
 include/pqxx/transaction_focus
 include/pqxx/transaction_focus.hxx
 include/pqxx/transactor
 include/pqxx/transactor.hxx
 include/pqxx/types
 include/pqxx/types.hxx
 include/pqxx/util
 include/pqxx/util.hxx
 include/pqxx/version
 include/pqxx/version.hxx
 include/pqxx/zview
 include/pqxx/zview.hxx
-lib/libpqxx-%%PORTVERSION%%.so
-lib/libpqxx.a
+lib/cmake/libpqxx/libpqxx-config-version.cmake
+lib/cmake/libpqxx/libpqxx-config.cmake
+lib/cmake/libpqxx/libpqxx-targets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/libpqxx/libpqxx-targets.cmake
+lib/libpqxx-%%DISTVERSION%%.so
 lib/libpqxx.so
 libdata/pkgconfig/libpqxx.pc