<pre style='margin:0'>
Ryan Schmidt (ryandesign) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/f1c4ed4a3aaf07a9d522490fab6e3c87e922d51b">https://github.com/macports/macports-ports/commit/f1c4ed4a3aaf07a9d522490fab6e3c87e922d51b</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new f1c4ed4a3aa mysql51, mysql55: remove obsolete pre-activate
</span>f1c4ed4a3aa is described below
<span style='display:block; white-space:pre;color:#808000;'>commit f1c4ed4a3aaf07a9d522490fab6e3c87e922d51b
</span>Author: Christopher Chavez <chrischavez@gmx.us>
AuthorDate: Sat Aug 15 15:52:32 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> mysql51, mysql55: remove obsolete pre-activate
</span><span style='display:block; white-space:pre;color:#404040;'>
</span><span style='display:block; white-space:pre;color:#404040;'> Originally added in 35e5cd40ef and 43a05a4df9 respectively 8 years ago.
</span>---
databases/mysql51/Portfile | 13 -------------
databases/mysql55/Portfile | 12 ------------
2 files changed, 25 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql51/Portfile b/databases/mysql51/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index bcfd242d93d..2ff370bc7e0 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql51/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql51/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -152,19 +152,6 @@ if {${subport} eq ${name}} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The macports-default.cnf is installed by ${name_mysql}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Early versions of ${name_mysql}-server installed macports-default.cnf so for a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # reasonable period we need to deactivate older versions of the ${name_mysql}-server.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 1] 5.1.63] < 1
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 2] 3] < 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-activate {
if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
copy ${prefix}/share/${name_mysql}/support-files/macports/my.cnf \
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/databases/mysql55/Portfile b/databases/mysql55/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 7a8d12505ee..8e4677f1b25 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/databases/mysql55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/databases/mysql55/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -127,18 +127,6 @@ if {$subport eq $name} {
</span> }
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>- pre-activate {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # The macports-default.cnf is installed by ${name_mysql}.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # Early versions of ${name_mysql}-server installed macports-default.cnf so for a
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- # reasonable period we need to deactivate older versions of the ${name_mysql}-server.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if { [file exists ${prefix}/etc/${name_mysql}/macports-default.cnf]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && ![catch {set vers [lindex [registry_active ${name_mysql}-server] 0]}]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- && [vercmp [lindex $vers 1] 5.5.25] < 0 } {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- registry_deactivate_composite ${name_mysql}-server "" [list ports_nodepcheck 1]
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> post-activate {
if {![file exists ${prefix}/etc/${name_mysql}/my.cnf]} {
copy ${prefix}/share/${name_mysql}/support-files/macports/my.cnf \
</pre><pre style='margin:0'>
</pre>