Date: Wed, 12 Jul 2023 18:13:43 -0400 From: Adam Weinberger <adamw@adamw.org> To: Guido Falsi <madpilot@freebsd.org>, steven_nikkel@ertyu.org Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Subject: Re: git: 25122d0e5673 - main - sysutils/xxd: Add missing conflict with vim console flavor Message-ID: <CAP7rwcjnTQtqM9aWK9cd06gavZfkEvGTc_StZ1BRcdX5-fkoQg@mail.gmail.com> In-Reply-To: <12039c19-d04f-8186-db7f-c9d2986ba4d4@FreeBSD.org> References: <202307120724.36C7Ohd9031623@gitrepo.freebsd.org> <CAP7rwcjG5Venh4uZxb-aapVgVO=9dUYZzLrbD6KEb_jbhV=W0A@mail.gmail.com> <12039c19-d04f-8186-db7f-c9d2986ba4d4@FreeBSD.org>
index | next in thread | previous in thread | raw e-mail
[-- Attachment #1 --] On Wed, Jul 12, 2023 at 5:58 PM Guido Falsi <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>> 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 > > > > > > 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>> (via email) > > Approved by: Gianmarco Giovannelli <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> > > 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 It'll fix the conflict, plus you get a much newer vim. # Adam -- Adam Weinberger adamw@adamw.org https://www.adamw.org [-- Attachment #2 --] <div dir="ltr"><div dir="ltr"><div class="gmail_default" style="font-family:arial,sans-serif"><br></div></div><br><div class="gmail_quote"><div dir="ltr" class="gmail_attr">On Wed, Jul 12, 2023 at 5:58 PM Guido Falsi <<a href="mailto:madpilot@freebsd.org">madpilot@freebsd.org</a>> wrote:<br></div><blockquote class="gmail_quote" style="margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1ex">On 12/07/23 23:47, Adam Weinberger wrote:<br> > On Wed, Jul 12, 2023 at 3:24 AM Guido Falsi <<a href="mailto:madpilot@freebsd.org" target="_blank">madpilot@freebsd.org</a> <br> > <mailto:<a href="mailto:madpilot@freebsd.org" target="_blank">madpilot@freebsd.org</a>>> wrote:<br> > <br> > The branch main has been updated by madpilot:<br> > <br> > URL:<br> > <a href="https://cgit.FreeBSD.org/ports/commit/?id=25122d0e5673c9ba2f91fe32d806cf3e91d23194" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=25122d0e5673c9ba2f91fe32d806cf3e91d23194</a>; <<a href="https://cgit.FreeBSD.org/ports/commit/?id=25122d0e5673c9ba2f91fe32d806cf3e91d23194" rel="noreferrer" target="_blank">https://cgit.FreeBSD.org/ports/commit/?id=25122d0e5673c9ba2f91fe32d806cf3e91d23194</a>><br>; > <br> > commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194<br> > Author: Guido Falsi <madpilot@FreeBSD.org><br> > AuthorDate: 2023-07-12 07:21:47 +0000<br> > Commit: Guido Falsi <madpilot@FreeBSD.org><br> > CommitDate: 2023-07-12 07:24:42 +0000<br> > <br> > sysutils/xxd: Add missing conflict with vim console flavor<br> > <br> > Reported by: Steven Nikkel <<a href="mailto:steven_nikkel@ertyu.org" target="_blank">steven_nikkel@ertyu.org</a><br> > <mailto:<a href="mailto:steven_nikkel@ertyu.org" target="_blank">steven_nikkel@ertyu.org</a>>> (via email)<br> > Approved by: Gianmarco Giovannelli <<a href="mailto:gmarco@giovannelli.it" target="_blank">gmarco@giovannelli.it</a><br> > <mailto:<a href="mailto:gmarco@giovannelli.it" target="_blank">gmarco@giovannelli.it</a>>> (maintainer)<br> > MFH: 2023Q3<br> > ---<br> > sysutils/xxd/Makefile | 2 +-<br> > 1 file changed, 1 insertion(+), 1 deletion(-)<br> > <br> > diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile<br> > index 3db60c1ba60e..d0f2752ba2d3 100644<br> > --- a/sysutils/xxd/Makefile<br> > +++ b/sysutils/xxd/Makefile<br> > @@ -7,7 +7,7 @@ MAINTAINER= <a href="mailto:gmarco@giovannelli.it" target="_blank">gmarco@giovannelli.it</a><br> > <mailto:<a href="mailto:gmarco@giovannelli.it" target="_blank">gmarco@giovannelli.it</a>><br> > COMMENT= Hexdump and reverse hexdump utility from vim<br> > distribution<br> > WWW= ${VIM_WWW}<br> > <br> > -CONFLICTS_INSTALL= vim-[0-9]* vim-gtk2 vim-gtk3 vim-motif vim-x11<br> > +CONFLICTS_INSTALL= vim-[0-9]* vim-console vim-gtk2 vim-gtk3<br> > vim-motif vim-x11<br> > <br> > <br> > FWIW, there is no vim-console package (the console package is just 'vim'):<br> > <br> > editors/vim/Makefile:<br> > .for f in ${FLAVORS:Nconsole}<br> > ${f}_PKGNAMESUFFIX= -${f}<br> > .endfor<br> > <br> <br> You're definitely right but a user reported this:<br> <br> pkg-static: xxd-9.0.1671 conflicts with vim-console-9.0.0129 (installs <br> files into the same place). Problematic file: /usr/local/bin/xxd<br> <br> I clearly have not checked well enough, maybe this user has some local <br> changes?<br></blockquote><div><br></div><div style="font-family:arial,sans-serif" class="gmail_default">Ahh, it's because they have a stale vim package around (9.0.0129 was from Aug 1, 2022).</div><div style="font-family:arial,sans-serif" class="gmail_default"><br></div><div style="font-family:arial,sans-serif" class="gmail_default">Cc:ing reporter here: remove your vim-console package and install the vim package</div><div style="font-family:arial,sans-serif" class="gmail_default">(it's the same thing, but with a new name):</div><div style="font-family:arial,sans-serif" class="gmail_default"> pkg delete vim-console</div><div style="font-family:arial,sans-serif" class="gmail_default"> pkg install vim<br></div></div><div><br></div><div><div style="font-family:arial,sans-serif" class="gmail_default">It'll fix the conflict, plus you get a much newer vim.</div><div style="font-family:arial,sans-serif" class="gmail_default"><br></div><div style="font-family:arial,sans-serif" class="gmail_default"># Adam</div><br></div><br><span class="gmail_signature_prefix">-- </span><br><div dir="ltr" class="gmail_signature"><div dir="ltr"><div><div dir="ltr"><div>Adam Weinberger</div><div><a href="mailto:adamw@adamw.org" target="_blank">adamw@adamw.org</a></div><div><a href="https://www.adamw.org" target="_blank">https://www.adamw.org</a></div></div></div></div></div></div>;home | help
Want to link to this message? Use this
URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAP7rwcjnTQtqM9aWK9cd06gavZfkEvGTc_StZ1BRcdX5-fkoQg>