From nobody Wed Jul 12 21:47:36 2023 X-Original-To: dev-commits-ports-main@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 4R1WZ51VNwz4nGRk for ; Wed, 12 Jul 2023 21:47:57 +0000 (UTC) (envelope-from adamw@adamw.org) Received: from mail-lf1-x134.google.com (mail-lf1-x134.google.com [IPv6:2a00:1450:4864:20::134]) (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 4R1WZ46VzFz4CDb for ; Wed, 12 Jul 2023 21:47:56 +0000 (UTC) (envelope-from adamw@adamw.org) Authentication-Results: mx1.freebsd.org; none Received: by mail-lf1-x134.google.com with SMTP id 2adb3069b0e04-4fbf09a9139so47521e87.2 for ; Wed, 12 Jul 2023 14:47:56 -0700 (PDT) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=adamw-org.20221208.gappssmtp.com; s=20221208; t=1689198473; x=1691790473; h=cc:to:subject:message-id:date:from:in-reply-to:references :mime-version:from:to:cc:subject:date:message-id:reply-to; bh=Pu8dhSVFBpzbkpi8eZxnhLNF6J/dzXG4uOOZRRud9hI=; b=jJEw260fKpQtaLtGI6oYY5U0YoGS6/wCU9SfQDzWTT7Og/5CAHPwVQCiFv+osNYj+w TGOI2WFaNnU8EGMNPLjcew5t/+nnXHRJTalaiUDN4Tipjs6nUdNxW7/g/zgS/U9CVpDy jVvJ4fkXbMLsf/eXEdHcq3tCSSUtJ7mARibMosHqcBKoUo9oOKgcar8MtcvJA3jr9pUd w890eZ2ypGzl+brTJxN+iMXTFdKLgOORAa/XglolM25rGeVDyVHFe+z7lxprEnZ0Uf/A dmwiZubf1H0KyPfvhlKgBT4VqmV+WR4PJ4LIetAF48jjWoasLJLUDY1QsPxa+P4ImT1e Ms9Q== X-Google-DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=1e100.net; s=20221208; t=1689198473; x=1691790473; 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=Pu8dhSVFBpzbkpi8eZxnhLNF6J/dzXG4uOOZRRud9hI=; b=XACql/jhgIdMP33F63Qu1a/Url6XN0AmJssBxXj7aWia99nWUX8GDBQiJMbYH5nH7U d8tEH95lQM1/q8XDOmSYV9o1AHzIJWFN4akhRuOgEim89G75K9DNJg2tsZgcboPygqMa V73Qg2CF0H2p7s7Vtgi2pigExAW20eXKueToc1iJi9sjyiVA8/qzik7E+4X2dgOphBMJ x4HGa6NthRnRYGliGRsaiQVAnr2sK9c0Lix7ItyClq0iolHMdsuh3ydF33jo+AOeQfW2 Zx/bA2iRnvnrVh7zgQG9UIGCBMnwsn+N2kaRbALJYST4ZaYHV7KuVMgrsNtrDaO+KFPr KB8A== X-Gm-Message-State: ABy/qLZxE/I/cQ/V5kWLoYdKBzcOj1bHX49350xXaqDV18yjsksyhwqo 5vk31FIQ5JG7BMW2VMr8XbMnVGjneBi1xxY5HpkDvw== X-Google-Smtp-Source: APBJJlEvt+mgvNco91VX5LZSv2Z0Z7iW4+1OM/qVsxRHvj2FpnNFNv+7o2DH/YH77jOp7UrGGCC6uHa5xWmq6c36snc= X-Received: by 2002:a05:6512:5c7:b0:4fb:8eec:ce49 with SMTP id o7-20020a05651205c700b004fb8eecce49mr14364675lfo.31.1689198473028; Wed, 12 Jul 2023 14:47:53 -0700 (PDT) List-Id: Commits to the main branch of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-main List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-main@freebsd.org X-BeenThere: dev-commits-ports-main@freebsd.org MIME-Version: 1.0 References: <202307120724.36C7Ohd9031623@gitrepo.freebsd.org> In-Reply-To: <202307120724.36C7Ohd9031623@gitrepo.freebsd.org> From: Adam Weinberger Date: Wed, 12 Jul 2023 17:47:36 -0400 Message-ID: Subject: Re: git: 25122d0e5673 - main - sysutils/xxd: Add missing conflict with vim console flavor To: Guido Falsi Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org Content-Type: multipart/alternative; boundary="000000000000f0c9b30600512aaa" X-Rspamd-Queue-Id: 4R1WZ46VzFz4CDb 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 --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 = wrote: > The branch main has been updated by madpilot: > > URL: > 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 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
On Wed, Jul 12, 2023 at 3:24=E2=80=AFAM Guido Fa= lsi <madpilot@freebsd.org>= ; wrote:
The branch main has been updated by madpilot:

URL: https://cgi= t.FreeBSD.org/ports/commit/?id=3D25122d0e5673c9ba2f91fe32d806cf3e91d23194

commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194
Author:=C2=A0 =C2=A0 =C2=A0Guido Falsi <madpilot@FreeBSD.org>
AuthorDate: 2023-07-12 07:21:47 +0000
Commit:=C2=A0 =C2=A0 =C2=A0Guido Falsi <madpilot@FreeBSD.org>
CommitDate: 2023-07-12 07:24:42 +0000

=C2=A0 =C2=A0 sysutils/xxd: Add missing conflict with vim console flavor
=C2=A0 =C2=A0 Reported by:=C2=A0 =C2=A0 Steven Nikkel <steven_nikkel@ertyu.org>= (via email)
=C2=A0 =C2=A0 Approved by:=C2=A0 =C2=A0 Gianmarco Giovannelli <gmarco@giovannelli.it> (maintainer)
=C2=A0 =C2=A0 MFH:=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 2023Q3
---
=C2=A0sysutils/xxd/Makefile | 2 +-
=C2=A01 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=C2=A0 =C2=A0 =C2=A0gmarco@giovannelli.it
=C2=A0COMMENT=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0Hexdump and reverse hexdump util= ity from vim distribution
=C2=A0WWW=3D=C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0 =C2=A0${VIM_WWW}

-CONFLICTS_INSTALL=3D=C2=A0 =C2=A0 =C2=A0vim-[0-9]* vim-gtk2 vim-gtk3 vim-m= otif vim-x11
+CONFLICTS_INSTALL=3D=C2=A0 =C2=A0 =C2=A0vim-[0-9]* vim-console vim-gtk2 vi= m-gtk3 vim-motif vim-x11

F= WIW, there is no vim-console package (the console package is just 'vim&= #39;):

editors/vim/Makefile:
=C2=A0 .for f in ${FLAVORS:Nconsole}
=C2= =A0 ${f}_PKGNAMESUFFIX=3D =C2=A0 =C2=A0 -${f}
=C2=A0 .endfor
=

Certainly no harm in this commit, and it definitely future-pro= ofs 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


--
--000000000000f0c9b30600512aaa--