Skip site navigation (1)Skip section navigation (2)
Date:      Thu, 5 Jun 2025 12:19:49 GMT
From:      Hiroki Tagato <tagattie@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 76dcbb55be72 - main - devel/libunicode: add CONFLICTS_INSTALL with devel/libunicode-contour
Message-ID:  <202506051219.555CJnKF096026@gitrepo.freebsd.org>

index | next in thread | raw e-mail

The branch main has been updated by tagattie:

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

commit 76dcbb55be7279fe58d5a1ed86edca94d2367273
Author:     Hiroki Tagato <tagattie@FreeBSD.org>
AuthorDate: 2025-06-05 12:07:01 +0000
Commit:     Hiroki Tagato <tagattie@FreeBSD.org>
CommitDate: 2025-06-05 12:19:35 +0000

    devel/libunicode: add CONFLICTS_INSTALL with devel/libunicode-contour
    
    They install libunicode.so to the same path. While here, reorder
    variables to make portclippy happy.
---
 devel/libunicode/Makefile | 10 ++++++++--
 1 file changed, 8 insertions(+), 2 deletions(-)

diff --git a/devel/libunicode/Makefile b/devel/libunicode/Makefile
index 894a7c91ee36..1f238fed7cf8 100644
--- a/devel/libunicode/Makefile
+++ b/devel/libunicode/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	libunicode
 PORTVERSION=	0.4
-PORTREVISION=	11
+PORTREVISION=	12
 CATEGORIES=	devel gnome
 MASTER_SITES=	GNOME/sources/libunicode/0.4
 DISTNAME=	${PORTNAME}-${PORTVERSION}.gnome
@@ -10,12 +10,18 @@ COMMENT=	Library for manipulating Unicode characters and strings
 WWW=		https://www.gnome.org/
 
 USES=		iconv libtool
-GNU_CONFIGURE=	yes
+
 USE_LDCONFIG=	yes
+
+GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--localstatedir=${PREFIX}/share \
 		--datadir=${PREFIX}/share
+
 CPPFLAGS+=	-I${LOCALBASE}/include
 LIBS+=		-L${LOCALBASE}/lib
+
+CONFLICTS_INSTALL=	libunicode-contour
+
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 .include <bsd.port.mk>


home | help

Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202506051219.555CJnKF096026>