Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 16 Jul 2023 15:04:58 GMT
From:      Felix Palmen <zirias@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: bcfeb2406519 - main - devel/poco: Update to 1.12.4
Message-ID:  <202307161504.36GF4w2D030617@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by zirias:

URL: https://cgit.FreeBSD.org/ports/commit/?id=bcfeb2406519c3330a57ffb88adfa8b358ca1b45

commit bcfeb2406519c3330a57ffb88adfa8b358ca1b45
Author:     Henry Hu <henry.hu.sh@gmail.com>
AuthorDate: 2023-07-04 22:40:17 +0000
Commit:     Felix Palmen <zirias@FreeBSD.org>
CommitDate: 2023-07-16 15:00:04 +0000

    devel/poco: Update to 1.12.4
    
    Full Changelog:
    https://github.com/pocoproject/poco/blob/poco-1.12.4/CHANGELOG
    
    PR:             272371
---
 devel/poco/Makefile                                |  82 ++-
 devel/poco/distinfo                                |   6 +-
 .../files/patch-Crypto_src_OpenSSLInitializer.cpp  |  10 +
 .../files/patch-Foundation_src_Thread__POSIX.cpp   |  49 ++
 devel/poco/pkg-plist                               | 590 ++++++++++++---------
 5 files changed, 449 insertions(+), 288 deletions(-)

diff --git a/devel/poco/Makefile b/devel/poco/Makefile
index 73f8173e539b..f3df7c1dcc62 100644
--- a/devel/poco/Makefile
+++ b/devel/poco/Makefile
@@ -1,5 +1,5 @@
 PORTNAME=	poco
-DISTVERSION=	1.10.1
+DISTVERSION=	1.12.4
 DISTVERSIONSUFFIX=	-all
 CATEGORIES=	devel net
 MASTER_SITES=	https://pocoproject.org/releases/${PORTNAME}-${PORTVERSION}/
@@ -11,7 +11,7 @@ WWW=		https://pocoproject.org/
 LICENSE=	BSL
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-LIB_DEPENDS=	libpcre.so:devel/pcre \
+LIB_DEPENDS=	libpcre2-8.so:devel/pcre2 \
 		libexpat.so:textproc/expat2
 
 USES=		cmake compiler:c++14-lang cpe localbase pkgconfig tar:bz2
@@ -22,38 +22,70 @@ CONFLICTS=	poco-ssl
 CPE_VENDOR=	pocoproject
 
 CMAKE_ARGS=	-DPOCO_UNBUNDLED:BOOL=ON
-SHLIB_MAJOR=	71
+SHLIB_MAJOR=	94
 PLIST_SUB=	SHLIB_MAJOR=${SHLIB_MAJOR}
 
-OPTIONS_DEFINE=		MYSQL REDIS SQLITE SSL TEST
+OPTIONS_DEFINE=		ACTIVERECORD ENCODINGS JSON JWT MONGODB PAGECOMPILER \
+			PROMETHEUS REDIS SSL TEST XML ZIP
 OPTIONS_RADIO=		ODBC
 OPTIONS_RADIO_ODBC=	IODBC UNIXODBC
-OPTIONS_DEFAULT=	MYSQL REDIS SQLITE SSL
+OPTIONS_GROUP=		DB
+OPTIONS_GROUP_DB=	MYSQL PGSQL SQLITE
+OPTIONS_DEFAULT=	ACTIVERECORD ENCODINGS JSON JWT MYSQL MONGODB \
+			PAGECOMPILER PGSQL PROMETHEUS REDIS SQLITE SSL \
+			XML ZIP
 OPTIONS_SUB=		yes
 
+# Database support
+DB_DESC=		Database support
 MYSQL_USES=		mysql
 MYSQL_CMAKE_OFF=	-DENABLE_DATA_MYSQL:BOOL=OFF
-IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
-IODBC_CMAKE_ON=		-DODBC_INCLUDE_DIRECTORIES:PATH=${LOCALBASE}/include/libiodbc \
-			-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libiodbc.so
+PGSQL_USES=		pgsql
+PGSQL_CMAKE_OFF=	-DENABLE_DATA_POSTGRESQL:BOOL=OFF
 SQLITE_USES=		sqlite
 SQLITE_CMAKE_OFF=	-DENABLE_DATA_SQLITE:BOOL=OFF
-SSL_USES=		ssl
-SSL_CMAKE_OFF=		-DENABLE_CRYPTO:BOOL=OFF \
-			-DENABLE_NETSSL:BOOL=OFF
-SSL_VARS=	BROKEN_SSL="openssl30 openssl31" \
-			BROKEN_SSL_REASON="Do not build with OpenSSL 3.0 and later"
+IODBC_LIB_DEPENDS=	libiodbc.so:databases/libiodbc
+IODBC_CMAKE_ON=		-DODBC_INCLUDE_DIR:PATH=${LOCALBASE}/include/libiodbc \
+			-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libiodbc.so
 UNIXODBC_LIB_DEPENDS=	libodbc.so:databases/unixODBC
-UNIXODBC_CMAKE_ON=	-DODBC_INCLUDE_DIRECTORIES:PATH=${LOCALBASE}/include \
+UNIXODBC_CMAKE_ON=	-DODBC_INCLUDE_DIR:PATH=${LOCALBASE}/include \
 			-DODBC_LIBRARIES:FILEPATH=${LOCALBASE}/lib/libodbc.so
+
+# Key-value store support
+MONGODB_DESC=		Enable MongoDB support
+MONGODB_CMAKE_OFF=	-DENABLE_MONGODB:BOOL=OFF
+REDIS_CMAKE_OFF=	-DENABLE_REDIS:BOOL=OFF
+
+# Components
+ACTIVERECORD_IMPLIES=	XML
+ACTIVERECORD_CMAKE_OFF=	-DENABLE_ACTIVERECORD:BOOL=OFF \
+			-DENABLE_ACTIVERECORD_COMPILER:BOOL=OFF
+ACTIVERECORD_DESC=	Enable ActiveRecord ORM and compiler
+ENCODINGS_CMAKE_OFF=	-DENABLE_ENCODINGS:BOOL=OFF
+ENCODINGS_DESC=		Enable Encodings component
+JSON_CMAKE_OFF=		-DENABLE_JSON:BOOL=OFF
+JWT_CMAKE_OFF=		-DENABLE_JWT:BOOL=OFF
+JWT_DESC=		Enable JWT (JSON Web Token) component
+JWT_IMPLIES=		JSON SSL
+PAGECOMPILER_CMAKE_OFF=	-DENABLE_PAGECOMPILER:BOOL=OFF \
+			-DENABLE_PAGECOMPILER_FILE2PAGE:BOOL=OFF
+PAGECOMPILER_DESC=	Enable PageCompiler and File2Page
+PROMETHEUS_CMAKE_OFF=	-DENABLE_PROMETHEUS:BOOL=OFF
+PROMETHEUS_DESC=	Enable Prometheus component
+SSL_USES=		ssl
+SSL_CMAKE_OFF=		-DENABLE_CRYPTO:BOOL=OFF \
+			-DENABLE_NETSSL:BOOL=OFF \
+			-DENABLE_JWT:BOOL=OFF
 TEST_CMAKE_ON=		-DENABLE_TESTS:BOOL=ON
-TEST_IMPLIES=		SQLITE SSL
+TEST_IMPLIES=		JSON SQLITE SSL XML
 TEST_TEST_TARGET=	test
-REDIS_CMAKE_OFF=	-DENABLE_REDIS:BOOL=OFF
+XML_CMAKE_OFF=		-DENABLE_XML:BOOL=OFF
+ZIP_CMAKE_OFF=		-DENABLE_ZIP:BOOL=OFF
+ZIP_DESC=		Enable Zip support
 
 .include <bsd.port.options.mk>
 
-.if ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MSQLITE} || ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC}
+.if ${PORT_OPTIONS:MACTIVERECORD} || ${PORT_OPTIONS:MMYSQL} || ${PORT_OPTIONS:MPGSQL} || ${PORT_OPTIONS:MSQLITE} || ${PORT_OPTIONS:MIODBC} || ${PORT_OPTIONS:MUNIXODBC}
 PLIST_SUB+=	DATA=""
 .else
 PLIST_SUB+=	DATA="@comment "
@@ -66,11 +98,19 @@ CMAKE_ARGS+=	-DENABLE_DATA_ODBC:BOOL=OFF
 PLIST_SUB+=	ODBC="@comment "
 .endif
 
+.for opt in ${_ALL_OPTIONS}
+.if !${OPTIONS_DEFINE:M${opt}}
+PLIST_SUB+=	${opt}="@comment "
+.endif
+.endfor
+
 post-patch:
 	@${REINPLACE_CMD} -e \
-		's|-D_XOPEN_SOURCE=500 || ; \
-		 s|_EPOLL|_POLL| ; \
-		 s|CMAKE_DEBUG_POSTFIX "d"|CMAKE_DEBUG_POSTFIX ""| ; \
-		 s|dl rt|rt|' ${WRKSRC}/cmake/DefinePlatformSpecifc.cmake
+		's|CMAKE_DEBUG_POSTFIX "d"|CMAKE_DEBUG_POSTFIX ""|' \
+		 ${WRKSRC}/cmake/DefinePlatformSpecifc.cmake
+
+# Avoid conflict with archivers/arc
+post-install-ACTIVERECORD-on:
+	@${MV} ${STAGEDIR}${PREFIX}/bin/arc ${STAGEDIR}${PREFIX}/bin/arc-poco
 
 .include <bsd.port.mk>
diff --git a/devel/poco/distinfo b/devel/poco/distinfo
index b8ca3e9b5e43..0dab3faf4856 100644
--- a/devel/poco/distinfo
+++ b/devel/poco/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1616964872
-SHA256 (poco-1.10.1-all.tar.bz2) = 2cde4b50778013ab3b7a522aa59bccaa7e85a8ccfc654a354c4d9611b6ce1758
-SIZE (poco-1.10.1-all.tar.bz2) = 5313561
+TIMESTAMP = 1688499287
+SHA256 (poco-1.12.4-all.tar.bz2) = 4e6ccc0df904596478414ef56a992cf885eb4b0ee695b23d307eb2ff91c36626
+SIZE (poco-1.12.4-all.tar.bz2) = 5990710
diff --git a/devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp b/devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp
new file mode 100644
index 000000000000..3f132d50e507
--- /dev/null
+++ b/devel/poco/files/patch-Crypto_src_OpenSSLInitializer.cpp
@@ -0,0 +1,10 @@
+--- Crypto/src/OpenSSLInitializer.cpp.orig	2023-07-04 22:23:04 UTC
++++ Crypto/src/OpenSSLInitializer.cpp
+@@ -137,7 +137,6 @@ void OpenSSLInitializer::initialize()
+ 		if (!_legacyProvider)
+ 		{
+ 			_legacyProvider = OSSL_PROVIDER_load(NULL, "legacy");
+-			if (!_legacyProvider) throw CryptoException("Failed to load OpenSSL legacy provider");
+ 		}
+ #endif
+ 	}
diff --git a/devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp b/devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp
new file mode 100644
index 000000000000..90dac0edb172
--- /dev/null
+++ b/devel/poco/files/patch-Foundation_src_Thread__POSIX.cpp
@@ -0,0 +1,49 @@
+--- Foundation/src/Thread_POSIX.cpp.orig	2022-10-31 17:44:32 UTC
++++ Foundation/src/Thread_POSIX.cpp
+@@ -19,6 +19,13 @@
+ #include "Poco/Timespan.h"
+ #include "Poco/Timestamp.h"
+ #include <signal.h>
++
++#if POCO_OS == POCO_OS_FREE_BSD
++#    include <sys/thr.h>
++#    include <pthread_np.h>
++#    include <osreldate.h>
++#endif
++
+ #if defined(__sun) && defined(__SVR4)
+ #	if !defined(__EXTENSIONS__)
+ #		define __EXTENSIONS__
+@@ -65,7 +72,10 @@ void setThreadName(pthread_t thread, const std::string
+ namespace {
+ void setThreadName(pthread_t thread, const std::string& threadName)
+ {
+-#if (POCO_OS == POCO_OS_MAC_OS_X)
++#if POCO_OS == POCO_OS_FREE_BSD && __FreeBSD_version <  1300000
++	pthread_set_name_np(pthread_self(), threadName.c_str());
++	return;
++#elif (POCO_OS == POCO_OS_MAC_OS_X)
+ 	pthread_setname_np(threadName.c_str()); // __OSX_AVAILABLE_STARTING(__MAC_10_6, __IPHONE_3_2)
+ #else
+ 	if (pthread_setname_np(thread, threadName.c_str()) == ERANGE && threadName.size() > 15)
+@@ -273,11 +283,17 @@ long ThreadImpl::currentOsTidImpl()
+ long ThreadImpl::currentOsTidImpl()
+ {
+ #if POCO_OS == POCO_OS_LINUX
+-    return ::syscall(SYS_gettid);
++	return ::syscall(SYS_gettid);
+ #elif POCO_OS == POCO_OS_MAC_OS_X
+-    return ::pthread_mach_thread_np(::pthread_self());
++	return ::pthread_mach_thread_np(::pthread_self());
++#elif POCO_OS == POCO_OS_FREE_BSD
++	long id;
++	if(thr_self(&id) < 0) {
++		return 0;
++	}
++	return id;
+ #else
+-    return ::pthread_self();
++	return ::pthread_self();
+ #endif
+ }
+ 
diff --git a/devel/poco/pkg-plist b/devel/poco/pkg-plist
index 41cc8df1ec15..74b857f77060 100644
--- a/devel/poco/pkg-plist
+++ b/devel/poco/pkg-plist
@@ -1,5 +1,6 @@
-bin/cpspc
-bin/f2cpsp
+%%ACTIVERECORD%%bin/arc-poco
+%%PAGECOMPILER%%bin/cpspc
+%%PAGECOMPILER%%bin/f2cpsp
 include/Poco/ASCIIEncoding.h
 include/Poco/AbstractCache.h
 include/Poco/AbstractDelegate.h
@@ -13,6 +14,12 @@ include/Poco/AccessExpireLRUCache.h
 include/Poco/AccessExpireStrategy.h
 include/Poco/ActiveDispatcher.h
 include/Poco/ActiveMethod.h
+%%ACTIVERECORD%%include/Poco/ActiveRecord/ActiveRecord.h
+%%ACTIVERECORD%%include/Poco/ActiveRecord/ActiveRecordLib.h
+%%ACTIVERECORD%%include/Poco/ActiveRecord/Context.h
+%%ACTIVERECORD%%include/Poco/ActiveRecord/IDTraits.h
+%%ACTIVERECORD%%include/Poco/ActiveRecord/Query.h
+%%ACTIVERECORD%%include/Poco/ActiveRecord/StatementPlaceholderProvider.h
 include/Poco/ActiveResult.h
 include/Poco/ActiveRunnable.h
 include/Poco/ActiveStarter.h
@@ -63,7 +70,9 @@ include/Poco/CountingStream.h
 %%SSL%%include/Poco/Crypto/ECDSADigestEngine.h
 %%SSL%%include/Poco/Crypto/ECKey.h
 %%SSL%%include/Poco/Crypto/ECKeyImpl.h
+%%SSL%%include/Poco/Crypto/EVPCipherImpl.h
 %%SSL%%include/Poco/Crypto/EVPPKey.h
+%%SSL%%include/Poco/Crypto/Envelope.h
 %%SSL%%include/Poco/Crypto/KeyPair.h
 %%SSL%%include/Poco/Crypto/KeyPairImpl.h
 %%SSL%%include/Poco/Crypto/OpenSSLInitializer.h
@@ -73,47 +82,47 @@ include/Poco/CountingStream.h
 %%SSL%%include/Poco/Crypto/RSAKey.h
 %%SSL%%include/Poco/Crypto/RSAKeyImpl.h
 %%SSL%%include/Poco/Crypto/X509Certificate.h
-include/Poco/DOM/AbstractContainerNode.h
-include/Poco/DOM/AbstractNode.h
-include/Poco/DOM/Attr.h
-include/Poco/DOM/AttrMap.h
-include/Poco/DOM/AutoPtr.h
-include/Poco/DOM/CDATASection.h
-include/Poco/DOM/CharacterData.h
-include/Poco/DOM/ChildNodesList.h
-include/Poco/DOM/Comment.h
-include/Poco/DOM/DOMBuilder.h
-include/Poco/DOM/DOMException.h
-include/Poco/DOM/DOMImplementation.h
-include/Poco/DOM/DOMObject.h
-include/Poco/DOM/DOMParser.h
-include/Poco/DOM/DOMSerializer.h
-include/Poco/DOM/DOMWriter.h
-include/Poco/DOM/DTDMap.h
-include/Poco/DOM/Document.h
-include/Poco/DOM/DocumentEvent.h
-include/Poco/DOM/DocumentFragment.h
-include/Poco/DOM/DocumentType.h
-include/Poco/DOM/Element.h
-include/Poco/DOM/ElementsByTagNameList.h
-include/Poco/DOM/Entity.h
-include/Poco/DOM/EntityReference.h
-include/Poco/DOM/Event.h
-include/Poco/DOM/EventDispatcher.h
-include/Poco/DOM/EventException.h
-include/Poco/DOM/EventListener.h
-include/Poco/DOM/EventTarget.h
-include/Poco/DOM/MutationEvent.h
-include/Poco/DOM/NamedNodeMap.h
-include/Poco/DOM/Node.h
-include/Poco/DOM/NodeAppender.h
-include/Poco/DOM/NodeFilter.h
-include/Poco/DOM/NodeIterator.h
-include/Poco/DOM/NodeList.h
-include/Poco/DOM/Notation.h
-include/Poco/DOM/ProcessingInstruction.h
-include/Poco/DOM/Text.h
-include/Poco/DOM/TreeWalker.h
+%%XML%%include/Poco/DOM/AbstractContainerNode.h
+%%XML%%include/Poco/DOM/AbstractNode.h
+%%XML%%include/Poco/DOM/Attr.h
+%%XML%%include/Poco/DOM/AttrMap.h
+%%XML%%include/Poco/DOM/AutoPtr.h
+%%XML%%include/Poco/DOM/CDATASection.h
+%%XML%%include/Poco/DOM/CharacterData.h
+%%XML%%include/Poco/DOM/ChildNodesList.h
+%%XML%%include/Poco/DOM/Comment.h
+%%XML%%include/Poco/DOM/DOMBuilder.h
+%%XML%%include/Poco/DOM/DOMException.h
+%%XML%%include/Poco/DOM/DOMImplementation.h
+%%XML%%include/Poco/DOM/DOMObject.h
+%%XML%%include/Poco/DOM/DOMParser.h
+%%XML%%include/Poco/DOM/DOMSerializer.h
+%%XML%%include/Poco/DOM/DOMWriter.h
+%%XML%%include/Poco/DOM/DTDMap.h
+%%XML%%include/Poco/DOM/Document.h
+%%XML%%include/Poco/DOM/DocumentEvent.h
+%%XML%%include/Poco/DOM/DocumentFragment.h
+%%XML%%include/Poco/DOM/DocumentType.h
+%%XML%%include/Poco/DOM/Element.h
+%%XML%%include/Poco/DOM/ElementsByTagNameList.h
+%%XML%%include/Poco/DOM/Entity.h
+%%XML%%include/Poco/DOM/EntityReference.h
+%%XML%%include/Poco/DOM/Event.h
+%%XML%%include/Poco/DOM/EventDispatcher.h
+%%XML%%include/Poco/DOM/EventException.h
+%%XML%%include/Poco/DOM/EventListener.h
+%%XML%%include/Poco/DOM/EventTarget.h
+%%XML%%include/Poco/DOM/MutationEvent.h
+%%XML%%include/Poco/DOM/NamedNodeMap.h
+%%XML%%include/Poco/DOM/Node.h
+%%XML%%include/Poco/DOM/NodeAppender.h
+%%XML%%include/Poco/DOM/NodeFilter.h
+%%XML%%include/Poco/DOM/NodeIterator.h
+%%XML%%include/Poco/DOM/NodeList.h
+%%XML%%include/Poco/DOM/Notation.h
+%%XML%%include/Poco/DOM/ProcessingInstruction.h
+%%XML%%include/Poco/DOM/Text.h
+%%XML%%include/Poco/DOM/TreeWalker.h
 %%DATA%%include/Poco/Data/AbstractBinder.h
 %%DATA%%include/Poco/Data/AbstractBinding.h
 %%DATA%%include/Poco/Data/AbstractExtraction.h
@@ -136,6 +145,7 @@ include/Poco/DOM/TreeWalker.h
 %%DATA%%include/Poco/Data/DynamicDateTime.h
 %%DATA%%include/Poco/Data/DynamicLOB.h
 %%DATA%%include/Poco/Data/Extraction.h
+%%DATA%%include/Poco/Data/JSONRowFormatter.h
 %%DATA%%include/Poco/Data/LOB.h
 %%DATA%%include/Poco/Data/LOBStream.h
 %%DATA%%include/Poco/Data/Limit.h
@@ -171,17 +181,29 @@ include/Poco/DOM/TreeWalker.h
 %%ODBC%%include/Poco/Data/ODBC/Unicode_UNIXODBC.h
 %%ODBC%%include/Poco/Data/ODBC/Unicode_WIN32.h
 %%ODBC%%include/Poco/Data/ODBC/Utility.h
-include/Poco/Data/PooledSessionHolder.h
-include/Poco/Data/PooledSessionImpl.h
-include/Poco/Data/Position.h
-include/Poco/Data/Preparation.h
-include/Poco/Data/Range.h
-include/Poco/Data/RecordSet.h
-include/Poco/Data/Row.h
-include/Poco/Data/RowFilter.h
-include/Poco/Data/RowFormatter.h
-include/Poco/Data/RowIterator.h
-include/Poco/Data/SQLChannel.h
+%%DATA%%include/Poco/Data/PooledSessionHolder.h
+%%DATA%%include/Poco/Data/PooledSessionImpl.h
+%%DATA%%include/Poco/Data/Position.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/BinaryExtractor.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/Binder.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/Connector.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/Extractor.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/PostgreSQL.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/PostgreSQLException.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/PostgreSQLStatementImpl.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/PostgreSQLTypes.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/SessionHandle.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/SessionImpl.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/StatementExecutor.h
+%%PGSQL%%include/Poco/Data/PostgreSQL/Utility.h
+%%DATA%%include/Poco/Data/Preparation.h
+%%DATA%%include/Poco/Data/Range.h
+%%DATA%%include/Poco/Data/RecordSet.h
+%%DATA%%include/Poco/Data/Row.h
+%%DATA%%include/Poco/Data/RowFilter.h
+%%DATA%%include/Poco/Data/RowFormatter.h
+%%DATA%%include/Poco/Data/RowIterator.h
+%%DATA%%include/Poco/Data/SQLChannel.h
 %%SQLITE%%include/Poco/Data/SQLite/Binder.h
 %%SQLITE%%include/Poco/Data/SQLite/Connector.h
 %%SQLITE%%include/Poco/Data/SQLite/Extractor.h
@@ -191,20 +213,21 @@ include/Poco/Data/SQLChannel.h
 %%SQLITE%%include/Poco/Data/SQLite/SQLiteStatementImpl.h
 %%SQLITE%%include/Poco/Data/SQLite/SessionImpl.h
 %%SQLITE%%include/Poco/Data/SQLite/Utility.h
-include/Poco/Data/Session.h
-include/Poco/Data/SessionFactory.h
-include/Poco/Data/SessionImpl.h
-include/Poco/Data/SessionPool.h
-include/Poco/Data/SessionPoolContainer.h
-include/Poco/Data/SimpleRowFormatter.h
-include/Poco/Data/Statement.h
-include/Poco/Data/StatementCreator.h
-include/Poco/Data/StatementImpl.h
-include/Poco/Data/Time.h
-include/Poco/Data/Transaction.h
-include/Poco/Data/TypeHandler.h
-include/Poco/DataURIStream.h
-include/Poco/DataURIStreamFactory.h
+%%DATA%%include/Poco/Data/Session.h
+%%DATA%%include/Poco/Data/SessionFactory.h
+%%DATA%%include/Poco/Data/SessionImpl.h
+%%DATA%%include/Poco/Data/SessionPool.h
+%%DATA%%include/Poco/Data/SessionPoolContainer.h
+%%DATA%%include/Poco/Data/SimpleRowFormatter.h
+%%DATA%%include/Poco/Data/Statement.h
+%%DATA%%include/Poco/Data/StatementCreator.h
+%%DATA%%include/Poco/Data/StatementImpl.h
+%%DATA%%include/Poco/Data/Time.h
+%%DATA%%include/Poco/Data/Transaction.h
+%%DATA%%include/Poco/Data/Transcoder.h
+%%DATA%%include/Poco/Data/TypeHandler.h
+%%DATA%%include/Poco/DataURIStream.h
+%%DATA%%include/Poco/DataURIStreamFactory.h
 include/Poco/DateTime.h
 include/Poco/DateTimeFormat.h
 include/Poco/DateTimeFormatter.h
@@ -220,7 +243,7 @@ include/Poco/DirectoryIteratorStrategy.h
 include/Poco/DirectoryIterator_UNIX.h
 include/Poco/DirectoryIterator_WIN32U.h
 include/Poco/DirectoryWatcher.h
-include/Poco/DoubleByteEncoding.h
+%%ENCODINGS%%include/Poco/DoubleByteEncoding.h
 include/Poco/Dynamic/Pair.h
 include/Poco/Dynamic/Struct.h
 include/Poco/Dynamic/Var.h
@@ -230,7 +253,7 @@ include/Poco/DynamicAny.h
 include/Poco/DynamicAnyHolder.h
 include/Poco/DynamicFactory.h
 include/Poco/DynamicStruct.h
-include/Poco/Encodings.h
+%%ENCODINGS%%include/Poco/Encodings.h
 include/Poco/Environment.h
 include/Poco/Environment_UNIX.h
 include/Poco/Environment_VX.h
@@ -288,45 +311,45 @@ include/Poco/HashStatistic.h
 include/Poco/HashTable.h
 include/Poco/HexBinaryDecoder.h
 include/Poco/HexBinaryEncoder.h
-include/Poco/ISO8859_10Encoding.h
-include/Poco/ISO8859_11Encoding.h
-include/Poco/ISO8859_13Encoding.h
-include/Poco/ISO8859_14Encoding.h
-include/Poco/ISO8859_16Encoding.h
-include/Poco/ISO8859_3Encoding.h
-include/Poco/ISO8859_4Encoding.h
-include/Poco/ISO8859_5Encoding.h
-include/Poco/ISO8859_6Encoding.h
-include/Poco/ISO8859_7Encoding.h
-include/Poco/ISO8859_8Encoding.h
-include/Poco/ISO8859_9Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_10Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_11Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_13Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_14Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_16Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_3Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_4Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_5Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_6Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_7Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_8Encoding.h
+%%ENCODINGS%%include/Poco/ISO8859_9Encoding.h
 include/Poco/InflatingStream.h
 include/Poco/Instantiator.h
-include/Poco/JSON/Array.h
-include/Poco/JSON/Handler.h
-include/Poco/JSON/JSON.h
-include/Poco/JSON/JSONException.h
-include/Poco/JSON/Object.h
-include/Poco/JSON/ParseHandler.h
-include/Poco/JSON/Parser.h
-include/Poco/JSON/ParserImpl.h
-include/Poco/JSON/PrintHandler.h
-include/Poco/JSON/Query.h
-include/Poco/JSON/Stringifier.h
-include/Poco/JSON/Template.h
-include/Poco/JSON/TemplateCache.h
-include/Poco/JSONString.h
-include/Poco/JWT/JWT.h
-include/Poco/JWT/JWTException.h
-include/Poco/JWT/Serializer.h
-include/Poco/JWT/Signer.h
-include/Poco/JWT/Token.h
+%%JSON%%include/Poco/JSON/Array.h
+%%JSON%%include/Poco/JSON/Handler.h
+%%JSON%%include/Poco/JSON/JSON.h
+%%JSON%%include/Poco/JSON/JSONException.h
+%%JSON%%include/Poco/JSON/Object.h
+%%JSON%%include/Poco/JSON/ParseHandler.h
+%%JSON%%include/Poco/JSON/Parser.h
+%%JSON%%include/Poco/JSON/ParserImpl.h
+%%JSON%%include/Poco/JSON/PrintHandler.h
+%%JSON%%include/Poco/JSON/Query.h
+%%JSON%%include/Poco/JSON/Stringifier.h
+%%JSON%%include/Poco/JSON/Template.h
+%%JSON%%include/Poco/JSON/TemplateCache.h
+%%JSON%%include/Poco/JSONString.h
+%%JWT%%include/Poco/JWT/JWT.h
+%%JWT%%include/Poco/JWT/JWTException.h
+%%JWT%%include/Poco/JWT/Serializer.h
+%%JWT%%include/Poco/JWT/Signer.h
+%%JWT%%include/Poco/JWT/Token.h
 include/Poco/KeyValueArgs.h
 include/Poco/LRUCache.h
 include/Poco/LRUStrategy.h
-include/Poco/Latin1Encoding.h
-include/Poco/Latin2Encoding.h
-include/Poco/Latin9Encoding.h
+%%ENCODINGS%%include/Poco/Latin1Encoding.h
+%%ENCODINGS%%include/Poco/Latin2Encoding.h
+%%ENCODINGS%%include/Poco/Latin9Encoding.h
 include/Poco/LineEndingConverter.h
 include/Poco/LinearHashTable.h
 include/Poco/ListMap.h
@@ -340,44 +363,44 @@ include/Poco/LoggingFactory.h
 include/Poco/LoggingRegistry.h
 include/Poco/MD4Engine.h
 include/Poco/MD5Engine.h
-include/Poco/MacCentralEurRomanEncoding.h
-include/Poco/MacChineseSimpEncoding.h
-include/Poco/MacChineseTradEncoding.h
-include/Poco/MacCyrillicEncoding.h
-include/Poco/MacJapaneseEncoding.h
-include/Poco/MacKoreanEncoding.h
-include/Poco/MacRomanEncoding.h
+%%ENCODINGS%%include/Poco/MacCentralEurRomanEncoding.h
+%%ENCODINGS%%include/Poco/MacChineseSimpEncoding.h
+%%ENCODINGS%%include/Poco/MacChineseTradEncoding.h
+%%ENCODINGS%%include/Poco/MacCyrillicEncoding.h
+%%ENCODINGS%%include/Poco/MacJapaneseEncoding.h
+%%ENCODINGS%%include/Poco/MacKoreanEncoding.h
+%%ENCODINGS%%include/Poco/MacRomanEncoding.h
 include/Poco/Manifest.h
 include/Poco/MemoryPool.h
 include/Poco/MemoryStream.h
 include/Poco/Message.h
 include/Poco/MetaObject.h
 include/Poco/MetaProgramming.h
-include/Poco/MongoDB/Array.h
-include/Poco/MongoDB/BSONReader.h
-include/Poco/MongoDB/BSONWriter.h
-include/Poco/MongoDB/Binary.h
-include/Poco/MongoDB/Connection.h
-include/Poco/MongoDB/Cursor.h
-include/Poco/MongoDB/Database.h
-include/Poco/MongoDB/DeleteRequest.h
-include/Poco/MongoDB/Document.h
-include/Poco/MongoDB/Element.h
-include/Poco/MongoDB/GetMoreRequest.h
-include/Poco/MongoDB/InsertRequest.h
-include/Poco/MongoDB/JavaScriptCode.h
-include/Poco/MongoDB/KillCursorsRequest.h
-include/Poco/MongoDB/Message.h
-include/Poco/MongoDB/MessageHeader.h
-include/Poco/MongoDB/MongoDB.h
-include/Poco/MongoDB/ObjectId.h
-include/Poco/MongoDB/PoolableConnectionFactory.h
-include/Poco/MongoDB/QueryRequest.h
-include/Poco/MongoDB/RegularExpression.h
-include/Poco/MongoDB/ReplicaSet.h
-include/Poco/MongoDB/RequestMessage.h
-include/Poco/MongoDB/ResponseMessage.h
-include/Poco/MongoDB/UpdateRequest.h
+%%MONGODB%%include/Poco/MongoDB/Array.h
+%%MONGODB%%include/Poco/MongoDB/BSONReader.h
+%%MONGODB%%include/Poco/MongoDB/BSONWriter.h
+%%MONGODB%%include/Poco/MongoDB/Binary.h
+%%MONGODB%%include/Poco/MongoDB/Connection.h
+%%MONGODB%%include/Poco/MongoDB/Cursor.h
+%%MONGODB%%include/Poco/MongoDB/Database.h
+%%MONGODB%%include/Poco/MongoDB/DeleteRequest.h
+%%MONGODB%%include/Poco/MongoDB/Document.h
+%%MONGODB%%include/Poco/MongoDB/Element.h
+%%MONGODB%%include/Poco/MongoDB/GetMoreRequest.h
+%%MONGODB%%include/Poco/MongoDB/InsertRequest.h
+%%MONGODB%%include/Poco/MongoDB/JavaScriptCode.h
+%%MONGODB%%include/Poco/MongoDB/KillCursorsRequest.h
+%%MONGODB%%include/Poco/MongoDB/Message.h
+%%MONGODB%%include/Poco/MongoDB/MessageHeader.h
+%%MONGODB%%include/Poco/MongoDB/MongoDB.h
+%%MONGODB%%include/Poco/MongoDB/ObjectId.h
+%%MONGODB%%include/Poco/MongoDB/PoolableConnectionFactory.h
+%%MONGODB%%include/Poco/MongoDB/QueryRequest.h
+%%MONGODB%%include/Poco/MongoDB/RegularExpression.h
+%%MONGODB%%include/Poco/MongoDB/ReplicaSet.h
+%%MONGODB%%include/Poco/MongoDB/RequestMessage.h
+%%MONGODB%%include/Poco/MongoDB/ResponseMessage.h
+%%MONGODB%%include/Poco/MongoDB/UpdateRequest.h
 include/Poco/Mutex.h
 include/Poco/Mutex_POSIX.h
 include/Poco/Mutex_VX.h
@@ -521,6 +544,7 @@ include/Poco/Net/SocketDefs.h
 include/Poco/Net/SocketImpl.h
 include/Poco/Net/SocketNotification.h
 include/Poco/Net/SocketNotifier.h
+include/Poco/Net/SocketProactor.h
 include/Poco/Net/SocketReactor.h
 include/Poco/Net/SocketStream.h
 include/Poco/Net/StreamSocket.h
@@ -583,6 +607,25 @@ include/Poco/Process_UNIX.h
 include/Poco/Process_VX.h
 include/Poco/Process_WIN32U.h
 include/Poco/Process_WINCE.h
+%%PROMETHEUS%%include/Poco/Prometheus/AtomicFloat.h
+%%PROMETHEUS%%include/Poco/Prometheus/CallbackMetric.h
+%%PROMETHEUS%%include/Poco/Prometheus/Collector.h
+%%PROMETHEUS%%include/Poco/Prometheus/Counter.h
+%%PROMETHEUS%%include/Poco/Prometheus/Exporter.h
+%%PROMETHEUS%%include/Poco/Prometheus/Gauge.h
+%%PROMETHEUS%%include/Poco/Prometheus/Histogram.h
+%%PROMETHEUS%%include/Poco/Prometheus/IntCounter.h
+%%PROMETHEUS%%include/Poco/Prometheus/IntGauge.h
+%%PROMETHEUS%%include/Poco/Prometheus/LabeledMetric.h
+%%PROMETHEUS%%include/Poco/Prometheus/LabeledMetricImpl.h
+%%PROMETHEUS%%include/Poco/Prometheus/Metric.h
+%%PROMETHEUS%%include/Poco/Prometheus/MetricsRequestHandler.h
+%%PROMETHEUS%%include/Poco/Prometheus/MetricsServer.h
+%%PROMETHEUS%%include/Poco/Prometheus/ProcessCollector.h
+%%PROMETHEUS%%include/Poco/Prometheus/Prometheus.h
+%%PROMETHEUS%%include/Poco/Prometheus/Registry.h
+%%PROMETHEUS%%include/Poco/Prometheus/TextExporter.h
+%%PROMETHEUS%%include/Poco/Prometheus/ThreadPoolCollector.h
 include/Poco/PurgeStrategy.h
 include/Poco/RWLock.h
 include/Poco/RWLock_Android.h
@@ -610,26 +653,26 @@ include/Poco/RegularExpression.h
 include/Poco/RotateStrategy.h
 include/Poco/Runnable.h
 include/Poco/RunnableAdapter.h
-include/Poco/SAX/Attributes.h
-include/Poco/SAX/AttributesImpl.h
-include/Poco/SAX/ContentHandler.h
-include/Poco/SAX/DTDHandler.h
-include/Poco/SAX/DeclHandler.h
-include/Poco/SAX/DefaultHandler.h
-include/Poco/SAX/EntityResolver.h
-include/Poco/SAX/EntityResolverImpl.h
-include/Poco/SAX/ErrorHandler.h
-include/Poco/SAX/InputSource.h
-include/Poco/SAX/LexicalHandler.h
-include/Poco/SAX/Locator.h
-include/Poco/SAX/LocatorImpl.h
-include/Poco/SAX/NamespaceSupport.h
-include/Poco/SAX/SAXException.h
-include/Poco/SAX/SAXParser.h
-include/Poco/SAX/WhitespaceFilter.h
-include/Poco/SAX/XMLFilter.h
-include/Poco/SAX/XMLFilterImpl.h
-include/Poco/SAX/XMLReader.h
+%%XML%%include/Poco/SAX/Attributes.h
+%%XML%%include/Poco/SAX/AttributesImpl.h
+%%XML%%include/Poco/SAX/ContentHandler.h
+%%XML%%include/Poco/SAX/DTDHandler.h
+%%XML%%include/Poco/SAX/DeclHandler.h
+%%XML%%include/Poco/SAX/DefaultHandler.h
+%%XML%%include/Poco/SAX/EntityResolver.h
+%%XML%%include/Poco/SAX/EntityResolverImpl.h
+%%XML%%include/Poco/SAX/ErrorHandler.h
+%%XML%%include/Poco/SAX/InputSource.h
+%%XML%%include/Poco/SAX/LexicalHandler.h
+%%XML%%include/Poco/SAX/Locator.h
+%%XML%%include/Poco/SAX/LocatorImpl.h
+%%XML%%include/Poco/SAX/NamespaceSupport.h
+%%XML%%include/Poco/SAX/SAXException.h
+%%XML%%include/Poco/SAX/SAXParser.h
+%%XML%%include/Poco/SAX/WhitespaceFilter.h
+%%XML%%include/Poco/SAX/XMLFilter.h
+%%XML%%include/Poco/SAX/XMLFilterImpl.h
+%%XML%%include/Poco/SAX/XMLReader.h
 include/Poco/SHA1Engine.h
 include/Poco/SHA2Engine.h
 include/Poco/ScopedLock.h
@@ -721,6 +764,7 @@ include/Poco/Util/IniFileConfiguration.h
 include/Poco/Util/IntValidator.h
 include/Poco/Util/JSONConfiguration.h
 include/Poco/Util/LayeredConfiguration.h
+include/Poco/Util/LocalConfigurationView.h
 include/Poco/Util/LoggingConfigurator.h
 include/Poco/Util/LoggingSubsystem.h
 include/Poco/Util/MapConfiguration.h
@@ -747,116 +791,128 @@ include/Poco/Util/XMLConfiguration.h
 include/Poco/ValidArgs.h
 include/Poco/Version.h
 include/Poco/Void.h
-include/Poco/Windows1250Encoding.h
-include/Poco/Windows1251Encoding.h
-include/Poco/Windows1252Encoding.h
-include/Poco/Windows1253Encoding.h
-include/Poco/Windows1254Encoding.h
-include/Poco/Windows1255Encoding.h
-include/Poco/Windows1256Encoding.h
-include/Poco/Windows1257Encoding.h
-include/Poco/Windows1258Encoding.h
-include/Poco/Windows874Encoding.h
-include/Poco/Windows932Encoding.h
-include/Poco/Windows936Encoding.h
-include/Poco/Windows949Encoding.h
-include/Poco/Windows950Encoding.h
+%%ENCODINGS%%include/Poco/Windows1250Encoding.h
+%%ENCODINGS%%include/Poco/Windows1251Encoding.h
+%%ENCODINGS%%include/Poco/Windows1252Encoding.h
+%%ENCODINGS%%include/Poco/Windows1253Encoding.h
+%%ENCODINGS%%include/Poco/Windows1254Encoding.h
+%%ENCODINGS%%include/Poco/Windows1255Encoding.h
+%%ENCODINGS%%include/Poco/Windows1256Encoding.h
+%%ENCODINGS%%include/Poco/Windows1257Encoding.h
+%%ENCODINGS%%include/Poco/Windows1258Encoding.h
+%%ENCODINGS%%include/Poco/Windows874Encoding.h
+%%ENCODINGS%%include/Poco/Windows932Encoding.h
+%%ENCODINGS%%include/Poco/Windows936Encoding.h
+%%ENCODINGS%%include/Poco/Windows949Encoding.h
+%%ENCODINGS%%include/Poco/Windows950Encoding.h
 include/Poco/WindowsConsoleChannel.h
-include/Poco/XML/Content.h
-include/Poco/XML/Name.h
-include/Poco/XML/NamePool.h
-include/Poco/XML/NamespaceStrategy.h
-include/Poco/XML/ParserEngine.h
-include/Poco/XML/QName.h
-include/Poco/XML/ValueTraits.h
-include/Poco/XML/XML.h
-include/Poco/XML/XMLException.h
-include/Poco/XML/XMLStream.h
-include/Poco/XML/XMLStreamParser.h
-include/Poco/XML/XMLStreamParserException.h
-include/Poco/XML/XMLString.h
-include/Poco/XML/XMLWriter.h
-include/Poco/XML/expat.h
-include/Poco/XML/expat_external.h
-include/Poco/Zip/Add.h
-include/Poco/Zip/AutoDetectStream.h
-include/Poco/Zip/Compress.h
-include/Poco/Zip/Decompress.h
-include/Poco/Zip/Delete.h
-include/Poco/Zip/Keep.h
-include/Poco/Zip/ParseCallback.h
-include/Poco/Zip/PartialStream.h
-include/Poco/Zip/Rename.h
-include/Poco/Zip/Replace.h
-include/Poco/Zip/SkipCallback.h
-include/Poco/Zip/Zip.h
-include/Poco/Zip/ZipArchive.h
-include/Poco/Zip/ZipArchiveInfo.h
-include/Poco/Zip/ZipCommon.h
-include/Poco/Zip/ZipDataInfo.h
-include/Poco/Zip/ZipException.h
-include/Poco/Zip/ZipFileInfo.h
-include/Poco/Zip/ZipLocalFileHeader.h
-include/Poco/Zip/ZipManipulator.h
-include/Poco/Zip/ZipOperation.h
-include/Poco/Zip/ZipStream.h
-include/Poco/Zip/ZipUtil.h
+%%XML%%include/Poco/XML/Content.h
+%%XML%%include/Poco/XML/Name.h
+%%XML%%include/Poco/XML/NamePool.h
+%%XML%%include/Poco/XML/NamespaceStrategy.h
+%%XML%%include/Poco/XML/ParserEngine.h
+%%XML%%include/Poco/XML/QName.h
+%%XML%%include/Poco/XML/ValueTraits.h
+%%XML%%include/Poco/XML/XML.h
+%%XML%%include/Poco/XML/XMLException.h
+%%XML%%include/Poco/XML/XMLStream.h
+%%XML%%include/Poco/XML/XMLStreamParser.h
+%%XML%%include/Poco/XML/XMLStreamParserException.h
+%%XML%%include/Poco/XML/XMLString.h
+%%XML%%include/Poco/XML/XMLWriter.h
+%%XML%%include/Poco/XML/expat.h
+%%XML%%include/Poco/XML/expat_external.h
+%%ZIP%%include/Poco/Zip/Add.h
+%%ZIP%%include/Poco/Zip/AutoDetectStream.h
+%%ZIP%%include/Poco/Zip/Compress.h
+%%ZIP%%include/Poco/Zip/Decompress.h
+%%ZIP%%include/Poco/Zip/Delete.h
+%%ZIP%%include/Poco/Zip/Keep.h
+%%ZIP%%include/Poco/Zip/ParseCallback.h
+%%ZIP%%include/Poco/Zip/PartialStream.h
+%%ZIP%%include/Poco/Zip/Rename.h
+%%ZIP%%include/Poco/Zip/Replace.h
+%%ZIP%%include/Poco/Zip/SkipCallback.h
+%%ZIP%%include/Poco/Zip/Zip.h
+%%ZIP%%include/Poco/Zip/ZipArchive.h
+%%ZIP%%include/Poco/Zip/ZipArchiveInfo.h
+%%ZIP%%include/Poco/Zip/ZipCommon.h
+%%ZIP%%include/Poco/Zip/ZipDataInfo.h
+%%ZIP%%include/Poco/Zip/ZipException.h
+%%ZIP%%include/Poco/Zip/ZipFileInfo.h
+%%ZIP%%include/Poco/Zip/ZipLocalFileHeader.h
+%%ZIP%%include/Poco/Zip/ZipManipulator.h
+%%ZIP%%include/Poco/Zip/ZipOperation.h
+%%ZIP%%include/Poco/Zip/ZipStream.h
+%%ZIP%%include/Poco/Zip/ZipUtil.h
 include/Poco/ordered_hash.h
 include/Poco/ordered_map.h
 include/Poco/ordered_set.h
 include/Poco/zconf.h
 include/Poco/zlib.h
-lib/cmake/Poco/FindPCRE.cmake
+lib/cmake/Poco/FindPCRE2.cmake
+%%ACTIVERECORD%%lib/cmake/Poco/PocoActiveRecordConfig.cmake
+%%ACTIVERECORD%%lib/cmake/Poco/PocoActiveRecordConfigVersion.cmake
+%%ACTIVERECORD%%lib/cmake/Poco/PocoActiveRecordTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%ACTIVERECORD%%lib/cmake/Poco/PocoActiveRecordTargets.cmake
 lib/cmake/Poco/PocoConfig.cmake
 lib/cmake/Poco/PocoConfigVersion.cmake
 %%SSL%%lib/cmake/Poco/PocoCryptoConfig.cmake
 %%SSL%%lib/cmake/Poco/PocoCryptoConfigVersion.cmake
-%%SSL%%lib/cmake/Poco/PocoCryptoTargets.cmake
 %%SSL%%lib/cmake/Poco/PocoCryptoTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoDataConfig.cmake
-lib/cmake/Poco/PocoDataConfigVersion.cmake
+%%SSL%%lib/cmake/Poco/PocoCryptoTargets.cmake
+%%DATA%%lib/cmake/Poco/PocoDataConfig.cmake
+%%DATA%%lib/cmake/Poco/PocoDataConfigVersion.cmake
 %%MYSQL%%lib/cmake/Poco/PocoDataMySQLConfig.cmake
 %%MYSQL%%lib/cmake/Poco/PocoDataMySQLConfigVersion.cmake
-%%MYSQL%%lib/cmake/Poco/PocoDataMySQLTargets.cmake
 %%MYSQL%%lib/cmake/Poco/PocoDataMySQLTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%MYSQL%%lib/cmake/Poco/PocoDataMySQLTargets.cmake
 %%ODBC%%lib/cmake/Poco/PocoDataODBCConfig.cmake
 %%ODBC%%lib/cmake/Poco/PocoDataODBCConfigVersion.cmake
-%%ODBC%%lib/cmake/Poco/PocoDataODBCTargets.cmake
 %%ODBC%%lib/cmake/Poco/PocoDataODBCTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%ODBC%%lib/cmake/Poco/PocoDataODBCTargets.cmake
+%%PGSQL%%lib/cmake/Poco/PocoDataPostgreSQLConfig.cmake
+%%PGSQL%%lib/cmake/Poco/PocoDataPostgreSQLConfigVersion.cmake
+%%PGSQL%%lib/cmake/Poco/PocoDataPostgreSQLTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%PGSQL%%lib/cmake/Poco/PocoDataPostgreSQLTargets.cmake
 %%SQLITE%%lib/cmake/Poco/PocoDataSQLiteConfig.cmake
 %%SQLITE%%lib/cmake/Poco/PocoDataSQLiteConfigVersion.cmake
-%%SQLITE%%lib/cmake/Poco/PocoDataSQLiteTargets.cmake
 %%SQLITE%%lib/cmake/Poco/PocoDataSQLiteTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoDataTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoDataTargets.cmake
-lib/cmake/Poco/PocoEncodingsConfig.cmake
-lib/cmake/Poco/PocoEncodingsConfigVersion.cmake
-lib/cmake/Poco/PocoEncodingsTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoEncodingsTargets.cmake
+%%SQLITE%%lib/cmake/Poco/PocoDataSQLiteTargets.cmake
+%%DATA%%lib/cmake/Poco/PocoDataTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%DATA%%lib/cmake/Poco/PocoDataTargets.cmake
+%%ENCODINGS%%lib/cmake/Poco/PocoEncodingsConfig.cmake
+%%ENCODINGS%%lib/cmake/Poco/PocoEncodingsConfigVersion.cmake
+%%ENCODINGS%%lib/cmake/Poco/PocoEncodingsTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%ENCODINGS%%lib/cmake/Poco/PocoEncodingsTargets.cmake
 lib/cmake/Poco/PocoFoundationConfig.cmake
 lib/cmake/Poco/PocoFoundationConfigVersion.cmake
 lib/cmake/Poco/PocoFoundationTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Poco/PocoFoundationTargets.cmake
-lib/cmake/Poco/PocoJSONConfig.cmake
-lib/cmake/Poco/PocoJSONConfigVersion.cmake
-lib/cmake/Poco/PocoJSONTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoJSONTargets.cmake
-lib/cmake/Poco/PocoJWTConfig.cmake
-lib/cmake/Poco/PocoJWTConfigVersion.cmake
-lib/cmake/Poco/PocoJWTTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoJWTTargets.cmake
-lib/cmake/Poco/PocoMongoDBConfig.cmake
-lib/cmake/Poco/PocoMongoDBConfigVersion.cmake
-lib/cmake/Poco/PocoMongoDBTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoMongoDBTargets.cmake
+%%JSON%%lib/cmake/Poco/PocoJSONConfig.cmake
+%%JSON%%lib/cmake/Poco/PocoJSONConfigVersion.cmake
+%%JSON%%lib/cmake/Poco/PocoJSONTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%JSON%%lib/cmake/Poco/PocoJSONTargets.cmake
+%%JWT%%lib/cmake/Poco/PocoJWTConfig.cmake
+%%JWT%%lib/cmake/Poco/PocoJWTConfigVersion.cmake
+%%JWT%%lib/cmake/Poco/PocoJWTTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%JWT%%lib/cmake/Poco/PocoJWTTargets.cmake
+%%MONGODB%%lib/cmake/Poco/PocoMongoDBConfig.cmake
+%%MONGODB%%lib/cmake/Poco/PocoMongoDBConfigVersion.cmake
+%%MONGODB%%lib/cmake/Poco/PocoMongoDBTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%MONGODB%%lib/cmake/Poco/PocoMongoDBTargets.cmake
 lib/cmake/Poco/PocoNetConfig.cmake
 lib/cmake/Poco/PocoNetConfigVersion.cmake
 %%SSL%%lib/cmake/Poco/PocoNetSSLConfig.cmake
 %%SSL%%lib/cmake/Poco/PocoNetSSLConfigVersion.cmake
-%%SSL%%lib/cmake/Poco/PocoNetSSLTargets.cmake
 %%SSL%%lib/cmake/Poco/PocoNetSSLTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoNetTargets.cmake
+%%SSL%%lib/cmake/Poco/PocoNetSSLTargets.cmake
 lib/cmake/Poco/PocoNetTargets-%%CMAKE_BUILD_TYPE%%.cmake
+lib/cmake/Poco/PocoNetTargets.cmake
+%%PROMETHEUS%%lib/cmake/Poco/PocoPrometheusConfig.cmake
+%%PROMETHEUS%%lib/cmake/Poco/PocoPrometheusConfigVersion.cmake
+%%PROMETHEUS%%lib/cmake/Poco/PocoPrometheusTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%PROMETHEUS%%lib/cmake/Poco/PocoPrometheusTargets.cmake
 %%REDIS%%lib/cmake/Poco/PocoRedisConfig.cmake
 %%REDIS%%lib/cmake/Poco/PocoRedisConfigVersion.cmake
 %%REDIS%%lib/cmake/Poco/PocoRedisTargets-%%CMAKE_BUILD_TYPE%%.cmake
@@ -865,45 +921,51 @@ lib/cmake/Poco/PocoUtilConfig.cmake
 lib/cmake/Poco/PocoUtilConfigVersion.cmake
 lib/cmake/Poco/PocoUtilTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/Poco/PocoUtilTargets.cmake
-lib/cmake/Poco/PocoXMLConfig.cmake
-lib/cmake/Poco/PocoXMLConfigVersion.cmake
-lib/cmake/Poco/PocoXMLTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoXMLTargets.cmake
-lib/cmake/Poco/PocoZipConfig.cmake
-lib/cmake/Poco/PocoZipConfigVersion.cmake
-lib/cmake/Poco/PocoZipTargets-%%CMAKE_BUILD_TYPE%%.cmake
-lib/cmake/Poco/PocoZipTargets.cmake
+%%XML%%lib/cmake/Poco/PocoXMLConfig.cmake
+%%XML%%lib/cmake/Poco/PocoXMLConfigVersion.cmake
+%%XML%%lib/cmake/Poco/PocoXMLTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%XML%%lib/cmake/Poco/PocoXMLTargets.cmake
+%%ZIP%%lib/cmake/Poco/PocoZipConfig.cmake
+%%ZIP%%lib/cmake/Poco/PocoZipConfigVersion.cmake
+%%ZIP%%lib/cmake/Poco/PocoZipTargets-%%CMAKE_BUILD_TYPE%%.cmake
+%%ZIP%%lib/cmake/Poco/PocoZipTargets.cmake
 lib/cmake/Poco/V313/FindSQLite3.cmake
 lib/cmake/Poco/V39/FindEXPAT.cmake
-%%SSL%%lib/libPocoCrypto.so
+%%ACTIVERECORD%%lib/libPocoActiveRecord.so.%%SHLIB_MAJOR%%
+%%ACTIVERECORD%%lib/libPocoActiveRecord.so
 %%SSL%%lib/libPocoCrypto.so.%%SHLIB_MAJOR%%
-lib/libPocoData.so
-lib/libPocoData.so.%%SHLIB_MAJOR%%
-%%MYSQL%%lib/libPocoDataMySQL.so
+%%SSL%%lib/libPocoCrypto.so
+%%DATA%%lib/libPocoData.so.%%SHLIB_MAJOR%%
+%%DATA%%lib/libPocoData.so
 %%MYSQL%%lib/libPocoDataMySQL.so.%%SHLIB_MAJOR%%
-%%ODBC%%lib/libPocoDataODBC.so
+%%MYSQL%%lib/libPocoDataMySQL.so
 %%ODBC%%lib/libPocoDataODBC.so.%%SHLIB_MAJOR%%
-%%SQLITE%%lib/libPocoDataSQLite.so
+%%ODBC%%lib/libPocoDataODBC.so
+%%PGSQL%%lib/libPocoDataPostgreSQL.so.%%SHLIB_MAJOR%%
+%%PGSQL%%lib/libPocoDataPostgreSQL.so
 %%SQLITE%%lib/libPocoDataSQLite.so.%%SHLIB_MAJOR%%
-lib/libPocoEncodings.so
-lib/libPocoEncodings.so.%%SHLIB_MAJOR%%
+%%SQLITE%%lib/libPocoDataSQLite.so
+%%ENCODINGS%%lib/libPocoEncodings.so.%%SHLIB_MAJOR%%
+%%ENCODINGS%%lib/libPocoEncodings.so
 lib/libPocoFoundation.so
 lib/libPocoFoundation.so.%%SHLIB_MAJOR%%
-lib/libPocoJSON.so
-lib/libPocoJSON.so.%%SHLIB_MAJOR%%
-lib/libPocoJWT.so
-lib/libPocoJWT.so.%%SHLIB_MAJOR%%
-lib/libPocoMongoDB.so
-lib/libPocoMongoDB.so.%%SHLIB_MAJOR%%
+%%JSON%%lib/libPocoJSON.so.%%SHLIB_MAJOR%%
+%%JSON%%lib/libPocoJSON.so
+%%JWT%%lib/libPocoJWT.so.%%SHLIB_MAJOR%%
+%%JWT%%lib/libPocoJWT.so
+%%MONGODB%%lib/libPocoMongoDB.so.%%SHLIB_MAJOR%%
+%%MONGODB%%lib/libPocoMongoDB.so
 lib/libPocoNet.so
 lib/libPocoNet.so.%%SHLIB_MAJOR%%
-%%SSL%%lib/libPocoNetSSL.so
 %%SSL%%lib/libPocoNetSSL.so.%%SHLIB_MAJOR%%
-%%REDIS%%lib/libPocoRedis.so
+%%SSL%%lib/libPocoNetSSL.so
+%%PROMETHEUS%%lib/libPocoPrometheus.so.%%SHLIB_MAJOR%%
+%%PROMETHEUS%%lib/libPocoPrometheus.so
*** 12 LINES SKIPPED ***



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307161504.36GF4w2D030617>