From nobody Wed Jul 12 07:24:43 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 4R18Q40HNfz4lVH6; Wed, 12 Jul 2023 07:24:44 +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 4R18Q353PNz4CLs; Wed, 12 Jul 2023 07:24:43 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689146683; 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=mQBYLu/Jf0tb9SlmVMt5Z0esUr7igywEyzGKNj1340k=; b=eufveL1Huzp6nhMi2j8C093O0RlZv2r9Mzmpzn598XgA5VS786A87jdQSx1EtbjUMMU1Bk SL7wRwSzIAsoMa4CgggB+5yco+ePGp7kKGFX3nhK/u7/ozyxcX+yp1i1AYQvQT30kG1LST xp4zbRBr6k4uOpEdc7n6B6BhCSlyxrgJbLQCaQyDFJGc9GNFflLLnTarnaHOrhtuduL6Bz Vucb2vtsZA7lrzcfXDzDi09o9q/j2NE/hCDIJtlK8NvVvQFDdKDGBANyk6xNVV7pJqy0cQ avrmW9ecGmPoAk3VjUKrHsQvAfX2WJo1vlti4LtKNx4TEnBrrhyKB18srqkkxA== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689146683; 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=mQBYLu/Jf0tb9SlmVMt5Z0esUr7igywEyzGKNj1340k=; b=ZqtuBYiFUpEgsXQI0jJdIuJ1hcnfwXSfjFdHV3Gub9LttGb0k0BzwJPVNH8VFsjkzK4O7N qvsJaj5tomn90mnMq7GU+Gdp1iiTB0nOkdIkfCj9tLbELTmXzQf/Gd+d8W5LUYMZXP5yDP 2PVfXWISSCk1884LLhDFegLbqKnkRjnzihnmVm6eCc7Eum8sKsRmtEy6E0smfafx/VsMXF BEdClPlaVKsw/swz89JQDfqPx6y02k54NUkJvJj6+yGK6guyyloWpPTVCOnJfrOweTiiQB gm/WiQZLGJ7HbbHLtMvz/4Ibp48obkvfUQxmpiXioZnMoy99aXENM57yDci8Jg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689146683; a=rsa-sha256; cv=none; b=A1fiooFtQXn1FA3D5KeVfyGrPxsRKdjxt5YAjeooQS1iumfoiQoZFYcitJNUvR0IePpFYW fCU+Dx9MgKSN9IpCL+QMsfoPPrPqJrhD5BxgCFMyisUj6oYeYxPBOjc0ErmzEnQztNCDvq 68W9FF/ZBsz9l3qwhH0bvVnENMTfr72DLLyI37oCqBbKg3s/mZHFVoKqNQiTfG4ZO+E6yq 4njMj18jN3sXPiJM94DmL3upIi3if+ZQC0EHlHu7FJaXku7mH5202s4dOJZfZgwpYyt1tY wgf97Tnbz/h6XCPPWrKYxAk7zdUtIEvoodGwNw0sWehN1RJmUcOHjx3pwMlCeQ== 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 4R18Q342fnz10J6; Wed, 12 Jul 2023 07:24:43 +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 36C7OhlJ031624; Wed, 12 Jul 2023 07:24:43 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36C7Ohd9031623; Wed, 12 Jul 2023 07:24:43 GMT (envelope-from git) Date: Wed, 12 Jul 2023 07:24:43 GMT Message-Id: <202307120724.36C7Ohd9031623@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Guido Falsi Subject: git: 25122d0e5673 - main - sysutils/xxd: Add missing conflict with vim console flavor 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 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: madpilot X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 25122d0e5673c9ba2f91fe32d806cf3e91d23194 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N 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 DISTINFO_FILE= ${VIM_PORT}/distinfo ALL_TARGET= ${PORTNAME}