Emmanuel Dreyfus <manu%netbsd.org@localhost> writes: > On Mon, Aug 10, 2015 at 05:44:53AM -0400, Greg Troxel wrote: >> My reaction (without too much thought) is that either mariadb is a >> different database (as pgsql is to mysql), or it's a version of mysql >> (with different names, but with depending packages expecting to treat it >> as more-or-less mysql). mk/mysql.mk seems to indicate it is simply a >> version of mysql. > > MariaDB intent to be a drop-in replacement for MySQL. Hence it is almost > a mysql-client version. There is however a caveat: I am not sure > mariadb-server is able to build against a non mariadb mysql-client. Sure, but I bet mysql-server 55 does not build against mysql-client 54, or if it does people will tell you not to. The mysql server packages do the same thing. > databases/mariadb55-server/Maefile does not include mk/mysql-buildlink3.mk > but databases/mariadb55-client/buildlink3.mk therefore it is probably fine. Agreed. > All we would need would be this change? > RCS file: /cvsroot/pkgsrc/databases/mariadb55-client/buildlink3.mk,v > retrieving revision 1.2 > diff -U4 -r1.2 buildlink3.mk > --- databases/mariadb55-client/buildlink3.mk 7 May 2015 12:45:28 -00001.2 > +++ databases/mariadb55-client/buildlink3.mk 10 Aug 2015 10:05:37 -0000 > @@ -1,18 +1,18 @@ > # $NetBSD: buildlink3.mk,v 1.2 2015/05/07 12:45:28 fhajny Exp $ > > -BUILDLINK_TREE+= mariadb-client > +BUILDLINK_TREE+= mysql-client > > .if !defined(MARIADB_CLIENT_BUILDLINK3_MK) > MARIADB_CLIENT_BUILDLINK3_MK:= > > -BUILDLINK_API_DEPENDS.mariadb-client+= mariadb-client>=5.5.43 > -BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client > -BUILDLINK_PKGSRCDIR.mariadb-client?= ../../databases/mariadb55-client > -BUILDLINK_INCDIRS.mariadb-client?= include/mysql > -BUILDLINK_LIBDIRS.mariadb-client?= lib > +BUILDLINK_API_DEPENDS.mysql-client+= mariadb-client>=5.5.43 > +BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client > +BUILDLINK_PKGSRCDIR.mysql-client?= ../../databases/mariadb55-client > +BUILDLINK_INCDIRS.mysql-client?= include/mysql > +BUILDLINK_LIBDIRS.mysql-client?= lib > > .include "../../devel/zlib/buildlink3.mk" > .include "../../security/openssl/buildlink3.mk" > .endif # MARIADB_CLIENT_BUILDLINK3_MK > > -BUILDLINK_TREE+= -mariadb-client > +BUILDLINK_TREE+= -mysql-client As long as all the packages that use mariadb (only) are coded to use the right variables, that seems ok to me. Plus it needs a comment; this is far from obvious. php-mysqli would need fixing, but looks easy. I don't know what else would be affected.
Attachment:
pgpOpK6CtTJXD.pgp
Description: PGP signature