Date: Wed, 12 Jul 2023 17:47:36 -0400 From: Adam Weinberger <adamw@adamw.org> To: Guido Falsi <madpilot@freebsd.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: <CAP7rwcjG5Venh4uZxb-aapVgVO=9dUYZzLrbD6KEb_jbhV=W0A@mail.gmail.com> In-Reply-To: <202307120724.36C7Ohd9031623@gitrepo.freebsd.org> References: <202307120724.36C7Ohd9031623@gitrepo.freebsd.org>
next in thread | previous in thread | raw e-mail | index | archive | help
--000000000000f0c9b30600512aaa Content-Type: text/plain; charset="UTF-8" Content-Transfer-Encoding: quoted-printable On Wed, Jul 12, 2023 at 3:24=E2=80=AFAM Guido Falsi <madpilot@freebsd.org> = wrote: > The branch main has been updated by madpilot: > > URL: > 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> (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=3D gmarco@giovannelli.it > COMMENT=3D Hexdump and reverse hexdump utility from vim distributi= on > 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-mo= tif > 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 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 --=20 Adam Weinberger adamw@adamw.org https://www.adamw.org --000000000000f0c9b30600512aaa 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">On Wed, Jul 12, 2023 at 3:24=E2=80=AFAM Guido Fa= lsi <<a href=3D"mailto:madpilot@freebsd.org">madpilot@freebsd.org</a>>= ; wrote:</div></div><div class=3D"gmail_quote"><blockquote class=3D"gmail_q= uote" style=3D"margin:0px 0px 0px 0.8ex;border-left:1px solid rgb(204,204,2= 04);padding-left:1ex">The branch main has been updated by madpilot:<br> <br> URL: <a href=3D"https://cgit.FreeBSD.org/ports/commit/?id=3D25122d0e5673c9b= a2f91fe32d806cf3e91d23194" rel=3D"noreferrer" target=3D"_blank">https://cgi= t.FreeBSD.org/ports/commit/?id=3D25122d0e5673c9ba2f91fe32d806cf3e91d23194</= a><br> <br> commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194<br> Author:=C2=A0 =C2=A0 =C2=A0Guido Falsi <madpilot@FreeBSD.org><br> AuthorDate: 2023-07-12 07:21:47 +0000<br> Commit:=C2=A0 =C2=A0 =C2=A0Guido Falsi <madpilot@FreeBSD.org><br> CommitDate: 2023-07-12 07:24:42 +0000<br> <br> =C2=A0 =C2=A0 sysutils/xxd: Add missing conflict with vim console flavor<br= > <br> =C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 Steven Nikkel <<a href=3D"mailto= :steven_nikkel@ertyu.org" target=3D"_blank">steven_nikkel@ertyu.org</a>>= (via email)<br> =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>> (maintainer)<br> =C2=A0 =C2=A0 MFH:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 2023Q3<br> ---<br> =C2=A0sysutils/xxd/Makefile | 2 +-<br> =C2=A01 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=3D=C2=A0 =C2=A0 =C2=A0<a href=3D"mailto:gmarco@g= iovannelli.it" target=3D"_blank">gmarco@giovannelli.it</a><br> =C2=A0COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0Hexdump and reverse hexdump util= ity from vim distribution<br> =C2=A0WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${VIM_WWW}<br> <br> -CONFLICTS_INSTALL=3D=C2=A0 =C2=A0 =C2=A0vim-[0-9]* vim-gtk2 vim-gtk3 vim-m= otif vim-x11<br> +CONFLICTS_INSTALL=3D=C2=A0 =C2=A0 =C2=A0vim-[0-9]* vim-console vim-gtk2 vi= m-gtk3 vim-motif vim-x11<br clear=3D"all"></blockquote></div><div><br></div= ><div><div style=3D"font-family:arial,sans-serif" class=3D"gmail_default">F= WIW, there is no vim-console package (the console package is just 'vim&= #39;):</div><div style=3D"font-family:arial,sans-serif" class=3D"gmail_defa= ult"><br></div><div style=3D"font-family:arial,sans-serif" class=3D"gmail_d= efault">editors/vim/Makefile:<br></div><div style=3D"font-family:arial,sans= -serif" class=3D"gmail_default">=C2=A0 .for f in ${FLAVORS:Nconsole}<br>=C2= =A0 ${f}_PKGNAMESUFFIX=3D =C2=A0 =C2=A0 -${f}<br>=C2=A0 .endfor</div></div>= <div><br></div><div><div style=3D"font-family:arial,sans-serif" class=3D"gm= ail_default">Certainly no harm in this commit, and it definitely future-pro= ofs in case I get</div><div style=3D"font-family:arial,sans-serif" class=3D= "gmail_default">on the computer before coffee and decide to make vim-motif = the default. But</div><div style=3D"font-family:arial,sans-serif" class=3D"= gmail_default">it should be a NOOP at this time.<br></div><div style=3D"fon= t-family:arial,sans-serif" class=3D"gmail_default"><br></div><div style=3D"= font-family:arial,sans-serif" class=3D"gmail_default"># Adam</div><div styl= e=3D"font-family:arial,sans-serif" class=3D"gmail_default"><br></div><div s= tyle=3D"font-family:arial,sans-serif" class=3D"gmail_default"><br></div></d= iv><span class=3D"gmail_signature_prefix">-- </span><br><div dir=3D"ltr" cl= ass=3D"gmail_signature"><div dir=3D"ltr"><div><div dir=3D"ltr"><div>Adam We= inberger</div><div><a href=3D"mailto:adamw@adamw.org" target=3D"_blank">ada= mw@adamw.org</a></div><div><a href=3D"https://www.adamw.org" target=3D"_bla= nk">https://www.adamw.org</a></div></div></div></div></div></div>; --000000000000f0c9b30600512aaa--
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?CAP7rwcjG5Venh4uZxb-aapVgVO=9dUYZzLrbD6KEb_jbhV=W0A>