diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index 306ea3cc752f..1925bdbca98d 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -1,43 +1,41 @@
 PORTNAME=	log4cplus
-DISTVERSION=	2.1.2
+DISTVERSION=	2.2.0.1
 CATEGORIES=	devel
 MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/REL_${DISTVERSION:S:.:_:g}/
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Logging library for C++
 WWW=		https://log4cplus.github.io/log4cplus/
 
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 TEST_DEPENDS=	catch>=0:devel/catch
 
 USES=		cmake:testing compiler:c++11-lang pathfix tar:xz
 USE_LDCONFIG=	yes
 
 EXTRACT_AFTER_ARGS=	--exclude catch
 
-.if ${.TARGETS} == "test"
-CXXFLAGS+=	-I${LOCALBASE}/include/catch2
-.endif
-
 PORTDOCS=	*
 
 CMAKE_TESTING_ON=	LOG4CPLUS_BUILD_TESTING WITH_UNIT_TESTS
+CMAKE_TESTING_ARGS=	-DCATCH2_INCLUDE_DIR=${LOCALBASE}/include/catch2
 CMAKE_OFF=	LOG4CPLUS_BUILD_TESTING WITH_UNIT_TESTS
 
 OPTIONS_DEFINE=	DOCS
 
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 post-build-DOCS-on:
-	cd ${WRKDIR} && doxygen ${DISTNAME}/docs/doxygen.config
+	cd ${WRKDIR} && (cat ${DISTNAME}/docs/doxygen.config; \
+		${ECHO_CMD} "OUTPUT_DIRECTORY=${WRKSRC}/docs") | doxygen -
 
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/docs/html/* ${STAGEDIR}${DOCSDIR}
 
 pre-test:
 	${RM} ${BUILD_WRKSRC}/CMakeCache.txt
 
 .include <bsd.port.mk>
diff --git a/devel/log4cplus/distinfo b/devel/log4cplus/distinfo
index 20857e87a91e..ab35bd3b43cf 100644
--- a/devel/log4cplus/distinfo
+++ b/devel/log4cplus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1735459018
-SHA256 (log4cplus-2.1.2.tar.xz) = fbdabb4ef734fe1cc62169b23f0b480cc39127ac7b09b810a9c1229490d67e9e
-SIZE (log4cplus-2.1.2.tar.xz) = 953200
+TIMESTAMP = 1783482355
+SHA256 (log4cplus-2.2.0.1.tar.xz) = 6fc6b1b392921b048dcb0a71b5a1b46e9956bff710d288bdc9c4fc689f1a5f0b
+SIZE (log4cplus-2.2.0.1.tar.xz) = 973136
diff --git a/devel/log4cplus/files/patch-CMakeLists.txt b/devel/log4cplus/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..323ae282b4ef
--- /dev/null
+++ b/devel/log4cplus/files/patch-CMakeLists.txt
@@ -0,0 +1,16 @@
+--- CMakeLists.txt.orig	2026-07-09 04:40:46 UTC
++++ CMakeLists.txt
+@@ -168,9 +168,12 @@ configure_file(${DEFINES_HXX_CMAKE} ${DEFINES_HXX} @ON
+ 
+ configure_file(${DEFINES_HXX_CMAKE} ${DEFINES_HXX} @ONLY)
+ 
++if(NOT DEFINED CATCH2_INCLUDE_DIR)
++  set(CATCH2_INCLUDE_DIR ${log4cplus_SOURCE_DIR}/catch/single_include/catch2)
++endif()
+ include_directories (${log4cplus_SOURCE_DIR}/include
+                      ${log4cplus_SOURCE_DIR}/threadpool
+-                     ${log4cplus_SOURCE_DIR}/catch/single_include/catch2
++                     ${CATCH2_INCLUDE_DIR}
+                      ${log4cplus_BINARY_DIR}/include
+                     )
+ 
diff --git a/devel/log4cplus/pkg-plist b/devel/log4cplus/pkg-plist
index 7dde11e505de..72023a852e54 100644
--- a/devel/log4cplus/pkg-plist
+++ b/devel/log4cplus/pkg-plist
@@ -1,82 +1,83 @@
 bin/loggingserver
 include/log4cplus/appender.h
 include/log4cplus/asyncappender.h
 include/log4cplus/boost/deviceappender.hxx
 include/log4cplus/callbackappender.h
 include/log4cplus/clogger.h
 include/log4cplus/config.hxx
 include/log4cplus/config/defines.hxx
 include/log4cplus/config/macosx.h
 include/log4cplus/config/win32.h
 include/log4cplus/config/windowsh-inc.h
 include/log4cplus/configurator.h
 include/log4cplus/consoleappender.h
 include/log4cplus/exception.h
 include/log4cplus/fileappender.h
 include/log4cplus/fstreams.h
 include/log4cplus/helpers/appenderattachableimpl.h
 include/log4cplus/helpers/connectorthread.h
 include/log4cplus/helpers/eventcounter.h
 include/log4cplus/helpers/fileinfo.h
 include/log4cplus/helpers/lockfile.h
 include/log4cplus/helpers/loglog.h
 include/log4cplus/helpers/pointer.h
 include/log4cplus/helpers/property.h
 include/log4cplus/helpers/queue.h
 include/log4cplus/helpers/snprintf.h
 include/log4cplus/helpers/socket.h
 include/log4cplus/helpers/socketbuffer.h
 include/log4cplus/helpers/stringhelper.h
 include/log4cplus/helpers/thread-config.h
 include/log4cplus/helpers/timehelper.h
+include/log4cplus/helpers/win32fstream.h
 include/log4cplus/hierarchy.h
 include/log4cplus/hierarchylocker.h
 include/log4cplus/initializer.h
 include/log4cplus/internal/env.h
 include/log4cplus/internal/internal.h
 include/log4cplus/internal/socket.h
 include/log4cplus/layout.h
 include/log4cplus/log4cplus.h
 include/log4cplus/log4judpappender.h
 include/log4cplus/logger.h
 include/log4cplus/loggingmacros.h
 include/log4cplus/loglevel.h
 include/log4cplus/mdc.h
 include/log4cplus/ndc.h
 include/log4cplus/nteventlogappender.h
 include/log4cplus/nullappender.h
 include/log4cplus/socketappender.h
 include/log4cplus/spi/appenderattachable.h
 include/log4cplus/spi/factory.h
 include/log4cplus/spi/filter.h
 include/log4cplus/spi/loggerfactory.h
 include/log4cplus/spi/loggerimpl.h
 include/log4cplus/spi/loggingevent.h
 include/log4cplus/spi/objectregistry.h
 include/log4cplus/spi/rootlogger.h
 include/log4cplus/streams.h
 include/log4cplus/syslogappender.h
 include/log4cplus/tchar.h
 include/log4cplus/thread/impl/syncprims-cxx11.h
 include/log4cplus/thread/impl/syncprims-impl.h
 include/log4cplus/thread/impl/syncprims-pmsm.h
 include/log4cplus/thread/impl/threads-impl.h
 include/log4cplus/thread/impl/tls.h
 include/log4cplus/thread/syncprims-pub-impl.h
 include/log4cplus/thread/syncprims.h
 include/log4cplus/thread/threads.h
 include/log4cplus/tracelogger.h
 include/log4cplus/tstring.h
 include/log4cplus/version.h
 include/log4cplus/win32consoleappender.h
 include/log4cplus/win32debugappender.h
 lib/cmake/log4cplus/log4cplusConfig.cmake
 lib/cmake/log4cplus/log4cplusConfigVersion.cmake
 lib/cmake/log4cplus/log4cplusTargets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/log4cplus/log4cplusTargets.cmake
 lib/liblog4cplus.so
 lib/liblog4cplus.so.9
 libdata/pkgconfig/log4cplus.pc
 %%DATADIR%%/ChangeLog
 %%DATADIR%%/LICENSE
 %%DATADIR%%/README.md