From nobody Wed Jul 12 22:36:24 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 4R1Xf05SSsz2tkL4; Wed, 12 Jul 2023 22:36:24 +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 4R1Xf051LBz4Qh0; Wed, 12 Jul 2023 22:36:24 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689201384; 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=6PeFddIIm49TcBEgHXCk9OgrmsCMj7QZmR+Ll7YZKDc=; b=KjVDySZzDYvgU7ZXMhLAnuskK4U8bIjnbmnjlTRUkDuGpBeHGU5dHycThz8kXz/yPgWNWl e+e1DIYlxVWbxFZNZWbh5CWgVRe2G5qehoQ4XCZbOu8z0UROq+b2CRgBi4jJDV5/kGwu6f rsyHn+lj9d8R30oyUlUZXa1zQn1S9ZocSl0kQYjKt5G/uogNvbx8VdoW0aO3Thf+Kxxb6z 0tZKwXoT9hqQvKijuLQKAvLOc1DtrDlgRVG2aZiQwemGm38r4VMdI3BgBA2rslNYIe7XvK NVYPGJTwmaHKrlGSzojmItA5e1kYOnem+IKEG5YjU1njXZMpxRaJhm/SwgNNLQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1689201384; 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=6PeFddIIm49TcBEgHXCk9OgrmsCMj7QZmR+Ll7YZKDc=; b=jjNJS2VueSclGZLOixKzrcjg97glKAne8THMCPCjcnv1/D+QOPNwEPKx5tSpGEICGRnMz1 xQXvPZqsM7pngCffwdwbJhZRRIVgXeOP9fhFpJciVr8fBWZ8AayMy4GdD+6cZ5xtkxQqN9 a4Oht+6t03mVwUnNi31+LKIFth/nopTcrd1KWMXBS6GJlcCG8itDwBvk4UZNI/ZLM240uv JOpP0LwElAoLLXxT9zyMqRkilfDVxOfTOmLKI5C34fbtAktF4CSDVX5lmiOnKJ2lfLsB8m NWj4JZDr6b2hv7hIAFuSs00mB9/LkVbVjmdDCf/ztfsR6o93U8ZmNl5a1CQO0g== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1689201384; a=rsa-sha256; cv=none; b=e5oUNjtIQ8N2Lx7C/pkXaTnhc2GAi0TAj6441Co8iSw0F/sYnMw9yDqVc63fZMU7DB3J/I 1AO2IH56jj9+gL8DrgbA+sIsMDvmrPh+2LvtzqerR+lc0os4ch+ON9/k0L+/6SryEcVNme uY1XeASlx3S0zNMXRQqlM+/58bcgXC+LLBE1Mcd3s+txjMSGDZ8Y3C4Z/ej/VKXOsajaoI fLI0B91GtWmY7nu2RV7ePC3IT4hxPfkpoROXMIE6ZBPbupvudxqn5GvnUjlxf1fW1F8FfN gAk0vymBXX4g1qZfdwjOF8uI6JjfyegRkd5UJEU38r9d5T5Fd82uBzIQ+HeByQ== 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 4R1Xf044GBzRZj; Wed, 12 Jul 2023 22:36:24 +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 36CMaOAX040082; Wed, 12 Jul 2023 22:36:24 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.17.1/8.17.1/Submit) id 36CMaOKC040081; Wed, 12 Jul 2023 22:36:24 GMT (envelope-from git) Date: Wed, 12 Jul 2023 22:36:24 GMT Message-Id: <202307122236.36CMaOKC040081@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: 23f74cef1bfb - 2023Q3 - Revert "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: 23f74cef1bfb4eb130c4734964813bc8e176d1aa Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch 2023Q3 has been updated by madpilot: URL: https://cgit.FreeBSD.org/ports/commit/?id=23f74cef1bfb4eb130c4734964813bc8e176d1aa commit 23f74cef1bfb4eb130c4734964813bc8e176d1aa Author: Guido Falsi AuthorDate: 2023-07-12 22:27:57 +0000 Commit: Guido Falsi CommitDate: 2023-07-12 22:35:43 +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 (cherry picked from commit 2901ad0f23916b83deaf4f1fc688503c404d3e6a) --- 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}