5 files changed, 60 insertions, 25 deletions
diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile
index a0a57b6..1413c1e 100644
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@@ -11,6 +11,8 @@ PKGMESSAGE=	mustnotexist
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
+MAKE_JOBS_UNSAFE=	yes
+
 LATEST_LINK=	mariadb55-client
 
 CONFLICTS_INSTALL=	mysql-client-[345].* mariadb-client-5.3.* percona-client-5.*
@@ -19,11 +21,6 @@ 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
 
-NO_STAGE=	yes
 .include "${MASTERDIR}/Makefile"
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt
index 82d2cd9..161956b 100644
--- a/databases/mariadb55-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2013-01-29 16:12:48.000000000 +0200
-+++ CMakeLists.txt	2013-02-01 20:09:31.000000000 +0200
-@@ -303,28 +303,8 @@
+--- CMakeLists.txt.orig	2013-09-20 01:34:26.000000000 +0300
++++ CMakeLists.txt	2013-09-27 01:30:14.000000000 +0300
+@@ -306,28 +306,8 @@
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(libservices)
  ADD_SUBDIRECTORY(scripts)
@@ -29,17 +29,25 @@
  IF(UNIX)
    ADD_SUBDIRECTORY(man)
  ENDIF()
-@@ -362,6 +342,7 @@
+@@ -339,7 +319,6 @@
+   ADD_SUBDIRECTORY(win/upgrade_wizard)
+   ADD_SUBDIRECTORY(win/packaging)
+ ENDIF()
+-ADD_SUBDIRECTORY(packaging/solaris)
+ 
+ CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/my_config.h)
+ CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/config.h)
+@@ -366,6 +345,7 @@
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(FALSE)
- INSTALL(FILES COPYING COPYING.LESSER LICENSE.mysql 
- DESTINATION ${INSTALL_DOCREADMEDIR} 
- COMPONENT Readme
-@@ -372,6 +353,7 @@
+ INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
+                       COMPONENT Readme)
+ INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
+@@ -373,6 +353,7 @@
  IF(UNIX)
-   INSTALL(FILES Docs/INSTALL-BINARY DESTINATION ${INSTALL_DOCREADMEDIR} COMPONENT Readme)
+   INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
  ENDIF()
 +ENDIF()
  
diff --git a/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake b/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake
new file mode 100644
index 0000000..e341103
--- /dev/null
+++ b/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake
@@ -0,0 +1,14 @@
+--- cmake/jemalloc.cmake.orig	2013-09-20 00:34:22.000000000 +0200
++++ cmake/jemalloc.cmake	2013-09-27 22:46:05.791110010 +0200
+@@ -37,9 +37,9 @@
+     SET(WITH_JEMALLOC "no")
+   ENDIF()
+   IF(WITH_JEMALLOC STREQUAL "system" OR WITH_JEMALLOC STREQUAL "yes")
+-    CHECK_LIBRARY_EXISTS(jemalloc malloc_stats_print "" HAVE_JEMALLOC)
++    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
+     IF (HAVE_JEMALLOC)
+-      SET(LIBJEMALLOC jemalloc)
++      SET(LIBJEMALLOC c)
+     ELSEIF (WITH_JEMALLOC STREQUAL "system")
+       MESSAGE(FATAL_ERROR "system jemalloc is not found")
+     ELSEIF (WITH_JEMALLOC STREQUAL "yes")
diff --git a/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake b/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake
index dd8947d..5089f86 100644
--- a/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake
+++ b/databases/mariadb55-client/files/patch-cmake_os_FreeBSD.cmake
@@ -1,15 +1,16 @@
---- cmake/os/FreeBSD.cmake.orig	2013-01-13 02:13:17.000000000 +0200
-+++ cmake/os/FreeBSD.cmake	2013-01-13 02:14:15.000000000 +0200
-@@ -24,6 +24,7 @@
+--- cmake/os/FreeBSD.cmake.orig	2013-09-27 00:09:44.000000000 +0300
++++ cmake/os/FreeBSD.cmake	2013-09-27 00:09:57.000000000 +0300
+@@ -24,9 +24,10 @@
  # ADD_DEFINITIONS(-DHAVE_BROKEN_REALPATH)
  
  # Find libexecinfo (library that contains backtrace_symbols etc)
-+IF(FALSE)
- INCLUDE_DIRECTORIES(/usr/local/include)
- SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
- SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
-@@ -31,6 +32,7 @@
+-INCLUDE_DIRECTORIES(/usr/local/include)
+-SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} /usr/local/include )
+-SET(ENV{LIB} "$ENV{LIB}:/usr/local/lib")
++SET(EXECINFO_ROOT /usr/local CACHE INTERNAL "Where to find execinfo library and header")
++INCLUDE_DIRECTORIES(${EXECINFO_ROOT}/include)
++SET(CMAKE_REQUIRED_INCLUDES ${CMAKE_REQUIRED_INCLUDES} ${EXECINFO_ROOT}/include)
++SET(ENV{LIB} "$ENV{LIB}:${EXECINFO_ROOT}/lib")
+ FIND_LIBRARY(EXECINFO NAMES execinfo)
  IF(EXECINFO)
   SET(LIBEXECINFO ${EXECINFO})
- ENDIF()
-+ENDIF()
diff --git a/databases/mariadb55-client/pkg-plist b/databases/mariadb55-client/pkg-plist
index a24d9ff..fe61028 100644
--- a/databases/mariadb55-client/pkg-plist
+++ b/databases/mariadb55-client/pkg-plist
@@ -52,6 +52,7 @@ include/mysql/psi/mysql_thread.h
 include/mysql/psi/psi.h
 include/mysql/service_debug_sync.h
 include/mysql/service_kill_statement.h
+include/mysql/service_logger.h
 include/mysql/service_my_snprintf.h
 include/mysql/service_progress_report.h
 include/mysql/service_thd_alloc.h
@@ -70,7 +71,21 @@ lib/mysql/libmysqlclient.so.18
 lib/mysql/libmysqlclient_r.a
 lib/mysql/libmysqlclient_r.so
 lib/mysql/libmysqlclient_r.so.18
+man/man1/msql2mysql.1.gz
+man/man1/mysql.1.gz
+man/man1/mysql_config.1.gz
+man/man1/mysql_find_rows.1.gz
+man/man1/mysql_plugin.1.gz
+man/man1/mysql_waitpid.1.gz
+man/man1/mysqlaccess.1.gz
+man/man1/mysqladmin.1.gz
+man/man1/mysqlbinlog.1.gz
+man/man1/mysqlcheck.1.gz
+man/man1/mysqldump.1.gz
+man/man1/mysqlimport.1.gz
+man/man1/mysqlshow.1.gz
+man/man1/mysqlslap.1.gz
 share/aclocal/mysql.m4
+@dirrmtry lib/mysql
 @dirrm include/mysql/psi
 @dirrm include/mysql
-@dirrmtry lib/mysql