From nobody Wed Jul 12 21:58:18 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 4R1Wp53h3kz4nKZZ; Wed, 12 Jul 2023 21:58:21 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Received: from smtp.freebsd.org (smtp.freebsd.org [96.47.72.83]) (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 4R1Wp53HPpz4J5Y; Wed, 12 Jul 2023 21:58:21 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689199101; 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=iI6wlFrhNgHq9YB8/pjaNJh6TKMxemI54AguhbLqEfE=; b=U3e9QQmk3dDZ3VTKdukwX/Kzwb6kIySxNoASD5U9YRHlQHPcqi7pv+nY4Iwv5M+9RiyriD EepllpnBIzREBcqX17dFMHqwMKu01S+xtkifsatHy/GZHM/e/8q5jiyCFE+mnh7UIxGz/A eYHcaKvuWkWobRSh81lfEDog7esQF7goZIOPjg4yhytEGHNmEtHfp5l1X+v8O4t1DkPUpc jLZfjo9Gj6Qf9h4NWZfMCqqvE0bwAN5qpqE7mfiKGAGJO8+SzwpH9J0HOGDbOGjHvHpH3K gUjsn/UPEuliDtAjh1Z5Oughu/iI8gI3ds3T7twGJhKTjoq7LMTYeIiFZrlOUQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689199101; 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=iI6wlFrhNgHq9YB8/pjaNJh6TKMxemI54AguhbLqEfE=; b=EdxIF0si5lc0lUdw2ymeSjDVJ2RAcSxKIeeJvIM+43clNJednIdUrvUREtDZy072jI5CRa F2hRbRcCxhVRBM/vMnupMRG0GqcdpRh3zkGEI0dOLDMnZOoO/9xmqqWg4X9WRNw7+yZ71I n5yz66PIH2ZeZFN38P6vfoAxztGmX/OONxGFQyWdilQpuqBcQ66v9s4ZXvSXFKm3rhMswu YTo333r2FpvUouJ8G1gFvoHV6Ic+dPeJ/9qyVrGh/qL7wr6DcbrJAvOTj/7wiFAg8/97uo SGosK2HugHXF1sdZ8plUaJK01yuoiJGCs8qyE/+pf0P7ubENm/Vy/Is2CpirRg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689199101; a=rsa-sha256; cv=none; b=xizTpoNSm3sV92qFPoxFp09JnzO81LXEtgCkqG3c+6R0hMdXUDdTAzv0eB9EptNSxUse7+ xXwVheoGTek9eYcOGHgPscrDU7Dqe+NBtrwQGvKvz24NbiIwauFu6f3Monj88kT8vrTBX9 KKlWAOYae8mgnuDHqzWPb+ZX7c8rwZKazVpcHH9iG817mWXWcViTmfrWvwmLIhT3HP0Msh jPhkeEVk3mVjw3nAl86We2eKqvBtA+FOqD99o0KbayG/tPphFekR9soAj+1lOab0V+Bi2a pgO6jrXNrRADp3eSzNB3EWvut2eYcH3MfQqJ9+MvHR7qLmr6UGCzdAoPDzQGqA== 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) server-digest SHA256) (Client did not present a certificate) (Authenticated sender: madpilot/mail) by smtp.freebsd.org (Postfix) with ESMTPSA id 4R1Wp45gKpz1459; Wed, 12 Jul 2023 21:58:20 +0000 (UTC) (envelope-from madpilot@FreeBSD.org) Message-ID: <12039c19-d04f-8186-db7f-c9d2986ba4d4@FreeBSD.org> Date: Wed, 12 Jul 2023 23:58:18 +0200 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 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 To: Adam Weinberger Cc: ports-committers@freebsd.org, dev-commits-ports-all@freebsd.org, dev-commits-ports-main@freebsd.org References: <202307120724.36C7Ohd9031623@gitrepo.freebsd.org> Content-Language: en-US From: Guido Falsi In-Reply-To: Content-Type: text/plain; charset=UTF-8; format=flowed Content-Transfer-Encoding: 8bit X-ThisMailContainsUnwantedMimeParts: N 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? -- Guido Falsi