3 files changed, 32 insertions, 22 deletions

diff --git a/databases/mariadb55-client/Makefile b/databases/mariadb55-client/Makefile
index 178207b8e94e..cac41e95973f 100644
--- a/databases/mariadb55-client/Makefile
+++ b/databases/mariadb55-client/Makefile
@@ -1,7 +1,6 @@
 # $FreeBSD$
 
 PORTNAME=	mariadb
-PORTREVISION=	1
 PKGNAMESUFFIX=	55-client
 
 COMMENT=	Multithreaded SQL database (client)
diff --git a/databases/mariadb55-client/files/patch-CMakeLists.txt b/databases/mariadb55-client/files/patch-CMakeLists.txt
index a91e9981186e..e959e3925fe4 100644
--- a/databases/mariadb55-client/files/patch-CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-CMakeLists.txt
@@ -1,6 +1,6 @@
---- CMakeLists.txt.orig	2014-04-15 14:02:39.000000000 +0300
-+++ CMakeLists.txt	2014-05-16 18:56:55.000000000 +0300
-@@ -395,29 +395,8 @@
+--- CMakeLists.txt.orig	2014-06-13 13:33:17.696408174 +0300
++++ CMakeLists.txt	2014-06-13 13:35:14.888349067 +0300
+@@ -403,29 +403,8 @@
  ADD_SUBDIRECTORY(extra)
  ADD_SUBDIRECTORY(libservices)
  ADD_SUBDIRECTORY(scripts)
@@ -30,7 +30,7 @@
  IF(UNIX)
    ADD_SUBDIRECTORY(man)
  ENDIF()
-@@ -429,7 +408,6 @@
+@@ -437,7 +416,6 @@
    ADD_SUBDIRECTORY(win/upgrade_wizard)
    ADD_SUBDIRECTORY(win/packaging)
  ENDIF()
@@ -38,15 +38,15 @@
  
  CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/my_config.h)
  CONFIGURE_FILE(config.h.cmake   ${CMAKE_BINARY_DIR}/include/config.h)
-@@ -462,6 +440,7 @@
+@@ -470,6 +448,7 @@
    WORKING_DIRECTORY ${CMAKE_BINARY_DIR}
  )
  
 +IF(FALSE)
- INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER
+ INSTALL_DOCUMENTATION(README COPYING COPYING.LESSER EXCEPTIONS-CLIENT
                        COMPONENT Readme)
  INSTALL_DOCUMENTATION(${CMAKE_BINARY_DIR}/Docs/INFO_SRC
-@@ -469,6 +448,7 @@
+@@ -477,6 +456,7 @@
  IF(UNIX)
    INSTALL_DOCUMENTATION(Docs/INSTALL-BINARY COMPONENT Readme)
  ENDIF()
diff --git a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
index e3490b326b03..314bf0b121fe 100644
--- a/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
+++ b/databases/mariadb55-client/files/patch-support-files_CMakeLists.txt
@@ -1,6 +1,6 @@
---- 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 @@
+--- 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
+@@ -41,15 +41,18 @@
    SET(inst_location ${INSTALL_SUPPORTFILESDIR})
  ENDIF()
  
@@ -15,23 +15,34 @@
  
  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)
++  IF(FALSE)
+   FOREACH(script  mysqld_multi.server mysql-log-rotate binary-configure)
      CONFIGURE_FILE(${CMAKE_CURRENT_SOURCE_DIR}/${script}.sh 
-@@ -66,8 +69,10 @@
-   IF(INSTALL_SUPPORTFILESDIR)
+                    ${CMAKE_CURRENT_BINARY_DIR}/${script} @ONLY )
+@@ -67,8 +70,10 @@
      INSTALL(FILES magic DESTINATION ${inst_location} COMPONENT SupportFiles)
+     INSTALL(DIRECTORY RHEL4-SElinux/ DESTINATION ${inst_location}/SELinux/RHEL4 COMPONENT SupportFiles)
    ENDIF()
-+ENDIF()
++  ENDIF()
  
    INSTALL(FILES mysql.m4 DESTINATION ${INSTALL_SHAREDIR}/aclocal COMPONENT Development)
-+IF(FALSE)
++  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 @@
+   
+@@ -92,6 +97,7 @@
+     DESTINATION ${inst_location} COMPONENT SupportFiles
      PERMISSIONS OWNER_READ OWNER_WRITE OWNER_EXECUTE GROUP_READ 
      GROUP_EXECUTE WORLD_READ WORLD_EXECUTE)
- ENDIF()
-+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)