From nobody Wed Jul 12 22:24:53 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 4R1XNl74gGz4nTkg; Wed, 12 Jul 2023 22:24:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [IPv6:2610:1c1:1:606c::24b:4]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "smtp.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R1XNl6cwgz4NdC; Wed, 12 Jul 2023 22:24:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689200695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5Tu9RQCKYHX0oWxbJ2gTinPdV2+iPfylYu8gO4r42+A=; b=sTJe+SzxQqpGEKuFpsDUGoGMgaMwTYw64gdKK5QJtQqNnN2uz9fX4wGZRtdhvRxj2saAZ4 nu/5/ooC6KOPr2x1Pi9OK+SgAjJL1ahyxLat9joh6at66zzj4ooHW6AeY2UsxvWxQcF3ue +5LoGjhXELIP0xaqOs77HnoiriVFbCfDuCObPY6FNrpGVh7+LF4zAJEYQPRxA1QJUA0B1L mBptQNDBcypjpAkMU2f4+//ntBOHqLAq4/EeW6gkY94huM2OyvjA8R6pBnF9+p6kAK9LM8 +a083OB/yOaKfE8pVZfYGM+8OSCcs/v27hJ6fA/xfY0v1kFmrXxWRh+5/XvU2g== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689200695; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding: in-reply-to:in-reply-to:references:references; bh=5Tu9RQCKYHX0oWxbJ2gTinPdV2+iPfylYu8gO4r42+A=; b=A1iMjehffhRw6phIF7VrNpiuCea8iQB0597RM1AOCgyCcs9k7OtmYD0cnH94gYoUnMuP9I ovEr6Sxsjkx2ToFGdPJ2m+vXIMUaES0XBRDi2Gr2EPQwWLOHrSObr4nT2LSL+NZIrpOJdM 35d15LSW4b2jEaWTvgF8GoFqR4/C3239+mfgRy6C2QY9T/lQW9gEItgtZVvgqr17QYreuq 0xDegbdnWaiQrPrtLwNce9O7tINpxN+LsDhMZrT0fWk0m4keof+tRWiZfxvkz9U7E0W/J+ o2Jaj2Lqtjruh/4xoH0l6hDj4m5loqt31IlaIbgArmu/7gHTkACyHyuVntOT8g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689200695; a=rsa-sha256; cv=none; b=blaNFTZEMs6rkafI4Qqt78Kp6H9jVjeAJ+IhMnSwO2NwWdRW4z4k2yuPNa7AjK/gOPOOvc NUVRjAvhaGCiNAdDMnm3/CK/TnnT633bJT97msb8hHntdh/Zf39ZSS8LaGhCRJsX7hzZK0 +DqwWv1e9BiS9bubsA6hHWzxdavgC8fkL+cVO/+D4Gn+j/kIucbmZA+ms3UdPGTLVd4Ius 47Llg8uSkXIUdVlBRBBn5Lhy9EOCAfLzLlhivG3PLU/OA/ZXWISvs3Bv3xyJ21NzLYk/Zm wZ5Q+LYB9zMksgJPJmPcDKR97YdNzZ4p3D+pAM8EAbkxhv3QytLKVModCTxgDw== Received: from [IPV6:2a01:e11:2002:4280:4aee:cff:fe73:9857] (unknown [IPv6:2a01:e11:2002:4280:4aee:cff:fe73:9857]) (using TLSv1.3 with cipher TLS_AES_128_GCM_SHA256 (128/128 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits)) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4R1XNl18T7z13x1; Wed, 12 Jul 2023 22:24:55 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Message-ID: Date: Thu, 13 Jul 2023 00:24:53 +0200 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 User-Agent: Mozilla/5.0 (X11; FreeBSD amd64; rv:102.0) Gecko/20100101 Thunderbird/102.13.0 Subject: Re: git: 25122d0e5673 - main - sysutils/xxd: Add missing conflict with vim console flavor Content-Language: en-US To: Adam Weinberger , steven_nikkel@ertyu.org Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org References: <202307120724.36C7Ohd9031623@gitrepo.freebsd.org> <12039c19-d04f-8186-db7f-c9d2986ba4d4@FreeBSD.org> From: Guido Falsi In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N On 13/07/23 00:13, Adam Weinberger wrote: > > > On Wed, Jul 12, 2023 at 5:58 PM Guido Falsi > wrote: > > On 12/07/23 23:47, Adam Weinberger wrote: > > On Wed, Jul 12, 2023 at 3:24 AM Guido Falsi > > >> wrote: > > > >     The branch main has been updated by madpilot: > > > >     URL: > > > https://cgit.FreeBSD.org/ports/commit/?id=25122d0e5673c9ba2f91fe32d806cf3e91d23194 > > > > >     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= 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 Thanks for the diagnosis, I did not notice this. I'll revert my change shortly. -- Guido Falsi