From nobody Wed Jul 12 22:13:43 2023 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 4R1X892tYvz4nQdQ for ; Wed, 12 Jul 2023 22:14:01 +0000 (UTC) (envelope-from adamw@adamw.org) Received: from mail-ed1-x52a.google.com (mail-ed1-x52a.google.com [IPv6:2a00:1450:4864:20::52a]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (2048 bits) client-digest SHA256) (Client CN "smtp.gmail.com", Issuer "GTS CA 1D4" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1X8916prz4Lsg for ; Wed, 12 Jul 2023 22:14:01 +0000 (UTC) (envelope-from adamw@adamw.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-ed1-x52a.google.com with SMTP id 4fb4d7f45d1cf-51fe084cf3cso1423570a12.1 for ; Wed, 12 Jul 2023 15:14:01 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adamw-org.20221208.gappssmtp.com; s=20221208; t=1689200040; x=1691792040; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=OVE62ZeNsScdK100AfkLqYYroXr+s7vP48QFZwalees=; b=VHiXCDIDVP/oJCL8C39WDHOOmiNfiSD1Oj6K9JnQm271Ve+vR7qvTTKndK1042a5Yi e0xdrdmczKoHQ+APZNimITpG2YyyrANr8EA9yGrMn2NbYq0gbJT7EYyNdWKWjOdK2B4D ddQjtUhAtZ0t0/ZZVIgyxDMoTWe9Ld3s41xTYjWHLxebSm48aKyrg5j3bID/OqtQrf1T obYyuw4hglpsiLJnJLv9/WHq/GtSOmD3A3p69TgBtajnboRE3nbfdNQTv7shiSwErDNI Hj2YBjvbPO8vxSbFI9M0SJWy6BkqY5qURNwgaXshm6zA5Qx7GqRNOLHg/5P57gZfOgaI PsLA== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689200040; x=1691792040; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:x-gm-message-state:from:to:cc:subject:date:message-id :reply-to; bh=OVE62ZeNsScdK100AfkLqYYroXr+s7vP48QFZwalees=; b=B0OemaPmQcjUk4karrdolsKfYoJtzFPDXzbR4rsOTIW12/d211CQL+am5V5H7eKuec TGax28fMmVWho0EVqgP4FKNtL/KIKkTfWOBy7nzsxu0toYtEKsDhedu9fdbVh/P0pAFE eaEim/1SMbfCV6XuycFSvGVXoCdtwNP7IMyvAg9vUsljzX67TZjuct9m2eyjJvrShY+S MhesetyspPJjHJctlW2EEspufKOqY3hzdj8mtSwVQ+3Zn9KenkIEF60B06eOY8IqiYdu G1i8o8/3pY++hILcny4KVIjG+/MmaBAlY41xVVpqhBNHxWSro5EqSItpwYOO2w9tQBCN Pkog== X-Gm-Message-State: ABy/qLboBwMrhECSBQRt6NZ2Cso0NSLI6cSdfceSb8Xh2HnkXXZZlbJA RkoQsjyg+Cv9DmSSd4rqAgvVwDWJwq6EPk/rk1y8tA== X-Google-Smtp-Source: APBJJlEHYUavTwMEgztYLQlPL1Xl4bQ1WXI1tIcelCIRu4zfe9qf+bbM37mqjSbX8A9WIQ6eJ8I+Z7Tkn9qNMKHTbvY= X-Received: by 2002:aa7:d50b:0:b0:51e:5ec8:d2f7 with SMTP id y11-20020aa7d50b000000b0051e5ec8d2f7mr49494edq.30.1689200039708; Wed, 12 Jul 2023 15:13:59 -0700 (PDT) List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 References: <202307120724.36C7Ohd9031623@gitrepo.freebsd.org> <12039c19-d04f-8186-db7f-c9d2986ba4d4@FreeBSD.org> In-Reply-To: <12039c19-d04f-8186-db7f-c9d2986ba4d4@FreeBSD.org> From: Adam Weinberger Date: Wed, 12 Jul 2023 18:13:43 -0400 Message-ID: Subject: Re: git: 25122d0e5673 - main - sysutils/xxd: Add missing conflict with vim console flavor To: Guido Falsi , steven_nikkel@ertyu.org Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000525cf50600518886" X-Rspamd-Queue-Id: 4R1X8916prz4Lsg X-Spamd-Bar: ---- X-Spamd-Result: default: False [-4.00 / 15.00]; REPLY(-4.00)[]; ASN(0.00)[asn:15169, ipnet:2a00:1450::/32, country:US] X-Rspamd-Pre-Result: action=no action; module=replies; Message is reply to one we originated X-ThisMailContainsUnwantedMimeParts: N --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 = wrote: > On 12/07/23 23:47, Adam Weinberger wrote: > > On Wed, Jul 12, 2023 at 3:24=E2=80=AFAM Guido Falsi > > 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 > > AuthorDate: 2023-07-12 07:21:47 +0000 > > Commit: Guido Falsi > > CommitDate: 2023-07-12 07:24:42 +0000 > > > > sysutils/xxd: Add missing conflict with vim console flavor > > > > Reported by: Steven Nikkel > > (via email) > > Approved by: Gianmarco Giovannelli > > (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 > > 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" class=3D"gmail_attr">On Wed, Jul 12, 2023 at 5:58=E2=80=AFP= M 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.org
> <mailto:m= adpilot@freebsd.org>> wrote:
>
>=C2=A0 =C2=A0 =C2=A0The branch main has been updated by madpilot:
>
>=C2=A0 =C2=A0 =C2=A0URL:
>=C2=A0 =C2=A0 =C2=A0https://cgit.FreeBSD.org/ports/commit/?id=3D25122d0e5673c9ba2f91fe3= 2d806cf3e91d23194 <https://cgit.FreeBSD.org/ports/commit/?id=3D25122d0e5673c9ba2f9= 1fe32d806cf3e91d23194>
>
>=C2=A0 =C2=A0 =C2=A0commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194
>=C2=A0 =C2=A0 =C2=A0Author:=C2=A0 =C2=A0 =C2=A0Guido Falsi <madpilot= @FreeBSD.org>
>=C2=A0 =C2=A0 =C2=A0AuthorDate: 2023-07-12 07:21:47 +0000
>=C2=A0 =C2=A0 =C2=A0Commit:=C2=A0 =C2=A0 =C2=A0Guido Falsi <madpilot= @FreeBSD.org>
>=C2=A0 =C2=A0 =C2=A0CommitDate: 2023-07-12 07:24:42 +0000
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 sysutils/xxd: Add missing conflict w= ith vim console flavor
>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 Steven Nik= kel <steven= _nikkel@ertyu.org
>=C2=A0 =C2=A0 =C2=A0<mailto:steven_nikkel@ertyu.org>> (via email)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 Approved by:=C2=A0 =C2=A0 Gianmarco = Giovannelli <= gmarco@giovannelli.it
>=C2=A0 =C2=A0 =C2=A0<mailto:gmarco@giovannelli.it>> (maintainer)
>=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 MFH:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0 =C2=A0 2023Q3
>=C2=A0 =C2=A0 =C2=A0---
>=C2=A0 =C2=A0 =C2=A0 =C2=A0sysutils/xxd/Makefile | 2 +-
>=C2=A0 =C2=A0 =C2=A0 =C2=A01 file changed, 1 insertion(+), 1 deletion(-= )
>
>=C2=A0 =C2=A0 =C2=A0diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/M= akefile
>=C2=A0 =C2=A0 =C2=A0index 3db60c1ba60e..d0f2752ba2d3 100644
>=C2=A0 =C2=A0 =C2=A0--- a/sysutils/xxd/Makefile
>=C2=A0 =C2=A0 =C2=A0+++ b/sysutils/xxd/Makefile
>=C2=A0 =C2=A0 =C2=A0@@ -7,7 +7,7 @@ MAINTAINER=3D gmarco@giovannelli.it
>=C2=A0 =C2=A0 =C2=A0<mailto:gmarco@giovannelli.it>
>=C2=A0 =C2=A0 =C2=A0 =C2=A0COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0Hexdump= and reverse hexdump utility from vim
>=C2=A0 =C2=A0 =C2=A0distribution
>=C2=A0 =C2=A0 =C2=A0 =C2=A0WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2= =A0${VIM_WWW}
>
>=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
>=C2=A0 =C2=A0 =C2=A0+CONFLICTS_INSTALL=3D=C2=A0 =C2=A0 =C2=A0vim-[0-9]*= vim-console vim-gtk2 vim-gtk3
>=C2=A0 =C2=A0 =C2=A0vim-motif vim-x11
>
>
> FWIW, there is no vim-console package (the console package is just = 9;vim'):
>
> editors/vim/Makefile:
>=C2=A0 =C2=A0 .for f in ${FLAVORS:Nconsole}
>=C2=A0 =C2=A0 ${f}_PKGNAMESUFFIX=3D =C2=A0 =C2=A0 -${f}
>=C2=A0 =C2=A0 .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).=C2=A0 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 vi= m package around (9.0.0129 was from Aug 1, 2022).

Cc:ing reporter here: re= move your vim-console package and install the vim package
(it's the sam= e thing, but with a new name):
=C2=A0 pkg delete vim-console
=C2=A0 pkg instal= l vim

It'll fix the conflict, plus you get = a much newer vim.

# Adam


--
--000000000000525cf50600518886--