From nobody Thu Nov 14 12:34:04 2024 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 4Xq02N5m8mz5cc2J; Thu, 14 Nov 2024 12:34:04 +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 "R10" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4Xq02N3d3dz4HbT; Thu, 14 Nov 2024 12:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731587644; 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=obKLn1qaeC0LYIo4xJZMzR+w4//RD86xQlpw/QZGtss=; b=YdVjULMw7vu9peOJv8i3rjVzsGD2YF+99uw8IX6csiXju6Rhjr14XrZYgdJZrHiQWGNT2h ocFs3fmSDVCNtWzeZjjWXyVvTbh5PYcF0s53Mn0R1awE0Uq9iw/JSMo6UOX8innBj7gyXE TyPH3aU9Z8XXjaRUTWSuv27qPqyesRCxwtFiosy/VYIJtA5/a/+OZjiAnZSYnF32+KnYTC 4P4bx0BoMMccZBYq+KnuI3MTOne4eDphh5Af9DtPwO2d3MPQTCjgR8pCovyrvOUPUOxJLf FbCH3qwxaVOvIWSiFswimZ3j9TJt5xTz0Xpzcck6H3PRB6OCOopGb42A9Fz4TQ== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731587644; 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=obKLn1qaeC0LYIo4xJZMzR+w4//RD86xQlpw/QZGtss=; b=HGsHtf85HKLQPHFpX/NX3/boT2ePDMWtfcpTMusjwzQQuwcHEYCiL9e3gG0kx5T7vEEIJi p/4NAvAwrQHSossukUZwN6ySNxyBLa8heDW34mYneys+9fazI8xFPdySDRCGVHZlRRbna7 BH2UHcQpMkX7KPo9qZIme2dyfqCB7sxFMPloahDEH+MOqQfW+XP84nPAQo6JHCS4iH3gK9 j817QKGFQdoRC36qswiTHzDFBqlvqE0ksQ+CZw1pRZ2zcEZ5EV/6Gdl2EgXi9yPeJTX824 GvtLmstX++wb6XSSdodP8n9k/GTWGz0NIZHd/T5hriurPdzsDfdkGYsHMG5UZA== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731587644; a=rsa-sha256; cv=none; b=DK1WiNZbKsvazMsDWwK5rUCboxDIifo0bGvadHone9HlNQs86RE1VnKm9JdMOvd+nYHsjC 7pwPPN7EN0j6hev12pkJ1Uhk1VRf0vTmMNE1qx1V+PUOVNWPa0oDEh6g8tK89PffEdCd4F D69Fmu8YL43XdqebHsJT14jCIzxMsgs7yaCoyaKguCmPnSIH8V9e5hkOTPp/Brs9tK4y62 kuiT6XXX7mhF0qrhWFZnJgqMYl3v/g3HTcpaXn4fjoktxINxHtvJ0IN4j5iA3+7uCkxlWO 01G06z4nxsnXjN7U8bh5mV+FyxSgFsth+d7ZF9BMVXvypWhLSadTVb5EkJl6OQ== 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 4Xq02N3DSKzfXV; Thu, 14 Nov 2024 12:34:04 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.18.1/8.18.1) with ESMTP id 4AECY40R047084; Thu, 14 Nov 2024 12:34:04 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AECY4x3047081; Thu, 14 Nov 2024 12:34:04 GMT (envelope-from git) Date: Thu, 14 Nov 2024 12:34:04 GMT Message-Id: <202411141234.4AECY4x3047081@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Bernard Spil Subject: git: 54b68d50803a - main - databases/mariadb1011-server: Fix mytop install conflict 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: X-BeenThere: dev-commits-ports-all@freebsd.org Sender: owner-dev-commits-ports-all@FreeBSD.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: brnrd X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 54b68d50803a50073ab420717309f44cd9ba715f Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=54b68d50803a50073ab420717309f44cd9ba715f commit 54b68d50803a50073ab420717309f44cd9ba715f Author: Bernard Spil AuthorDate: 2024-11-13 19:14:18 +0000 Commit: Bernard Spil CommitDate: 2024-11-14 12:33:05 +0000 databases/mariadb1011-server: Fix mytop install conflict PR: 282680 Reported by: Jordan Ostreff --- databases/mariadb1011-server/pkg-plist | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/databases/mariadb1011-server/pkg-plist b/databases/mariadb1011-server/pkg-plist index 94b7ef49acc7..901afe9bb8e3 100644 --- a/databases/mariadb1011-server/pkg-plist +++ b/databases/mariadb1011-server/pkg-plist @@ -26,7 +26,7 @@ bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack -bin/mytop +@comment bin/mytop %%ROCKSDB%%bin/myrocks_hotbackup bin/mysql_client_test bin/mysql_client_test_embedded @@ -305,7 +305,7 @@ libexec/mysqld @comment share/man/man1/mysqlslap.1.gz @comment share/man/man1/mysqltest.1.gz @comment share/man/man1/mysqltest_embedded.1.gz -share/man/man1/mytop.1.gz +@comment share/man/man1/mytop.1.gz @comment share/man/man1/mysql.server.1.gz @comment share/man/man1/mysql_fix_extensions.1.gz @comment share/man/man1/mysql_install_db.1.gz