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>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000525cf50600518886 Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jul 12, 2023 at 5:58=E2=80=AFPM Guido Falsi <madpilot@freebsd.org> = wrote: > On 12/07/23 23:47, Adam Weinberger wrote: > > On Wed, Jul 12, 2023 at 3:24=E2=80=AFAM Guido Falsi <madpilot@freebsd.o= rg > > <mailto:madpilot@freebsd.org>> wrote: > > > > The branch main has been updated by madpilot: > > > > URL: > > > https://cgit.FreeBSD.org/ports/commit/?id=3D25122d0e5673c9ba2f91fe32d806c= f3e91d23194 > < > https://cgit.FreeBSD.org/ports/commit/?id=3D25122d0e5673c9ba2f91fe32d806c= f3e91d23194 > > > > > > 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=3D gmarco@giovannelli.it > > <mailto:gmarco@giovannelli.it> > > COMMENT=3D Hexdump and reverse hexdump utility from vim > > distribution > > WWW=3D ${VIM_WWW} > > > > -CONFLICTS_INSTALL=3D vim-[0-9]* vim-gtk2 vim-gtk3 vim-motif > vim-x11 > > +CONFLICTS_INSTALL=3D 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=3D -${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 --=20 Adam Weinberger adamw@adamw.org https://www.adamw.org --000000000000525cf50600518886 Content-Type: text/html; charset="UTF-8" Content-Transfer-Encoding: quoted-printable <div dir=3D"ltr"><div dir=3D"ltr"><div class=3D"gmail_default" style=3D"fon= t-family:arial,sans-serif"><br></div></div><br><div class=3D"gmail_quote"><= div dir=3D"ltr" class=3D"gmail_attr">On Wed, Jul 12, 2023 at 5:58=E2=80=AFP= M Guido Falsi <<a href=3D"mailto:madpilot@freebsd.org">madpilot@freebsd.= org</a>> wrote:<br></div><blockquote class=3D"gmail_quote" style=3D"marg= in:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,204);padding-left:1e= x">On 12/07/23 23:47, Adam Weinberger wrote:<br> > On Wed, Jul 12, 2023 at 3:24=E2=80=AFAM Guido Falsi <<a href=3D"mai= lto:madpilot@freebsd.org" target=3D"_blank">madpilot@freebsd.org</a> <br> > <mailto:<a href=3D"mailto:madpilot@freebsd.org" target=3D"_blank">m= adpilot@freebsd.org</a>>> wrote:<br> > <br> >=C2=A0 =C2=A0 =C2=A0The branch main has been updated by madpilot:<br> > <br> >=C2=A0 =C2=A0 =C2=A0URL:<br> >=C2=A0 =C2=A0 =C2=A0<a href=3D"https://cgit.FreeBSD.org/ports/commit/?i= d=3D25122d0e5673c9ba2f91fe32d806cf3e91d23194" rel=3D"noreferrer" target=3D"= _blank">https://cgit.FreeBSD.org/ports/commit/?id=3D25122d0e5673c9ba2f91fe3= 2d806cf3e91d23194</a> <<a href=3D"https://cgit.FreeBSD.org/ports/commit/= ?id=3D25122d0e5673c9ba2f91fe32d806cf3e91d23194" rel=3D"noreferrer" target= =3D"_blank">https://cgit.FreeBSD.org/ports/commit/?id=3D25122d0e5673c9ba2f9= 1fe32d806cf3e91d23194</a>><br> > <br> >=C2=A0 =C2=A0 =C2=A0commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194<br> >=C2=A0 =C2=A0 =C2=A0Author:=C2=A0 =C2=A0 =C2=A0Guido Falsi <madpilot= @FreeBSD.org><br> >=C2=A0 =C2=A0 =C2=A0AuthorDate: 2023-07-12 07:21:47 +0000<br> >=C2=A0 =C2=A0 =C2=A0Commit:=C2=A0 =C2=A0 =C2=A0Guido Falsi <madpilot= @FreeBSD.org><br> >=C2=A0 =C2=A0 =C2=A0CommitDate: 2023-07-12 07:24:42 +0000<br> > <br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sysutils/xxd: Add missing conflict w= ith vim console flavor<br> > <br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 Steven Nik= kel <<a href=3D"mailto:steven_nikkel@ertyu.org" target=3D"_blank">steven= _nikkel@ertyu.org</a><br> >=C2=A0 =C2=A0 =C2=A0<mailto:<a href=3D"mailto:steven_nikkel@ertyu.or= g" target=3D"_blank">steven_nikkel@ertyu.org</a>>> (via email)<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Approved by:=C2=A0 =C2=A0 Gianmarco = Giovannelli <<a href=3D"mailto:gmarco@giovannelli.it" target=3D"_blank">= gmarco@giovannelli.it</a><br> >=C2=A0 =C2=A0 =C2=A0<mailto:<a href=3D"mailto:gmarco@giovannelli.it"= target=3D"_blank">gmarco@giovannelli.it</a>>> (maintainer)<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 MFH:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 2023Q3<br> >=C2=A0 =C2=A0 =C2=A0---<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0sysutils/xxd/Makefile | 2 +-<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A01 file changed, 1 insertion(+), 1 deletion(-= )<br> > <br> >=C2=A0 =C2=A0 =C2=A0diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/M= akefile<br> >=C2=A0 =C2=A0 =C2=A0index 3db60c1ba60e..d0f2752ba2d3 100644<br> >=C2=A0 =C2=A0 =C2=A0--- a/sysutils/xxd/Makefile<br> >=C2=A0 =C2=A0 =C2=A0+++ b/sysutils/xxd/Makefile<br> >=C2=A0 =C2=A0 =C2=A0@@ -7,7 +7,7 @@ MAINTAINER=3D <a href=3D"mailto:gma= rco@giovannelli.it" target=3D"_blank">gmarco@giovannelli.it</a><br> >=C2=A0 =C2=A0 =C2=A0<mailto:<a href=3D"mailto:gmarco@giovannelli.it"= target=3D"_blank">gmarco@giovannelli.it</a>><br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0Hexdump= and reverse hexdump utility from vim<br> >=C2=A0 =C2=A0 =C2=A0distribution<br> >=C2=A0 =C2=A0 =C2=A0 =C2=A0WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0${VIM_WWW}<br> > <br> >=C2=A0 =C2=A0 =C2=A0-CONFLICTS_INSTALL=3D=C2=A0 =C2=A0 =C2=A0vim-[0-9]*= vim-gtk2 vim-gtk3 vim-motif vim-x11<br> >=C2=A0 =C2=A0 =C2=A0+CONFLICTS_INSTALL=3D=C2=A0 =C2=A0 =C2=A0vim-[0-9]*= vim-console vim-gtk2 vim-gtk3<br> >=C2=A0 =C2=A0 =C2=A0vim-motif vim-x11<br> > <br> > <br> > FWIW, there is no vim-console package (the console package is just = 9;vim'):<br> > <br> > editors/vim/Makefile:<br> >=C2=A0 =C2=A0 .for f in ${FLAVORS:Nconsole}<br> >=C2=A0 =C2=A0 ${f}_PKGNAMESUFFIX=3D =C2=A0 =C2=A0 -${f}<br> >=C2=A0 =C2=A0 .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).=C2=A0 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=3D"font-family:arial,san= s-serif" class=3D"gmail_default">Ahh, it's because they have a stale vi= m package around (9.0.0129 was from Aug 1, 2022).</div><div style=3D"font-f= amily:arial,sans-serif" class=3D"gmail_default"><br></div><div style=3D"fon= t-family:arial,sans-serif" class=3D"gmail_default">Cc:ing reporter here: re= move your vim-console package and install the vim package</div><div style= =3D"font-family:arial,sans-serif" class=3D"gmail_default">(it's the sam= e thing, but with a new name):</div><div style=3D"font-family:arial,sans-se= rif" class=3D"gmail_default">=C2=A0 pkg delete vim-console</div><div style= =3D"font-family:arial,sans-serif" class=3D"gmail_default">=C2=A0 pkg instal= l vim<br></div></div><div><br></div><div><div style=3D"font-family:arial,sa= ns-serif" class=3D"gmail_default">It'll fix the conflict, plus you get = a much newer vim.</div><div style=3D"font-family:arial,sans-serif" class=3D= "gmail_default"><br></div><div style=3D"font-family:arial,sans-serif" class= =3D"gmail_default"># Adam</div><br></div><br><span class=3D"gmail_signature= _prefix">-- </span><br><div dir=3D"ltr" class=3D"gmail_signature"><div dir= =3D"ltr"><div><div dir=3D"ltr"><div>Adam Weinberger</div><div><a href=3D"ma= ilto:adamw@adamw.org" target=3D"_blank">adamw@adamw.org</a></div><div><a hr= ef=3D"https://www.adamw.org" target=3D"_blank">https://www.adamw.org</a></d= iv></div></div></div></div></div> --000000000000525cf50600518886--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAP7rwcjnTQtqM9aWK9cd06gavZfkEvGTc_StZ1BRcdX5-fkoQg>