Hi,
I've noticed that I have mysql_waitpid installed which is broken
symlink to mariadb-waitpid.
I think that symlink should be moved to -server package. I come up with
following diff, which I'm still building and didn't test it yet.
Index: Makefile
===================================================================
RCS file: /cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.96
diff -u -p -u -r1.96 Makefile
--- Makefile 12 Aug 2020 14:43:54 -0000 1.96
+++ Makefile 28 Sep 2020 13:57:54 -0000
@@ -9,6 +9,8 @@ DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
PKGNAME-tests= mariadb-tests-${VERSION}
+REVISION-main = 0
+REVISION-server = 0
EPOCH= 1
CATEGORIES= databases
Index: pkg/PLIST-main
===================================================================
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-main,v
retrieving revision 1.21
diff -u -p -u -r1.21 PLIST-main
--- pkg/PLIST-main 26 Jun 2020 08:46:42 -0000 1.21
+++ pkg/PLIST-main 28 Sep 2020 13:57:54 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-main,v 1.21 2020/06/26 08:46:42 sthen Exp $
-@conflict mariadb-server-<=10.4.12v1
+@conflict mariadb-server-<=10.5.5v1
@conflict mytop-*
@pkgpath databases/mytop
@bin bin/mariadb
@@ -23,7 +23,6 @@ bin/msql2mysql
bin/mysql
bin/mysql_config
bin/mysql_find_rows
-bin/mysql_waitpid
bin/mysqlaccess
bin/mysqladmin
bin/mysqlbinlog
Index: pkg/PLIST-server
===================================================================
RCS file: /cvs/ports/databases/mariadb/pkg/PLIST-server,v
retrieving revision 1.35
diff -u -p -u -r1.35 PLIST-server
--- pkg/PLIST-server 12 Aug 2020 14:43:54 -0000 1.35
+++ pkg/PLIST-server 28 Sep 2020 13:57:54 -0000
@@ -1,5 +1,5 @@
@comment $OpenBSD: PLIST-server,v 1.35 2020/08/12 14:43:54 sthen Exp $
-@conflict mariadb-client-<=10.4.12v1
+@conflict mariadb-client-<=10.5.5v1
@newgroup _mysql:502
@newuser _mysql:502:_mysql:daemon:MySQL Account:/nonexistent:/sbin/nologin
@rcscript ${RCDIR}/mysqld
@@ -36,6 +36,7 @@ bin/mysql_secure_installation
bin/mysql_setpermission
bin/mysql_tzinfo_to_sql
bin/mysql_upgrade
+bin/mysql_waitpid
bin/mysqld_multi
bin/mysqld_safe
bin/mysqld_safe_helper
--
Regards,
Mikolaj
