From nobody Sun Nov 10 13:35:17 2024 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 4XmYZs6bVRz5clrV; Sun, 10 Nov 2024 13:35:17 +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 4XmYZs4GFhz4tqN; Sun, 10 Nov 2024 13:35:17 +0000 (UTC) (envelope-from git@FreeBSD.org) DKIM-Signature: v=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731245717; 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=0dWhOfM/9HvFDgSosDmElpMZS8V7XYu2oVDaPmzA9YM=; b=mSj9ourIr5T9kaa/QcMZ9AOm8bXpTb2tfWX87s2j00bE2pedLr1FnevWoIfPCAP7C/Dkc9 +MT4x0md6MbKQFUgmETZxr5pVAKokpE99J0GFqKw14X8fF582Oornrd+YQ6jnuICUxxKHa VaHlp/3cqoUjQ/ZyGwJtp9sMPA2Kj2iWNL+4cXRzuplQODERkkmsl6OOXI7fDEK1sRl/kz 6m1NkGTWy/15u0guv96rjVWtMRIfVh6oebMb1LHPRS9oJltYYfz7dEj6tlKUbH6GyddmR+ VwmZUSE3QxncHluDCJ+/U1a9vBZVCqo48m1LyyzmonpD1hkhG1p5iSTG8LEeEw== ARC-Message-Signature: i=1; a=rsa-sha256; c=relaxed/relaxed; d=freebsd.org; s=dkim; t=1731245717; 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=0dWhOfM/9HvFDgSosDmElpMZS8V7XYu2oVDaPmzA9YM=; b=o/KgOisgLLSCMmvCUb2tKnBIVkcAwutocz1F2l7p0eVOamxgQrr/BJjyL+gN2pWBh4GZ8M yGkakthLSGq6xaYIX/VD7zlTvIS4QX2QDkOeFD4fXNhS47FPIKEHtIEds0gRtRBrz7xEuS JcWXEtTMX9hfMF4KEkrR/J15ApizraGbOyLRI8JN6M1IcwuKjNXY9QNHx83x/4tGM2SX5b 9xg5k/6LPCY+gpXYA1de83wJWP6vhf2ZFjC2OS3UGnSCvsiLhRAD02mJYZ4JuzdjdPOHs3 UE/Ljeyow31dyoTAZQkWxAMSSmVebCgO9BabpkUKqHbUmQ8yX4dJGkWVK3IfVg== ARC-Authentication-Results: i=1; mx1.freebsd.org; none ARC-Seal: i=1; s=dkim; d=freebsd.org; t=1731245717; a=rsa-sha256; cv=none; b=jXR5UdOiXPmiXyrcS4UQ+3c+gLaSEyG9VHRTa3zjuIIQdSbjCK0e7zEyT9pzB+8bECMGrW 6dO3qmS9y9F3HazpqquYiQn4REpTZFlLZMPYT7lS5Mf4ybVA05wela9Vz+AUU0kJSuPC5T pcPFVbOWLkwvJFXDAcaobwLlfjInFGHYERrK3bijCovqhXCFuy10drVAIGq2AwhbzPNx3R 9g0jGilKqmwErvfkhtUY/85hoLzJIiKmM7GNZgTmZllMiONYipihI0cPJBAAZZMkFXHy5p NZiCcAX8t5NtX3ZDUWvNX3l/kv/X2EARDICouWFqh/QGx5IhMN347/CYW/FsWA== 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 4XmYZs3Gy9zkr4; Sun, 10 Nov 2024 13:35:17 +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 4AADZHXH060478; Sun, 10 Nov 2024 13:35:17 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.18.1/8.18.1/Submit) id 4AADZHXq060475; Sun, 10 Nov 2024 13:35:17 GMT (envelope-from git) Date: Sun, 10 Nov 2024 13:35:17 GMT Message-Id: <202411101335.4AADZHXq060475@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: a8e7b5f4b6bd - main - databases/mytop: Adopt port and fix conflicts 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: X-BeenThere: dev-commits-ports-main@freebsd.org Sender: owner-dev-commits-ports-main@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: a8e7b5f4b6bd64d7a805c08b5027a41da51640c3 Auto-Submitted: auto-generated The branch main has been updated by brnrd: URL: https://cgit.FreeBSD.org/ports/commit/?id=a8e7b5f4b6bd64d7a805c08b5027a41da51640c3 commit a8e7b5f4b6bd64d7a805c08b5027a41da51640c3 Author: Bernard Spil AuthorDate: 2024-11-10 13:34:56 +0000 Commit: Bernard Spil CommitDate: 2024-11-10 13:34:56 +0000 databases/mytop: Adopt port and fix conflicts * The MariaDB ports have shipped a mytop for a long time. This was commented out due to earlier conflicts. These changes use the packaged mytop for MariaDB ports whilst providing the port for MySQL versions. Reported by: till php net PR: 266630 --- databases/mariadb1011-client/pkg-plist | 4 ++-- databases/mariadb1011-server/Makefile | 3 ++- databases/mariadb1011-server/pkg-plist | 4 ++-- databases/mariadb105-client/pkg-plist | 4 ++-- databases/mariadb106-client/pkg-plist | 4 ++-- databases/mariadb106-server/Makefile | 3 ++- databases/mariadb114-client/pkg-plist | 2 +- databases/mariadb114-server/Makefile | 3 ++- databases/mytop/Makefile | 6 ++++-- 9 files changed, 19 insertions(+), 14 deletions(-) diff --git a/databases/mariadb1011-client/pkg-plist b/databases/mariadb1011-client/pkg-plist index 4a870eb11fd0..c285da216916 100644 --- a/databases/mariadb1011-client/pkg-plist +++ b/databases/mariadb1011-client/pkg-plist @@ -39,7 +39,7 @@ bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest -@comment bin/mytop +bin/mytop bin/my_print_defaults bin/replace @sample %%ETCDIR%%/my.cnf.sample @@ -140,7 +140,7 @@ share/man/man1/mysqlshow.1.gz share/man/man1/mysqlslap.1.gz share/man/man1/mysqltest.1.gz share/man/man1/mysqltest_embedded.1.gz -@comment share/man/man1/mytop.1.gz +share/man/man1/mytop.1.gz @comment share/man/man1/perror.1.gz share/man/man1/replace.1.gz @comment share/man/man1/resolve_stack_dump.1.gz diff --git a/databases/mariadb1011-server/Makefile b/databases/mariadb1011-server/Makefile index ea21c4fe3c0a..736be6b84d1b 100644 --- a/databases/mariadb1011-server/Makefile +++ b/databases/mariadb1011-server/Makefile @@ -132,7 +132,8 @@ ETCDIR= ${PREFIX}/etc/mysql CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mytop FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi diff --git a/databases/mariadb1011-server/pkg-plist b/databases/mariadb1011-server/pkg-plist index 2f45fcfa3815..94b7ef49acc7 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 -@comment bin/mytop +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 -@comment @comment share/man/man1/mytop.1.gz +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 diff --git a/databases/mariadb105-client/pkg-plist b/databases/mariadb105-client/pkg-plist index 4ac9327ed063..5c8f7bd6516e 100644 --- a/databases/mariadb105-client/pkg-plist +++ b/databases/mariadb105-client/pkg-plist @@ -34,7 +34,7 @@ bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest -@comment bin/mytop +bin/mytop bin/my_print_defaults @comment bin/wsrep_sst_rsync_wan @sample %%ETCDIR%%/my.cnf.sample @@ -172,7 +172,7 @@ share/man/man1/mysqlshow.1.gz share/man/man1/mysqlslap.1.gz share/man/man1/mysqltest.1.gz share/man/man1/mysqltest_embedded.1.gz -@comment share/man/man1/mytop.1.gz +share/man/man1/mytop.1.gz @comment share/man/man1/perror.1.gz share/man/man1/replace.1.gz @comment share/man/man1/resolve_stack_dump.1.gz diff --git a/databases/mariadb106-client/pkg-plist b/databases/mariadb106-client/pkg-plist index 88168392f335..bdfecf8c3bac 100644 --- a/databases/mariadb106-client/pkg-plist +++ b/databases/mariadb106-client/pkg-plist @@ -39,7 +39,7 @@ bin/mysqlimport bin/mysqlshow bin/mysqlslap bin/mysqltest -@comment bin/mytop +bin/mytop bin/my_print_defaults bin/replace @sample %%ETCDIR%%/my.cnf.sample @@ -140,7 +140,7 @@ share/man/man1/mysqlshow.1.gz share/man/man1/mysqlslap.1.gz share/man/man1/mysqltest.1.gz share/man/man1/mysqltest_embedded.1.gz -@comment share/man/man1/mytop.1.gz +share/man/man1/mytop.1.gz @comment share/man/man1/perror.1.gz share/man/man1/replace.1.gz @comment share/man/man1/resolve_stack_dump.1.gz diff --git a/databases/mariadb106-server/Makefile b/databases/mariadb106-server/Makefile index 556add1ebd0a..3747af70ccb6 100644 --- a/databases/mariadb106-server/Makefile +++ b/databases/mariadb106-server/Makefile @@ -125,7 +125,8 @@ CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mytop FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi diff --git a/databases/mariadb114-client/pkg-plist b/databases/mariadb114-client/pkg-plist index 2efc25cdc504..4b00fefc5279 100644 --- a/databases/mariadb114-client/pkg-plist +++ b/databases/mariadb114-client/pkg-plist @@ -137,7 +137,7 @@ share/man/man1/mysqlshow.1.gz share/man/man1/mysqlslap.1.gz share/man/man1/mysqltest.1.gz share/man/man1/mysqltest_embedded.1.gz -@comment share/man/man1/mytop.1.gz +share/man/man1/mytop.1.gz share/man/man1/perror.1.gz share/man/man1/replace.1.gz share/man/man1/resolve_stack_dump.1.gz diff --git a/databases/mariadb114-server/Makefile b/databases/mariadb114-server/Makefile index a050630bafe8..ce2a8f0e1f7e 100644 --- a/databases/mariadb114-server/Makefile +++ b/databases/mariadb114-server/Makefile @@ -132,7 +132,8 @@ ETCDIR= ${PREFIX}/etc/mysql CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysqlwsrep* \ - percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* + percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ + mytop FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES GSSAPI_BASE_USES= gssapi diff --git a/databases/mytop/Makefile b/databases/mytop/Makefile index faee6e334d48..23a1fc1fb39c 100644 --- a/databases/mytop/Makefile +++ b/databases/mytop/Makefile @@ -1,14 +1,16 @@ PORTNAME= mytop PORTVERSION= 1.7 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= databases -MAINTAINER= ports@FreeBSD.org +MAINTAINER= brnrd@FreeBSD.org COMMENT= Top clone for MySQL WWW= https://jeremy.zawodny.com/mysql/mytop/ LICENSE= GPLv2 +CONFLICTS_INSTALL= mariadb*-client + RUN_DEPENDS= ${DBD_MYSQL} \ p5-DBI>=1.13:databases/p5-DBI \ p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey