6 files changed, 33 insertions, 36 deletions

diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile
index cac41e95973f..c5f1c3338e06 100644
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@@ -11,7 +11,10 @@ FILESDIR=	${.CURDIR}/files
 PATCHDIR=	${.CURDIR}/files
 PLIST=		${.CURDIR}/pkg-plist
 
-CONFLICTS_INSTALL=	mysql[0-9][0-9]-client-* mariadb[0-46-9][0-9]-client-* mariadb5.[0-46-9]-client-* percona[0-9][0-9]-client-*
+CONFLICTS_INSTALL=	mysql*-client-* \
+			mariadb1[0-9][0-9]-client-* \
+			mariadb5[0-46-9]-client-* \
+			percona*-client-*
 
 CMAKE_ARGS+=	-DWITHOUT_SERVER=1
 
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt
index d2cd64141a0b..c290e0ed6ecc 100644
--- a/databases/mariadb55-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-CMakeLists.txt
@@ -1,5 +1,5 @@
---- CMakeLists.txt.orig	2014-08-08 03:08:33.378366450 +0300
-+++ CMakeLists.txt	2014-08-08 03:10:04.225360039 +0300
+--- CMakeLists.txt.orig	2014-10-08 15:19:53.000000000 +0200
++++ CMakeLists.txt	2014-10-17 21:36:43.000000000 +0200
 @@ -411,28 +411,8 @@
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(libservices)
@@ -44,8 +44,8 @@
 +IF(FALSE)
  INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT
                        COMPONENT Readme)
- INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
-@@ -484,6 +464,7 @@
+ 
+@@ -487,6 +467,7 @@
  IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
  ENDIF()
diff --git a/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake b/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake
index e34110399130..2b32419de733 100644
--- a/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake
+++ b/databases/mariadb55-client/files/patch-cmake__jemalloc.cmake
@@ -1,14 +1,16 @@
---- 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)
+--- cmake/jemalloc.cmake.orig	2014-10-08 15:19:51.000000000 +0200
++++ cmake/jemalloc.cmake	2014-11-16 20:27:50.032638191 +0100
+@@ -22,11 +22,11 @@
+       SET(libname jemalloc)
+     ENDIF()
+ 
+-    CHECK_LIBRARY_EXISTS(${libname} malloc_stats_print "" HAVE_JEMALLOC)
 +    CHECK_LIBRARY_EXISTS(c malloc_stats_print "" HAVE_JEMALLOC)
+     SET(CMAKE_REQUIRED_LIBRARIES)
+ 
      IF (HAVE_JEMALLOC)
--      SET(LIBJEMALLOC jemalloc)
+-      SET(LIBJEMALLOC ${libname})
 +      SET(LIBJEMALLOC c)
-     ELSEIF (WITH_JEMALLOC STREQUAL "system")
-       MESSAGE(FATAL_ERROR "system jemalloc is not found")
-     ELSEIF (WITH_JEMALLOC STREQUAL "yes")
+     ELSEIF (NOT WITH_JEMALLOC STREQUAL "auto")
+       MESSAGE(FATAL_ERROR "${libname} is not found")
+     ENDIF()
diff --git a/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
index 377feb832067..c80c4c6e12f9 100644
--- a/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-libservices_CMakeLists.txt
@@ -1,7 +1,7 @@
---- 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)
+--- libservices/CMakeLists.txt.orig	2014-10-08 15:19:52.000000000 +0200
++++ libservices/CMakeLists.txt	2014-10-17 21:47:48.000000000 +0200
+@@ -26,4 +26,6 @@
+   logger_service.c)
  
  ADD_CONVENIENCE_LIBRARY(mysqlservices ${MYSQLSERVICES_SOURCES})
 +IF(FALSE)
diff --git a/databases/mariadb55-client/files/patch-scripts_mysql_config.sh b/databases/mariadb55-client/files/patch-scripts_mysql_config.sh
index 5271d5256b8f..2cbe2aae424a 100644
--- a/databases/mariadb55-client/files/patch-scripts_mysql_config.sh
+++ b/databases/mariadb55-client/files/patch-scripts_mysql_config.sh
@@ -1,6 +1,6 @@
---- scripts/mysql_config.sh.orig	2014-04-15 14:02:39.000000000 +0300
-+++ scripts/mysql_config.sh	2014-05-16 19:08:41.000000000 +0300
-@@ -108,8 +108,11 @@
+--- scripts/mysql_config.sh.orig	2014-10-17 21:44:16.000000000 +0200
++++ scripts/mysql_config.sh	2014-10-17 21:54:16.000000000 +0200
+@@ -109,8 +109,11 @@
  # We intentionally add a space to the beginning and end of lib strings, simplifies replace later
  libs=" $ldflags -L$pkglibdir @RPATH_OPTION@ -lmysqlclient @ZLIB_DEPS@ @NON_THREADED_LIBS@"
  libs="$libs @openssl_libs@ @STATIC_NSS_FLAGS@ "
diff --git a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
index 314bf0b121fe..08a6556bbbb2 100644
--- a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
@@ -1,5 +1,5 @@
---- support-files/CMakeLists.txt.orig	2014-06-13 13:36:52.080474738 +0300
-+++ support-files/CMakeLists.txt	2014-06-13 13:50:59.537282325 +0300
+--- support-files/CMakeLists.txt.orig	2014-10-08 15:19:53.000000000 +0200
++++ support-files/CMakeLists.txt	2014-10-17 22:34:28.000000000 +0200
 @@ -41,15 +41,18 @@
    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
  ENDIF()
@@ -19,7 +19,7 @@
    FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
                     ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
-@@ -67,8 +70,10 @@
+@@ -69,8 +72,10 @@
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
      INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
    ENDIF()
@@ -30,19 +30,11 @@
    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)
    
-@@ -92,6 +97,7 @@
+@@ -94,6 +99,7 @@
      DESTINATION ${inst_location} COMPONENT SupportFiles
      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+  
++  ENDIF()
  
    IF (INSTALL_SYSCONFDIR)
      INSTALL(FILES ${CMAKE_CURRENT_BINARY_DIR}/mysql-log-rotate DESTINATION ${INSTALL_SYSCONFDIR}/logrotate.d
-@@ -101,6 +107,7 @@
-             RENAME mysql COMPONENT SupportFiles
-             PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
-             GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
-+ ENDIF()
- 
-     INSTALL(FILES rpm/my.cnf DESTINATION ${INSTALL_SYSCONFDIR}
-             COMPONENT Common)