From nobody Thu Jun 5 12:19:49 2025 X-Original-To: dev-commits-ports-main@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4bCk6G0XTyz5xkvH; Thu, 05 Jun 2025 12:19:50 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R11" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4bCk6F1jXNz3CKP; Thu, 05 Jun 2025 12:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749125989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUpAdMirhjSALaGC5ngrSNb0+Z+bQvM2G/02Ga9qzn0=; b=feHxK5/W/YSe41KL5jg6UvzqdtEH6E7rulre6X+gONcZXe/clKFmtDDLPHSqrVQszx/5CB BH+oQiuu7R1BZ9rQW7/amF2gtY0Tk1g9EN0vUQ4wDirQ3AAcxD2TBCEQ4BzDyDBzjqEYKR H8cL7gXkuupmBjnxQbgWR/vOJXcIx/dwjdMlzy6PucCqp+vyOjFZB8MOAR+7vuw5sl/HW1 akH4bkR1DllGlgjRHdZ/UuO45gOGorGZEUs6lPDkPQQxCpaFKdBE+foPwBfOJl1acATusA ZGW4ipvVyKL6bZPMwhd8zeAj+VMbvfGe0zKQD0LNpRB3N8kS3yPvnhpDsyGuqA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1749125989; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=eUpAdMirhjSALaGC5ngrSNb0+Z+bQvM2G/02Ga9qzn0=; b=bZtp/Yu1QO99hSzRH2UGx8mNFlQ/z5LBIfFp5pBn88i1yYA8T7lPgvvGfo9fEVUyuXU/au cJW/QN2a2Oeebztxpm/RsF6vi1+qnA+r7PHCiqcvKvc1BMZDzUKB+upur1rgoXHSxGA77z tMkwBtZPh2tXAaqlfeJCly5P1j7jjl75LMuk1ZTnq++fFIGUloLg16s27yFk2TANtf9iCb 4jcCs+A85iiqOtwWwv6iQTGBx2lrXAIGNwK4fpWJuiepF8gbwyLyOa7v/5KC5d/XbW8Aej 7lIdTRsso+dbbI57nc+BAcejDguJAULol2SducbvW0JVxTtyvNojJ6L8FD4DUw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1749125989; a=rsa-sha256; cv=none; b=CBeyj474STYgN+wFZD9jWbbML1UchMYtEIPan8WCEPmxOB1LouLXxgEFHSb2hhj9RwAFRn GyVStaNivBnTyinCPNo36rCY7+nuz5tW2B5FMM3A2bF6Gtf8ZkYDUa0/fWQG1NwQYqMs1d 0ZtyR67R1rfW7aaDQmZIOHoXcW6Yx0sA/sdpi6Ge8tJaLZzdNVOaZXfYwLkT+s7Jx0FSmU M/Gnc0wFom96+ALA2R1Zlr6ooMzdFTm0cr8unF7sruhkqPVVwdqwo1cpJjmRX9tQbKaqxS PgsfjFR1w+h+D3RNgSRM3gHZ4/lndeOPHJjOLSqxRY8QM1rNcm0W30Mo+LUQYQ== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4bCk6F1Hj3z187m; Thu, 05 Jun 2025 12:19:49 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 555CJnI7096029; Thu, 5 Jun 2025 12:19:49 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 555CJnKF096026; Thu, 5 Jun 2025 12:19:49 GMT (envelope-from git) Date: Thu, 5 Jun 2025 12:19:49 GMT Message-Id: <202506051219.555CJnKF096026@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Hiroki Tagato Subject: git: 76dcbb55be72 - main - devel/libunicode: add CONFLICTS_INSTALL with devel/libunicode-contour List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: tagattie X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 76dcbb55be7279fe58d5a1ed86edca94d2367273 Auto-Submitted: auto-generated The branch main has been updated by tagattie: URL: https://cgit.FreeBSD.org/ports/commit/?id=76dcbb55be7279fe58d5a1ed86edca94d2367273 commit 76dcbb55be7279fe58d5a1ed86edca94d2367273 Author: Hiroki Tagato AuthorDate: 2025-06-05 12:07:01 +0000 Commit: Hiroki Tagato 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