diff options
7 files changed, 33 insertions, 66 deletions
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile index 90eab068a09..e9d01024e74 100644 --- a/databases/mariadb100-server/Makefile +++ b/databases/mariadb100-server/Makefile @@ -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}/source 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 " diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo index fc302449175..3b7a74627e0 100644 --- a/databases/mariadb100-server/distinfo +++ b/databases/mariadb100-server/distinfo @@ -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 diff --git a/databases/mariadb100-server/files/patch-storage_connect_array.cpp b/databases/mariadb100-server/files/patch-storage_connect_array.cpp deleted file mode 100644 index 3968f4ff377..00000000000 --- a/databases/mariadb100-server/files/patch-storage_connect_array.cpp +++ /dev/null @@ -1,11 +0,0 @@ ---- storage/connect/array.cpp.orig 2014-09-25 00:29:47.000000000 +0200 -+++ storage/connect/array.cpp 2014-09-27 12:00:33.000000000 +0200 -@@ -129,7 +129,7 @@ - break; - case TYPE_VOID: - // Integer stored inside pp->Value -- par->AddValue(g, (int)parmp->Value); -+ par->AddValue(g, *(int*)parmp->Value); - break; - } // endswitch valtyp - diff --git a/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp b/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp deleted file mode 100644 index 3a082bc01d9..00000000000 --- a/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp +++ /dev/null @@ -1,20 +0,0 @@ ---- storage/connect/filamap.cpp.orig 2014-09-25 00:29:47.000000000 +0200 -+++ storage/connect/filamap.cpp 2014-09-27 11:46:06.000000000 +0200 -@@ -288,7 +288,7 @@ - /***********************************************************************/ - /* Initialize Fpos and Mempos for indexed DELETE. */ - /***********************************************************************/ --int MAPFAM::InitDelete(PGLOBAL g, int fpos, int spos) -+int MAPFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos) - { - Fpos = Memory + fpos; - Mempos = Memory + spos; -@@ -683,7 +683,7 @@ - /***********************************************************************/ - /* Initialize CurBlk, CurNum, Mempos and Fpos for indexed DELETE. */ - /***********************************************************************/ --int MPXFAM::InitDelete(PGLOBAL g, int fpos, int spos) -+int MPXFAM::InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos) - { - Fpos = Memory + Headlen + fpos * Lrecl; - Mempos = Fpos + Lrecl; diff --git a/databases/mariadb100-server/files/patch-storage_connect_filamap.h b/databases/mariadb100-server/files/patch-storage_connect_filamap.h deleted file mode 100644 index a3cca7da1a5..00000000000 --- a/databases/mariadb100-server/files/patch-storage_connect_filamap.h +++ /dev/null @@ -1,27 +0,0 @@ ---- storage/connect/filamap.h.orig 2014-09-25 00:29:47.000000000 +0200 -+++ storage/connect/filamap.h 2014-09-27 11:44:39.000000000 +0200 -@@ -47,7 +47,7 @@ - virtual void Rewind(void); - - protected: -- virtual int InitDelete(PGLOBAL g, int fpos, int spos); -+ virtual int InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos); - - // Members - char *Memory; // Pointer on file mapping view. -@@ -104,13 +104,13 @@ - virtual int MaxBlkSize(PGLOBAL g, int s) - {return TXTFAM::MaxBlkSize(g, s);} - virtual bool SetPos(PGLOBAL g, int recpos); -- virtual int GetNextPos(void) {return (int)Fpos + Nrec;} -+ virtual int GetNextPos(void) {return (uintptr_t)Fpos + Nrec;} - virtual bool DeferReading(void) {return false;} - virtual int ReadBuffer(PGLOBAL g); - virtual int WriteBuffer(PGLOBAL g); - - protected: -- virtual int InitDelete(PGLOBAL g, int fpos, int spos); -+ virtual int InitDelete(PGLOBAL g, uintptr_t fpos, uintptr_t spos); - - // No additional members - }; // end of class MPXFAM diff --git a/databases/mariadb100-server/files/pkg-message.in b/databases/mariadb100-server/files/pkg-message.in index 060c6c66c17..b49d4207414 100644 --- a/databases/mariadb100-server/files/pkg-message.in +++ b/databases/mariadb100-server/files/pkg-message.in @@ -8,4 +8,8 @@ MariaDB respects hier(7) and doesn't check /etc and /etc/mysql for 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 + ************************************************************************ diff --git a/databases/mariadb100-server/pkg-plist b/databases/mariadb100-server/pkg-plist index a439714dd61..d00a737844d 100644 --- a/databases/mariadb100-server/pkg-plist +++ b/databases/mariadb100-server/pkg-plist @@ -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 |