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

On 13/07/23 00:13, Adam Weinberger wrote:
> 
> 
> On Wed, Jul 12, 2023 at 5:58 PM Guido Falsi <madpilot@freebsd.org 
> <mailto:madpilot@freebsd.org>> wrote:
> 
>     On 12/07/23 23:47, Adam Weinberger wrote:
>      > On Wed, Jul 12, 2023 at 3:24 AM Guido Falsi <madpilot@freebsd.org
>     <mailto:madpilot@freebsd.org>
>      > <mailto:madpilot@freebsd.org <mailto:madpilot@freebsd.org>>> wrote:
>      >
>      >     The branch main has been updated by madpilot:
>      >
>      >     URL:
>      >
>     https://cgit.FreeBSD.org/ports/commit/?id=25122d0e5673c9ba2f91fe32d806cf3e91d23194 <https://cgit.FreeBSD.org/ports/commit/?id=25122d0e5673c9ba2f91fe32d806cf3e91d23194> <https://cgit.FreeBSD.org/ports/commit/?id=25122d0e5673c9ba2f91fe32d806cf3e91d23194 <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
>     <mailto:steven_nikkel@ertyu.org>
>      >     <mailto:steven_nikkel@ertyu.org
>     <mailto:steven_nikkel@ertyu.org>>> (via email)
>      >          Approved by:    Gianmarco Giovannelli
>     <gmarco@giovannelli.it <mailto:gmarco@giovannelli.it>
>      >     <mailto:gmarco@giovannelli.it
>     <mailto: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
>     <mailto:gmarco@giovannelli.it>
>      >     <mailto:gmarco@giovannelli.it <mailto: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
>      >
> 
>     You're definitely right but a user reported this:
> 
>     pkg-static: xxd-9.0.1671 conflicts with vim-console-9.0.0129 (installs
>     files into the same place).  Problematic file: /usr/local/bin/xxd
> 
>     I clearly have not checked well enough, maybe this user has some local
>     changes?
> 
> 
> Ahh, it's because they have a stale vim package around (9.0.0129 was 
> from Aug 1, 2022).
> 
> Cc:ing reporter here: remove your vim-console package and install the 
> vim package
> (it's the same thing, but with a new name):
>    pkg delete vim-console
>    pkg install vim

Thanks for the diagnosis, I did not notice this. I'll revert my change 
shortly.

-- 
Guido Falsi <madpilot@FreeBSD.org>