git: a7d1b84d1fa8 - main - devel/log4cplus: Update to 2.1.1 and fix "make test"

The branch main has been updated by delphij:

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

commit a7d1b84d1fa81ea9f1813701dadf9742ddf4237d
Author:     Daniel Engberg <diizzy@FreeBSD.org>
AuthorDate: 2023-11-22 05:02:08 +0000
Commit:     Xin LI <delphij@FreeBSD.org>
CommitDate: 2023-11-22 05:02:08 +0000

    devel/log4cplus: Update to 2.1.1 and fix "make test"
    
    PR:             ports/275195
---
 devel/log4cplus/Makefile | 24 ++++++++++++++++++------
 devel/log4cplus/distinfo |  6 +++---
 2 files changed, 21 insertions(+), 9 deletions(-)

diff --git a/devel/log4cplus/Makefile b/devel/log4cplus/Makefile
index a5c741d91797..9c43e3f5cf8b 100644
--- a/devel/log4cplus/Makefile
+++ b/devel/log4cplus/Makefile
@@ -1,7 +1,7 @@
 PORTNAME=	log4cplus
-PORTVERSION=	2.1.0
+DISTVERSION=	2.1.1
 CATEGORIES=	devel
-MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/REL_${PORTVERSION:S:.:_:g}/
+MASTER_SITES=	https://github.com/${PORTNAME}/${PORTNAME}/releases/download/REL_${DISTVERSION:S:.:_:g}/
 
 MAINTAINER=	delphij@FreeBSD.org
 COMMENT=	Logging library for C++
@@ -10,15 +10,24 @@ WWW=		https://log4cplus.github.io/log4cplus/
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-USES=		cmake compiler:c++11-lang tar:xz
-
-OPTIONS_DEFINE=	DOCS
+TEST_DEPENDS=	catch>=0:devel/catch
 
+USES=		cmake:testing compiler:c++11-lang pathfix tar:xz
 USE_LDCONFIG=	yes
-CMAKE_OFF=	LOG4CPLUS_BUILD_TESTING
+
+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_OFF=	LOG4CPLUS_BUILD_TESTING WITH_UNIT_TESTS
+
+OPTIONS_DEFINE=	DOCS
+
 DOCS_BUILD_DEPENDS=	doxygen:devel/doxygen
 
 post-build-DOCS-on:
@@ -28,4 +37,7 @@ 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 2161965e5422..a09e651d23cf 100644
--- a/devel/log4cplus/distinfo
+++ b/devel/log4cplus/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1687763458
-SHA256 (log4cplus-2.1.0.tar.xz) = d84ac8b1c46645122fbf72691f8eacef68c71b587403ee833bd9a252e06d46cc
-SIZE (log4cplus-2.1.0.tar.xz) = 940796
+TIMESTAMP = 1700396330
+SHA256 (log4cplus-2.1.1.tar.xz) = a1d8e67a207f90a9dd4f82b28a1f3ac6dead5a80c2bed071277a9e865698a82b
+SIZE (log4cplus-2.1.1.tar.xz) = 941168