Date: Wed, 12 Jul 2023 22:36:24 GMT From: Guido Falsi <madpilot@FreeBSD.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org Subject: git: 23f74cef1bfb - 2023Q3 - Revert "sysutils/xxd: Add missing conflict with vim console flavor" Message-ID: <202307122236.36CMaOKC040081@gitrepo.freebsd.org>
next in thread | raw e-mail | index | archive | help
The branch 2023Q3 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=23f74cef1bfb4eb130c4734964813bc8e176d1aa commit 23f74cef1bfb4eb130c4734964813bc8e176d1aa Author: Guido Falsi <madpilot@FreeBSD.org> AuthorDate: 2023-07-12 22:27:57 +0000 Commit: Guido Falsi <madpilot@FreeBSD.org> CommitDate: 2023-07-12 22:35:43 +0000 Revert "sysutils/xxd: Add missing conflict with vim console flavor" The vim console flavor package name is "vim" (without -console), so the conflict on vim-console is not required. This reverts commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194. Reported by: adamw (cherry picked from commit 2901ad0f23916b83deaf4f1fc688503c404d3e6a) --- sysutils/xxd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile index d0f2752ba2d3..3db60c1ba60e 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-console vim-gtk2 vim-gtk3 vim-motif vim-x11 +CONFLICTS_INSTALL= vim-[0-9]* vim-gtk2 vim-gtk3 vim-motif vim-x11 DISTINFO_FILE= ${VIM_PORT}/distinfo ALL_TARGET= ${PORTNAME}
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202307122236.36CMaOKC040081>