From 2901ad0f23916b83deaf4f1fc688503c404d3e6a Mon Sep 17 00:00:00 2001 From: Guido Falsi Date: Thu, 13 Jul 2023 00:27:57 +0200 Subject: [PATCH] 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 --- sysutils/xxd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile index d0f2752ba2d36..3db60c1ba60e6 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}