From nobody Wed Jul 12 07:26:10 2023 X-Original-To: dev-commits-ports-branches@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 4R18Rk42Lgz4lWLD; Wed, 12 Jul 2023 07:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (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 "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4R18Rk3Zz2z4CS9; Wed, 12 Jul 2023 07:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689146770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pwkHEYgJiCQPodxJAjwhOr35HWShWPBSXsjAIR59V/8=; b=HheCFU3gILaqwJtNI9iGJltCNwPrE9U0hgAdDRFWUm/ZI02bgLeOOw8myewXifk7rodDl5 P9F+O/W82Anzsj/uwlPPlZhwuI2BE4sCMTCDDl3j53ZqjPGndeVh+P5BHj3tEqVSIj7luv WqKMuB+DIMr7ErJPgsWrVswNGl1l7AGzpY2hESaISmShlqQR8VppBNtaiuFcGU/JyiRqwH S/U3HpTwOQmQOqNI9dmXCTDYKM74tFG3/RQjikE0C2+V8ZA2c5eLihbNsWpI+8+uzaegIQ 6EYPcu7fRdhx3KpsKJQR7qTjc56xurgFRB/AubWL/E1Z2yv0zrRY+Q3ULqHopw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689146770; h=from:from:reply-to:subject:subject:date:date:message-id:message-id: to:to:cc:mime-version:mime-version:content-type:content-type: content-transfer-encoding:content-transfer-encoding; bh=pwkHEYgJiCQPodxJAjwhOr35HWShWPBSXsjAIR59V/8=; b=lpLu9FfJd2RryDCMNrGzFVAItXseEiCev7sk52tWI/EqKzPlr0M9HmDcnp/5RDL+49ROpH CiqIETLk0EtGac9EOwhgvDjhq6DQivZmnIg6JtVrv8ASus4ZxD3x7tXgr/In3H56Rhq34K rwA+Ns1DZrwDB8Wq+/TQ4WTXeDesSyfe0v3PqObZfXn1fPj3E7xjRfN9Iedm+ahLbq588F heP7LPAoJ4FBFDC4ZmkMpXHkiqWUiPD7J6tiYuC+bnY0guJez8wusvIUzYzvoAaRacvNrS b7ROX0yJR9j7zRddsqsM+WZXw44Kqs8gsriXE6VAJAp3qIeSXCjOehxS8LCLJg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689146770; a=rsa-sha256; cv=none; b=GPgRceWalAxznV2VCm+rrnSWkMR6ZnCR59Z3t74XeujbJLIDdXY6brA9oYVKx9exEn4W58 C63dlG0kI6TKxuiKZgzdw2mpO3oAceZUuFCwS/92D62uwSQgcusROTx4bPw1Ppk9zT0HZO ODL9IONIkeboLXuYxQYlQYBsoi36Y/YUiYKb/cCDzuKN+N6a6cL1DlL9JZIVQPdKySwdaC NsAD8/olM87vNbMmX3L6gGPapbALQsPDpeHhUc3cQpGgnN8UmDVEwkfFv+MHhrLVhosIv7 SDmTGcV3WcyzwLicN9rN56J6tS+PdtjFH16t5eBfRgfeIbHSGTezJRBahEiyQw== Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 4R18Rk2dd2z10rf; Wed, 12 Jul 2023 07:26:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.17.1/8.17.1) with ESMTP id 36C7QACM031895; Wed, 12 Jul 2023 07:26:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C7QAQg031894; Wed, 12 Jul 2023 07:26:10 GMT (envelope-from git) Date: Wed, 12 Jul 2023 07:26:10 GMT Message-Id: <202307120726.36C7QAQg031894@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-branches@FreeBSD.org From: Guido Falsi Subject: git: d3cfa7ea4222 - 2023Q3 - sysutils/xxd: Add missing conflict with vim console flavor List-Id: Commits to the quarterly branches of the FreeBSD ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-branches List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-branches@freebsd.org X-BeenThere: dev-commits-ports-branches@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/2023Q3 X-Git-Reftype: branch X-Git-Commit: d3cfa7ea42229670219c0dad9acc8595bee31c29 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=d3cfa7ea42229670219c0dad9acc8595bee31c29 commit d3cfa7ea42229670219c0dad9acc8595bee31c29 Author: Guido Falsi AuthorDate: 2023-07-12 07:21:47 +0000 Commit: Guido Falsi CommitDate: 2023-07-12 07:26:05 +0000 sysutils/xxd: Add missing conflict with vim console flavor Reported by: Steven Nikkel (via email) Approved by: Gianmarco Giovannelli (maintainer) MFH: 2023Q3 (cherry picked from commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194) --- 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 DISTINFO_FILE= ${VIM_PORT}/distinfo ALL_TARGET= ${PORTNAME}