Date: Wed, 3 Jan 2024 13:54:58 GMT From: Vladimir Druzenko <vvd@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org Subject: git: 1a0d88cb8b73 - main - print/scribus{,-devel}: add CONFLICTS_INSTALL each other Message-ID: <202401031354.403Dswul046732@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch main has been updated by vvd: URL: https://cgit.FreeBSD.org/ports/commit/?id=1a0d88cb8b73b037140330eb3079ccd49f2f2670 commit 1a0d88cb8b73b037140330eb3079ccd49f2f2670 Author: Vladimir Druzenko <vvd@FreeBSD.org> AuthorDate: 2024-01-03 13:52:24 +0000 Commit: Vladimir Druzenko <vvd@FreeBSD.org> 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 <bsd.port.pre.mk> 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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202401031354.403Dswul046732>