git: 9a1181f1ec8a - 2025Q3 - devel/libunicode-contour: fix build on armv7

From: Robert Clausecker <fuz_at_FreeBSD.org>
Date: Fri, 19 Sep 2025 08:34:04 UTC
The branch 2025Q3 has been updated by fuz:

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

commit 9a1181f1ec8a242b4cd695b56a464b16e146062c
Author:     Robert Clausecker <fuz@FreeBSD.org>
AuthorDate: 2025-09-15 16:43:51 +0000
Commit:     Robert Clausecker <fuz@FreeBSD.org>
CommitDate: 2025-09-19 08:33:19 +0000

    devel/libunicode-contour: fix build on armv7
    
    Same solution as on some other platforms.
    Change file for devel/catch2 build dependency to one that is not also
    provided by devel/catch.
    
    Approved by:    portmgr (build fix blanket)
    MFH:            2025Q3
    
    (cherry picked from commit 4f186b7071db773f9b6b9aa7bc12d85bed7fb78a)
---
 devel/libunicode-contour/Makefile | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/devel/libunicode-contour/Makefile b/devel/libunicode-contour/Makefile
index fc70ef1157a7..e45e6d87e32f 100644
--- a/devel/libunicode-contour/Makefile
+++ b/devel/libunicode-contour/Makefile
@@ -1,6 +1,7 @@
 PORTNAME=	libunicode
 DISTVERSIONPREFIX=	v
 DISTVERSION=	0.6.0
+PORTREVISION=	1
 CATEGORIES=	devel
 PKGNAMESUFFIX=	-contour
 
@@ -11,7 +12,7 @@ WWW=		https://github.com/contour-terminal/libunicode
 LICENSE=	APACHE20
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
-BUILD_DEPENDS=	${LOCALBASE}/lib/cmake/Catch2/Catch2Config.cmake:devel/catch2 \
+BUILD_DEPENDS=	${LOCALBASE}/share/pkgconfig/catch2-with-main.pc:devel/catch2 \
 		UCD>=16.0.0,1:textproc/UCD
 
 USES=		cmake:testing
@@ -23,6 +24,7 @@ USE_LDCONFIG=	yes
 
 CMAKE_ARGS=	-DLIBUNICODE_UCD_DIR:STRING=${LOCALBASE}/share/unicode/ucd \
 		${CMAKE_ARGS_${ARCH}}
+CMAKE_ARGS_armv7=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=std
 CMAKE_ARGS_i386=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=std
 CMAKE_ARGS_powerpc64=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=sse2
 CMAKE_ARGS_powerpc64le=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=sse2