26 files changed, 117 insertions, 134 deletions

diff --git a/databases/mariadb100-client/files/patch-CMakeLists.txt b/databases/mariadb100-client/files/patch-CMakeLists.txt
index a346520af0dc..c8b7b286c938 100644
--- a/databases/mariadb100-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb100-client/files/patch-CMakeLists.txt
@@ -1,43 +1,25 @@
---- CMakeLists.txt.orig	2014-09-25 00:29:47.000000000 +0200
-+++ CMakeLists.txt	2014-09-27 09:57:32.000000000 +0200
-@@ -430,28 +430,8 @@
+--- CMakeLists.txt.orig	2015-08-05 20:11:27.000000000 +0200
++++ CMakeLists.txt	2015-08-07 12:05:52.895578945 +0200
+@@ -405,9 +405,9 @@ ADD_SUBDIRECTORY(client)
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(libservices)
  ADD_SUBDIRECTORY(scripts)
 -ADD_SUBDIRECTORY(sql/share)
  ADD_SUBDIRECTORY(support-files)
  
--IF(NOT WITHOUT_SERVER)
--  ADD_SUBDIRECTORY(tests)
--  ADD_SUBDIRECTORY(sql)
--  OPTION (WITH_EMBEDDED_SERVER "Compile MySQL with embedded server" OFF)
--  IF(WITH_EMBEDDED_SERVER) 
--   ADD_SUBDIRECTORY(libmysqld)
--   ADD_SUBDIRECTORY(libmysqld/examples)
--  ENDIF(WITH_EMBEDDED_SERVER)
--
--  ADD_SUBDIRECTORY(mysql-test)
--  ADD_SUBDIRECTORY(mysql-test/lib/My/SafeProcess)
--  ADD_SUBDIRECTORY(sql-bench)
--
--  IF(EXISTS ${CMAKE_SOURCE_DIR}/internal/CMakeLists.txt)
--    ADD_SUBDIRECTORY(internal)
--  ENDIF()
--  ADD_SUBDIRECTORY(packaging/rpm-oel)
--ENDIF()
--
- IF(UNIX)
-   ADD_SUBDIRECTORY(man)
- ENDIF()
-@@ -463,7 +443,6 @@
-   ADD_SUBDIRECTORY(win/upgrade_wizard)
-   ADD_SUBDIRECTORY(win/packaging)
++IF(FALSE)
+ IF(NOT WITHOUT_SERVER)
+   ADD_SUBDIRECTORY(tests)
+   ADD_SUBDIRECTORY(sql)
+@@ -425,6 +426,7 @@ IF(NOT WITHOUT_SERVER)
+     ADD_SUBDIRECTORY(internal)
+   ENDIF()
  ENDIF()
--ADD_SUBDIRECTORY(packaging/solaris)
++ENDIF()
  
- IF(NOT CMAKE_CROSSCOMPILING)
-   SET(EXPORTED comp_err comp_sql factorial)
-@@ -506,6 +485,7 @@
+ IF(UNIX)
+   ADD_SUBDIRECTORY(man)
+@@ -480,6 +482,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
@@ -45,7 +27,7 @@
  INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
                        COMPONENT Readme)
  
-@@ -516,6 +496,7 @@
+@@ -490,6 +493,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
  IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
  ENDIF()
diff --git a/databases/mariadb100-server/Makefile b/databases/mariadb100-server/Makefile
index 3bbf88711eae..7e7bc6909dff 100644
--- a/databases/mariadb100-server/Makefile
+++ b/databases/mariadb100-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.17
+PORTVERSION=	10.0.21
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
@@ -13,7 +13,7 @@ MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirror.switch.ch/mirror/${SITESDIR}/
 PKGNAMESUFFIX?=	100-server
 
-MAINTAINER=	spil.oss@gmail.com
+MAINTAINER=	brnrd@FreeBSD.org
 COMMENT?=	Multithreaded SQL database (server)
 
 LICENSE=	GPLv2
@@ -21,13 +21,13 @@ LICENSE=	GPLv2
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
+UNIQUENAME=	${PKGNAMEPREFIX}${PORTNAME}${PKGNAMESUFFIX}
 SLAVEDIRS=	databases/mariadb100-client
 USES=		bison:build cmake execinfo gmake shebangfix cpe
+USE_LDCONFIG=	${PREFIX}/lib/mysql ${PREFIX}/lib/mysql/plugin
 SHEBANG_FILES=	scripts/*.sh
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
 
-BROKEN_armv6=	Does not compile on arm
-
 OPTIONS_DEFINE=		FASTMTX
 OPTIONS_RADIO=		SSL
 OPTIONS_RADIO_SSL=	BUNDLED_SSL OPENSSL WITHOUT_SSL
@@ -59,15 +59,16 @@ CMAKE_ARGS+=	-DINSTALL_DOCDIR="share/doc/mysql" \
 		-DEXECINFO_ROOT=${LOCALBASE} \
 		-DCOMPILATION_COMMENT="FreeBSD Ports"
 
+DATADIR=	${PREFIX}/share/mysql
+
 .ifdef USE_MYSQL
-.error You have USE_MYSQL variable defined either in environment or in make(1) arguments. Please undefine and try again.
+.error You have `USE_MYSQL' variable defined either in environment or in make(1) arguments. This leads to a circular dependency. Please undefine and try again.
 .endif
 
-DATADIR=	${PREFIX}/share/mysql
-
 .if !defined(CLIENT_ONLY)
 # MySQL-Server options
 USE_MYSQL=		yes
+USE_LDCONFIG+=		${PREFIX}/lib/mysql/plugin
 OPTIONS_DEFINE+=	INNODB MAXKEY MROONGA OQGRAPH
 OPTIONS_DEFAULT+=	MAXKEY
 OPTIONS_SUB=		yes
@@ -104,10 +105,11 @@ CMAKE_ARGS+=	-DWITH_EMBEDDED_SERVER="ON" \
 		-DWITHOUT_EXAMPLE_STORAGE_ENGINE=1
 
 INNODB_CMAKE_OFF=	-DWITHOUT_INNOBASE=1
-MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my_compare.h
+MAXKEY_EXTRA_PATCHES+=	${FILESDIR}/extra-patch-include_my__compare.h
 MROONGA_CMAKE_OFF=	-DWITHOUT_MROONGA=1
 OQGRAPH_CMAKE_OFF=	-DWITHOUT_OQGRAPH=1
-OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs
+OQGRAPH_LIB_DEPENDS=	libboost_system.so:${PORTSDIR}/devel/boost-libs \
+			libJudy.so:${PORTSDIR}/devel/judy
 
 post-install:
 	# Remove programs to avoid conflict with mariadb100-client
@@ -132,6 +134,11 @@ CMAKE_ARGS+=	-DWITH_JEMALLOC="no"
 USE_GCC=	yes
 .endif
 
+.if ${PORT_OPTIONS:MOQGRPAH}
+IGNORE=	currently MariaDB doesn't build correctly with OQGraph \
+	See https://mariadb.atlassian.net/browse/MDEV-8128.
+.endif
+
 post-patch:
 	@${REINPLACE_CMD} 's/*.1/${MAN1}/' ${WRKSRC}/man/CMakeLists.txt
 	@${REINPLACE_CMD} 's|%%PREFIX%%|${PREFIX}|g' ${WRKSRC}/mysys/my_default.c
diff --git a/databases/mariadb100-server/distinfo b/databases/mariadb100-server/distinfo
index 04fba07de0ed..34c8f85bf289 100644
--- a/databases/mariadb100-server/distinfo
+++ b/databases/mariadb100-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-10.0.17.tar.gz) = 9cd394e99942c3700b13f2bf126895fe587e668bfcaffcfd81f0cd878fc19311
-SIZE (mariadb-10.0.17.tar.gz) = 55989700
+SHA256 (mariadb-10.0.21.tar.gz) = 4b9a32e15ceadefdb1057a02eb3e0addf702b75aef631a3c9194b832ecfa3545
+SIZE (mariadb-10.0.21.tar.gz) = 56216903
diff --git a/databases/mariadb100-server/files/extra-patch-include_my_compare.h b/databases/mariadb100-server/files/extra-patch-include_my__compare.h
index 5fc447b98cd7..5fc447b98cd7 100644
--- a/databases/mariadb100-server/files/extra-patch-include_my_compare.h
+++ b/databases/mariadb100-server/files/extra-patch-include_my__compare.h
diff --git a/databases/mariadb100-server/files/patch-CMakeLists.txt b/databases/mariadb100-server/files/patch-CMakeLists.txt
index f6efa9d9682a..cc24e5b85fd7 100644
--- a/databases/mariadb100-server/files/patch-CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-CMakeLists.txt
@@ -1,22 +1,14 @@
---- CMakeLists.txt.orig	2014-08-09 00:13:37.000000000 +0200
-+++ CMakeLists.txt	2014-09-05 18:22:34.646409575 +0200
-@@ -463,7 +463,6 @@
-   ADD_SUBDIRECTORY(win/upgrade_wizard)
-   ADD_SUBDIRECTORY(win/packaging)
- ENDIF()
--ADD_SUBDIRECTORY(packaging/solaris)
- 
- IF(NOT CMAKE_CROSSCOMPILING)
-   SET(EXPORTED comp_err comp_sql factorial gen_lex_hash)
-@@ -503,6 +502,7 @@
+--- CMakeLists.txt.orig	2015-08-05 18:11:27 UTC
++++ CMakeLists.txt
+@@ -480,6 +480,7 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(FALSE)
  INSTALL_DOCUMENTATION(README CREDITS COPYING COPYING.LESSER EXCEPTIONS-CLIENT
                        COMPONENT Readme)
- INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
-@@ -511,6 +511,7 @@
+ 
+@@ -490,6 +491,7 @@ INSTALL_DOCUMENTATION(README CREDITS COP
  IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
  ENDIF()
diff --git a/databases/mariadb100-server/files/patch-client_CMakeLists.txt b/databases/mariadb100-server/files/patch-client_CMakeLists.txt
index 4b8f071eac27..ad9967fb338b 100644
--- a/databases/mariadb100-server/files/patch-client_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-client_CMakeLists.txt
@@ -1,6 +1,6 @@
---- client/CMakeLists.txt.orig	2014-08-09 00:13:48.000000000 +0200
-+++ client/CMakeLists.txt	2014-09-07 21:19:33.000000000 +0200
-@@ -30,6 +30,7 @@
+--- client/CMakeLists.txt.orig	2015-06-17 14:54:11 UTC
++++ client/CMakeLists.txt
+@@ -30,6 +30,7 @@ INCLUDE_DIRECTORIES(
  COPY_OPENSSL_DLLS(copy_openssl_client)
  
  ADD_DEFINITIONS(${SSL_DEFINES})
@@ -8,7 +8,7 @@
  MYSQL_ADD_EXECUTABLE(mysql completion_hash.cc mysql.cc readline.cc
                             ${CMAKE_SOURCE_DIR}/sql/sql_string.cc)
  TARGET_LINK_LIBRARIES(mysql mysqlclient)
-@@ -37,6 +38,7 @@
+@@ -37,6 +38,7 @@ IF(UNIX)
    TARGET_LINK_LIBRARIES(mysql ${MY_READLINE_LIBRARY})
    SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
  ENDIF(UNIX)
@@ -16,7 +16,7 @@
  
  MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
  SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
-@@ -44,6 +46,7 @@
+@@ -44,6 +46,7 @@ TARGET_LINK_LIBRARIES(mysqltest mysqlcli
  SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
  
  
@@ -24,7 +24,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
  TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
  
-@@ -52,17 +55,21 @@
+@@ -52,17 +55,21 @@ TARGET_LINK_LIBRARIES(mysqldump mysqlcli
  
  MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
  TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
@@ -46,7 +46,7 @@
  MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
  TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
  
-@@ -72,17 +79,20 @@
+@@ -72,17 +79,20 @@ TARGET_LINK_LIBRARIES(mysqladmin mysqlcl
  MYSQL_ADD_EXECUTABLE(mysqlslap mysqlslap.c)
  SET_SOURCE_FILES_PROPERTIES(mysqlslap.c PROPERTIES COMPILE_FLAGS "-DTHREADS")
  TARGET_LINK_LIBRARIES(mysqlslap mysqlclient)
diff --git a/databases/mariadb100-server/files/patch-cmake__jemalloc.cmake b/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake
index aea0487ba809..ca8a8626617e 100644
--- a/databases/mariadb100-server/files/patch-cmake__jemalloc.cmake
+++ b/databases/mariadb100-server/files/patch-cmake_jemalloc.cmake
@@ -1,6 +1,6 @@
---- cmake/jemalloc.cmake.orig	2014-09-25 00:29:47.000000000 +0200
-+++ cmake/jemalloc.cmake	2014-09-27 10:05:48.000000000 +0200
-@@ -24,12 +24,12 @@
+--- cmake/jemalloc.cmake.orig	2015-06-17 14:54:11 UTC
++++ cmake/jemalloc.cmake
+@@ -24,12 +24,12 @@ MACRO (CHECK_JEMALLOC)
        SET(what system)
      ENDIF()
  
diff --git a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt
index 7a53775810bb..cd7c4a947240 100644
--- a/databases/mariadb100-server/files/patch-extra_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-extra_CMakeLists.txt
@@ -1,6 +1,6 @@
---- extra/CMakeLists.txt.orig	2014-08-09 00:13:40.000000000 +0200
-+++ extra/CMakeLists.txt	2014-09-05 18:32:20.555373233 +0200
-@@ -80,6 +80,8 @@
+--- extra/CMakeLists.txt.orig	2015-06-17 14:54:11 UTC
++++ extra/CMakeLists.txt
+@@ -78,9 +78,11 @@ IF(UNIX)
    MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
    TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
  
@@ -9,3 +9,6 @@
    TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
  ENDIF()
 +ENDIF()
+ 
+ 
+   # Add path to the InnoDB headers
diff --git a/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
index 214edfd8834a..1301365656fc 100644
--- a/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
+++ b/databases/mariadb100-server/files/patch-extra_yassl_taocrypt_src_integer.cpp
@@ -1,6 +1,6 @@
---- extra/yassl/taocrypt/src/integer.cpp.orig	2014-04-15 14:02:39.000000000 +0300
-+++ extra/yassl/taocrypt/src/integer.cpp	2014-05-16 17:00:15.000000000 +0300
-@@ -75,7 +75,7 @@
+--- extra/yassl/taocrypt/src/integer.cpp.orig	2015-06-17 14:54:11 UTC
++++ extra/yassl/taocrypt/src/integer.cpp
+@@ -74,7 +74,7 @@ template <class T>
  CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
                                             size_type n, const void *)
  {
diff --git a/databases/mariadb100-server/files/patch-include_CMakeLists.txt b/databases/mariadb100-server/files/patch-include_CMakeLists.txt
index ef405d749892..388e12c58666 100644
--- a/databases/mariadb100-server/files/patch-include_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-include_CMakeLists.txt
@@ -1,6 +1,6 @@
---- include/CMakeLists.txt.orig	2014-08-09 00:13:38.000000000 +0200
-+++ include/CMakeLists.txt	2014-09-05 18:38:18.461346954 +0200
-@@ -62,17 +62,21 @@
+--- include/CMakeLists.txt.orig	2015-06-17 14:54:11 UTC
++++ include/CMakeLists.txt
+@@ -62,17 +62,21 @@ SET(HEADERS 
    handler_ername.h
  )
  
diff --git a/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt b/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt
index 00813cb9fa00..a692fdfec2f0 100644
--- a/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-libmysql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libmysql/CMakeLists.txt.orig	2014-08-09 00:13:37.000000000 +0200
-+++ libmysql/CMakeLists.txt	2014-09-05 18:46:34.420323119 +0200
-@@ -403,7 +403,7 @@
+--- libmysql/CMakeLists.txt.orig	2015-06-17 14:54:11 UTC
++++ libmysql/CMakeLists.txt
+@@ -410,7 +410,7 @@ SET(LIBS clientlib dbug strings vio mysy
  
  # Merge several convenience libraries into one big mysqlclient
  # and link them together into shared library.
@@ -9,7 +9,7 @@
  
  # Visual Studio users need debug  static library for debug projects
  IF(MSVC)
-@@ -411,6 +411,7 @@
+@@ -418,6 +418,7 @@ IF(MSVC)
   INSTALL_DEBUG_TARGET(clientlib DESTINATION ${INSTALL_LIBDIR}/debug)
  ENDIF()
  
@@ -17,7 +17,7 @@
  IF(UNIX)
    MACRO(GET_VERSIONED_LIBNAME LIBNAME EXTENSION VERSION OUTNAME)
      SET(DOT_VERSION ".${VERSION}")
-@@ -425,11 +426,13 @@
+@@ -432,11 +433,13 @@ IF(UNIX)
    ENDMACRO()
    INSTALL_SYMLINK(${CMAKE_STATIC_LIBRARY_PREFIX}mysqlclient_r.a mysqlclient ${INSTALL_LIBDIR} Development)
  ENDIF()
@@ -32,7 +32,7 @@
    IF(UNIX)
      # libtool compatability
      IF(CMAKE_SYSTEM_NAME MATCHES "FreeBSD" OR APPLE)
-@@ -477,3 +480,4 @@
+@@ -484,3 +487,4 @@ IF(NOT DISABLE_SHARED)
      ENDFOREACH()
    ENDIF()
  ENDIF()
diff --git a/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt b/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt
index a5c78814c6a8..1cb3f24acbeb 100644
--- a/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-libservices_CMakeLists.txt
@@ -1,6 +1,6 @@
---- libservices/CMakeLists.txt.orig	2014-08-09 00:13:47.000000000 +0200
-+++ libservices/CMakeLists.txt	2014-09-05 18:48:40.074297131 +0200
-@@ -29,4 +29,6 @@
+--- libservices/CMakeLists.txt.orig	2015-06-17 14:54:11 UTC
++++ libservices/CMakeLists.txt
+@@ -29,4 +29,6 @@ SET(MYSQLSERVICES_SOURCES
    logger_service.c)
  
  ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
diff --git a/databases/mariadb100-server/files/patch-man_CMakeLists.txt b/databases/mariadb100-server/files/patch-man_CMakeLists.txt
index 873a4fbdad04..852c5b63cd5c 100644
--- a/databases/mariadb100-server/files/patch-man_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-man_CMakeLists.txt
@@ -1,6 +1,6 @@
---- man/CMakeLists.txt.orig	2014-06-13 13:58:21.397251542 +0300
-+++ man/CMakeLists.txt	2014-06-13 14:00:24.132245109 +0300
-@@ -33,7 +33,8 @@
+--- man/CMakeLists.txt.orig	2015-06-17 14:54:11 UTC
++++ man/CMakeLists.txt
+@@ -34,7 +34,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
  
  INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
  INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
diff --git a/databases/mariadb100-server/files/patch-mysys_my_default.c b/databases/mariadb100-server/files/patch-mysys_my__default.c
index fef69528a070..fbce62ffde68 100644
--- a/databases/mariadb100-server/files/patch-mysys_my_default.c
+++ b/databases/mariadb100-server/files/patch-mysys_my__default.c
@@ -1,6 +1,6 @@
---- mysys/my_default.c.orig	2014-08-09 00:13:39.000000000 +0200
-+++ mysys/my_default.c	2014-09-05 19:56:48.006019959 +0200
-@@ -90,7 +90,7 @@
+--- mysys/my_default.c.orig	2015-06-17 14:54:12 UTC
++++ mysys/my_default.c
+@@ -90,7 +90,7 @@ static my_bool defaults_already_read= FA
  
  /* Which directories are searched for options (and in which order) */
  
@@ -9,7 +9,7 @@
  #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
  static const char **default_directories = NULL;
  
-@@ -785,7 +785,7 @@
+@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -18,7 +18,7 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@
+@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
    if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
      return 1;					/* Ignore wrong files */
  
@@ -33,7 +33,7 @@
    while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
    {
      line++;
-@@ -1067,7 +1075,8 @@
+@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
            if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
              *end++= '.';
            strxmov(end, conf_file, *ext, " ", NullS);
@@ -43,7 +43,7 @@
          }
        }
      }
-@@ -1223,13 +1232,10 @@
+@@ -1223,13 +1232,10 @@ static const char **init_default_directo
  
  #else
  
diff --git a/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt b/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt
index 2c46f7484de7..a292081845ba 100644
--- a/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-pcre_CMakeLists.txt
@@ -1,6 +1,6 @@
---- pcre/CMakeLists.txt.orig	2014-08-09 00:13:36.000000000 +0200
-+++ pcre/CMakeLists.txt	2014-09-05 20:08:49.090972949 +0200
-@@ -513,6 +513,8 @@
+--- pcre/CMakeLists.txt.orig	2015-06-17 14:54:12 UTC
++++ pcre/CMakeLists.txt
+@@ -513,6 +513,8 @@ IF(PCRE_SHOW_REPORT)
    MESSAGE(STATUS "")
  ENDIF(PCRE_SHOW_REPORT)
  
diff --git a/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt b/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt
index d0892e1219f2..b7a5a3912ba6 100644
--- a/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-scripts_CMakeLists.txt
@@ -1,6 +1,6 @@
---- scripts/CMakeLists.txt.orig	2014-08-09 00:13:37.000000000 +0200
-+++ scripts/CMakeLists.txt	2014-09-05 19:06:46.206250221 +0200
-@@ -281,6 +281,8 @@
+--- scripts/CMakeLists.txt.orig	2015-06-17 14:54:12 UTC
++++ scripts/CMakeLists.txt
+@@ -269,6 +269,8 @@ MACRO(EXTRACT_LINK_LIBRARIES target var)
              STRING(REGEX REPLACE "^lib" "" lib "${lib}")
              SET(${var} "${${var}}-l${lib} " ) 
            ENDIF()
diff --git a/databases/mariadb100-server/files/patch-scripts_mysql_config.sh b/databases/mariadb100-server/files/patch-scripts_mysql__config.sh
index 5271d5256b8f..bbf559927e05 100644
--- a/databases/mariadb100-server/files/patch-scripts_mysql_config.sh
+++ b/databases/mariadb100-server/files/patch-scripts_mysql__config.sh
@@ -1,6 +1,6 @@
---- scripts/mysql_config.sh.orig	2014-04-15 14:02:39.000000000 +0300
-+++ scripts/mysql_config.sh	2014-05-16 19:08:41.000000000 +0300
-@@ -108,8 +108,11 @@
+--- scripts/mysql_config.sh.orig	2015-06-17 14:54:12 UTC
++++ scripts/mysql_config.sh
+@@ -109,8 +109,11 @@ fi
  # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
  libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
  libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
diff --git a/databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh
index 57811043cb33..85ed88461ead 100644
--- a/databases/mariadb100-server/files/patch-scripts_mysqld_safe.sh
+++ b/databases/mariadb100-server/files/patch-scripts_mysqld__safe.sh
@@ -1,6 +1,6 @@
---- scripts/mysqld_safe.sh.orig	2007-10-08 10:39:23.000000000 +0200
-+++ scripts/mysqld_safe.sh	2007-10-08 10:40:52.000000000 +0200
-@@ -235,10 +235,10 @@
+--- scripts/mysqld_safe.sh.orig	2015-06-17 14:54:12 UTC
++++ scripts/mysqld_safe.sh
+@@ -445,10 +445,10 @@ fi
  
  if test -z "$MYSQL_HOME"
  then 
@@ -13,7 +13,7 @@
  $DATADIR/my.cnf
  IGNORING $DATADIR/my.cnf"
  
-@@ -247,7 +247,7 @@
+@@ -457,7 +457,7 @@ IGNORING $DATADIR/my.cnf"
    then
      log_error "WARNING: Found $DATADIR/my.cnf
  The data directory is a deprecated location for my.cnf, please move it to
diff --git a/databases/mariadb100-server/files/patch-sql_CMakeLists.txt b/databases/mariadb100-server/files/patch-sql_CMakeLists.txt
index 7805e56701ab..8f2defac77f8 100644
--- a/databases/mariadb100-server/files/patch-sql_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-sql_CMakeLists.txt
@@ -1,6 +1,6 @@
---- sql/CMakeLists.txt.orig	2013-05-22 01:09:51.000000000 +0300
-+++ sql/CMakeLists.txt	2013-06-08 14:13:06.000000000 +0300
-@@ -278,6 +278,7 @@
+--- sql/CMakeLists.txt.orig	2015-06-17 14:54:12 UTC
++++ sql/CMakeLists.txt
+@@ -312,6 +312,7 @@ ADD_CUSTOM_TARGET(distclean
    VERBATIM
    )
  
@@ -8,7 +8,7 @@
  IF(INSTALL_LAYOUT STREQUAL "STANDALONE")
  
  # Copy db.opt into data/test/
-@@ -321,6 +322,7 @@
+@@ -355,6 +356,7 @@ ELSE()
    INSTALL(FILES ${DUMMY_FILE} DESTINATION data/mysql COMPONENT DataFiles)
  ENDIF(WIN32 AND MYSQLD_EXECUTABLE)
  ENDIF(INSTALL_LAYOUT STREQUAL "STANDALONE")
@@ -16,7 +16,7 @@
  
  IF(WIN32)
    SET(my_bootstrap_sql ${CMAKE_CURRENT_BINARY_DIR}/my_bootstrap.sql)
-@@ -363,8 +365,10 @@
+@@ -397,8 +399,10 @@ IF(WIN32)
    TARGET_LINK_LIBRARIES(mysql_upgrade_service mysys winservice)
  ENDIF(WIN32)
  
diff --git a/databases/mariadb100-server/files/patch-sql_sql_trigger.cc b/databases/mariadb100-server/files/patch-sql_sql__trigger.cc
index be49b1f5f758..91fdcac66e75 100644
--- a/databases/mariadb100-server/files/patch-sql_sql_trigger.cc
+++ b/databases/mariadb100-server/files/patch-sql_sql__trigger.cc
@@ -1,6 +1,6 @@
---- sql/sql_trigger.cc.orig	2013-05-21 22:09:51.000000000 +0000
-+++ sql/sql_trigger.cc	2013-09-26 13:15:55.450195525 +0000
-@@ -192,32 +192,32 @@
+--- sql/sql_trigger.cc.orig	2015-06-17 14:54:12 UTC
++++ sql/sql_trigger.cc
+@@ -192,32 +192,32 @@ static File_option triggers_file_paramet
  {
    {
      { C_STRING_WITH_LEN("triggers") },
@@ -39,7 +39,7 @@
      FILE_OPTIONS_STRLIST
    },
    { { 0, 0 }, 0, FILE_OPTIONS_STRING }
-@@ -226,7 +226,7 @@
+@@ -226,7 +226,7 @@ static File_option triggers_file_paramet
  File_option sql_modes_parameters=
  {
    { C_STRING_WITH_LEN("sql_modes") },
diff --git a/databases/mariadb100-server/files/patch-sql_sql_view.cc b/databases/mariadb100-server/files/patch-sql_sql__view.cc
index 8b6d0b84579f..f723c208a05a 100644
--- a/databases/mariadb100-server/files/patch-sql_sql_view.cc
+++ b/databases/mariadb100-server/files/patch-sql_sql__view.cc
@@ -1,6 +1,6 @@
---- sql/sql_view.cc.orig	2013-05-21 22:09:51.000000000 +0000
-+++ sql/sql_view.cc	2013-09-26 13:16:16.065195172 +0000
-@@ -742,46 +742,46 @@
+--- sql/sql_view.cc.orig	2015-06-17 14:54:12 UTC
++++ sql/sql_view.cc
+@@ -716,46 +716,46 @@ static const int required_view_parameter
  */
  static File_option view_parameters[]=
  {{{ C_STRING_WITH_LEN("query")},
@@ -59,5 +59,5 @@
 -  my_offsetof(TABLE_LIST, view_body_utf8),
 +  static_cast<int>(my_offsetof(TABLE_LIST, view_body_utf8)),
    FILE_OPTIONS_ESTRING},
-  {{NullS, 0},			0,
-   FILE_OPTIONS_STRING}
+  {{ C_STRING_WITH_LEN("mariadb-version")},
+   my_offsetof(TABLE_LIST, mariadb_version),
diff --git a/databases/mariadb100-server/files/patch-sql_sys_vars.cc b/databases/mariadb100-server/files/patch-sql_sys__vars.cc
index c0027d356f5c..58721ac6b568 100644
--- a/databases/mariadb100-server/files/patch-sql_sys_vars.cc
+++ b/databases/mariadb100-server/files/patch-sql_sys__vars.cc
@@ -1,6 +1,6 @@
---- sql/sys_vars.cc.orig	2014-08-09 00:13:37.000000000 +0200
-+++ sql/sys_vars.cc	2014-09-05 19:30:55.609134039 +0200
-@@ -1012,7 +1012,7 @@
+--- sql/sys_vars.cc.orig	2015-06-17 14:54:13 UTC
++++ sql/sys_vars.cc
+@@ -1012,7 +1012,7 @@ static Sys_var_ulong Sys_interactive_tim
         "connection before closing it",
         SESSION_VAR(net_interactive_timeout),
         CMD_LINE(REQUIRED_ARG),
@@ -9,7 +9,7 @@
  
  static Sys_var_ulonglong Sys_join_buffer_size(
         "join_buffer_size",
-@@ -2044,7 +2044,7 @@
+@@ -2046,7 +2046,7 @@ static Sys_var_ulong Sys_net_read_timeou
         "Number of seconds to wait for more data from a connection before "
         "aborting the read",
         SESSION_VAR(net_read_timeout), CMD_LINE(REQUIRED_ARG),
@@ -18,7 +18,7 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_net_read_timeout));
  
-@@ -2059,7 +2059,7 @@
+@@ -2061,7 +2061,7 @@ static Sys_var_ulong Sys_net_write_timeo
         "Number of seconds to wait for a block to be written to a connection "
         "before aborting the write",
         SESSION_VAR(net_write_timeout), CMD_LINE(REQUIRED_ARG),
@@ -27,7 +27,7 @@
         NO_MUTEX_GUARD, NOT_IN_BINLOG, ON_CHECK(0),
         ON_UPDATE(fix_net_write_timeout));
  
-@@ -3288,7 +3288,7 @@
+@@ -3291,7 +3291,7 @@ static Sys_var_ulong Sys_net_wait_timeou
         "The number of seconds the server waits for activity on a "
         "connection before closing it",
         SESSION_VAR(net_wait_timeout), CMD_LINE(REQUIRED_ARG),
diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake
index 8325f3ebe216..d894a2a81c3e 100644
--- a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake
+++ b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake
@@ -1,4 +1,4 @@
---- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig	2014-09-24 22:29:47 UTC
+--- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig	2015-06-17 14:54:13 UTC
 +++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake
 @@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL)
  endif ()
diff --git a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc
index b03b0eba5303..216620d315cb 100644
--- a/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc
+++ b/databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc
@@ -1,4 +1,4 @@
---- storage/tokudb/ft-index/portability/memory.cc.orig	2014-09-24 22:29:47 UTC
+--- storage/tokudb/ft-index/portability/memory.cc.orig	2015-06-17 14:54:13 UTC
 +++ storage/tokudb/ft-index/portability/memory.cc
 @@ -94,11 +94,6 @@ PATENT RIGHTS GRANT:
  #include <string.h>
diff --git a/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt b/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt
index 70154e20b3b0..36eadd4a4413 100644
--- a/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb100-server/files/patch-support-files_CMakeLists.txt
@@ -1,6 +1,6 @@
---- support-files/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
-+++ support-files/CMakeLists.txt	2012-12-23 05:40:39.000000000 +0200
-@@ -66,10 +66,11 @@
+--- support-files/CMakeLists.txt.orig	2015-06-17 14:54:14 UTC
++++ support-files/CMakeLists.txt
+@@ -67,10 +67,11 @@ IF(UNIX)
    ENDFOREACH()
    IF(INSTALL_SUPPORTFILESDIR)
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
diff --git a/databases/mariadb100-server/pkg-plist b/databases/mariadb100-server/pkg-plist
index d00a737844d2..e0741d0b8f50 100644
--- a/databases/mariadb100-server/pkg-plist
+++ b/databases/mariadb100-server/pkg-plist
@@ -1,4 +1,3 @@
-@stopdaemon mysql-server
 bin/aria_chk
 bin/aria_dump_log
 bin/aria_ftdump