mirror/freebsd-ports
1
0
Fork 0
mirror of https://git.FreeBSD.org/ports.git synced 2024-11-18 00:10:04 +00:00
Code Issues Releases Activity

databases/mytop: Adopt port and fix conflicts

Browse Source 
* 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
This commit is contained in:
Bernard Spil 2024-11-10 14:34:56 +01:00
parent f4cd045557
commit a8e7b5f4b6
9 changed files with 19 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
databases/mariadb1011-client/pkg-plist
View File

@ -39,7 +39,7 @@ bin/mysqlimport
bin/mysqlshow bin/mysqlshow
bin/mysqlslap bin/mysqlslap
bin/mysqltest bin/mysqltest
@comment bin/mytop bin/mytop
bin/my_print_defaults bin/my_print_defaults
bin/replace bin/replace
@sample %%ETCDIR%%/my.cnf.sample @sample %%ETCDIR%%/my.cnf.sample
@ -140,7 +140,7 @@ share/man/man1/mysqlshow.1.gz
share/man/man1/mysqlslap.1.gz share/man/man1/mysqlslap.1.gz
share/man/man1/mysqltest.1.gz share/man/man1/mysqltest.1.gz
share/man/man1/mysqltest_embedded.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 @comment share/man/man1/perror.1.gz
share/man/man1/replace.1.gz share/man/man1/replace.1.gz
@comment share/man/man1/resolve_stack_dump.1.gz @comment share/man/man1/resolve_stack_dump.1.gz

3
databases/mariadb1011-server/Makefile
View File

@ -132,7 +132,8 @@ ETCDIR= ${PREFIX}/etc/mysql
CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \ mysqlwsrep* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mytop
FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES
GSSAPI_BASE_USES= gssapi GSSAPI_BASE_USES= gssapi

4
databases/mariadb1011-server/pkg-plist
View File

@ -26,7 +26,7 @@ bin/myisam_ftdump
bin/myisamchk bin/myisamchk
bin/myisamlog bin/myisamlog
bin/myisampack bin/myisampack
@comment bin/mytop bin/mytop
%%ROCKSDB%%bin/myrocks_hotbackup %%ROCKSDB%%bin/myrocks_hotbackup
bin/mysql_client_test bin/mysql_client_test
bin/mysql_client_test_embedded bin/mysql_client_test_embedded
@ -305,7 +305,7 @@ libexec/mysqld
@comment share/man/man1/mysqlslap.1.gz @comment share/man/man1/mysqlslap.1.gz
@comment share/man/man1/mysqltest.1.gz @comment share/man/man1/mysqltest.1.gz
@comment share/man/man1/mysqltest_embedded.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.server.1.gz
@comment share/man/man1/mysql_fix_extensions.1.gz @comment share/man/man1/mysql_fix_extensions.1.gz
@comment share/man/man1/mysql_install_db.1.gz @comment share/man/man1/mysql_install_db.1.gz

4
databases/mariadb105-client/pkg-plist
View File

@ -34,7 +34,7 @@ bin/mysqlimport
bin/mysqlshow bin/mysqlshow
bin/mysqlslap bin/mysqlslap
bin/mysqltest bin/mysqltest
@comment bin/mytop bin/mytop
bin/my_print_defaults bin/my_print_defaults
@comment bin/wsrep_sst_rsync_wan @comment bin/wsrep_sst_rsync_wan
@sample %%ETCDIR%%/my.cnf.sample @sample %%ETCDIR%%/my.cnf.sample
@ -172,7 +172,7 @@ share/man/man1/mysqlshow.1.gz
share/man/man1/mysqlslap.1.gz share/man/man1/mysqlslap.1.gz
share/man/man1/mysqltest.1.gz share/man/man1/mysqltest.1.gz
share/man/man1/mysqltest_embedded.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 @comment share/man/man1/perror.1.gz
share/man/man1/replace.1.gz share/man/man1/replace.1.gz
@comment share/man/man1/resolve_stack_dump.1.gz @comment share/man/man1/resolve_stack_dump.1.gz

4
databases/mariadb106-client/pkg-plist
View File

@ -39,7 +39,7 @@ bin/mysqlimport
bin/mysqlshow bin/mysqlshow
bin/mysqlslap bin/mysqlslap
bin/mysqltest bin/mysqltest
@comment bin/mytop bin/mytop
bin/my_print_defaults bin/my_print_defaults
bin/replace bin/replace
@sample %%ETCDIR%%/my.cnf.sample @sample %%ETCDIR%%/my.cnf.sample
@ -140,7 +140,7 @@ share/man/man1/mysqlshow.1.gz
share/man/man1/mysqlslap.1.gz share/man/man1/mysqlslap.1.gz
share/man/man1/mysqltest.1.gz share/man/man1/mysqltest.1.gz
share/man/man1/mysqltest_embedded.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 @comment share/man/man1/perror.1.gz
share/man/man1/replace.1.gz share/man/man1/replace.1.gz
@comment share/man/man1/resolve_stack_dump.1.gz @comment share/man/man1/resolve_stack_dump.1.gz

3
databases/mariadb106-server/Makefile
View File

@ -125,7 +125,8 @@ CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mariadb1011-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \ mysqlwsrep* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mytop
FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES
GSSAPI_BASE_USES= gssapi GSSAPI_BASE_USES= gssapi

2
databases/mariadb114-client/pkg-plist
View File

@ -137,7 +137,7 @@ share/man/man1/mysqlshow.1.gz
share/man/man1/mysqlslap.1.gz share/man/man1/mysqlslap.1.gz
share/man/man1/mysqltest.1.gz share/man/man1/mysqltest.1.gz
share/man/man1/mysqltest_embedded.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/perror.1.gz
share/man/man1/replace.1.gz share/man/man1/replace.1.gz
share/man/man1/resolve_stack_dump.1.gz share/man/man1/resolve_stack_dump.1.gz

3
databases/mariadb114-server/Makefile
View File

@ -132,7 +132,8 @@ ETCDIR= ${PREFIX}/etc/mysql
CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ CONFLICTS_INSTALL= mariadb10[0-57-9]-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \ mysql[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mysqlwsrep* \ mysqlwsrep* \
percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* percona[0-9]*-${PKGNAMESUFFIX:C/^[0-9]*-//}-* \
mytop
FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES FASTMTX_CMAKE_BOOL= WITH_FAST_MUTEXES
GSSAPI_BASE_USES= gssapi GSSAPI_BASE_USES= gssapi

6
databases/mytop/Makefile
View File

@ -1,14 +1,16 @@
PORTNAME= mytop PORTNAME= mytop
PORTVERSION= 1.7 PORTVERSION= 1.7
PORTREVISION= 1 PORTREVISION= 2
CATEGORIES= databases CATEGORIES= databases
MAINTAINER= ports@FreeBSD.org MAINTAINER= brnrd@FreeBSD.org
COMMENT= Top clone for MySQL COMMENT= Top clone for MySQL
WWW= https://jeremy.zawodny.com/mysql/mytop/ WWW= https://jeremy.zawodny.com/mysql/mytop/
LICENSE= GPLv2 LICENSE= GPLv2
CONFLICTS_INSTALL= mariadb*-client
RUN_DEPENDS= ${DBD_MYSQL} \ RUN_DEPENDS= ${DBD_MYSQL} \
p5-DBI>=1.13:databases/p5-DBI \ p5-DBI>=1.13:databases/p5-DBI \
p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey p5-Term-ReadKey>=2.10:devel/p5-Term-ReadKey