git: bbd87db70668 - main - devel/libunicode-contour: resolve conflict with devel/libunicode

The branch main has been updated by tagattie:

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

commit bbd87db706681d01be8888118ee9356e19b3c018
Author:     Chad Jacob Milios <milios@ccsys.com>
AuthorDate: 2025-08-13 00:25:29 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-08-13 00:31:07 +0000

    devel/libunicode-contour: resolve conflict with devel/libunicode
    
    Avoid conflict with devel/libunicode by install shared libraries into
    ${PREFIX}/lib/contour and adjust a cmake file so that consumers can
    find the libraries for linking.
    
    PR:             288799
    Reported by:    Chad Jacob Milios <milios@ccsys.com>
---
 devel/libunicode-contour/Makefile  | 11 +++++++++--
 devel/libunicode-contour/pkg-plist | 18 +++++++++---------
 2 files changed, 18 insertions(+), 11 deletions(-)

diff --git a/devel/libunicode-contour/Makefile b/devel/libunicode-contour/Makefile
index 7838bbc1e031..9e7001648d9b 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
 
@@ -19,18 +20,24 @@ USES=		cmake:testing
 USE_GITHUB=	yes
 GH_ACCOUNT=	contour-terminal
 
-USE_LDCONFIG=	yes
+USE_LDCONFIG=	${PREFIX}/lib/contour
 
 CMAKE_ARGS=	-DLIBUNICODE_UCD_DIR:STRING=${LOCALBASE}/share/unicode/ucd \
 		${CMAKE_ARGS_${ARCH}}
 CMAKE_ARGS_i386=	-DLIBUNICODE_SIMD_IMPLEMENTATION:STRING=std
 
-CONFLICTS_INSTALL=	libunicode
+REINPLACE_ARGS=	-i ''
 
 PORTDOCS=	README.md TODO.md
 
 OPTIONS_DEFINE=	DOCS
 
+post-install:
+	@${MKDIR} ${STAGEDIR}${PREFIX}/lib/contour
+	${MV} ${STAGEDIR}${PREFIX}/lib/*.* ${STAGEDIR}${PREFIX}/lib/contour
+	${REINPLACE_CMD} -e 's|$${_IMPORT_PREFIX}/lib/|$${_IMPORT_PREFIX}/lib/contour/|' \
+		${STAGEDIR}${PREFIX}/lib/cmake/libunicode/libunicode-targets-${CMAKE_BUILD_TYPE:tl}.cmake
+
 post-install-DOCS-on:
 	@${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_MAN} ${PORTDOCS:S|^|${WRKSRC}/|} ${STAGEDIR}${DOCSDIR}
diff --git a/devel/libunicode-contour/pkg-plist b/devel/libunicode-contour/pkg-plist
index e7237ec8f7af..d8de5d928c9b 100644
--- a/devel/libunicode-contour/pkg-plist
+++ b/devel/libunicode-contour/pkg-plist
@@ -24,12 +24,12 @@ lib/cmake/libunicode/libunicode-config-version.cmake
 lib/cmake/libunicode/libunicode-config.cmake
 lib/cmake/libunicode/libunicode-targets-%%CMAKE_BUILD_TYPE%%.cmake
 lib/cmake/libunicode/libunicode-targets.cmake
-lib/libunicode.so
-lib/libunicode.so.0.6
-lib/libunicode.so.0.6.0
-lib/libunicode_loader.so
-lib/libunicode_loader.so.0.6
-lib/libunicode_loader.so.0.6.0
-lib/libunicode_ucd.so
-lib/libunicode_ucd.so.0.6
-lib/libunicode_ucd.so.0.6.0
+lib/contour/libunicode.so
+lib/contour/libunicode.so.0.6
+lib/contour/libunicode.so.0.6.0
+lib/contour/libunicode_loader.so
+lib/contour/libunicode_loader.so.0.6
+lib/contour/libunicode_loader.so.0.6.0
+lib/contour/libunicode_ucd.so
+lib/contour/libunicode_ucd.so.0.6
+lib/contour/libunicode_ucd.so.0.6.0