git: d3cfa7ea4222 - 2023Q3 - sysutils/xxd: Add missing conflict with vim console flavor

From: Guido Falsi <madpilot_at_FreeBSD.org>
Date: Wed, 12 Jul 2023 07:26:10 UTC 
The branch 2023Q3 has been updated by madpilot:

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

commit d3cfa7ea42229670219c0dad9acc8595bee31c29
Author:     Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-07-12 07:21:47 +0000
Commit:     Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-07-12 07:26:05 +0000

    sysutils/xxd: Add missing conflict with vim console flavor
    
    Reported by:    Steven Nikkel <steven_nikkel@ertyu.org> (via email)
    Approved by:    Gianmarco Giovannelli <gmarco@giovannelli.it> (maintainer)
    MFH:            2023Q3
    
    (cherry picked from commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194)
---
 sysutils/xxd/Makefile | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile
index 3db60c1ba60e..d0f2752ba2d3 100644
--- a/sysutils/xxd/Makefile
+++ b/sysutils/xxd/Makefile
@@ -7,7 +7,7 @@ MAINTAINER=	gmarco@giovannelli.it
 COMMENT=	Hexdump and reverse hexdump utility from vim distribution
 WWW=		${VIM_WWW}
 
-CONFLICTS_INSTALL=	vim-[0-9]* vim-gtk2 vim-gtk3 vim-motif vim-x11
+CONFLICTS_INSTALL=	vim-[0-9]* vim-console vim-gtk2 vim-gtk3 vim-motif vim-x11
 
 DISTINFO_FILE=	${VIM_PORT}/distinfo
 ALL_TARGET=	${PORTNAME}