--- mariadb104-server/Makefile	2019-10-09 10:34:56.000000000 +0000
+++ mariadb104-server/Makefile	2019-10-18 22:28:19.930645000 +0000
@@ -2,7 +2,7 @@ 
 # $FreeBSD: head/databases/mariadb104-server/Makefile 514130 2019-10-09 10:34:56Z bapt $
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.4.7
+PORTVERSION=	10.4.8
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
@@ -154,6 +154,7 @@ 
 TOKUDB_PORTDOCS=	README.md
 TOKUDB_VARS=		LICENSE+=PerconaFT LICENSE_COMB=multi
 WSREP_CMAKE_BOOL=	WITH_WSREP
+WSREP_LIB_DEPENDS=	libgalera.so:databases/galera26
 ZMQ_LIB_DEPENDS=	libzmq.so:net/libzmq4
 ZSTD_CMAKE_BOOL=	WITH_ROCKSDB_ZSTD
 ZSTD_LIB_DEPENDS=	libzstd.so:archivers/zstd
--- mariadb104-server/distinfo	2019-09-01 14:21:27.000000000 +0000
+++ mariadb104-server/distinfo	2019-10-18 22:28:19.930733000 +0000
@@ -1,3 +1,3 @@ 
-TIMESTAMP = 1564591340
-SHA256 (mariadb-10.4.7.tar.gz) = c8e6a6d0bb4f22c416ed675d24682a3ecfa383c5283efee70c8edf131374d817
-SIZE (mariadb-10.4.7.tar.gz) = 78155161
+TIMESTAMP = 1571429742
+SHA256 (mariadb-10.4.8.tar.gz) = 10cc2c3bdb76733c9c6fd1e3c6c860d8b4282c85926da7d472d2a0e00fffca9b
+SIZE (mariadb-10.4.8.tar.gz) = 78262897
--- mariadb104-server/files/patch-MDEV-20258	2019-09-01 14:21:27.000000000 +0000
+++ mariadb104-server/files/patch-MDEV-20258	1970-01-01 00:00:00.000000000 +0000
@@ -1,22 +0,0 @@ 
---- plugin/auth_pam/testing/pam_mariadb_mtr.c.orig	2019-07-30 11:32:16.000000000 +0000
-+++ plugin/auth_pam/testing/pam_mariadb_mtr.c	2019-08-20 18:31:37.712246000 +0000
-@@ -15,6 +15,9 @@
- 
- #define N 3
- 
-+typedef unsigned int uint;
-+typedef unsigned short ushort;
-+
- int pam_sm_authenticate(pam_handle_t *pamh, int flags,
-                         int argc, const char *argv[])
- {
---- plugin/auth_pam/CMakeLists.txt.orig	2019-07-30 11:32:16.000000000 +0000
-+++ plugin/auth_pam/CMakeLists.txt	2019-08-23 12:04:17.702326000 +0000
-@@ -21,7 +21,4 @@ IF(HAVE_PAM_APPL_H)
-                      WORKING_DIRECTORY \$ENV{DESTDIR}\${CMAKE_INSTALL_PREFIX}/${INSTALL_PLUGINDIR}/)"
-                    COMPONENT Server)
-   ENDIF()
--  IF(TARGET auth_pam OR TARGET auth_pam_v1)
--    ADD_SUBDIRECTORY(testing)
--  ENDIF()
- ENDIF(HAVE_PAM_APPL_H)
--- mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt	2017-05-28 20:52:49.000000000 +0000
+++ mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,15 +0,0 @@ 
---- libmariadb/include/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ libmariadb/include/CMakeLists.txt
-@@ -21,6 +21,7 @@ IF(WIN32)
-   SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
- ENDIF()
- 
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(FILES
-    ${MARIADB_CLIENT_INCLUDES}
-    DESTINATION ${INSTALL_INCLUDEDIR}
-@@ -33,3 +34,4 @@ INSTALL(FILES
-    ${MARIADB_ADDITIONAL_INCLUDES}
-    DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
-    COMPONENT Development)
-+ENDIF()
--- mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt	2017-05-28 20:52:49.000000000 +0000
+++ mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,14 +0,0 @@ 
---- libmariadb/libmariadb/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
-+++ libmariadb/libmariadb/CMakeLists.txt
-@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
- INSTALL(TARGETS mariadbclient
-           COMPONENT Development
-           DESTINATION ${INSTALL_LIBDIR})
-+IF(NOT WITHOUT_CLIENT)
- INSTALL(TARGETS libmariadb
-           COMPONENT SharedLibraries
-         DESTINATION ${INSTALL_LIBDIR})
-+ENDIF()
- 
- IF(WIN32)
-    # On Windows, install PDB
--- mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt	2018-06-09 16:40:54.000000000 +0000
+++ mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt	1970-01-01 00:00:00.000000000 +0000
@@ -1,31 +0,0 @@ 
---- libmariadb/plugins/auth/CMakeLists.txt.orig	2018-05-23 20:38:41 UTC
-+++ libmariadb/plugins/auth/CMakeLists.txt
-@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES)
-                   LIBRARIES ${GSSAPI_LIBS})
- ENDIF()
- 
-+IF(NOT WITHOUT_CLIENT)
- IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${WITH_SSL} STREQUAL "SCHANNEL")
-   IF(WIN32)
-     SET(SHA256_LIBS crypt32)
-@@ -51,6 +52,7 @@ IF(${WITH_SSL} STREQUAL "OPENSSL" OR ${W
-                   SOURCES ${AUTH_DIR}/sha256_pw.c
-                   LIBRARIES ${SHA256_LIBS})
- ENDIF()
-+ENDIF()
- 
- # old_password plugin
- REGISTER_PLUGIN(TARGET mysql_old_password
-@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor
-                 SOURCES ${AUTH_DIR}/old_password.c)
- 
- 
-+IF(NOT WITHOUT_CLIENT)
- # Cleartext
- REGISTER_PLUGIN(TARGET mysql_clear_password
-                 TYPE MARIADB_CLIENT_PLUGIN_AUTH
-                 CONFIGURATIONS DYNAMIC STATIC OFF
-                 DEFAULT DYNAMIC
-                 SOURCES ${AUTH_DIR}/mariadb_cleartext.c)
--
-+ENDIF()