git: a8e7b5f4b6bd - main - databases/mytop: Adopt port and fix conflicts

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Bernard Spil <brnrd_at_FreeBSD.org>
Date: Sun, 10 Nov 2024 13:35:17 UTC
The branch main has been updated by brnrd:

URL: https://cgit.FreeBSD.org/ports/commit/?id=a8e7b5f4b6bd64d7a805c08b5027a41da51640c3

commit a8e7b5f4b6bd64d7a805c08b5027a41da51640c3
Author:     Bernard Spil <brnrd@FreeBSD.org>
AuthorDate: 2024-11-10 13:34:56 +0000
Commit:     Bernard Spil <brnrd@FreeBSD.org>
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