Index: mariadb104-client/Makefile
===================================================================
--- mariadb104-client/Makefile	(revision 518118)
+++ mariadb104-client/Makefile	(working copy)
@@ -6,8 +6,6 @@
 
 COMMENT=	Multithreaded SQL database (client)
 
-BROKEN_i386=	compile error: undeclared identifier 'my_atomic_add32'
-
 MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
 
 FILESDIR=	${.CURDIR}/files
Index: mariadb104-client/files/extrapatch-MDEV-13728
===================================================================
--- mariadb104-client/files/extrapatch-MDEV-13728	(nonexistent)
+++ mariadb104-client/files/extrapatch-MDEV-13728	(working copy)
@@ -0,0 +1,119 @@
+--- include/my_atomic.h.orig	2019-11-07 05:52:21 UTC
++++ include/my_atomic.h
+@@ -113,6 +113,7 @@
+ #elif defined(HAVE_GCC_C11_ATOMICS)
+ #include "atomic/gcc_builtins.h"
+ #endif
++#include "atomic/gcc_sync.h"
+
+ #if SIZEOF_LONG == 4
+ #define my_atomic_addlong(A,B) my_atomic_add32((int32*) (A), (B))
+--- include/atomic/gcc_sync.h.orig	2019-11-20 09:23:32 UTC
++++ include/atomic/gcc_sync.h
+@@ -0,0 +1,106 @@
++#ifndef GCC_SYNC_INCLUDED
++#define GCC_SYNC_INCLUDED
++
++/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
++
++/* Old GCC __sync builtins introduced in GCC 4.1 */
++
++static inline int my_atomic_cas32(int32 volatile *a, int32 *cmp, int32 set)
++{
++  int32 cmp_val= *cmp;
++  int32 sav= __sync_val_compare_and_swap(a, cmp_val, set);
++  int ret= (sav == cmp_val);
++  if (!ret)
++    *cmp = sav;
++  return ret;
++}
++
++static inline int my_atomic_cas64(int64 volatile *a, int64 *cmp, int64 set)
++{
++  int64 cmp_val= *cmp;
++  int64 sav= __sync_val_compare_and_swap(a, cmp_val, set);
++  int ret= (sav == cmp_val);
++  if (!ret)
++    *cmp = sav;
++  return ret;
++}
++
++static inline int my_atomic_casptr(void * volatile *a, void **cmp, void *set)
++{
++  void *cmp_val= *cmp;
++  void *sav= __sync_val_compare_and_swap(a, cmp_val, set);
++  int ret= (sav == cmp_val);
++  if (!ret)
++    *cmp = sav;
++  return ret;
++}
++
++static inline int32 my_atomic_add32(int32 volatile *a, int32 v)
++{
++  return __sync_fetch_and_add(a, v);
++}
++
++static inline int64 my_atomic_add64(int64 volatile *a, int64 v)
++{
++  return __sync_fetch_and_add(a, v);
++}
++
++static inline int32 my_atomic_fas32(int32 volatile *a, int32 v)
++{
++  return __sync_lock_test_and_set(a, v);
++}
++
++static inline int64 my_atomic_fas64(int64 volatile *a, int64 v)
++{
++  return __sync_lock_test_and_set(a, v);
++}
++
++static inline void * my_atomic_fasptr(void * volatile *a, void * v)
++{
++  return __sync_lock_test_and_set(a, v);
++}
++
++static inline int32 my_atomic_load32(int32 volatile *a)
++{
++  return __sync_fetch_and_or(a, 0);
++}
++
++static inline int64 my_atomic_load64(int64 volatile *a)
++{
++  return __sync_fetch_and_or(a, 0);
++}
++
++static inline void* my_atomic_loadptr(void * volatile *a)
++{
++  return __sync_fetch_and_or(a, 0);
++}
++
++static inline void my_atomic_store32(int32 volatile *a, int32 v)
++{
++  (void) __sync_lock_test_and_set(a, v);
++}
++
++static inline void my_atomic_store64(int64 volatile *a, int64 v)
++{
++  (void) __sync_lock_test_and_set(a, v);
++}
++
++static inline void my_atomic_storeptr(void * volatile *a, void *v)
++{
++  (void) __sync_lock_test_and_set(a, v);
++}
++
++#endif /* GCC_SYNC_INCLUDED */

Property changes on: mariadb104-client/files/extrapatch-MDEV-13728
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: mariadb104-client/files/patch-MDEV-11790
===================================================================
--- mariadb104-client/files/patch-MDEV-11790	(revision 518118)
+++ mariadb104-client/files/patch-MDEV-11790	(working copy)
@@ -1,7 +1,7 @@
 WITHOUT_SERVER installs server-only files
 
 https://jira.mariadb.org/browse/MDEV-11790
---- extra/CMakeLists.txt.orig	2018-10-02 09:45:40 UTC
+--- extra/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
 +++ extra/CMakeLists.txt
 @@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
    ADD_DEPENDENCIES(innochecksum GenError)
@@ -12,7 +12,7 @@
  TARGET_LINK_LIBRARIES(replace mysys)
  
  IF(UNIX)
---- scripts/CMakeLists.txt.orig	2018-10-02 09:45:42 UTC
+--- scripts/CMakeLists.txt.orig	2019-11-07 05:52:22 UTC
 +++ scripts/CMakeLists.txt
 @@ -241,7 +241,10 @@ ENDIF()
  SET(mysql_config_COMPONENT COMPONENT Development)
@@ -25,7 +25,7 @@
  SET(mytop_COMPONENT Mytop)
  
  IF(WIN32)
-@@ -298,14 +301,14 @@ ELSE()
+@@ -296,14 +299,14 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(BIN_SCRIPTS
      msql2mysql
Index: mariadb104-client/files/patch-MDEV-15961
===================================================================
--- mariadb104-client/files/patch-MDEV-15961	(revision 518118)
+++ mariadb104-client/files/patch-MDEV-15961	(working copy)
@@ -1,7 +1,7 @@
 MDEV-15961: Fix stacktraces under FreeBSD
 
 https://jira.mariadb.org/browse/MDEV-15961
---- mysys/stacktrace.c.orig	2018-07-02 07:34:11 UTC
+--- mysys/stacktrace.c.orig	2019-11-07 05:52:22 UTC
 +++ mysys/stacktrace.c
 @@ -34,19 +34,19 @@
  #include <execinfo.h>
@@ -29,7 +29,7 @@
  }
  
  #ifdef __linux__
-@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
+@@ -149,15 +149,16 @@ static int safe_print_str(const char *addr, size_t max
  
  int my_safe_print_str(const char* val, size_t max_len)
  {
Index: mariadb104-server/Makefile
===================================================================
--- mariadb104-server/Makefile	(revision 518118)
+++ mariadb104-server/Makefile	(working copy)
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME?=	mariadb
-PORTVERSION=	10.4.7
+PORTVERSION=	10.4.10
 PORTREVISION?=	0
 CATEGORIES=	databases
 MASTER_SITES=	http://mirrors.supportex.net/${SITESDIR}/ \
@@ -24,11 +24,12 @@
 LICENSE_FILE_PerconaFT=	${WRKSRC}/storage/tokudb/PerconaFT/PATENTS
 LICENSE_PERMS_PerconaFT=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
+USES=		bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
+
 SUB_FILES=	pkg-message
 PKGMESSAGE=	${WRKDIR}/pkg-message
 
 SLAVEDIRS=	databases/mariadb102-client
-USES=		bison:build cmake:insource,noninja compiler:c++11-lib cpe iconv:translit libedit ncurses shebangfix ssl
 USE_LDCONFIG=	${PREFIX}/lib/mysql
 SHEBANG_FILES=	scripts/*.sh
 SITESDIR=	mariadb/mariadb-${PORTVERSION}/source
@@ -42,12 +43,12 @@
 # MySQL-Server options
 OPTIONS_DEFAULT+=	CONNECT_EXTRA INNOBASE SPHINX SPIDER WSREP
 OPTIONS_GROUP=		COMPRESSION ENGINES GROONGA
-OPTIONS_DEFINE=		AWS_KMS CONNECT_EXTRA DOCS
+OPTIONS_DEFINE=		CONNECT_EXTRA DOCS
 OPTIONS_DEFINE_amd64=	WSREP
 OPTIONS_GROUP_COMPRESSION=	LZ4 LZO SNAPPY ZSTD
 OPTIONS_GROUP_ENGINES=	INNOBASE MROONGA OQGRAPH ROCKSDB SPHINX SPIDER TOKUDB
 OPTIONS_GROUP_GROONGA=	ZMQ MSGPACK
-OPTIONS_EXCLUDE_i386=	TOKUDB
+OPTIONS_EXCLUDE_i386=	ROCKSDB TOKUDB
 
 CONNECT_EXTRA_DESC=	Enable ODBC and XML in CONNECT engine
 COMPRESSION_DESC=	Optional page compression
@@ -142,6 +143,7 @@
 LZ4_LIB_DEPENDS=	liblz4.so:archivers/liblz4
 LZO_CMAKE_BOOL=		WITH_INNODB_LZO
 LZO_LIB_DEPENDS=	liblzo2.so:archivers/lzo2
+MROONGA_BROKEN=		error: expected unqualified-id
 MROONGA_IMPLIES=	LZ4
 MSGPACK_LIB_DEPENDS=	libmsgpackc.so:devel/msgpack
 OQGRAPH_LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
@@ -149,11 +151,11 @@
 ROCKSDB_USES=		python
 SNAPPY_CMAKE_BOOL=	WITH_INNODB_SNAPPY WITH_ROCKSDB_snappy
 SNAPPY_LIB_DEPENDS=	libsnappy.so:archivers/snappy
-TOKUDB_BROKEN=		Error with bundled liblzma
 TOKUDB_IMPLIES=		SNAPPY
 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
@@ -178,6 +180,10 @@
 
 .include <bsd.port.pre.mk>
 
+.if ${ARCH} == "i386"
+EXTRA_PATCHES=	${PATCHDIR}/extrapatch-MDEV-13728
+.endif
+
 .if ${ARCH} != amd64
 PLIST_SUB+=	WSREP="@comment "
 .endif
@@ -201,8 +207,8 @@
 		-e 's|(#define LIBS .*)"$$|\1 -L${PREFIX}/lib"|' \
 		${WRKSRC}/libmariadb/mariadb_config/mariadb_config.c
 
-# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072 	 
-post-configure-INNOBASE-on: 	 
+# Fix build failure in mbstream, see https://jira.mariadb.org/browse/MDEV-14072
+post-configure-INNOBASE-on:
 	${REINPLACE_CMD} -e 's| ${PREFIX}/lib/liblz4.so\(.* ${PREFIX}/lib/liblz4.so.*\)|\1|' \
 		-e 's| ${PREFIX}/lib/liblzo2.so\(.* ${PREFIX}/lib/liblzo2.so.*\)|\1|' \
 		-e 's| ${PREFIX}/lib/libsnappy.so\(.* ${PREFIX}/lib/libsnappy.so\)|\1|' \
Index: mariadb104-server/distinfo
===================================================================
--- mariadb104-server/distinfo	(revision 518118)
+++ mariadb104-server/distinfo	(working copy)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1564591340
-SHA256 (mariadb-10.4.7.tar.gz) = c8e6a6d0bb4f22c416ed675d24682a3ecfa383c5283efee70c8edf131374d817
-SIZE (mariadb-10.4.7.tar.gz) = 78155161
+TIMESTAMP = 1574142229
+SHA256 (mariadb-10.4.10.tar.gz) = cd50fddf86c2a47405737e342f78ebd40d5716f0fb32b976245de713bed01421
+SIZE (mariadb-10.4.10.tar.gz) = 78352896
Index: mariadb104-server/files/extrapatch-MDEV-13728
===================================================================
--- mariadb104-server/files/extrapatch-MDEV-13728	(nonexistent)
+++ mariadb104-server/files/extrapatch-MDEV-13728	(working copy)
@@ -0,0 +1,119 @@
+--- include/my_atomic.h.orig	2019-11-07 05:52:21 UTC
++++ include/my_atomic.h
+@@ -113,6 +113,7 @@
+ #elif defined(HAVE_GCC_C11_ATOMICS)
+ #include "atomic/gcc_builtins.h"
+ #endif
++#include "atomic/gcc_sync.h"
+
+ #if SIZEOF_LONG == 4
+ #define my_atomic_addlong(A,B) my_atomic_add32((int32*) (A), (B))
+--- include/atomic/gcc_sync.h.orig	2019-11-20 09:23:32 UTC
++++ include/atomic/gcc_sync.h
+@@ -0,0 +1,106 @@
++#ifndef GCC_SYNC_INCLUDED
++#define GCC_SYNC_INCLUDED
++
++/* Copyright (c) 2008, 2016, Oracle and/or its affiliates. All rights reserved.
++
++   This program is free software; you can redistribute it and/or modify
++   it under the terms of the GNU General Public License as published by
++   the Free Software Foundation; version 2 of the License.
++
++   This program is distributed in the hope that it will be useful,
++   but WITHOUT ANY WARRANTY; without even the implied warranty of
++   MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
++   GNU General Public License for more details.
++
++   You should have received a copy of the GNU General Public License
++   along with this program; if not, write to the Free Software
++   Foundation, Inc., 51 Franklin St, Fifth Floor, Boston, MA 02110-1301  USA */
++
++/* Old GCC __sync builtins introduced in GCC 4.1 */
++
++static inline int my_atomic_cas32(int32 volatile *a, int32 *cmp, int32 set)
++{
++  int32 cmp_val= *cmp;
++  int32 sav= __sync_val_compare_and_swap(a, cmp_val, set);
++  int ret= (sav == cmp_val);
++  if (!ret)
++    *cmp = sav;
++  return ret;
++}
++
++static inline int my_atomic_cas64(int64 volatile *a, int64 *cmp, int64 set)
++{
++  int64 cmp_val= *cmp;
++  int64 sav= __sync_val_compare_and_swap(a, cmp_val, set);
++  int ret= (sav == cmp_val);
++  if (!ret)
++    *cmp = sav;
++  return ret;
++}
++
++static inline int my_atomic_casptr(void * volatile *a, void **cmp, void *set)
++{
++  void *cmp_val= *cmp;
++  void *sav= __sync_val_compare_and_swap(a, cmp_val, set);
++  int ret= (sav == cmp_val);
++  if (!ret)
++    *cmp = sav;
++  return ret;
++}
++
++static inline int32 my_atomic_add32(int32 volatile *a, int32 v)
++{
++  return __sync_fetch_and_add(a, v);
++}
++
++static inline int64 my_atomic_add64(int64 volatile *a, int64 v)
++{
++  return __sync_fetch_and_add(a, v);
++}
++
++static inline int32 my_atomic_fas32(int32 volatile *a, int32 v)
++{
++  return __sync_lock_test_and_set(a, v);
++}
++
++static inline int64 my_atomic_fas64(int64 volatile *a, int64 v)
++{
++  return __sync_lock_test_and_set(a, v);
++}
++
++static inline void * my_atomic_fasptr(void * volatile *a, void * v)
++{
++  return __sync_lock_test_and_set(a, v);
++}
++
++static inline int32 my_atomic_load32(int32 volatile *a)
++{
++  return __sync_fetch_and_or(a, 0);
++}
++
++static inline int64 my_atomic_load64(int64 volatile *a)
++{
++  return __sync_fetch_and_or(a, 0);
++}
++
++static inline void* my_atomic_loadptr(void * volatile *a)
++{
++  return __sync_fetch_and_or(a, 0);
++}
++
++static inline void my_atomic_store32(int32 volatile *a, int32 v)
++{
++  (void) __sync_lock_test_and_set(a, v);
++}
++
++static inline void my_atomic_store64(int64 volatile *a, int64 v)
++{
++  (void) __sync_lock_test_and_set(a, v);
++}
++
++static inline void my_atomic_storeptr(void * volatile *a, void *v)
++{
++  (void) __sync_lock_test_and_set(a, v);
++}
++
++#endif /* GCC_SYNC_INCLUDED */

Property changes on: mariadb104-server/files/extrapatch-MDEV-13728
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: mariadb104-server/files/patch-CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-CMakeLists.txt	(nonexistent)
+++ mariadb104-server/files/patch-CMakeLists.txt	(working copy)
@@ -0,0 +1,13 @@
+--- CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
++++ CMakeLists.txt
+@@ -498,8 +498,10 @@ ADD_CUSTOM_TARGET(INFO_BIN ALL
+   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ )
+ 
++IF(FALSE)
+ INSTALL_DOCUMENTATION(README.md CREDITS COPYING THIRDPARTY
+                       EXCEPTIONS-CLIENT COMPONENT Readme)
++ENDIF()
+ 
+ # MDEV-6526 these files are not installed anymore
+ #INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC

Property changes on: mariadb104-server/files/patch-CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: mariadb104-server/files/patch-MDEV-11790
===================================================================
--- mariadb104-server/files/patch-MDEV-11790	(revision 518118)
+++ mariadb104-server/files/patch-MDEV-11790	(working copy)
@@ -1,7 +1,7 @@
 WITHOUT_SERVER installs server-only files
 
 https://jira.mariadb.org/browse/MDEV-11790
---- extra/CMakeLists.txt.orig	2018-10-02 09:45:40 UTC
+--- extra/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
 +++ extra/CMakeLists.txt
 @@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
    ADD_DEPENDENCIES(innochecksum GenError)
@@ -12,7 +12,7 @@
  TARGET_LINK_LIBRARIES(replace mysys)
  
  IF(UNIX)
---- scripts/CMakeLists.txt.orig	2018-10-02 09:45:42 UTC
+--- scripts/CMakeLists.txt.orig	2019-11-07 05:52:22 UTC
 +++ scripts/CMakeLists.txt
 @@ -241,7 +241,10 @@ ENDIF()
  SET(mysql_config_COMPONENT COMPONENT Development)
@@ -25,7 +25,7 @@
  SET(mytop_COMPONENT Mytop)
  
  IF(WIN32)
-@@ -298,14 +301,14 @@ ELSE()
+@@ -296,14 +299,14 @@ ELSE()
    # On Unix, most of the files end up in the bin directory
    SET(BIN_SCRIPTS
      msql2mysql
Index: mariadb104-server/files/patch-MDEV-15961
===================================================================
--- mariadb104-server/files/patch-MDEV-15961	(revision 518118)
+++ mariadb104-server/files/patch-MDEV-15961	(working copy)
@@ -1,7 +1,7 @@
 MDEV-15961: Fix stacktraces under FreeBSD
 
 https://jira.mariadb.org/browse/MDEV-15961
---- mysys/stacktrace.c.orig	2018-07-02 07:34:11 UTC
+--- mysys/stacktrace.c.orig	2019-11-07 05:52:22 UTC
 +++ mysys/stacktrace.c
 @@ -34,19 +34,19 @@
  #include <execinfo.h>
@@ -29,7 +29,7 @@
  }
  
  #ifdef __linux__
-@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
+@@ -149,15 +149,16 @@ static int safe_print_str(const char *addr, size_t max
  
  int my_safe_print_str(const char* val, size_t max_len)
  {
Index: mariadb104-server/files/patch-MDEV-20258
===================================================================
--- mariadb104-server/files/patch-MDEV-20258	(revision 518118)
+++ mariadb104-server/files/patch-MDEV-20258	(nonexistent)
@@ -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)

Property changes on: mariadb104-server/files/patch-MDEV-20258
___________________________________________________________________
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: mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-libmariadb_include_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- libmariadb/include/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+--- libmariadb/include/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
 +++ libmariadb/include/CMakeLists.txt
-@@ -21,6 +21,7 @@ IF(WIN32)
+@@ -27,6 +27,7 @@ IF(WIN32)
    SET(WIX_INCLUDES ${MARIADB_CLIENT_INCLUDES} ${MARIADB_ADDITIONAL_INCLUDES} ${MYSQL_ADDITIONAL_INCLUDES} PARENT_SCOPE)
  ENDIF()
  
@@ -8,7 +8,7 @@
  INSTALL(FILES
     ${MARIADB_CLIENT_INCLUDES}
     DESTINATION ${INSTALL_INCLUDEDIR}
-@@ -33,3 +34,4 @@ INSTALL(FILES
+@@ -39,3 +40,4 @@ INSTALL(FILES
     ${MARIADB_ADDITIONAL_INCLUDES}
     DESTINATION ${INSTALL_INCLUDEDIR}/mariadb
     COMPONENT Development)
Index: mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-libmariadb_libmariadb_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- libmariadb/libmariadb/CMakeLists.txt.orig	2017-05-14 23:13:15 UTC
+--- libmariadb/libmariadb/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
 +++ libmariadb/libmariadb/CMakeLists.txt
-@@ -401,9 +401,11 @@ SET_TARGET_PROPERTIES(libmariadb PROPERT
+@@ -447,9 +447,11 @@ ENDIF()
  INSTALL(TARGETS mariadbclient
            COMPONENT Development
            DESTINATION ${INSTALL_LIBDIR})
@@ -10,5 +10,5 @@
          DESTINATION ${INSTALL_LIBDIR})
 +ENDIF()
  
+ 
  IF(WIN32)
-    # On Windows, install PDB
Index: mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-libmariadb_plugins_auth_CMakeLists.txt	(working copy)
@@ -1,25 +1,25 @@
---- libmariadb/plugins/auth/CMakeLists.txt.orig	2018-05-23 20:38:41 UTC
+--- libmariadb/plugins/auth/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
 +++ libmariadb/plugins/auth/CMakeLists.txt
-@@ -38,6 +38,7 @@ IF(GSSAPI_SOURCES)
-                   LIBRARIES ${GSSAPI_LIBS})
- ENDIF()
+@@ -3,6 +3,7 @@ SET(AUTH_DIR ${CC_SOURCE_DIR}/plugins/auth)
+ INCLUDE_DIRECTORIES(${AUTH_DIR})
+ INCLUDE_DIRECTORIES(${CC_SOURCE_DIR}/include)
  
 +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})
+ SET(CRYPTO_PLUGIN 1)
+ IF(WIN32)
+   SET(CRYPT_SOURCE ${CC_SOURCE_DIR}/libmariadb/secure/win_crypt.c)
+@@ -18,6 +19,7 @@ ELSEIF(WITH_SSL STREQUAL "GNUTLS")
+ ELSE()
+   UNSET(CRYPTO_PLUGIN)
  ENDIF()
 +ENDIF()
  
- # old_password plugin
- REGISTER_PLUGIN(TARGET mysql_old_password
-@@ -60,10 +62,11 @@ REGISTER_PLUGIN(TARGET mysql_old_passwor
+ #native password
+ REGISTER_PLUGIN(TARGET mysql_native_password
+@@ -119,10 +121,11 @@ REGISTER_PLUGIN(TARGET mysql_old_password
+                 DEFAULT STATIC
                  SOURCES ${AUTH_DIR}/old_password.c)
  
- 
 +IF(NOT WITHOUT_CLIENT)
  # Cleartext
  REGISTER_PLUGIN(TARGET mysql_clear_password
Index: mariadb104-server/files/patch-libservices_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-libservices_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-libservices_CMakeLists.txt	(working copy)
@@ -1,8 +1,8 @@
 Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
 
---- libservices/CMakeLists.txt.orig	2017-05-14 23:13:16 UTC
+--- libservices/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
 +++ libservices/CMakeLists.txt
-@@ -40,4 +40,6 @@ SET(MYSQLSERVICES_SOURCES
+@@ -41,4 +41,6 @@ SET(MYSQLSERVICES_SOURCES
    )
  
  ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
Index: mariadb104-server/files/patch-man_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-man_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-man_CMakeLists.txt	(working copy)
@@ -1,8 +1,8 @@
 Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
 
---- man/CMakeLists.txt.orig	2017-05-14 23:13:16 UTC
+--- man/CMakeLists.txt.orig	2019-11-07 05:52:21 UTC
 +++ man/CMakeLists.txt
-@@ -38,7 +38,8 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mys
+@@ -40,10 +40,11 @@ SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl
  
  INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
  INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
@@ -12,3 +12,6 @@
  INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
 -
 +ENDIF()
+ macro(MARIADB_SYMLINK_MANPAGE)
+   list(LENGTH MARIADB_SYMLINK_FROMS _len)
+   math(EXPR _listlen "${_len}-1")
Index: mariadb104-server/files/patch-mysys_my__default.c
===================================================================
--- mariadb104-server/files/patch-mysys_my__default.c	(revision 518118)
+++ mariadb104-server/files/patch-mysys_my__default.c	(working copy)
@@ -1,6 +1,6 @@
---- mysys/my_default.c.orig	2017-05-14 23:13:17 UTC
+--- mysys/my_default.c.orig	2019-11-07 05:52:22 UTC
 +++ mysys/my_default.c
-@@ -785,7 +785,7 @@ static int search_default_file_with_ext(
+@@ -784,7 +784,7 @@ static int search_default_file_with_ext(Process_option
    {
      MY_STAT stat_info;
      if (!my_stat(name,&stat_info,MYF(0)))
@@ -9,7 +9,7 @@
      /*
        Ignore world-writable regular files.
        This is mainly done to protect us to not read a file created by
-@@ -803,6 +803,14 @@ static int search_default_file_with_ext(
+@@ -802,6 +802,14 @@ static int search_default_file_with_ext(Process_option
    if (!(fp= mysql_file_fopen(key_file_cnf, name, O_RDONLY, MYF(0))))
      return 1;					/* Ignore wrong files */
  
@@ -24,7 +24,7 @@
    while (mysql_file_fgets(buff, sizeof(buff) - 1, fp))
    {
      line++;
-@@ -1067,7 +1075,8 @@ void my_print_default_files(const char *
+@@ -1066,7 +1074,8 @@ void my_print_default_files(const char *conf_file)
            if (name[0] == FN_HOMELIB)	/* Add . to filenames in home */
              *end++= '.';
            strxmov(end, conf_file, *ext, " ", NullS);
@@ -34,7 +34,7 @@
          }
        }
      }
-@@ -1192,13 +1201,10 @@ static const char **init_default_directo
+@@ -1193,13 +1202,10 @@ static const char **init_default_directories(MEM_ROOT 
  
  #else
  
Index: mariadb104-server/files/patch-pcre_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-pcre_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-pcre_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- pcre/CMakeLists.txt.orig	2017-08-17 10:05:39 UTC
+--- pcre/CMakeLists.txt.orig	2019-11-07 05:52:22 UTC
 +++ pcre/CMakeLists.txt
-@@ -510,6 +510,8 @@ IF(PCRE_SHOW_REPORT)
+@@ -483,6 +483,8 @@ IF(PCRE_SHOW_REPORT)
    MESSAGE(STATUS "")
  ENDIF(PCRE_SHOW_REPORT)
  
Index: mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt	(nonexistent)
+++ mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt	(working copy)
@@ -0,0 +1,10 @@
+--- plugin/auth_pam/testing/CMakeLists.txt.orig	2019-11-07 05:52:22 UTC
++++ plugin/auth_pam/testing/CMakeLists.txt
+@@ -5,5 +5,7 @@ SET_TARGET_PROPERTIES (pam_mariadb_mtr PROPERTIES PREF
+ TARGET_LINK_LIBRARIES(pam_mariadb_mtr pam)
+ 
+ SET(dest DESTINATION "${INSTALL_MYSQLTESTDIR}/suite/plugins/pam" COMPONENT Test)
++IF(FALSE)
+ INSTALL(TARGETS pam_mariadb_mtr ${dest})
+ INSTALL(FILES mariadb_mtr.conf RENAME mariadb_mtr ${dest})
++ENDIF()

Property changes on: mariadb104-server/files/patch-plugin_auth__pam_testing_CMakeLists.txt
___________________________________________________________________
Added: fbsd:nokeywords
## -0,0 +1 ##
+yes
\ No newline at end of property
Added: svn:eol-style
## -0,0 +1 ##
+native
\ No newline at end of property
Added: svn:mime-type
## -0,0 +1 ##
+text/plain
\ No newline at end of property
Index: mariadb104-server/files/patch-scripts_mysql__config.sh
===================================================================
--- mariadb104-server/files/patch-scripts_mysql__config.sh	(revision 518118)
+++ mariadb104-server/files/patch-scripts_mysql__config.sh	(working copy)
@@ -1,6 +1,6 @@
---- scripts/mysql_config.sh.orig	2017-05-24 09:15:23 UTC
+--- scripts/mysql_config.sh.orig	2019-11-20 15:04:07 UTC
 +++ scripts/mysql_config.sh
-@@ -106,7 +106,9 @@ fi
+@@ -87,7 +87,9 @@ fi
  
  # Create options 
  libs="-L$pkglibdir @RPATH_OPTION@ @LIBS_FOR_CLIENTS@"
Index: mariadb104-server/files/patch-scripts_mysqld__safe.sh
===================================================================
--- mariadb104-server/files/patch-scripts_mysqld__safe.sh	(revision 518118)
+++ mariadb104-server/files/patch-scripts_mysqld__safe.sh	(working copy)
@@ -1,6 +1,6 @@
---- scripts/mysqld_safe.sh.orig	2017-05-24 09:15:23 UTC
+--- scripts/mysqld_safe.sh.orig	2019-11-20 15:04:07 UTC
 +++ scripts/mysqld_safe.sh
-@@ -568,11 +568,11 @@ fi
+@@ -564,11 +564,11 @@ fi
  
  if test -z "$MYSQL_HOME"
  then 
Index: mariadb104-server/files/patch-sql_mysqld.cc
===================================================================
--- mariadb104-server/files/patch-sql_mysqld.cc	(revision 518118)
+++ mariadb104-server/files/patch-sql_mysqld.cc	(working copy)
@@ -1,6 +1,6 @@
---- sql/mysqld.cc.orig	2017-05-14 23:13:18 UTC
+--- sql/mysqld.cc.orig	2019-11-07 05:52:22 UTC
 +++ sql/mysqld.cc
-@@ -4838,8 +4840,9 @@ static void init_ssl()
+@@ -4736,8 +4736,9 @@ static void init_ssl()
        while ((err= ERR_get_error()))
          sql_print_warning("SSL error: %s", ERR_error_string(err, NULL));
      }
Index: mariadb104-server/files/patch-storage_innobase_lz4.cmake
===================================================================
--- mariadb104-server/files/patch-storage_innobase_lz4.cmake	(revision 518118)
+++ mariadb104-server/files/patch-storage_innobase_lz4.cmake	(working copy)
@@ -1,6 +1,6 @@
---- storage/innobase/lz4.cmake.orig	2017-05-14 23:13:18 UTC
+--- storage/innobase/lz4.cmake.orig	2019-11-07 05:52:22 UTC
 +++ storage/innobase/lz4.cmake
-@@ -17,21 +17,29 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
+@@ -17,20 +17,28 @@ SET(WITH_INNODB_LZ4 AUTO CACHE STRING
  
  MACRO (MYSQL_CHECK_LZ4)
    IF (WITH_INNODB_LZ4 STREQUAL "ON" OR WITH_INNODB_LZ4 STREQUAL "AUTO")
@@ -29,8 +29,7 @@
        IF (WITH_INNODB_LZ4 STREQUAL "ON")
  	MESSAGE(FATAL_ERROR "Required lz4 library is not found")
        ENDIF()
++    ENDIF()
      ENDIF()
-+    ENDIF()
    ENDIF()
  ENDMACRO()
- 
Index: mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-storage_mroonga_vendor_groonga_CMakeLists.txt	(working copy)
@@ -1,9 +1,9 @@
 From https://github.com/openquery/mariadb-server/commit/43bf72e45b9ead6aa0dc4abd6e5719c6381974b5
 
---- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2017-05-14 23:13:18 UTC
+--- storage/mroonga/vendor/groonga/CMakeLists.txt.orig	2019-11-07 05:52:22 UTC
 +++ storage/mroonga/vendor/groonga/CMakeLists.txt
-@@ -167,6 +167,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COM
-   MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-clobbered")
+@@ -170,6 +170,10 @@ if(CMAKE_COMPILER_IS_GNUCXX OR CMAKE_COMPILER_IS_CLANG
+   MY_CHECK_AND_SET_COMPILER_FLAG("-Wno-implicit-fallthrough")
  endif()
  
 +if(CMAKE_COMPILER_IS_CLANGCXX)
Index: mariadb104-server/files/patch-storage_rocksdb_build__rocksdb.cmake
===================================================================
--- mariadb104-server/files/patch-storage_rocksdb_build__rocksdb.cmake	(revision 518118)
+++ mariadb104-server/files/patch-storage_rocksdb_build__rocksdb.cmake	(working copy)
@@ -1,6 +1,6 @@
---- storage/rocksdb/build_rocksdb.cmake.orig	2018-10-02 09:45:43 UTC
+--- storage/rocksdb/build_rocksdb.cmake.orig	2019-11-07 05:52:23 UTC
 +++ storage/rocksdb/build_rocksdb.cmake
-@@ -69,10 +69,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD
+@@ -71,10 +71,6 @@ if(ZSTD_FOUND AND (NOT WITH_ROCKSDB_ZSTD STREQUAL "OFF
    SET(CMAKE_REQUIRED_LIBRARIES zstd)
    CHECK_FUNCTION_EXISTS(ZDICT_trainFromBuffer ZSTD_VALID)
    UNSET(CMAKE_REQUIRED_LIBRARIES)
Index: mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-storage_tokudb_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- storage/tokudb/CMakeLists.txt.orig	2017-09-25 08:33:26.000000000 +0200
-+++ storage/tokudb/CMakeLists.txt	2017-09-28 21:46:55.119327000 +0200
-@@ -108,6 +108,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINA
+--- storage/tokudb/CMakeLists.txt.orig	2019-11-07 05:52:23 UTC
++++ storage/tokudb/CMakeLists.txt
+@@ -165,6 +165,3 @@ INCLUDE_DIRECTORIES(${CMAKE_CURRENT_BINARY_DIR}/${TOKU
  
  TARGET_LINK_LIBRARIES(tokudb tokufractaltree_static tokuportability_static
                        ${ZLIB_LIBRARY} ${LIBJEMALLOC} stdc++)
Index: mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-storage_tokudb_PerconaFT_CMakeLists.txt	(working copy)
@@ -1,6 +1,6 @@
---- storage/tokudb/PerconaFT/CMakeLists.txt.orig	2017-05-14 23:13:20 UTC
+--- storage/tokudb/PerconaFT/CMakeLists.txt.orig	2019-11-07 05:52:23 UTC
 +++ storage/tokudb/PerconaFT/CMakeLists.txt
-@@ -80,7 +80,7 @@ add_subdirectory(src)
+@@ -99,7 +99,7 @@ add_subdirectory(src)
  add_subdirectory(ftcxx)
  add_subdirectory(tools)
  
Index: mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake
===================================================================
--- mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake	(revision 518118)
+++ mariadb104-server/files/patch-storage_tokudb_PerconaFT_cmake__modules_TokuThirdParty.cmake	(working copy)
@@ -1,10 +1,9 @@
 Do NOT use bundled libs, use xz/lzma from base and archivers/snappy from ports
 
---- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig	2017-05-14 23:13:20 UTC
+--- storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake.orig	2019-11-07 05:52:23 UTC
 +++ storage/tokudb/PerconaFT/cmake_modules/TokuThirdParty.cmake
-@@ -34,6 +34,13 @@ if (CMAKE_PROJECT_NAME STREQUAL TokuDB)
-     endif ()
- endif ()
+@@ -1,5 +1,12 @@
+ include(ExternalProject)
  
 +IF (CMAKE_SYSTEM_NAME STREQUAL "FreeBSD")
 +  include_directories("/usr/include")
@@ -16,7 +15,7 @@
  ## add lzma with an external project
  set(xz_configure_opts --with-pic --enable-static)
  if (APPLE)
-@@ -105,8 +112,15 @@ add_library(lzma STATIC IMPORTED)
+@@ -71,8 +78,15 @@ add_library(lzma STATIC IMPORTED)
  set_target_properties(lzma PROPERTIES IMPORTED_LOCATION
    "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/xz/lib/liblzma.a")
  add_dependencies(lzma build_lzma)
@@ -32,7 +31,7 @@
  ## add snappy with an external project
  set(SNAPPY_SOURCE_DIR "${TokuDB_SOURCE_DIR}/third_party/snappy-1.1.2" CACHE FILEPATH "Where to find sources for snappy.")
  if (NOT EXISTS "${SNAPPY_SOURCE_DIR}/CMakeLists.txt")
-@@ -140,3 +154,4 @@ add_library(snappy STATIC IMPORTED)
+@@ -109,3 +123,4 @@ add_library(snappy STATIC IMPORTED)
  set_target_properties(snappy PROPERTIES IMPORTED_LOCATION
    "${CMAKE_CURRENT_BINARY_DIR}/${CMAKE_CFG_INTDIR}/snappy/lib/libsnappy.a")
  add_dependencies(snappy build_snappy)
Index: mariadb104-server/files/patch-support-files_CMakeLists.txt
===================================================================
--- mariadb104-server/files/patch-support-files_CMakeLists.txt	(revision 518118)
+++ mariadb104-server/files/patch-support-files_CMakeLists.txt	(working copy)
@@ -1,8 +1,8 @@
 Fix up missing WITHOUT_DOCS, WITHOUT_CLIENT options
 
---- support-files/CMakeLists.txt.orig	2017-05-14 23:13:28 UTC
+--- support-files/CMakeLists.txt.orig	2019-11-07 05:52:24 UTC
 +++ support-files/CMakeLists.txt
-@@ -83,7 +83,9 @@ IF(UNIX)
+@@ -93,7 +93,9 @@ IF(UNIX)
    CONFIGURE_FILE(mariadb.pc.in ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc @ONLY)
    INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mariadb.pc DESTINATION ${INSTALL_SHAREDIR}/pkgconfig COMPONENT Development)
  
Index: mariadb104-server/pkg-plist
===================================================================
--- mariadb104-server/pkg-plist	(revision 518118)
+++ mariadb104-server/pkg-plist	(working copy)
@@ -309,12 +309,9 @@
 %%DATADIR%%/ukrainian/errmsg.sys
 %%WSREP%%%%DATADIR%%/wsrep.cnf
 %%WSREP%%%%DATADIR%%/wsrep_notify
-%%DOCSDIR%%/CREDITS
 @comment %%DOCSDIR%%/COPYING
-%%DOCSDIR%%/EXCEPTIONS-CLIENT
 %%DOCSDIR%%/INSTALL-BINARY
 %%WSREP%%%%DOCSDIR%%/README-wsrep
-%%DOCSDIR%%/README.md
 @comment %%DOCSDIR%%/THIRDPARTY
 @comment share/groonga-normalizer-mysql/lgpl-2.0.txt
 @comment share/groonga/COPYING