On Fri, Aug 22, 2014 at 10:06:40PM +0100, Stuart Henderson wrote:
> On 2014/08/19 17:15, Brad Smith wrote:
> > Here is a diff to make attempt #2 at switching to MariaDB.
> >
> > Going through the various Makefile's I noticed bmf had a typo
> > with its WANTLIB entry for MySQL.
>
> It seems that files moved between -server (on mysql) and -client (on mariadb),
>
> /usr/local/bin/msql2mysql (mysql-server-5.1.73p0v0 and
> mariadb-client-10.0.13)
> /usr/local/bin/mysql_find_rows (mysql-server-5.1.73p0v0 and
> mariadb-client-10.0.13)
> /usr/local/bin/mysql_waitpid (mysql-server-5.1.73p0v0 and
> mariadb-client-10.0.13)
> /usr/local/bin/mysqlaccess (mysql-server-5.1.73p0v0 and
> mariadb-client-10.0.13)
> /usr/local/man/cat1/msql2mysql.0 (mysql-server-5.1.73p0v0 and
> mariadb-client-10.0.13)
> /usr/local/man/cat1/mysql_find_rows.0 (mysql-server-5.1.73p0v0 and
> mariadb-client-10.0.13)
> /usr/local/man/cat1/mysql_waitpid.0 (mysql-server-5.1.73p0v0 and
> mariadb-client-10.0.13)
> /usr/local/man/cat1/mysqlaccess.0 (mysql-server-5.1.73p0v0 and
> mariadb-client-10.0.13)
>
> untested but perhaps adding "@conflict mysql-server-*" to
> mariadb/pkg/PLIST-main
> will let this update automatically..
With the conflict marker added I can at least do "make update" from having
MySQL client + server installed to it being able to replace the client with
the MariaDB client which the tools could not do before without erroring
out (I don't have the exact error handy).
Index: Makefile
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- Makefile 19 Aug 2014 16:42:40 -0000 1.16
+++ Makefile 22 Aug 2014 21:09:03 -0000
@@ -11,6 +11,7 @@ DISTNAME= mariadb-${VERSION}
PKGNAME-main= mariadb-client-${VERSION}
PKGNAME-server= mariadb-server-${VERSION}
PKGNAME-tests= mariadb-tests-${VERSION}
+REVISION-main= 0
CATEGORIES= databases
MASTER_SITES= http://mariadb.mirror.iweb.com//${DISTNAME}/source/ \
http://ftp.osuosl.org/pub/mariadb/${DISTNAME}/source/ \
Index: pkg/PLIST-main
===================================================================
RCS file: /home/cvs/ports/databases/mariadb/pkg/PLIST-main,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 PLIST-main
--- pkg/PLIST-main 19 Jun 2014 23:04:42 -0000 1.9
+++ pkg/PLIST-main 22 Aug 2014 21:09:32 -0000
@@ -1,5 +1,6 @@
@comment $OpenBSD: PLIST-main,v 1.9 2014/06/19 23:04:42 brad Exp $
@conflict mysql-client-*
+@conflict mysql-server-*
@pkgpath databases/mysql,-main
bin/msql2mysql
@bin bin/mysql
--
This message has been scanned for viruses and
dangerous content by MailScanner, and is
believed to be clean.
