[114740] trunk/dports/databases

[pixilla at macports.org]

Revision: 114740
          https://trac.macports.org/changeset/114740
Author:   pixilla at macports.org
Date:     2013-12-14 10:46:57 -0800 (Sat, 14 Dec 2013)
Log Message:
-----------
databases/mariadb:
databases/mysql55:
databases/mysql56:
databases/percona:
- Add patch comment indicating MacPorts sandbox as the cause for the patch.

Modified Paths:
--------------
    trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff
    trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff
    trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff
    trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff

Modified: trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff	2013-12-14 18:07:53 UTC (rev 114739)
+++ trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff	2013-12-14 18:46:57 UTC (rev 114740)
@@ -18,7 +18,7 @@
    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
-@@ -217,6 +217,33 @@
+@@ -217,6 +217,35 @@
  SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
  
  SET(INSTALL_UNIX_ADDRDIR_SVR            "/tmp/mysql.sock")
@@ -47,7 +47,9 @@
 +#
 +SET(INSTALL_MYSQLDATADIR_MACPORTS       "var/db/@NAME@")
 +SET(INSTALL_PLUGINTESTDIR_MACPORTS      ${plugin_tests})
-+# FIND_PROC in scripts/CMakeLists.txt is broken for us.
++#
++# SUID /bin/ps is not in MacPorts sandbox causing scripts/CMakeLists.txt tests to fail so we set FIND_PROC here.
++#
 +SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
  
  # Clear cached variables if install layout was changed

Modified: trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff	2013-12-14 18:07:53 UTC (rev 114739)
+++ trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff	2013-12-14 18:46:57 UTC (rev 114740)
@@ -18,7 +18,7 @@
    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
-@@ -222,6 +222,33 @@
+@@ -222,6 +222,35 @@
  SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
  SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
  
@@ -47,7 +47,9 @@
 +#
 +SET(INSTALL_MYSQLDATADIR_MACPORTS       "var/db/@NAME@")
 +SET(INSTALL_PLUGINTESTDIR_MACPORTS      ${plugin_tests})
-+# FIND_PROC in scripts/CMakeLists.txt is broken for us.
++#
++# SUID /bin/ps is not in MacPorts sandbox causing scripts/CMakeLists.txt tests to fail so we set FIND_PROC here.
++#
 +SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
  
  # Clear cached variables if install layout was changed

Modified: trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff	2013-12-14 18:07:53 UTC (rev 114739)
+++ trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff	2013-12-14 18:46:57 UTC (rev 114740)
@@ -18,7 +18,7 @@
    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
-@@ -222,6 +222,33 @@
+@@ -222,6 +222,35 @@
  SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
  SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
  
@@ -47,7 +47,9 @@
 +#
 +SET(INSTALL_MYSQLDATADIR_MACPORTS       "var/db/@NAME@")
 +SET(INSTALL_PLUGINTESTDIR_MACPORTS      ${plugin_tests})
-+# FIND_PROC in scripts/CMakeLists.txt is broken for us.
++#
++# SUID /bin/ps is not in MacPorts sandbox causing scripts/CMakeLists.txt tests to fail so we set FIND_PROC here.
++#
 +SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
  
  # Clear cached variables if install layout was changed

Modified: trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff
===================================================================
--- trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff	2013-12-14 18:07:53 UTC (rev 114739)
+++ trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff	2013-12-14 18:46:57 UTC (rev 114740)
@@ -18,7 +18,7 @@
    LIST(FIND VALID_INSTALL_LAYOUTS "${INSTALL_LAYOUT}" ind)
    IF(ind EQUAL -1)
      MESSAGE(FATAL_ERROR "Invalid INSTALL_LAYOUT parameter:${INSTALL_LAYOUT}."
-@@ -222,6 +222,33 @@
+@@ -222,6 +222,35 @@
  SET(INSTALL_MYSQLDATADIR_SVR4           "/var/lib/mysql")
  SET(INSTALL_PLUGINTESTDIR_SVR4          ${plugin_tests})
  
@@ -47,7 +47,9 @@
 +#
 +SET(INSTALL_MYSQLDATADIR_MACPORTS       "var/db/@NAME@")
 +SET(INSTALL_PLUGINTESTDIR_MACPORTS      ${plugin_tests})
-+# FIND_PROC in scripts/CMakeLists.txt is broken for us.
++#
++# SUID /bin/ps is not in MacPorts sandbox causing scripts/CMakeLists.txt tests to fail so we set FIND_PROC here.
++#
 +SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
  
  # Clear cached variables if install layout was changed
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131214/d8b80dda/attachment-0001.html>