From nobody Wed Jan 03 13:54:58 2024 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 4T4rnb0yJRz55wTn; Wed, 3 Jan 2024 13:54:59 +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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4T4rnZ6Zfsz4Ms9; Wed, 3 Jan 2024 13:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704290098; 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=e3wwuxDStRI2QNrVMSTNmcOjvVwM1aK6f0ZW7zMdpHU=; b=Tnn0H2+0tj4CdPkJRj0oDlKt2IwcSbY+otmtg2JajYBrTYm/oBUKMEjudLujbxKwudJ2dx NCVxP3TRw/0tBkTaFsCGMMu8P162rQm3uJiLcYdvaS+fMa0JZxTMOnF62ENc75wsrvRVLV J2yWUaEKTA0VSRq7hZgLlkZKl6Fpk41P/P0VlWfJdzJuGWhEyoMnxxeF21twCUvljqLiP5 I9TzNv8g9djAG/4FQgnrd+mKQjTud9H+iOvXpQtjXLyOOE0SC4nznbHvZ+T4V5el+4LOAr G8t2Olw3cAauFETRqILOYYEzd4FtQTxoKoKKnbD6ewKoAw6l+kbisGhipSjt/g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1704290098; 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=e3wwuxDStRI2QNrVMSTNmcOjvVwM1aK6f0ZW7zMdpHU=; b=Aikzx27VXVil1wDScKMJCQmq7ePO+pbEPZKYKgkafsGacqw5mEE8NkJ2Nz5xa5r7yw42I1 jclVSX+vaJf4viSLYfCbqJN9MCRkOIdPvQnhqcRh2ZPwnzoVQ27jv0C6M9MhkTJ1QnbDXh gUCljZbAx2mE724C6BhAJ0PJzCdzqvG8vWEUS4RFiykpHKDr+AVuGycPad+MQdv81ctlVw dz7Ezc+Y/zICvpSQqfEMEBk68HocnKY5SPmUw8Nuon5NT9i4pr3JWE0ZZ/pjl5UPscRwpg OMHNrisZJOCAjm0oIQq2+uHZ8PvkBN7ciI3q13gvZJTQ+z7228O9/9ZPtO3x2w== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1704290098; a=rsa-sha256; cv=none; b=UTC0lft2TNDNnFf9XOYsezu+ugSNdYg0R4VGW7f6A4ZwhBEcsJxTVyjD27Cg6FGTlcIZF8 NFJzB8hQmPdRv8Qt8yYtSy7L/cClSF72/sAlpYwL4zGlzAl70FmzxS2pV6UPyErFfe7lk6 anBf69nZZd2R+sBOhOC5jGJRfBBqd97uDY4LVx6jjfNxVmq6NuRInVh0eZl/IEgdHjMoRp EOLSFak0kIHZ96PZIObspFz31Y9IxAc4yrRj8GiWy2CARxoSBe7zUHib056SLgjWv5joIB BkqTtWP6s46qceNgRPbKMe2ITz95rsBGKsQQj8HOcMu1XeYCNkJZXFX858jZXQ== 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 4T4rnZ5hKBzncP; Wed, 3 Jan 2024 13:54:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 403DswaI046735; Wed, 3 Jan 2024 13:54:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 403Dswul046732; Wed, 3 Jan 2024 13:54:58 GMT (envelope-from git) Date: Wed, 3 Jan 2024 13:54:58 GMT Message-Id: <202401031354.403Dswul046732@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Vladimir Druzenko Subject: git: 1a0d88cb8b73 - main - print/scribus{,-devel}: add CONFLICTS_INSTALL each other 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: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: vvd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 1a0d88cb8b73b037140330eb3079ccd49f2f2670 Auto-Submitted: auto-generated The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a0d88cb8b73b037140330eb3079ccd49f2f2670 commit 1a0d88cb8b73b037140330eb3079ccd49f2f2670 Author: Vladimir Druzenko AuthorDate: 2024-01-03 13:52:24 +0000 Commit: Vladimir Druzenko CommitDate: 2024-01-03 13:52:24 +0000 print/scribus{,-devel}: add CONFLICTS_INSTALL each other Approved by: pkubaj (maintainer), adamw (mentor) Differential Revision: https://reviews.freebsd.org/D43276 --- print/scribus-devel/Makefile | 2 ++ print/scribus/Makefile | 2 ++ 2 files changed, 4 insertions(+) diff --git a/print/scribus-devel/Makefile b/print/scribus-devel/Makefile index 6f4f5e93d454..420996134eb4 100644 --- a/print/scribus-devel/Makefile +++ b/print/scribus-devel/Makefile @@ -48,6 +48,8 @@ CMAKE_ARGS+= -DWANT_HUNSPELL=YES \ -DWANT_CPP17=YES \ -DCMAKE_COLOR_MAKEFILE:BOOL=ON +CONFLICTS_INSTALL= scribus + OPTIONS_DEFINE= DOCS .include diff --git a/print/scribus/Makefile b/print/scribus/Makefile index 5033addcb1e0..2e7cccbf542e 100644 --- a/print/scribus/Makefile +++ b/print/scribus/Makefile @@ -40,6 +40,8 @@ USE_GNOME= cairo libxml2 CMAKE_ARGS+= -DWANT_CPP17=YES \ -DCMAKE_COLOR_MAKEFILE:BOOL=ON +CONFLICTS_INSTALL= scribus-devel + OPTIONS_DEFINE= BOOST DOCS GRAPHICSMAGICK HUNSPELL OSG PDF OPTIONS_DEFAULT=BOOST GRAPHICSMAGICK HUNSPELL OSG PDF