[114690] trunk/dports/databases
pixilla at macports.org
pixilla at macports.org
Fri Dec 13 15:09:43 PST 2013
Revision: 114690
https://trac.macports.org/changeset/114690
Author: pixilla at macports.org
Date: 2013-12-13 15:09:43 -0800 (Fri, 13 Dec 2013)
Log Message:
-----------
databases/mariadb:
databases/mysql55:
databases/mysql56:
databases/percona:
- Fix mysqld_safe.
- Revbump.
Modified Paths:
--------------
trunk/dports/databases/mariadb/Portfile
trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff
trunk/dports/databases/mysql55/Portfile
trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff
trunk/dports/databases/mysql56/Portfile
trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff
trunk/dports/databases/percona/Portfile
trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff
Modified: trunk/dports/databases/mariadb/Portfile
===================================================================
--- trunk/dports/databases/mariadb/Portfile 2013-12-13 22:51:14 UTC (rev 114689)
+++ trunk/dports/databases/mariadb/Portfile 2013-12-13 23:09:43 UTC (rev 114690)
@@ -5,9 +5,9 @@
name mariadb
set name_mysql ${name}
-version 5.5.33a
+version 5.5.34
# Please set revision_client and revision_server to 0 if you bump version.
-set revision_client 0
+set revision_client 1
set revision_server 0
categories databases
platforms darwin
@@ -46,8 +46,8 @@
patchfiles patch-cmake-install_layout.cmake.diff \
patch-CMakeLists.txt.diff
- checksums rmd160 284504f3335fb7e89e039448530b3ea6ba01effc \
- sha256 adf4d04087177fde6568082c3fee77e52e84dc3ae4eb5b994d5defaaa8c83d5b
+ checksums rmd160 75a1268b2ef21fd2cbf530ecb0ac51798ebac618 \
+ sha256 a4d8b54be0f5784924629a1e87dbbccc4c0aaf537c76951e265625deda322f89
depends_lib-append port:zlib port:tcp_wrappers port:ncurses
depends_run-append port:mysql_select
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-13 22:51:14 UTC (rev 114689)
+++ trunk/dports/databases/mariadb/files/patch-cmake-install_layout.cmake.diff 2013-12-13 23:09:43 UTC (rev 114690)
@@ -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,31 @@
+@@ -217,6 +217,33 @@
SET(INSTALL_PLUGINTESTDIR_SVR4 ${plugin_tests})
SET(INSTALL_UNIX_ADDRDIR_SVR "/tmp/mysql.sock")
@@ -47,6 +47,8 @@
+#
+SET(INSTALL_MYSQLDATADIR_MACPORTS "var/db/@NAME@")
+SET(INSTALL_PLUGINTESTDIR_MACPORTS ${plugin_tests})
++# FIND_PROC in scripts/CMakeLists.txt is broken for us.
++SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
# Clear cached variables if install layout was changed
IF(OLD_INSTALL_LAYOUT)
Modified: trunk/dports/databases/mysql55/Portfile
===================================================================
--- trunk/dports/databases/mysql55/Portfile 2013-12-13 22:51:14 UTC (rev 114689)
+++ trunk/dports/databases/mysql55/Portfile 2013-12-13 23:09:43 UTC (rev 114690)
@@ -7,7 +7,7 @@
set name_mysql ${name}
version 5.5.33
# Set revision_client and revision_server to 0 if you bump version.
-set revision_client 0
+set revision_client 1
set revision_server 0
set version_branch [join [lrange [split ${version} .] 0 1] .]
categories databases
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-13 22:51:14 UTC (rev 114689)
+++ trunk/dports/databases/mysql55/files/patch-cmake-install_layout.cmake.diff 2013-12-13 23:09:43 UTC (rev 114690)
@@ -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,31 @@
+@@ -222,6 +222,33 @@
SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")
SET(INSTALL_PLUGINTESTDIR_SVR4 ${plugin_tests})
@@ -47,6 +47,8 @@
+#
+SET(INSTALL_MYSQLDATADIR_MACPORTS "var/db/@NAME@")
+SET(INSTALL_PLUGINTESTDIR_MACPORTS ${plugin_tests})
++# FIND_PROC in scripts/CMakeLists.txt is broken for us.
++SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
# Clear cached variables if install layout was changed
IF(OLD_INSTALL_LAYOUT)
Modified: trunk/dports/databases/mysql56/Portfile
===================================================================
--- trunk/dports/databases/mysql56/Portfile 2013-12-13 22:51:14 UTC (rev 114689)
+++ trunk/dports/databases/mysql56/Portfile 2013-12-13 23:09:43 UTC (rev 114690)
@@ -7,7 +7,7 @@
set name_mysql ${name}
version 5.6.15
# Set revision_client and revision_server to 0 on version bump.
-set revision_client 0
+set revision_client 1
set revision_server 0
set version_branch [join [lrange [split ${version} .] 0 1] .]
categories databases
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-13 22:51:14 UTC (rev 114689)
+++ trunk/dports/databases/mysql56/files/patch-cmake-install_layout.cmake.diff 2013-12-13 23:09:43 UTC (rev 114690)
@@ -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,31 @@
+@@ -222,6 +222,33 @@
SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")
SET(INSTALL_PLUGINTESTDIR_SVR4 ${plugin_tests})
@@ -47,6 +47,8 @@
+#
+SET(INSTALL_MYSQLDATADIR_MACPORTS "var/db/@NAME@")
+SET(INSTALL_PLUGINTESTDIR_MACPORTS ${plugin_tests})
++# FIND_PROC in scripts/CMakeLists.txt is broken for us.
++SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
# Clear cached variables if install layout was changed
IF(OLD_INSTALL_LAYOUT)
Modified: trunk/dports/databases/percona/Portfile
===================================================================
--- trunk/dports/databases/percona/Portfile 2013-12-13 22:51:14 UTC (rev 114689)
+++ trunk/dports/databases/percona/Portfile 2013-12-13 23:09:43 UTC (rev 114690)
@@ -8,7 +8,7 @@
set version_mysql 5.5.32
set release 31.0
# Please set revision_client and revision_server to 0 if you bump version_mysql or release.
-set revision_client 0
+set revision_client 1
set revision_server 0
version ${version_mysql}-${release}
# Stealth update requires dist_subdir change.
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-13 22:51:14 UTC (rev 114689)
+++ trunk/dports/databases/percona/files/patch-cmake-install_layout.cmake.diff 2013-12-13 23:09:43 UTC (rev 114690)
@@ -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,31 @@
+@@ -222,6 +222,33 @@
SET(INSTALL_MYSQLDATADIR_SVR4 "/var/lib/mysql")
SET(INSTALL_PLUGINTESTDIR_SVR4 ${plugin_tests})
@@ -47,6 +47,8 @@
+#
+SET(INSTALL_MYSQLDATADIR_MACPORTS "var/db/@NAME@")
+SET(INSTALL_PLUGINTESTDIR_MACPORTS ${plugin_tests})
++# FIND_PROC in scripts/CMakeLists.txt is broken for us.
++SET(FIND_PROC "ps -ef | grep -v mysqld_safe | grep -- $MYSQLD | grep $PID > /dev/null")
# Clear cached variables if install layout was changed
IF(OLD_INSTALL_LAYOUT)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20131213/56305302/attachment.html>
More information about the macports-changes
mailing list