Index: head/databases/mariadb100-server/Makefile =================================================================== --- head/databases/mariadb100-server/Makefile (revision 374834) +++ head/databases/mariadb100-server/Makefile (revision 374835) @@ -1,157 +1,175 @@ # $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}/ \ http://mirror2.hs-esslingen.de/pub/Mirrors/${SITESDIR}/ \ http://gd.tuwien.ac.at/db/${SITESDIR}/ \ http://mirrors.fe.up.pt/pub/${SITESDIR}/ \ http://mirror.de.gsnw.de:56431/${SITESDIR}/ \ http://mirror.layerjet.com/${SITESDIR}/ \ http://mirror.switch.ch/mirror/${SITESDIR}/ PKGNAMESUFFIX?= 100-server MAINTAINER= spil.oss@gmail.com COMMENT?= Multithreaded SQL database (server) SUB_FILES= pkg-message PKGMESSAGE= ${WRKDIR}/pkg-message SLAVEDIRS= databases/mariadb100-client USES= bison:build cmake execinfo gmake shebangfix SHEBANG_FILES= scripts/*.sh 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 FASTMTX_DESC= Replace mutexes with spinlocks OPENSSL_DESC= Use OpenSSL instead of bundled yassl PORTSSL_DESC= Use OpenSSL from port (requires OPENSSL to be set) CMAKE_ARGS+= -DINSTALL_DOCDIR="share/doc/mysql" \ -DINSTALL_DOCREADMEDIR="share/doc/mysql" \ -DINSTALL_INCLUDEDIR="include/mysql" \ -DINSTALL_INFODIR="info" \ -DINSTALL_LIBDIR="lib/mysql" \ -DINSTALL_MANDIR="man" \ -DINSTALL_MYSQLDATADIR="/var/db/mysql" \ -DINSTALL_MYSQLSHAREDIR="share/mysql" \ -DINSTALL_MYSQLTESTDIR= \ -DINSTALL_PLUGINDIR="lib/mysql/plugin" \ -DINSTALL_SBINDIR="libexec" \ -DINSTALL_SCRIPTDIR="bin" \ -DINSTALL_SHAREDIR="share" \ -DINSTALL_SQLBENCHDIR= \ -DINSTALL_SUPPORTFILESDIR="share/mysql" \ -DWITH_UNIT_TESTS=0 \ -DWITH_LIBEDIT=0 \ -DWITH_LIBWRAP=1 \ -DEXECINFO_ROOT=${LOCALBASE} \ -DCOMPILATION_COMMENT="FreeBSD Ports" .ifdef USE_MYSQL .error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine and try again. .endif 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 .include .if ${OPSYS} == FreeBSD && ${OSVERSION} >= 1000012 CMAKE_ARGS+= -DWITH_JEMALLOC="system" .else CMAKE_ARGS+= -DWITH_JEMALLOC="no" .endif .if ${PORT_OPTIONS:MSSL} . if exists(${LOCALBASE}/include/openssl/opensslv.h) . if !${PORT_OPTIONS:MOPENSSL} || !${PORT_OPTIONS:MPORTSSL} IGNORE= security/openssl package is installed. To build this either select the OPENSSL and PORTSSL options or deinstall openssl . endif . endif . if ${PORT_OPTIONS:MOPENSSL} USE_OPENSSL= yes . if !${PORT_OPTIONS:MPORTSSL} WITH_OPENSSL_BASE= yes . else WITH_OPENSSL_PORT= yes . endif CMAKE_ARGS+= -DWITH_SSL=yes . else CMAKE_ARGS+= -DWITH_SSL=bundled . endif .else CMAKE_FLAGS+= -DWITH_SSL=no .endif .if ${PORT_OPTIONS:MFASTMTX} CMAKE_ARGS+= -DWITH_FAST_MUTEXES=1 .endif # MySQL-Client part .if defined(CLIENT_ONLY) USES+= readline .else # MySQL-Server part CONFLICTS_INSTALL= mysql[0-9][0-9]-server-* mariadb[0-9][0-9]-server-* percona[0-9][0-9]-server-* USE_MYSQL= yes WANT_MYSQL_VER= 100m USE_RC_SUBR= mysql-server USERS= mysql GROUPS= mysql 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 " . else USE_GCC?= yes CMAKE_ARGS+= -DWITH_OQGRAPH_STORAGE_ENGINE=1 PLIST_SUB+= OQGRAPH="" LIB_DEPENDS+= libboost_system.so:${PORTSDIR}/devel/boost-libs . endif . if ${PORT_OPTIONS:MMAXKEY} EXTRA_PATCHES+= ${FILESDIR}/extra-patch-include_my_compare.h . endif post-install: # Remove programs to avoid conflict with mariadb100-client # These are "client" components, so there should be a switch that # prevents them from being installed but it's unknown right now ${RM} ${STAGEDIR}${PREFIX}/bin/msql2mysql \ ${STAGEDIR}${PREFIX}/bin/mysql_config \ ${STAGEDIR}${PREFIX}/bin/mysql_find_rows \ ${STAGEDIR}${PREFIX}/bin/mysqlaccess .endif post-patch: @${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt @${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c @${REINPLACE_CMD} 's|%%LOCALBASE%%|${LOCALBASE}|g' ${WRKSRC}/scripts/mysql_config.sh .if ${OPSYS} == DragonFly ${CP} ${WRKSRC}/cmake/os/FreeBSD.cmake \ ${WRKSRC}/cmake/os/DragonFly.cmake ${MV} ${WRKSRC}/storage/tokudb ${WRKSRC}/skip-tokudb .endif .include Index: head/databases/mariadb100-server/distinfo =================================================================== --- head/databases/mariadb100-server/distinfo (revision 374834) +++ head/databases/mariadb100-server/distinfo (revision 374835) @@ -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 Index: head/databases/mariadb100-server/files/patch-storage_connect_filamap.h =================================================================== --- head/databases/mariadb100-server/files/patch-storage_connect_filamap.h (revision 374834) +++ head/databases/mariadb100-server/files/patch-storage_connect_filamap.h (nonexistent) @@ -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 Property changes on: head/databases/mariadb100-server/files/patch-storage_connect_filamap.h ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-server/files/patch-storage_connect_array.cpp =================================================================== --- head/databases/mariadb100-server/files/patch-storage_connect_array.cpp (revision 374834) +++ head/databases/mariadb100-server/files/patch-storage_connect_array.cpp (nonexistent) @@ -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 - Property changes on: head/databases/mariadb100-server/files/patch-storage_connect_array.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp =================================================================== --- head/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp (revision 374834) +++ head/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp (nonexistent) @@ -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; Property changes on: head/databases/mariadb100-server/files/patch-storage_connect_filamap.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Deleted: svn:eol-style ## -1 +0,0 ## -native \ No newline at end of property Deleted: svn:mime-type ## -1 +0,0 ## -text/plain \ No newline at end of property Index: head/databases/mariadb100-server/files/pkg-message.in =================================================================== --- head/databases/mariadb100-server/files/pkg-message.in (revision 374834) +++ head/databases/mariadb100-server/files/pkg-message.in (revision 374835) @@ -1,11 +1,15 @@ ************************************************************************ Remember to run mysql_upgrade (with the optional --datadir= flag) the first time you start the MySQL server after an upgrade from an earlier version. 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 + ************************************************************************ Index: head/databases/mariadb100-server/pkg-plist =================================================================== --- head/databases/mariadb100-server/pkg-plist (revision 374834) +++ head/databases/mariadb100-server/pkg-plist (revision 374835) @@ -1,173 +1,176 @@ @stopdaemon mysql-server bin/aria_chk bin/aria_dump_log bin/aria_ftdump bin/aria_pack bin/aria_read_log bin/innochecksum bin/my_print_defaults bin/myisam_ftdump bin/myisamchk bin/myisamlog bin/myisampack bin/mysql_client_test bin/mysql_client_test_embedded bin/mysql_convert_table_format bin/mysql_embedded bin/mysql_fix_extensions bin/mysql_install_db bin/mysql_plugin bin/mysql_secure_installation bin/mysql_setpermission bin/mysql_tzinfo_to_sql bin/mysql_upgrade bin/mysql_zap bin/mysqlbug bin/mysqld_multi bin/mysqld_safe bin/mysqldumpslow bin/mysqlhotcopy bin/mysqltest bin/mysqltest_embedded -bin/mytop +@comment bin/mytop bin/perror bin/replace bin/resolve_stack_dump bin/resolveip include/mysql/private/embedded_priv.h lib/mysql/libmysqld.a lib/mysql/libmysqld.so lib/mysql/libmysqld.so.18 lib/mysql/plugin/adt_null.so lib/mysql/plugin/auth_0x0100.so lib/mysql/plugin/auth_pam.so lib/mysql/plugin/auth_socket.so lib/mysql/plugin/auth_test_plugin.so lib/mysql/plugin/daemon_example.ini lib/mysql/plugin/dialog.so lib/mysql/plugin/dialog_examples.so lib/mysql/plugin/feedback.so lib/mysql/plugin/ha_archive.so 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 lib/mysql/plugin/ha_spider.so lib/mysql/plugin/ha_test_sql_discovery.so lib/mysql/plugin/handlersocket.so lib/mysql/plugin/libdaemon_example.so lib/mysql/plugin/locales.so lib/mysql/plugin/metadata_lock_info.so lib/mysql/plugin/mypluglib.so lib/mysql/plugin/mysql_clear_password.so lib/mysql/plugin/qa_auth_client.so lib/mysql/plugin/qa_auth_interface.so lib/mysql/plugin/qa_auth_server.so lib/mysql/plugin/query_cache_info.so lib/mysql/plugin/query_response_time.so lib/mysql/plugin/semisync_master.so lib/mysql/plugin/semisync_slave.so lib/mysql/plugin/server_audit.so lib/mysql/plugin/sql_errlog.so libexec/mysqld man/man1/aria_chk.1.gz man/man1/aria_dump_log.1.gz man/man1/aria_ftdump.1.gz man/man1/aria_pack.1.gz man/man1/aria_read_log.1.gz man/man1/innochecksum.1.gz man/man1/my_print_defaults.1.gz man/man1/myisam_ftdump.1.gz man/man1/myisamchk.1.gz man/man1/myisamlog.1.gz man/man1/myisampack.1.gz man/man1/mysql.server.1.gz man/man1/mysql_convert_table_format.1.gz man/man1/mysql_fix_extensions.1.gz man/man1/mysql_install_db.1.gz man/man1/mysql_secure_installation.1.gz man/man1/mysql_setpermission.1.gz man/man1/mysql_tzinfo_to_sql.1.gz man/man1/mysql_upgrade.1.gz man/man1/mysql_zap.1.gz man/man1/mysqlbug.1.gz man/man1/mysqld_multi.1.gz man/man1/mysqld_safe.1.gz man/man1/mysqldumpslow.1.gz man/man1/mysqlhotcopy.1.gz man/man1/mysqltest.1.gz man/man1/perror.1.gz man/man1/replace.1.gz man/man1/resolve_stack_dump.1.gz man/man1/resolveip.1.gz man/man8/mysqld.8.gz %%DATADIR%%/binary-configure %%DATADIR%%/charsets/Index.xml %%DATADIR%%/charsets/README %%DATADIR%%/charsets/armscii8.xml %%DATADIR%%/charsets/ascii.xml %%DATADIR%%/charsets/cp1250.xml %%DATADIR%%/charsets/cp1251.xml %%DATADIR%%/charsets/cp1256.xml %%DATADIR%%/charsets/cp1257.xml %%DATADIR%%/charsets/cp850.xml %%DATADIR%%/charsets/cp852.xml %%DATADIR%%/charsets/cp866.xml %%DATADIR%%/charsets/dec8.xml %%DATADIR%%/charsets/geostd8.xml %%DATADIR%%/charsets/greek.xml %%DATADIR%%/charsets/hebrew.xml %%DATADIR%%/charsets/hp8.xml %%DATADIR%%/charsets/keybcs2.xml %%DATADIR%%/charsets/koi8r.xml %%DATADIR%%/charsets/koi8u.xml %%DATADIR%%/charsets/latin1.xml %%DATADIR%%/charsets/latin2.xml %%DATADIR%%/charsets/latin5.xml %%DATADIR%%/charsets/latin7.xml %%DATADIR%%/charsets/macce.xml %%DATADIR%%/charsets/macroman.xml %%DATADIR%%/charsets/swe7.xml %%DATADIR%%/czech/errmsg.sys %%DATADIR%%/danish/errmsg.sys %%DATADIR%%/dutch/errmsg.sys %%DATADIR%%/english/errmsg.sys %%DATADIR%%/errmsg-utf8.txt %%DATADIR%%/estonian/errmsg.sys %%DATADIR%%/fill_help_tables.sql %%DATADIR%%/french/errmsg.sys %%DATADIR%%/german/errmsg.sys %%DATADIR%%/greek/errmsg.sys %%DATADIR%%/hungarian/errmsg.sys %%DATADIR%%/install_spider.sql %%DATADIR%%/italian/errmsg.sys %%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 %%DATADIR%%/my-medium.cnf %%DATADIR%%/my-small.cnf %%DATADIR%%/mysql-log-rotate %%DATADIR%%/mysql.server %%DATADIR%%/mysql_performance_tables.sql %%DATADIR%%/mysql_system_tables.sql %%DATADIR%%/mysql_system_tables_data.sql %%DATADIR%%/mysql_test_data_timezone.sql %%DATADIR%%/mysqld_multi.server %%DATADIR%%/norwegian-ny/errmsg.sys %%DATADIR%%/norwegian/errmsg.sys %%DATADIR%%/polish/errmsg.sys %%DATADIR%%/portuguese/errmsg.sys %%DATADIR%%/romanian/errmsg.sys %%DATADIR%%/russian/errmsg.sys %%DATADIR%%/serbian/errmsg.sys %%DATADIR%%/slovak/errmsg.sys %%DATADIR%%/spanish/errmsg.sys %%DATADIR%%/swedish/errmsg.sys %%DATADIR%%/ukrainian/errmsg.sys