Index: databases/mariadb100-client/Makefile
===================================================================
--- databases/mariadb100-client/Makefile
+++ databases/mariadb100-client/Makefile
@@ -15,8 +15,8 @@
 
 CONFLICTS_INSTALL=	mariadb5*-client-* \
 			mariadb10[1-9]-client-* \
-			mysql*-client-* \
-			percona*-client-*
+			mysql[0-9]*-client-* \
+			percona[0-9]*-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
Index: databases/mariadb100-server/Makefile
===================================================================
--- databases/mariadb100-server/Makefile
+++ databases/mariadb100-server/Makefile
@@ -1,7 +1,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.0.22
+PORTVERSION=	10.0.23
 CATEGORIES=	databases ipv6
 MASTER_SITES=	http://ftp.osuosl.org/pub/${SITESDIR}/ \
 		http://mirrors.supportex.net/${SITESDIR}/ \
@@ -92,8 +92,8 @@
 
 CONFLICTS_INSTALL=	mariadb5*-server-* \
 			mariadb10[1-9]-server-* \
-			mysql*-server-* \
-			percona*-server-*
+			mysql[0-9]*-server-* \
+			percona[0-9]*-server-*
 
 USE_MYSQL=	yes
 WANT_MYSQL_VER=	100m
Index: databases/mariadb100-server/distinfo
===================================================================
--- databases/mariadb100-server/distinfo
+++ databases/mariadb100-server/distinfo
@@ -1,2 +1,2 @@
-SHA256 (mariadb-10.0.22.tar.gz) = 9e17f4aaccb7069a874555cca254974d0f0103f0ad5e2434acab6aa353dafc7b
-SIZE (mariadb-10.0.22.tar.gz) = 56252325
+SHA256 (mariadb-10.0.23.tar.gz) = 156eed69892834be66736aebe0a17a76d5031fd1c2f481a82228ff33bb7ba274
+SIZE (mariadb-10.0.23.tar.gz) = 57394548
Index: databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake
===================================================================
--- databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake
+++ databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuFeatureDetection.cmake
@@ -1,5 +1,5 @@
---- storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake.orig	2015-06-17 14:54:13 UTC
-+++ storage/tokudb/ft-index/cmake_modules/TokuFeatureDetection.cmake
+--- storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake.orig	2015-06-17 14:54:13 UTC
++++ storage/tokudb/PerconaFT/cmake_modules/TokuFeatureDetection.cmake
 @@ -87,13 +87,7 @@ if (NOT HAVE_DLSYM_WITHOUT_DL)
  endif ()
  check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO)
Index: databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
===================================================================
--- databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
+++ databases/mariadb100-server/files/patch-storage_tokudb_PerconaFT_portability_memory.cc
@@ -1,5 +1,5 @@
---- storage/tokudb/ft-index/portability/memory.cc.orig	2015-06-17 14:54:13 UTC
-+++ storage/tokudb/ft-index/portability/memory.cc
+--- storage/tokudb/PerconaFT/portability/memory.cc.orig	2015-06-17 14:54:13 UTC
++++ storage/tokudb/PerconaFT/portability/memory.cc
 @@ -94,11 +94,6 @@ PATENT RIGHTS GRANT:
  #include <string.h>
  #include <stdio.h>
Index: databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake
===================================================================
--- databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake
+++ databases/mariadb100-server/files/patch-storage_tokudb_ft-index_cmake__modules_TokuFeatureDetection.cmake
@@ -1,17 +0,0 @@
---- 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 ()
- check_function_exists(backtrace HAVE_BACKTRACE_WITHOUT_EXECINFO)
- if (NOT HAVE_BACKTRACE_WITHOUT_EXECINFO)
--  set(CMAKE_REQUIRED_LIBRARIES execinfo)
--  check_function_exists(backtrace HAVE_BACKTRACE_WITH_EXECINFO)
--  if (HAVE_BACKTRACE_WITH_EXECINFO)
--    list(APPEND EXTRA_SYSTEM_LIBS execinfo)
--  else ()
--    message(FATAL_ERROR "Cannot find backtrace(), even with -lexecinfo.")
--  endif ()
-+  list(APPEND EXTRA_SYSTEM_LIBS execinfo)
- endif ()
- 
- if(HAVE_CLOCK_REALTIME)
Index: databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc
===================================================================
--- databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc
+++ databases/mariadb100-server/files/patch-storage_tokudb_ft-index_portability_memory.cc
@@ -1,14 +0,0 @@
---- 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>
- #include <stdio.h>
- #include <stdlib.h>
--#if defined(HAVE_MALLOC_H)
--# include <malloc.h>
--#elif defined(HAVE_SYS_MALLOC_H)
--# include <sys/malloc.h>
--#endif
- #include <dlfcn.h>
- #include <toku_race_tools.h>
- #include "memory.h"