From nobody Wed Jul 12 22:35:21 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 4R1Xcp0Lpbz2tjrq; Wed, 12 Jul 2023 22:35:22 +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 4R1Xcn71tpz4Qg0; Wed, 12 Jul 2023 22:35:21 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689201322; 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=MQZY7cJClvWAzV+vBWmezJtM9/1lVcR5uvo90dbvRwg=; b=nKpNoTD+jV1N3TDy0kTdC+YpJxTNuhxgdUzTEVi+eJL13YiZaNh2lDN1LUm12fqVIBqP5a u/KaT2vKsGiYIKxOwW6naas0dZcUDxjfor9QRwz7YpQCGSM4XzqC2IIaw3u94jhmI+DID4 MY8vbv6dc2hgpqHkLKFj5UZnHlCpWPAg2eLOj+dSvY/coopJAtKeR6THyE9WhCar8SmD1H Hxz6EVq0cH2Rru6MOqcLpz8J0LhNHbXqMkOM1NYh3gT9MC2ogvV8NIFE5h3hJODSf9IgtV ohMckwO1KbGhgK6Avv1Jy/JDjPLKNFFYY1J5aZPg8AxY6ojk7s5nrP+V4gBOYQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689201322; 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=MQZY7cJClvWAzV+vBWmezJtM9/1lVcR5uvo90dbvRwg=; b=ZWCWVdFVhM6pvhoqqZ0yWS4BqD66bjb8gyZhIWGgi3SWIqO2F9OcfLu1qXQq9WV2crNcd8 ltA8ypdVsbp5A7gPnp5NIxsm7oH2oj5WppV30ADl/OaqCSBcwztbDH00XJmAGi7QOwCpSi 9zu0+kRnQi0rFAXZb93D/yl010L1LRYdoRu7RMknVlN+CTNIOKnnmWTW18lFlCIkufMuAW yC2NVDdjW9bHQJJeCkpJHvbtPsAKA2z2Gp3sdEtEgaXP1m9pKvgWool9IX6wRhOdKnj9Pj AYazj6U78kd7D9CvS96OvwIPzNIMwI+wpUoMQInB5sy6BWFgGbKf/tXg2Q3ZMw== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689201322; a=rsa-sha256; cv=none; b=mR77iWL+liZ1wIyPRHrRDAGc36KHj+YG9mCAMJAr/nXOEXT6c8jiyQ4NX088Fw5PvugeMi sWtPW4FRthq0pMOOFXLsMjR6H0km/qSw4LrvZ8n0RXFAXMIZmlwNqo36IHnyzC3l4xlMlZ t6Fh8rFVnKqeLIKi5jpFt4ZEDtFf2b4MTGJMGdVsy2V3jgV8xqO1PRv2pjuEXJFIzxH+QE CwndKjLiMUrJuLVgVCsexx2uPCxkMaIHM6w6i34KWnqlpbsisd0U2B7CkGXgH5nBxwHge8 T6KrJ3G3IoTb2pf++q3FCcQJ5Ey5vhZT8zeAlMtX2LB9Nuupt/WOo7WA+bQcaQ== 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 4R1Xcn66FRzR6M; Wed, 12 Jul 2023 22:35:21 +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 36CMZLdu039828; Wed, 12 Jul 2023 22:35:21 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CMZLHD039827; Wed, 12 Jul 2023 22:35:21 GMT (envelope-from git) Date: Wed, 12 Jul 2023 22:35:21 GMT Message-Id: <202307122235.36CMZLHD039827@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: 2901ad0f2391 - main - Revert "sysutils/xxd: Add missing conflict with vim console flavor" 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 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: 2901ad0f23916b83deaf4f1fc688503c404d3e6a Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=2901ad0f23916b83deaf4f1fc688503c404d3e6a commit 2901ad0f23916b83deaf4f1fc688503c404d3e6a Author: Guido Falsi AuthorDate: 2023-07-12 22:27:57 +0000 Commit: Guido Falsi CommitDate: 2023-07-12 22:35:01 +0000 Revert "sysutils/xxd: Add missing conflict with vim console flavor" The vim console flavor package name is "vim" (without -console), so the conflict on vim-console is not required. This reverts commit 25122d0e5673c9ba2f91fe32d806cf3e91d23194. Reported by: adamw --- sysutils/xxd/Makefile | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/sysutils/xxd/Makefile b/sysutils/xxd/Makefile index d0f2752ba2d3..3db60c1ba60e 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-console vim-gtk2 vim-gtk3 vim-motif vim-x11 +CONFLICTS_INSTALL= vim-[0-9]* vim-gtk2 vim-gtk3 vim-motif vim-x11 DISTINFO_FILE= ${VIM_PORT}/distinfo ALL_TARGET= ${PORTNAME}