5 files changed, 2 insertions, 113 deletions
diff --git a/databases/mariadb104-client/Makefile b/databases/mariadb104-client/Makefile
index 1e60b7fb5473..7539b5346078 100644
--- a/databases/mariadb104-client/Makefile
+++ b/databases/mariadb104-client/Makefile
@@ -10,8 +10,6 @@ BROKEN_i386=	compile error: undeclared identifier 'my_atomic_add32'
 
 MASTERDIR=	${.CURDIR}/../${PORTNAME}${PKGNAMESUFFIX:C/-client/-server/}
 
-FILESDIR=	${.CURDIR}/files
-PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
 CONFLICTS_INSTALL=	databases/mytop
diff --git a/databases/mariadb104-client/files/patch-MDEV-11790 b/databases/mariadb104-client/files/patch-MDEV-11790
deleted file mode 100644
index 1794bcf44da7..000000000000
--- a/databases/mariadb104-client/files/patch-MDEV-11790
+++ /dev/null
@@ -1,46 +0,0 @@
-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
-@@ -99,7 +99,7 @@ IF(WITH_INNOBASE_STORAGE_ENGINE)
-   ADD_DEPENDENCIES(innochecksum GenError)
- ENDIF()
- 
--MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
-+MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Client)
- TARGET_LINK_LIBRARIES(replace mysys)
- 
- IF(UNIX)
---- scripts/CMakeLists.txt.orig	2018-10-02 09:45:42 UTC
-+++ scripts/CMakeLists.txt
-@@ -241,7 +241,10 @@ ENDIF()
- SET(mysql_config_COMPONENT COMPONENT Development)
- SET(msql2mysql_COMPONENT COMPONENT Client)
- SET(mysqlaccess_COMPONENT COMPONENT Client)
-+SET(mysqlhotcopy_COMPONENT COMPONENT Client)
-+SET(mysql_convert_table_format_COMPONENT COMPONENT Client)
- SET(mysql_find_rows_COMPONENT COMPONENT Client)
-+SET(mysql_setpermission_COMPONENT COMPONENT Client)
- SET(mytop_COMPONENT Mytop)
- 
- IF(WIN32)
-@@ -298,14 +301,14 @@ ELSE()
-   # On Unix, most of the files end up in the bin directory
-   SET(BIN_SCRIPTS
-     msql2mysql
--    mysql_config
--    mysql_setpermission
--    mysql_secure_installation
-     mysqlaccess
-+    mysqlhotcopy
-+    mysql_config
-     mysql_convert_table_format
-     mysql_find_rows
-+    mysql_secure_installation
-+    mysql_setpermission
-     mytop
--    mysqlhotcopy
-     ${SERVER_SCRIPTS}
-     ${WSREP_SCRIPTS}
-     ${SYSTEMD_SCRIPTS}
diff --git a/databases/mariadb104-client/files/patch-MDEV-15961 b/databases/mariadb104-client/files/patch-MDEV-15961
deleted file mode 100644
index 65fb24a2f46d..000000000000
--- a/databases/mariadb104-client/files/patch-MDEV-15961
+++ /dev/null
@@ -1,50 +0,0 @@
-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
-@@ -34,19 +34,19 @@
- #include <execinfo.h>
- #endif
- 
-+#ifdef __linux__
- #define PTR_SANE(p) ((p) && (char*)(p) >= heap_start && (char*)(p) <= heap_end)
--
- static char *heap_start;
--
--#if(defined HAVE_BSS_START) && !(defined __linux__)
- extern char *__bss_start;
--#endif
-+#else
-+#define PTR_SANE(p) (p)
-+#endif /* __linux */
- 
- void my_init_stacktrace()
- {
--#if(defined HAVE_BSS_START) && !(defined __linux__)
-+#ifdef __linux__
-   heap_start = (char*) &__bss_start;
--#endif
-+#endif /* __linux__ */
- }
- 
- #ifdef __linux__
-@@ -149,15 +149,16 @@ static int safe_print_str(const char *ad
- 
- int my_safe_print_str(const char* val, size_t max_len)
- {
-+#ifdef __linux__
-+/* Only needed by the linux version of PTR_SANE */
-   char *heap_end;
- 
--#ifdef __linux__
-   // Try and make use of /proc filesystem to safely print memory contents.
-   if (!safe_print_str(val, max_len))
-     return 0;
--#endif
- 
-   heap_end= (char*) sbrk(0);
-+#endif
- 
-   if (!PTR_SANE(val))
-   {
diff --git a/databases/mariadb104-client/files/pkg-message.in b/databases/mariadb104-client/files/pkg-message.in
deleted file mode 100644
index 00ac47038607..000000000000
--- a/databases/mariadb104-client/files/pkg-message.in
+++ /dev/null
@@ -1,9 +0,0 @@
-[
-{ type: install
-  message: <<EOM
-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.
-EOM
-}
-]
diff --git a/databases/mariadb104-client/pkg-plist b/databases/mariadb104-client/pkg-plist
index 143e3b130562..38294df90054 100644
--- a/databases/mariadb104-client/pkg-plist
+++ b/databases/mariadb104-client/pkg-plist
@@ -36,6 +36,8 @@ bin/mysqlslap
 bin/mytop
 bin/replace
 @comment bin/wsrep_sst_rsync_wan
+@sample %%ETCDIR%%/my.cnf.sample
+@sample %%ETCDIR%%/conf.d/client.cnf.sample
 include/mysql/errmsg.h
 include/mysql/ma_list.h
 include/mysql/ma_pvio.h
@@ -65,7 +67,6 @@ lib/mysql/libmysqlclient.a
 lib/mysql/libmysqlclient.so
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
-lib/mysql/libmysqlservices.a
 @comment lib/mysql/plugin/caching_sha2_password.so
 lib/mysql/plugin/client_ed25519.so
 lib/mysql/plugin/daemon_example.ini
@@ -161,15 +162,10 @@ man/man1/mysqlslap.1.gz
 man/man1/replace.1.gz
 @comment man/man1/resolve_stack_dump.1.gz
 @comment man/man1/resolveip.1.gz
-@comment man/man1/tokuft_logprint.1.gz
-@comment man/man1/tokuftdump.1.gz
 @comment man/man1/wsrep_sst_common.1.gz
 @comment man/man1/wsrep_sst_mariabackup.1.gz
 @comment man/man1/wsrep_sst_mysqldump.1.gz
 @comment man/man1/wsrep_sst_rsync.1.gz
 @comment man/man1/wsrep_sst_rsync_wan.1.gz
-@comment man/man1/wsrep_sst_xtrabackup-v2.1.gz
-@comment man/man1/wsrep_sst_xtrabackup.1.gz
 @comment man/man8/mysqld.8.gz
-@comment share/aclocal/mysql.m4
 libdata/pkgconfig/mariadb.pc