Skip site navigation (1)Skip section navigation (2)
Date:      Sat, 27 Nov 2021 19:08:13 GMT
From:      Mateusz Piotrowski <0mp@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1867c6e684f9 - main - */yj*: Add CONFLICTS_INSTALL
Message-ID:  <202111271908.1ARJ8Ddk096229@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by 0mp:

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

commit 1867c6e684f9012e5806b6a71d068045e94407de
Author:     Mateusz Piotrowski <0mp@FreeBSD.org>
AuthorDate: 2021-11-27 19:01:19 +0000
Commit:     Mateusz Piotrowski <0mp@FreeBSD.org>
CommitDate: 2021-11-27 19:08:05 +0000

    */yj*: Add CONFLICTS_INSTALL
    
    Approved by:    portmgr (blanket)
---
 converters/yj-bruceadams/Makefile | 2 ++
 converters/yj/Makefile            | 2 ++
 2 files changed, 4 insertions(+)

diff --git a/converters/yj-bruceadams/Makefile b/converters/yj-bruceadams/Makefile
index 7cd263e66a63..c1aeea723ae5 100644
--- a/converters/yj-bruceadams/Makefile
+++ b/converters/yj-bruceadams/Makefile
@@ -68,6 +68,8 @@ CARGO_CRATES=	addr2line-0.16.0 \
 		winapi-x86_64-pc-windows-gnu-0.4.0 \
 		yaml-rust-0.4.5
 
+CONFLICTS_INSTALL=	yj-[0-9]*.[0-9]*
+
 PLIST_FILES=	bin/yj
 
 post-install:
diff --git a/converters/yj/Makefile b/converters/yj/Makefile
index e733d9155080..e326f0966ec5 100644
--- a/converters/yj/Makefile
+++ b/converters/yj/Makefile
@@ -15,6 +15,8 @@ USE_GITHUB=	yes
 
 GH_ACCOUNT=	sclevine
 
+CONFLICTS_INSTALL=	yj-bruceadams
+
 PLIST_FILES=	bin/yj
 
 GH_TUPLE=	go-yaml:yaml:eeeca48fe776:go_yaml_yaml/vendor/gopkg.in/yaml.v3 \



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