Date: Wed, 17 Dec 2014 07:10:59 +0000 (UTC) From: Xin LI <delphij@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r374835 - in head/databases/mariadb100-server: . files Message-ID: <201412170710.sBH7Ax6f003503@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: delphij Date: Wed Dec 17 07:10:58 2014 New Revision: 374835 URL: https://svnweb.freebsd.org/changeset/ports/374835 QAT: https://qat.redports.org/buildarchive/r374835/ Log: Update to 10.0.15. - InnoDB is now disabled by default. MariaDB ships with XtraDB as drop-in replacement of InnoDB but keeps the original InnoDB as an option you have to set specifically to enable it. - Added support for Mroonga storage engine. - Removed mytop script, which the latest version can be installed via databases/mytop. - Moved INNODB option to the Server part (as OQGraph) - Updated -server log only as this only affects -server. Submitted by: Bernard Spil <spil oss gmail com> (maintainer) Deleted: head/databases/mariadb100-server/files/patch-storage_connect_array.cpp head/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp head/databases/mariadb100-server/files/patch-storage_connect_filamap.h Modified: head/databases/mariadb100-server/Makefile head/databases/mariadb100-server/distinfo head/databases/mariadb100-server/files/pkg-message.in head/databases/mariadb100-server/pkg-plist Modified: head/databases/mariadb100-server/Makefile ============================================================================== --- head/databases/mariadb100-server/Makefile Wed Dec 17 02:35:55 2014 (r374834) +++ head/databases/mariadb100-server/Makefile Wed Dec 17 07:10:58 2014 (r374835) @@ -1,7 +1,7 @@ # $FreeBSD$ PORTNAME?= mariadb -PORTVERSION= 10.0.14 +PORTVERSION= 10.0.15 CATEGORIES= databases ipv6 MASTER_SITES= http://ftp.osuosl.org/pub/${SITESDIR}/ \ http://mirrors.supportex.net/${SITESDIR}/ \ @@ -26,7 +26,7 @@ SITESDIR= mariadb/mariadb-${PORTVERSION} BROKEN_arm= Does not compile on arm -OPTIONS_DEFINE= SSL OPENSSL PORTSSL FASTMTX +OPTIONS_DEFINE= INNODB SSL OPENSSL PORTSSL FASTMTX OPTIONS_DEFAULT= SSL NO_OPTIONS_SORT= yes @@ -64,10 +64,12 @@ DATADIR= ${PREFIX}/share/mysql # MySQL-Server options .if !defined(CLIENT_ONLY) USE_MYSQL= yes -OPTIONS_DEFINE+= OQGRAPH MAXKEY +OPTIONS_DEFINE+= INNODB MROONGA OQGRAPH MAXKEY OPTIONS_DEFAULT+= MAXKEY -OQGRAPH_DESC= Open Query Graph Computation engine +INNODB_DESC= Build InnoDB engine next to XtraDB +MROONGA_DESC= Mroonga Full Text Search engine (gcc) +OQGRAPH_DESC= Open Query Graph Computation engine (gcc) MAXKEY_DESC= Change max key length from 1000 to 4000 .endif @@ -121,6 +123,22 @@ CMAKE_ARGS+= -DWITH_EMBEDDED_SERVER="ON" -DCMAKE_SKIP_BUILD_RPATH:BOOL=YES \ -DWITHOUT_EXAMPLE_STORAGE_ENGINE=1 +. if empty(PORT_OPTIONS:MINNODB) +PLIST_SUB+= INNODB="@comment " +. else +CMAKE_ARGS+= -DWITHOUT_INNOBASE=1 +PLIST_SUB+= INNODB="" +. endif + +. if empty(PORT_OPTIONS:MMROONGA) +CMAKE_ARGS+= -DWITHOUT_MROONGA=1 +PLIST_SUB+= MROONGA="@comment " +. else +USE_GCC?= yes +CMAKE_ARGS+= -DWITH_MROONGA_STORAGE_ENGINE=1 +PLIST_SUB+= MROONGA="" +. endif + . if empty(PORT_OPTIONS:MOQGRAPH) CMAKE_ARGS+= -DWITHOUT_OQGRAPH=1 PLIST_SUB+= OQGRAPH="@comment " Modified: head/databases/mariadb100-server/distinfo ============================================================================== --- head/databases/mariadb100-server/distinfo Wed Dec 17 02:35:55 2014 (r374834) +++ head/databases/mariadb100-server/distinfo Wed Dec 17 07:10:58 2014 (r374835) @@ -1,2 +1,2 @@ -SHA256 (mariadb-10.0.14.tar.gz) = ac0eca4ebb278aa304236bf6dbd5e8c9cf285431333f1379051c231c08e2e31d -SIZE (mariadb-10.0.14.tar.gz) = 51156364 +SHA256 (mariadb-10.0.15.tar.gz) = 9154cb68504d469b1bac636b85e30b2b2da2586092476d6ad2f9d6bc462909d8 +SIZE (mariadb-10.0.15.tar.gz) = 55531927 Modified: head/databases/mariadb100-server/files/pkg-message.in ============================================================================== --- head/databases/mariadb100-server/files/pkg-message.in Wed Dec 17 02:35:55 2014 (r374834) +++ head/databases/mariadb100-server/files/pkg-message.in Wed Dec 17 07:10:58 2014 (r374835) @@ -8,4 +8,8 @@ MariaDB respects hier(7) and doesn't che my.cnf. Please move existing my.cnf files from those paths to %%PREFIX%%/etc and %%PREFIX%%/etc/mysql. +This port does NOT include the mytop perl script, this is included in +the MariaDB tarball but the most recent version can be found in the +databases/mytop port + ************************************************************************ Modified: head/databases/mariadb100-server/pkg-plist ============================================================================== --- head/databases/mariadb100-server/pkg-plist Wed Dec 17 02:35:55 2014 (r374834) +++ head/databases/mariadb100-server/pkg-plist Wed Dec 17 07:10:58 2014 (r374835) @@ -29,7 +29,7 @@ bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest bin/mysqltest_embedded -bin/mytop +@comment bin/mytop bin/perror bin/replace bin/resolve_stack_dump @@ -52,7 +52,8 @@ lib/mysql/plugin/ha_blackhole.so lib/mysql/plugin/ha_connect.so lib/mysql/plugin/ha_federated.so lib/mysql/plugin/ha_federatedx.so -lib/mysql/plugin/ha_innodb.so +%%INNODB%%lib/mysql/plugin/ha_innodb.so +%%MROONGA%%lib/mysql/plugin/ha_mroonga.so %%OQGRAPH%%lib/mysql/plugin/ha_oqgraph.so lib/mysql/plugin/ha_sequence.so lib/mysql/plugin/ha_sphinx.so @@ -148,6 +149,8 @@ man/man8/mysqld.8.gz %%DATADIR%%/japanese/errmsg.sys %%DATADIR%%/korean/errmsg.sys %%DATADIR%%/magic +%%MROONGA%%%%DATADIR%%/mroonga/install.sql +%%MROONGA%%%%DATADIR%%/mroonga/uninstall.sql %%DATADIR%%/my-huge.cnf %%DATADIR%%/my-innodb-heavy-4G.cnf %%DATADIR%%/my-large.cnf
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201412170710.sBH7Ax6f003503>