Re: git: 25122d0e5673 - main - sysutils/xxd: Add missing conflict with vim console flavor

On Wed, Jul 12, 2023 at 3:24 AM Guido Falsi <madpilot@freebsd.org> wrote:

> The branch main has been updated by madpilot:
>
> URL:
> https://cgit.FreeBSD.org/ports/commit/?id=25122d0e5673c9ba2f91fe32d806cf3e91d23194
>
> commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194
> 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:24:42 +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
> ---
>  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
>

FWIW, there is no vim-console package (the console package is just 'vim'):

editors/vim/Makefile:
  .for f in ${FLAVORS:Nconsole}
  ${f}_PKGNAMESUFFIX=     -${f}
  .endfor

Certainly no harm in this commit, and it definitely future-proofs in case I
get
on the computer before coffee and decide to make vim-motif the default. But
it should be a NOOP at this time.

# Adam


-- 
Adam Weinberger
adamw@adamw.org
https://www.adamw.org