git: 13997379d1d0 - main - textproc/mandoc: add CONFLICTS_INSTALL for groff

The branch main has been updated by tz:

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

commit 13997379d1d074a0f58d1f68cb752605d82db6ec
Author:     Torsten Zuehlsdorff <tz@FreeBSD.org>
AuthorDate: 2026-03-24 21:59:16 +0000
Commit:     Torsten Zuehlsdorff <tz@FreeBSD.org>
CommitDate: 2026-03-25 14:43:04 +0000

    textproc/mandoc: add CONFLICTS_INSTALL for groff
    
      mandoc and groff both install /usr/local/bin/soelim. Mark the conflict
      so pkg can warn users before installation.
    
      PR:           272956
      Approved by:  bapt@FreeBSD.org (maintainer timeout)
---
 textproc/groff/Makefile  | 2 ++
 textproc/mandoc/Makefile | 4 +++-
 2 files changed, 5 insertions(+), 1 deletion(-)

diff --git a/textproc/groff/Makefile b/textproc/groff/Makefile
index 64fa4cd2f244..3b41a61fed3c 100644
--- a/textproc/groff/Makefile
+++ b/textproc/groff/Makefile
@@ -1,5 +1,6 @@
 PORTNAME=	groff
 DISTVERSION=	1.24.1
+PORTREVISION=	1
 CATEGORIES=	textproc
 MASTER_SITES=	GNU
 
@@ -36,6 +37,7 @@ MAKE_ARGS=	datasubdir=${DATADIR} \
 		exampledir=${EXAMPLESDIR}
 
 CONFLICTS=	heirloom-doctools ja-groff
+CONFLICTS_INSTALL=	mandoc
 
 INFO=		groff
 PORTDOCS=	*
diff --git a/textproc/mandoc/Makefile b/textproc/mandoc/Makefile
index 54773537bef6..107e51ae8348 100644
--- a/textproc/mandoc/Makefile
+++ b/textproc/mandoc/Makefile
@@ -1,6 +1,6 @@
 PORTNAME=	mandoc
 PORTVERSION=	1.14.6
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	textproc
 MASTER_SITES=	http://mandoc.bsd.lv/snapshots/ \
 		LOCAL/uqs
@@ -20,6 +20,8 @@ HAS_CONFIGURE=	yes
 CFLAGS+=	-I${LOCALBASE}/include
 LDFLAGS+=	-L${LOCALBASE}/lib
 
+CONFLICTS_INSTALL=	groff
+
 post-configure:
 	@${REINPLACE_CMD} -e '/^CFLAGS/s/=/?=/' -e '/^PREFIX/s/=/?=/' \
 		-e 's/^INSTALL_PROGRAM.*/INSTALL_PROGRAM=${INSTALL_PROGRAM}/' \