git: 36ac40d573d2 - main - devel/log4cplus: update to 2.2.0.1

From: Xin LI <delphij_at_FreeBSD.org>
Date: Fri, 10 Jul 2026 02:06:42 UTC
The branch main has been updated by delphij:

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

commit 36ac40d573d29f70bc778104dd987efaff636a4b
Author:     Xin LI <delphij@FreeBSD.org>
AuthorDate: 2026-07-09 04:03:26 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2026-07-10 02:06:29 +0000

    devel/log4cplus: update to 2.2.0.1
---
 devel/log4cplus/Makefile                   | 10 ++++------
 devel/log4cplus/distinfo                   |  6 +++---
 devel/log4cplus/files/patch-CMakeLists.txt | 16 ++++++++++++++++
 devel/log4cplus/pkg-plist                  |  1 +
 4 files changed, 24 insertions(+), 9 deletions(-)

diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index 306ea3cc752f..1925bdbca98d 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -1,5 +1,5 @@
 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}/
 
@@ -17,13 +17,10 @@ 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
@@ -31,7 +28,8 @@ 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}
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
@@ -29,6 +29,7 @@ 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