Add the 5.5 branch of MariaDB

PR:		ports/174660
Submitted by:	Alexandr Kovalenko <never@nevermind.kiev.ua>
Approved by:	geoffroy desvernay <dgeo@centrale-marseille.fr>
		(maintainer of databases/mariadb-*)

14 files changed, 456 insertions, 0 deletions

diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile
new file mode 100644
index 000000000000..ee6591ed736c
--- /dev/null
+++ b/databases/mariadb55-client/Makefile
@@ -0,0 +1,28 @@
+# $FreeBSD$
+
+PORTNAME=	mariadb
+PKGNAMESUFFIX=	-client
+
+COMMENT=	Multithreaded SQL database (client)
+
+MASTERDIR=	${.CURDIR}/../mariadb55-server
+
+PKGMESSAGE=	mustnotexist
+PATCHDIR=	${.CURDIR}/files
+PLIST=		${.CURDIR}/pkg-plist
+
+LATEST_LINK=	mariadb55-client
+
+CONFLICTS_INSTALL=	mysql-client-[345].* mariadb-client-5.3.* percona-client-5.*
+
+CMAKE_ARGS+=	-DWITHOUT_SERVER=1
+
+USE_LDCONFIG=	${PREFIX}/lib/mysql
+
+MAN1=		msql2mysql.1 mysql.1 mysql_config.1 mysql_find_rows.1 \
+		mysql_waitpid.1 mysqlaccess.1 mysqladmin.1 mysqlbinlog.1 \
+		mysqlcheck.1 mysqldump.1 mysqlimport.1 mysqlshow.1 mysqlslap.1
+
+CLIENT_ONLY=	yes
+
+.include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt
new file mode 100644
index 000000000000..494f4e27e520
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-CMakeLists.txt
@@ -0,0 +1,57 @@
+--- CMakeLists.txt.orig	2012-11-28 17:49:36.000000000 +0200
++++ CMakeLists.txt	2012-12-23 01:47:47.000000000 +0200
+@@ -298,34 +298,13 @@
+ ADD_SUBDIRECTORY(regex)
+ ADD_SUBDIRECTORY(mysys)
+ ADD_SUBDIRECTORY(libmysql)
+-ADD_SUBDIRECTORY(client)
+ ADD_SUBDIRECTORY(extra)
++
++ADD_SUBDIRECTORY(client)
+ 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()
+-ENDIF()
+-
+-IF(UNIX)
+-  ADD_SUBDIRECTORY(man)
+-ENDIF()
++ADD_SUBDIRECTORY(scripts)
++ADD_SUBDIRECTORY(man)
+ 
+ INCLUDE(cmake/abi_check.cmake)
+ INCLUDE(cmake/tags.cmake)
+@@ -360,6 +339,7 @@
+   WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
+ )
+ 
++IF(FALSE)
+ INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql 
+ DESTINATION ${INSTALL_DOCREADMEDIR} 
+ COMPONENT Readme
+@@ -370,6 +350,7 @@
+ IF(UNIX)
+   INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+ ENDIF()
++ENDIF()
+ 
+ INCLUDE(CPack)
+ 
diff --git a/databases/mariadb55-client/files/patch-client_CMakeLists.txt b/databases/mariadb55-client/files/patch-client_CMakeLists.txt
new file mode 100644
index 000000000000..2a96c82473a8
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-client_CMakeLists.txt
@@ -0,0 +1,50 @@
+--- client/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
++++ client/CMakeLists.txt	2013-01-05 01:49:16.000000000 +0200
+@@ -34,11 +34,12 @@
+   SET_TARGET_PROPERTIES(mysql PROPERTIES ENABLE_EXPORTS TRUE)
+ ENDIF(UNIX)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysqltest mysqltest.cc COMPONENT Test)
+ SET_SOURCE_FILES_PROPERTIES(mysqltest.cc PROPERTIES COMPILE_FLAGS "-DTHREADS")
+ TARGET_LINK_LIBRARIES(mysqltest mysqlclient regex)
+ SET_TARGET_PROPERTIES(mysqltest PROPERTIES ENABLE_EXPORTS TRUE)
+-
++ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlcheck mysqlcheck.c)
+ TARGET_LINK_LIBRARIES(mysqlcheck mysqlclient)
+@@ -49,15 +50,19 @@
+ MYSQL_ADD_EXECUTABLE(mysqlimport mysqlimport.c)
+ TARGET_LINK_LIBRARIES(mysqlimport mysqlclient)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_upgrade mysql_upgrade.c COMPONENT Server)
+ TARGET_LINK_LIBRARIES(mysql_upgrade mysqlclient)
+ ADD_DEPENDENCIES(mysql_upgrade GenFixPrivs)
++ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlshow mysqlshow.c)
+ TARGET_LINK_LIBRARIES(mysqlshow mysqlclient)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(mysql_plugin mysql_plugin.c)
+ TARGET_LINK_LIBRARIES(mysql_plugin mysqlclient)
++ENDIF()
+ 
+ MYSQL_ADD_EXECUTABLE(mysqlbinlog mysqlbinlog.cc)
+ TARGET_LINK_LIBRARIES(mysqlbinlog mysqlclient)
+@@ -75,10 +80,12 @@
+ ENDIF(WIN32)
+ 
+ # async_example is just a code example, do not install it.
++IF(FALSE)
+ ADD_EXECUTABLE(async_example async_example.c)
+ TARGET_LINK_LIBRARIES(async_example mysqlclient)
++ENDIF()
+ 
+-SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysql_upgrade mysqlshow mysqlslap mysql_plugin 
++SET_TARGET_PROPERTIES (mysqlcheck mysqldump mysqlimport mysqlshow mysqlslap 
+ PROPERTIES HAS_CXX TRUE)
+ 
+ ADD_DEFINITIONS(-DHAVE_DLOPEN)
diff --git a/databases/mariadb55-client/files/patch-extra_CMakeLists.txt b/databases/mariadb55-client/files/patch-extra_CMakeLists.txt
new file mode 100644
index 000000000000..f08649d6ed04
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-extra_CMakeLists.txt
@@ -0,0 +1,25 @@
+--- extra/CMakeLists.txt.orig	2012-12-17 03:38:29.000000000 +0200
++++ extra/CMakeLists.txt	2012-12-17 03:40:12.000000000 +0200
+@@ -54,6 +54,7 @@
+                   DEPENDS 
+                   ${CMAKE_BINARY_DIR}/include/mysqld_error.h.tmp)
+ 
++IF(FALSE)
+ MYSQL_ADD_EXECUTABLE(my_print_defaults my_print_defaults.c)
+ TARGET_LINK_LIBRARIES(my_print_defaults  mysys)
+ 
+@@ -74,11 +75,14 @@
+ 
+ MYSQL_ADD_EXECUTABLE(replace replace.c COMPONENT Server)
+ TARGET_LINK_LIBRARIES(replace mysys)
++ENDIF()
+ IF(UNIX)
++IF(FALSE)
+   MYSQL_ADD_EXECUTABLE(innochecksum innochecksum.c)
+ 
+   MYSQL_ADD_EXECUTABLE(resolve_stack_dump resolve_stack_dump.c)
+   TARGET_LINK_LIBRARIES(resolve_stack_dump mysys)
++ENDIF()
+ 
+   MYSQL_ADD_EXECUTABLE(mysql_waitpid mysql_waitpid.c COMPONENT Client)
+   TARGET_LINK_LIBRARIES(mysql_waitpid mysys)
diff --git a/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
new file mode 100644
index 000000000000..ff6354e1abef
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-extra_yassl_taocrypt_src_integer.cpp
@@ -0,0 +1,11 @@
+--- extra/yassl/taocrypt/src/integer.cpp.orig	2012-12-17 03:41:47.000000000 +0200
++++ extra/yassl/taocrypt/src/integer.cpp	2012-12-17 03:42:47.000000000 +0200
+@@ -73,7 +73,7 @@
+ CPP_TYPENAME AlignedAllocator<T>::pointer AlignedAllocator<T>::allocate(
+                                            size_type n, const void *)
+ {
+-    if (n > max_size())
++    if (n > AlignedAllocator<T>::max_size())
+         return 0;
+     if (n == 0)
+         return 0;
diff --git a/databases/mariadb55-client/files/patch-include_CMakeLists.txt b/databases/mariadb55-client/files/patch-include_CMakeLists.txt
new file mode 100644
index 000000000000..e4c1761275ca
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-include_CMakeLists.txt
@@ -0,0 +1,22 @@
+--- include/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
++++ include/CMakeLists.txt	2012-12-23 00:48:29.000000000 +0200
+@@ -58,13 +58,18 @@
+ FOREACH(f ${HEADERS_GEN_CONFIGURE})
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${f} DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development PERMISSIONS OWNER_READ GROUP_READ WORLD_READ)
+ ENDFOREACH(f)
+-INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development FILES_MATCHING PATTERN "*.h")
++INSTALL(DIRECTORY mysql/ DESTINATION ${INSTALL_INCLUDEDIR} COMPONENT Development
++  FILES_MATCHING PATTERN "*.h"
++  PATTERN "psi_abi*" EXCLUDE
++)
+ 
+ STRING(REPLACE "." "\\." EXCL_RE "${HEADERS};${HEADERS_GEN_CONFIGURE}")
+ STRING(REPLACE ";" "|" EXCL_RE "${EXCL_RE}")
+ 
++IF(FALSE)
+ INSTALL(DIRECTORY . DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development
+   FILES_MATCHING PATTERN "*.h"
+   PATTERN CMakeFiles EXCLUDE
+   PATTERN mysql EXCLUDE
+   REGEX "\\./(${EXCL_RE}$)" EXCLUDE)
++ENDIF()
diff --git a/databases/mariadb55-client/files/patch-include_my_compare.h b/databases/mariadb55-client/files/patch-include_my_compare.h
new file mode 100644
index 000000000000..ad948aa1b5db
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-include_my_compare.h
@@ -0,0 +1,11 @@
+--- include/my_compare.h.orig	2012-12-17 03:52:37.000000000 +0200
++++ include/my_compare.h	2012-12-17 03:53:40.000000000 +0200
+@@ -40,7 +40,7 @@
+   But beware the dependency of MI_MAX_POSSIBLE_KEY_BUFF and HA_MAX_KEY_LENGTH.
+ */
+ 
+-#define HA_MAX_KEY_LENGTH           1000        /* Max length in bytes */
++#define HA_MAX_KEY_LENGTH           4000        /* Max length in bytes */
+ #define HA_MAX_KEY_SEG              32          /* Max segments for key */
+ 
+ #define HA_MAX_POSSIBLE_KEY_BUFF    (HA_MAX_KEY_LENGTH + 24+ 6+6)
diff --git a/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
new file mode 100644
index 000000000000..377feb832067
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
@@ -0,0 +1,9 @@
+--- libservices/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
++++ libservices/CMakeLists.txt	2012-12-23 17:32:35.000000000 +0200
+@@ -24,4 +24,6 @@
+   debug_sync_service.c)
+ 
+ ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
++IF(FALSE)
+ INSTALL(TARGETS mysqlservices DESTINATION ${INSTALL_LIBDIR} COMPONENT Development)
++ENDIF()
diff --git a/databases/mariadb55-client/files/patch-man_CMakeLists.txt b/databases/mariadb55-client/files/patch-man_CMakeLists.txt
new file mode 100644
index 000000000000..09dd6e3b0f7d
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-man_CMakeLists.txt
@@ -0,0 +1,16 @@
+--- man/CMakeLists.txt.orig	2012-12-22 21:30:12.000000000 +0200
++++ man/CMakeLists.txt	2012-12-22 21:30:54.000000000 +0200
+@@ -30,9 +30,13 @@
+ SET(MAN1_TEST mysql-stress-test.pl.1 mysql-test-run.pl.1 mysql_client_test.1
+               mysqltest_embedded.1 mysql_client_test_embedded.1)
+ 
++IF(FALSE)
+ INSTALL(FILES ${MAN1_SERVER} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesServer)
+ INSTALL(FILES ${MAN8_SERVER} DESTINATION ${INSTALL_MANDIR}/man8 COMPONENT ManPagesServer)
++ENDIF()
+ INSTALL(FILES ${MAN1_CLIENT} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesClient)
+ INSTALL(FILES ${MAN1_DEVEL} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesDevelopment)
++IF(FALSE)
+ INSTALL(FILES ${MAN1_TEST} DESTINATION ${INSTALL_MANDIR}/man1 COMPONENT ManPagesTest)
++ENDIF()
+ 
diff --git a/databases/mariadb55-client/files/patch-mysys_default.c b/databases/mariadb55-client/files/patch-mysys_default.c
new file mode 100644
index 000000000000..2f9596809d99
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-mysys_default.c
@@ -0,0 +1,28 @@
+--- mysys/default.c.orig	2012-12-17 03:57:40.000000000 +0200
++++ mysys/default.c	2012-12-17 04:00:28.000000000 +0200
+@@ -89,7 +89,7 @@
+ 
+ /* Which directories are searched for options (and in which order) */
+ 
+-#define MAX_DEFAULT_DIRS 6
++#define MAX_DEFAULT_DIRS 7
+ #define DEFAULT_DIRS_SIZE (MAX_DEFAULT_DIRS + 1)  /* Terminate with NULL */
+ static const char **default_directories = NULL;
+ 
+@@ -785,7 +785,7 @@
+   {
+     MY_STAT stat_info;
+     if (!my_stat(name,&stat_info,MYF(0)))
+-      return 1;
++      return 0;
+     /*
+       Ignore world-writable regular files.
+       This is mainly done to protect us to not read a file created by
+@@ -1229,6 +1229,7 @@
+ #if defined(DEFAULT_SYSCONFDIR)
+   if (DEFAULT_SYSCONFDIR[0])
+     errors += add_directory(alloc, DEFAULT_SYSCONFDIR, dirs);
++    errors += add_directory(alloc, DEFAULT_SYSCONFDIR "/mysql", dirs);
+ #endif /* DEFAULT_SYSCONFDIR */
+ 
+ #endif
diff --git a/databases/mariadb55-client/files/patch-regex_CMakeLists.txt b/databases/mariadb55-client/files/patch-regex_CMakeLists.txt
new file mode 100644
index 000000000000..a058662b781b
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-regex_CMakeLists.txt
@@ -0,0 +1,9 @@
+--- regex/CMakeLists.txt.orig	2012-12-23 00:42:41.000000000 +0200
++++ regex/CMakeLists.txt	2012-12-23 00:42:54.000000000 +0200
+@@ -18,4 +18,6 @@
+ SET(REGEX_SOURCES regcomp.c regerror.c regexec.c regfree.c reginit.c)
+ ADD_CONVENIENCE_LIBRARY(regex ${REGEX_SOURCES})
+ 
++IF(FALSE)
+ INSTALL(FILES "my_regex.h" DESTINATION ${INSTALL_INCLUDEDIR}/private COMPONENT Development)
++ENDIF()
diff --git a/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt
new file mode 100644
index 000000000000..d8b26b4ca49c
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-scripts_CMakeLists.txt
@@ -0,0 +1,78 @@
+--- scripts/CMakeLists.txt.orig	2012-11-28 17:49:47.000000000 +0200
++++ scripts/CMakeLists.txt	2012-12-22 23:26:51.000000000 +0200
+@@ -71,6 +71,7 @@
+ )
+ ENDIF()
+ 
++IF(FALSE)
+ INSTALL(FILES 
+   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables.sql 
+   ${CMAKE_CURRENT_SOURCE_DIR}/mysql_system_tables_data.sql
+@@ -79,6 +80,7 @@
+   ${FIX_PRIVILEGES_SQL}
+   DESTINATION ${INSTALL_MYSQLSHAREDIR} COMPONENT Server
+ )
++ENDIF()
+ 
+ # TCMalloc hacks
+ IF(MALLOC_LIB)
+@@ -138,6 +140,7 @@
+ SET(HOSTNAME "hostname")
+ SET(MYSQLD_USER "mysql")
+ 
++IF(FALSE)
+ # Required for mysqlbug until autotools are deprecated, once done remove these
+ # and expand default cmake variables
+ SET(CC ${CMAKE_C_COMPILER})
+@@ -174,6 +177,7 @@
+   DESTINATION ${INSTALL_BINDIR}
+   COMPONENT Server
+   )
++ENDIF()
+ 
+ ENDIF(UNIX)
+ 
+@@ -198,6 +202,7 @@
+   SET(localstatedir ${MYSQL_DATADIR})
+ ENDIF()
+ 
++IF()
+ IF(UNIX)
+ CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/mysql_install_db.sh
+   ${CMAKE_CURRENT_BINARY_DIR}/mysql_install_db ESCAPE_QUOTES @ONLY)
+@@ -209,6 +214,7 @@
+   COMPONENT Server
+   )
+ ENDIF()
++ENDIF()
+ 
+ 
+ SET(prefix "${CMAKE_INSTALL_PREFIX}")
+@@ -260,6 +266,8 @@
+           GET_FILENAME_COMPONENT(lib "${lib}" NAME_WE)
+           STRING(REGEX REPLACE "^lib" "" lib "${lib}")
+           SET(${var} "${${var}}-l${lib} " ) 
++        ELSEIF(lib STREQUAL "-pthread")
++          SET(${var} "${${var}}-pthread " )
+         ELSE()
+           SET(${var} "${${var}}-l${lib} " ) 
+         ENDIF()
+@@ -315,18 +323,8 @@
+   SET(BIN_SCRIPTS
+     msql2mysql
+     mysql_config
+-    mysql_fix_extensions
+-    mysql_setpermission
+-    mysql_secure_installation
+-    mysql_zap
+     mysqlaccess
+-    mysql_convert_table_format
+     mysql_find_rows
+-    mytop
+-    mysqlhotcopy
+-    mysqldumpslow
+-    mysqld_multi
+-    mysqld_safe
+   )
+   FOREACH(file ${BIN_SCRIPTS})
+     IF(EXISTS ${CMAKE_CURRENT_SOURCE_DIR}/${file}.sh)
diff --git a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
new file mode 100644
index 000000000000..e3490b326b03
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
@@ -0,0 +1,37 @@
+--- support-files/CMakeLists.txt.orig	2011-01-19 23:37:09.000000000 +0100
++++ support-files/CMakeLists.txt	2011-02-07 22:52:05.238344276 +0100
+@@ -40,15 +40,18 @@
+   SET(inst_location ${INSTALL_SUPPORTFILESDIR})
+ ENDIF()
+ 
++IF(FALSE)
+ FOREACH(inifile my-huge my-innodb-heavy-4G my-large my-medium my-small)
+   CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${inifile}.cnf.sh 
+                  ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension} @ONLY)
+   INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/${inifile}.${ini_file_extension}
+           DESTINATION ${inst_location} COMPONENT IniFiles)
+ ENDFOREACH()
++ENDIF()
+ 
+ IF(UNIX)
+   SET(prefix ${CMAKE_INSTALL_PREFIX})
++IF(FALSE)
+   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure
+     config.medium.ini config.small.ini config.huge.ini ndb-config-2-node.ini)
+     CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
+@@ -66,8 +69,10 @@
+   IF(INSTALL_SUPPORTFILESDIR)
+     INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
+   ENDIF()
++ENDIF()
+ 
+   INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
++IF(FALSE)
+   CONFIGURE_FILE(MySQL-shared-compat.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/MySQL-shared-compat.spec @ONLY)
+   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.spec @ONLY)
+   CONFIGURE_FILE(mysql.spec.sh ${CMAKE_CURRENT_BINARY_DIR}/mysql.${VERSION}.spec @ONLY)
+@@ -85,3 +90,4 @@
+     PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
+     GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
+ ENDIF()
++ENDIF()
diff --git a/databases/mariadb55-client/pkg-plist b/databases/mariadb55-client/pkg-plist
new file mode 100644
index 000000000000..0724b120407b
--- /dev/null
+++ b/databases/mariadb55-client/pkg-plist
@@ -0,0 +1,75 @@
+bin/msql2mysql
+bin/mysql
+bin/mysql_config
+bin/mysql_find_rows
+bin/mysql_waitpid
+bin/mysqlaccess
+bin/mysqladmin
+bin/mysqlbinlog
+bin/mysqlcheck
+bin/mysqldump
+bin/mysqlimport
+bin/mysqlshow
+bin/mysqlslap
+include/mysql/auth_dialog_client.h
+include/mysql/client_plugin.h
+include/mysql/decimal.h
+include/mysql/errmsg.h
+include/mysql/handler_state.h
+include/mysql/keycache.h
+include/mysql/m_ctype.h
+include/mysql/m_string.h
+include/mysql/ma_dyncol.h
+include/mysql/my_alloc.h
+include/mysql/my_attribute.h
+include/mysql/my_compiler.h
+include/mysql/my_config.h
+include/mysql/my_dbug.h
+include/mysql/my_decimal_limits.h
+include/mysql/my_dir.h
+include/mysql/my_getopt.h
+include/mysql/my_global.h
+include/mysql/my_list.h
+include/mysql/my_net.h
+include/mysql/my_pthread.h
+include/mysql/my_sys.h
+include/mysql/my_valgrind.h
+include/mysql/my_xml.h
+include/mysql/mysql.h
+include/mysql/mysql_com.h
+include/mysql/mysql_embed.h
+include/mysql/mysql_time.h
+include/mysql/mysql_version.h
+include/mysql/mysqld_ername.h
+include/mysql/mysqld_error.h
+include/mysql/plugin.h
+include/mysql/plugin_audit.h
+include/mysql/plugin_auth.h
+include/mysql/plugin_auth_common.h
+include/mysql/plugin_ftparser.h
+include/mysql/psi/mysql_file.h
+include/mysql/psi/mysql_thread.h
+include/mysql/psi/psi.h
+include/mysql/service_debug_sync.h
+include/mysql/service_my_snprintf.h
+include/mysql/service_progress_report.h
+include/mysql/service_thd_alloc.h
+include/mysql/service_thd_wait.h
+include/mysql/service_thread_scheduler.h
+include/mysql/services.h
+include/mysql/sql_common.h
+include/mysql/sql_state.h
+include/mysql/sslopt-case.h
+include/mysql/sslopt-longopts.h
+include/mysql/sslopt-vars.h
+include/mysql/typelib.h
+lib/mysql/libmysqlclient.a
+lib/mysql/libmysqlclient.so
+lib/mysql/libmysqlclient.so.18
+lib/mysql/libmysqlclient_r.a
+lib/mysql/libmysqlclient_r.so
+lib/mysql/libmysqlclient_r.so.18
+share/aclocal/mysql.m4
+@dirrm include/mysql/psi
+@dirrm include/mysql
+@dirrmtry lib/mysql