git: b4dedc91e8a0 - main - net/rdist6: Register conflict with the new net/rdist7

Go to: [ bottom of page ] [ top of archives ] [ this month ]

From: Cy Schubert <cy_at_FreeBSD.org>
Date: Wed, 20 Mar 2024 03:03:08 UTC

The branch main has been updated by cy:

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

commit b4dedc91e8a04fffdd486ec53158b811105cffe1
Author:     Cy Schubert <cy@FreeBSD.org>
AuthorDate: 2024-03-20 03:01:59 +0000
Commit:     Cy Schubert <cy@FreeBSD.org>
CommitDate: 2024-03-20 03:02:33 +0000

    net/rdist6: Register conflict with the new net/rdist7
---
 net/rdist6/Makefile | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/net/rdist6/Makefile b/net/rdist6/Makefile
index d93c11f7e69a..77d4343a6eac 100644
--- a/net/rdist6/Makefile
+++ b/net/rdist6/Makefile
@@ -11,6 +11,8 @@ WWW=		https://www.magnicomp.com/
 
 LICENSE=	BSD4CLAUSE
 
+CONFLICTS=	rdist7
+
 MAKE_JOBS_UNSAFE=	yes
 
 # Years ago base FreeBSD maintained /usr/bin/rdist, but since then it was