<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[137069] trunk/dports/databases</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="https://trac.macports.org/changeset/137069">137069</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2015-06-03 20:49:33 -0700 (Wed, 03 Jun 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>databases/mariadb:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 5.5.43.
databases/mariadb-10.0:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 10.0.19.
databases/mariadb-10.1:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 10.1.4.
- Fix build with upstream patch.
databases/mysql51:
- Update mysql select file.
- Update version to 5.1.73.
databases/mysql55:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 5.5.44.
databases/mysql56:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 5.6.25. See #47893
databases/mysql_select:
- Update mysql select files.
databases/percona:
- Use cmake.out_of_source. See #47197
- Update mysql select file.
- Update version to 5.6.24-72.2.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesmariadbPortfile">trunk/dports/databases/mariadb/Portfile</a></li>
<li><a href="#trunkdportsdatabasesmariadbfilesmariadb">trunk/dports/databases/mariadb/files/mariadb</a></li>
<li><a href="#trunkdportsdatabasesmariadb100Portfile">trunk/dports/databases/mariadb-10.0/Portfile</a></li>
<li><a href="#trunkdportsdatabasesmariadb100filesmariadb100">trunk/dports/databases/mariadb-10.0/files/mariadb-10.0</a></li>
<li><a href="#trunkdportsdatabasesmariadb101Portfile">trunk/dports/databases/mariadb-10.1/Portfile</a></li>
<li><a href="#trunkdportsdatabasesmariadb101filesmariadb101">trunk/dports/databases/mariadb-10.1/files/mariadb-10.1</a></li>
<li><a href="#trunkdportsdatabasesmysql51Portfile">trunk/dports/databases/mysql51/Portfile</a></li>
<li><a href="#trunkdportsdatabasesmysql51filesmysql51">trunk/dports/databases/mysql51/files/mysql51</a></li>
<li><a href="#trunkdportsdatabasesmysql55Portfile">trunk/dports/databases/mysql55/Portfile</a></li>
<li><a href="#trunkdportsdatabasesmysql55filesmysql55">trunk/dports/databases/mysql55/files/mysql55</a></li>
<li><a href="#trunkdportsdatabasesmysql56Portfile">trunk/dports/databases/mysql56/Portfile</a></li>
<li><a href="#trunkdportsdatabasesmysql56filesmysql56">trunk/dports/databases/mysql56/files/mysql56</a></li>
<li><a href="#trunkdportsdatabasesmysql_selectfilesbase">trunk/dports/databases/mysql_select/files/base</a></li>
<li><a href="#trunkdportsdatabasesmysql_selectfilesnone">trunk/dports/databases/mysql_select/files/none</a></li>
<li><a href="#trunkdportsdatabasesperconaPortfile">trunk/dports/databases/percona/Portfile</a></li>
<li><a href="#trunkdportsdatabasesperconafilespercona">trunk/dports/databases/percona/files/percona</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesmariadb101filespatchsqlmdlccdiff">trunk/dports/databases/mariadb-10.1/files/patch-sql-mdl.cc.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabasesmariadbPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mariadb/Portfile (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mariadb/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name mariadb
</span><span class="cx"> set name_mysql ${name}
</span><del>-version 5.5.41
</del><ins>+version 5.5.43
</ins><span class="cx"> set version_branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> # Please set revision_client and revision_server to 0 if you bump version.
</span><span class="cx"> set revision_client 0
</span><span class="lines">@@ -41,14 +41,15 @@
</span><span class="cx"> # Mirrors with bad distfiles
</span><span class="cx"> # http://mirror.switch.ch/mirror/mariadb/mariadb-${version}/source/ \
</span><span class="cx">
</span><ins>+ cmake.out_of_source yes
</ins><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-cmake-install_layout.cmake.diff \
</span><span class="cx"> patch-CMakeLists.txt.diff
</span><span class="cx">
</span><del>- checksums rmd160 ac6d8c529efd2dd8c9648459d2fc4eefb23c83b7 \
- sha256 a16dc62e4bcabecd5c483f2f8b657483a8c51934e7be5ad4ab21b8baea1f5332
</del><ins>+ checksums rmd160 93296e8d9e14949d47d4d0195f566891ba83bc76 \
+ sha256 a0709997140549154edb87c9dfab564cd4755b238251acbf42369118f9bb4d01
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:zlib port:tcp_wrappers port:ncurses
</span><span class="cx"> depends_run-append port:mysql_select
</span><span class="lines">@@ -59,27 +60,23 @@
</span><span class="cx"> archcheck.files lib/libz.dylib lib/libwrap.dylib
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- file mkdir ${worksrcpath}/build_macports/macports
</del><ins>+ file mkdir ${cmake.build_dir}/macports
</ins><span class="cx"> copy ${filespath}/macports-default.cnf \
</span><span class="cx"> ${filespath}/my.cnf \
</span><del>- ${worksrcpath}/build_macports/macports/
</del><ins>+ ${cmake.build_dir}/macports/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><span class="cx"> ${worksrcpath}/cmake/install_layout.cmake
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><del>- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" \
</span><del>- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- configure.cmd cmake ..
- configure.dir ${worksrcpath}/build_macports
- build.dir ${worksrcpath}/build_macports
-
</del><span class="cx"> configure.args-delete \
</span><span class="cx"> -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span class="cx"> configure.args-append \
</span><span class="lines">@@ -102,7 +99,7 @@
</span><span class="cx"> -DWITH_SSL:STRING=no
</span><span class="cx">
</span><span class="cx"> post-build {
</span><del>- set dirs ${worksrcpath}/build_macports
</del><ins>+ set dirs ${cmake.build_dir}
</ins><span class="cx"> foreach dir ${dirs} {
</span><span class="cx"> reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span class="cx"> ${dir}/scripts/mysql_config \
</span><span class="lines">@@ -127,11 +124,11 @@
</span><span class="cx"> }
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}
</span><del>- copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/macports-default.cnf \
</ins><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}/
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports
</span><del>- copy ${worksrcpath}/build_macports/macports/my.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/my.cnf \
</ins><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdatabasesmariadbfilesmariadb"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mariadb/files/mariadb (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mariadb/files/mariadb 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb/files/mariadb 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> lib/mariadb/bin/mysql_client_test
</span><span class="cx"> -
</span><span class="cx"> lib/mariadb/bin/mysql_config
</span><ins>+-
</ins><span class="cx"> lib/mariadb/bin/mysql_convert_table_format
</span><ins>+lib/mariadb/bin/mysql_embedded
</ins><span class="cx"> lib/mariadb/bin/mysql_find_rows
</span><span class="cx"> lib/mariadb/bin/mysql_fix_extensions
</span><span class="cx"> -
</span></span></pre></div>
<a id="trunkdportsdatabasesmariadb100Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mariadb-10.0/Portfile (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mariadb-10.0/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb-10.0/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name mariadb-10.0
</span><span class="cx"> set name_mysql ${name}
</span><del>-version 10.0.16
</del><ins>+version 10.0.19
</ins><span class="cx"> set version_branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> # Please set revision_client and revision_server to 0 if you bump version.
</span><span class="cx"> set revision_client 0
</span><span class="lines">@@ -40,14 +40,15 @@
</span><span class="cx"> http://mirror.switch.ch/mirror/mariadb/mariadb-${version}/source/
</span><span class="cx">
</span><span class="cx"> distname mariadb-${version}
</span><ins>+ cmake.out_of_source yes
</ins><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-cmake-install_layout.cmake.diff \
</span><span class="cx"> patch-CMakeLists.txt.diff
</span><span class="cx">
</span><del>- checksums rmd160 bf2a309c041aae6be0465bd71b0760334328c8a5 \
- sha256 44134a5f3e174e3e8443c1d07916af57f3ffadd4c8846338d41850fedfefcde4
</del><ins>+ checksums rmd160 2f9d70cce15d85654739ca7d64de87997f7db240 \
+ sha256 2fbf5e5d7d8094691601ece8ae60b941478d73c98a58a960aeebfa021091a132
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:zlib port:tcp_wrappers port:ncurses
</span><span class="cx"> depends_run-append port:mysql_select
</span><span class="lines">@@ -58,25 +59,23 @@
</span><span class="cx"> archcheck.files lib/libz.dylib lib/libwrap.dylib
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- file mkdir ${worksrcpath}/build_macports/macports
</del><ins>+ file mkdir ${cmake.build_dir}/macports
</ins><span class="cx"> copy ${filespath}/macports-default.cnf \
</span><span class="cx"> ${filespath}/my.cnf \
</span><del>- ${worksrcpath}/build_macports/macports/
</del><ins>+ ${cmake.build_dir}/macports/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><span class="cx"> ${worksrcpath}/cmake/install_layout.cmake
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><del>- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" \
</span><del>- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- configure.cmd cmake ..
- configure.dir ${worksrcpath}/build_macports
</del><span class="cx"> configure.args-delete \
</span><span class="cx"> -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span class="cx"> configure.args-append \
</span><span class="lines">@@ -99,9 +98,8 @@
</span><span class="cx"> -DWITH_SSL:STRING=no \
</span><span class="cx"> -DMYSQL_MAINTAINER_MODE:STRING=AUTO
</span><span class="cx">
</span><del>- build.dir ${worksrcpath}/build_macports
</del><span class="cx"> post-build {
</span><del>- set dirs ${worksrcpath}/build_macports
</del><ins>+ set dirs ${cmake.build_dir}
</ins><span class="cx"> foreach dir ${dirs} {
</span><span class="cx"> reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span class="cx"> ${dir}/scripts/mysql_config \
</span><span class="lines">@@ -126,11 +124,11 @@
</span><span class="cx"> }
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}
</span><del>- copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/macports-default.cnf \
</ins><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}/
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports
</span><del>- copy ${worksrcpath}/build_macports/macports/my.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/my.cnf \
</ins><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdatabasesmariadb100filesmariadb100"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mariadb-10.0/files/mariadb-10.0 (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mariadb-10.0/files/mariadb-10.0 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb-10.0/files/mariadb-10.0 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> lib/mariadb-10.0/bin/mysql_client_test
</span><span class="cx"> -
</span><span class="cx"> lib/mariadb-10.0/bin/mysql_config
</span><ins>+-
</ins><span class="cx"> lib/mariadb-10.0/bin/mysql_convert_table_format
</span><ins>+lib/mariadb-10.0/bin/mysql_embedded
</ins><span class="cx"> lib/mariadb-10.0/bin/mysql_find_rows
</span><span class="cx"> lib/mariadb-10.0/bin/mysql_fix_extensions
</span><span class="cx"> -
</span></span></pre></div>
<a id="trunkdportsdatabasesmariadb101Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mariadb-10.1/Portfile (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mariadb-10.1/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb-10.1/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name mariadb-10.1
</span><span class="cx"> set name_mysql ${name}
</span><del>-version 10.1.0
</del><ins>+version 10.1.4
</ins><span class="cx"> set version_branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> # Please set revision_client and revision_server to 0 if you bump version.
</span><span class="cx"> set revision_client 0
</span><span class="lines">@@ -24,8 +24,9 @@
</span><span class="cx">
</span><span class="cx"> revision ${revision_client}
</span><span class="cx"> license GPL-2
</span><del>- description (Beta version) Multithreaded SQL database server
- long_description (Beta version) Mariadb is a fork of the MySQL server, a multi-threaded SQL database.
</del><ins>+ description (Warning: Alpha version) Multithreaded SQL database server
+ long_description (Warning: Alpha version) Mariadb is a fork of the MySQL server, a \
+ multi-threaded SQL database.
</ins><span class="cx">
</span><span class="cx"> master_sites \
</span><span class="cx"> http://ftp.osuosl.org/pub/mariadb/mariadb-${version}/source/ \
</span><span class="lines">@@ -40,15 +41,20 @@
</span><span class="cx"> http://mirror.switch.ch/mirror/mariadb/mariadb-${version}/source/
</span><span class="cx">
</span><span class="cx"> distname mariadb-${version}
</span><ins>+ cmake.out_of_source yes
</ins><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-cmake-install_layout.cmake.diff \
</span><span class="cx"> patch-CMakeLists.txt.diff
</span><span class="cx">
</span><del>- checksums rmd160 83126e28b37cb51daedc99cacbd30df842fab2f3 \
- sha256 994cf538e4e833080bb91b99652399b0c47bde3cdaa139b2118a60075d766521
</del><ins>+ # Upstream issue MDEV-8073 fix
+ # https://mariadb.atlassian.net/browse/MDEV-8073
+ patchfiles-append patch-sql-mdl.cc.diff
</ins><span class="cx">
</span><ins>+ checksums rmd160 07d5ff5d48cc85093655c6af3579f6be61416df9 \
+ sha256 14cc92414b2c3822923977a6fb544593498dbb5005044db33c193511757d411c
+
</ins><span class="cx"> depends_lib-append port:zlib port:tcp_wrappers port:ncurses
</span><span class="cx"> depends_run-append port:mysql_select
</span><span class="cx">
</span><span class="lines">@@ -58,25 +64,23 @@
</span><span class="cx"> archcheck.files lib/libz.dylib lib/libwrap.dylib
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- file mkdir ${worksrcpath}/build_macports/macports
</del><ins>+ file mkdir ${cmake.build_dir}/macports
</ins><span class="cx"> copy ${filespath}/macports-default.cnf \
</span><span class="cx"> ${filespath}/my.cnf \
</span><del>- ${worksrcpath}/build_macports/macports/
</del><ins>+ ${cmake.build_dir}/macports/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><span class="cx"> ${worksrcpath}/cmake/install_layout.cmake
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><del>- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" \
</span><del>- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- configure.cmd cmake ..
- configure.dir ${worksrcpath}/build_macports
</del><span class="cx"> configure.args-delete \
</span><span class="cx"> -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span class="cx"> configure.args-append \
</span><span class="lines">@@ -91,7 +95,7 @@
</span><span class="cx"> -DWITH_ZLIB:STRING=system \
</span><span class="cx"> -DWITH_UNIT_TESTS:BOOL=ON \
</span><span class="cx"> -DWITHOUT_OQGRAPH_STORAGE_ENGINE:BOOL=ON \
</span><del>- -DWITHOUT_TOKUDB_STORAGE_ENGINE:BOOL=ON \
</del><ins>+ -DPLUGIN_TOKUDB:STRING=NO \
</ins><span class="cx"> -DENABLE_GCOV:BOOL=OFF \
</span><span class="cx"> -DENABLE_DTRACE:BOOL=OFF \
</span><span class="cx"> -DWITH_READLINE:BOOL=ON \
</span><span class="lines">@@ -99,9 +103,8 @@
</span><span class="cx"> -DWITH_SSL:STRING=no \
</span><span class="cx"> -DMYSQL_MAINTAINER_MODE:STRING=AUTO
</span><span class="cx">
</span><del>- build.dir ${worksrcpath}/build_macports
</del><span class="cx"> post-build {
</span><del>- set dirs ${worksrcpath}/build_macports
</del><ins>+ set dirs ${cmake.build_dir}
</ins><span class="cx"> foreach dir ${dirs} {
</span><span class="cx"> reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span class="cx"> ${dir}/scripts/mysql_config \
</span><span class="lines">@@ -126,11 +129,11 @@
</span><span class="cx"> }
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}
</span><del>- copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/macports-default.cnf \
</ins><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}/
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports
</span><del>- copy ${worksrcpath}/build_macports/macports/my.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/my.cnf \
</ins><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -200,8 +203,8 @@
</span><span class="cx"> "
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><del>- livecheck.url https://downloads.mariadb.org/mariadb/
- livecheck.regex "btn-large\" href=\"/mariadb/(\[^/\]+)/\">"
</del><ins>+ livecheck.url https://downloads.mariadb.org
+ livecheck.regex "btn-large\" href=\"/mariadb/(${version_branch}\[^/\]+)/\">"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport ${name_mysql}-server {
</span></span></pre></div>
<a id="trunkdportsdatabasesmariadb101filesmariadb101"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mariadb-10.1/files/mariadb-10.1 (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mariadb-10.1/files/mariadb-10.1 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mariadb-10.1/files/mariadb-10.1 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> lib/mariadb-10.1/bin/mysql_client_test
</span><span class="cx"> -
</span><span class="cx"> lib/mariadb-10.1/bin/mysql_config
</span><ins>+-
</ins><span class="cx"> lib/mariadb-10.1/bin/mysql_convert_table_format
</span><ins>+lib/mariadb-10.1/bin/mysql_embedded
</ins><span class="cx"> lib/mariadb-10.1/bin/mysql_find_rows
</span><span class="cx"> lib/mariadb-10.1/bin/mysql_fix_extensions
</span><span class="cx"> -
</span></span></pre></div>
<a id="trunkdportsdatabasesmariadb101filespatchsqlmdlccdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/databases/mariadb-10.1/files/patch-sql-mdl.cc.diff (0 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mariadb-10.1/files/patch-sql-mdl.cc.diff (rev 0)
+++ trunk/dports/databases/mariadb-10.1/files/patch-sql-mdl.cc.diff 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -0,0 +1,44 @@
</span><ins>+diff --git a/sql/mdl.cc b/sql/mdl.cc
+index fcb03d6..55e39d0 100644
+--- a/sql/mdl.cc
++++ b/sql/mdl.cc
+@@ -346,6 +346,7 @@ class MDL_lock
+ */
+ struct MDL_scoped_lock : public MDL_lock_strategy
+ {
++ MDL_scoped_lock() {}
+ virtual const bitmap_t *incompatible_granted_types_bitmap() const
+ { return m_granted_incompatible; }
+ virtual const bitmap_t *incompatible_waiting_types_bitmap() const
+@@ -382,6 +383,7 @@ class MDL_lock
+ */
+ struct MDL_object_lock : public MDL_lock_strategy
+ {
++ MDL_object_lock() {}
+ virtual const bitmap_t *incompatible_granted_types_bitmap() const
+ { return m_granted_incompatible; }
+ virtual const bitmap_t *incompatible_waiting_types_bitmap() const
+@@ -741,8 +743,8 @@ MDL_lock* MDL_map::find_or_insert(LF_PINS *pins, const MDL_key *mdl_key)
+ }
+
+ retry:
+- while (!(lock= (MDL_lock*) lf_hash_search_using_hash_value(&m_locks, pins,
+- mdl_key->hash_value(), mdl_key->ptr(), mdl_key->length())))
++ while (!(lock= (MDL_lock*) lf_hash_search(&m_locks, pins, mdl_key->ptr(),
++ mdl_key->length())))
+ if (lf_hash_insert(&m_locks, pins, (uchar*) mdl_key) == -1)
+ return NULL;
+
+@@ -780,10 +782,8 @@ MDL_map::get_lock_owner(LF_PINS *pins, const MDL_key *mdl_key)
+ }
+ else
+ {
+- lock= (MDL_lock*) lf_hash_search_using_hash_value(&m_locks, pins,
+- mdl_key->hash_value(),
+- mdl_key->ptr(),
+- mdl_key->length());
++ lock= (MDL_lock*) lf_hash_search(&m_locks, pins, mdl_key->ptr(),
++ mdl_key->length());
+ if (lock)
+ {
+ /*
</ins></span></pre></div>
<a id="trunkdportsdatabasesmysql51Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql51/Portfile (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql51/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql51/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -5,9 +5,9 @@
</span><span class="cx">
</span><span class="cx"> name mysql51
</span><span class="cx"> set name_mysql ${name}
</span><del>-version 5.1.72
</del><ins>+version 5.1.73
</ins><span class="cx"> # Set revision_client and revision_server to 0 if you bump version.
</span><del>-set revision_client 1
</del><ins>+set revision_client 0
</ins><span class="cx"> set revision_server 0
</span><span class="cx"> set version_branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories databases
</span><span class="lines">@@ -43,8 +43,8 @@
</span><span class="cx"> patchfiles patch-Makefile.in.diff \
</span><span class="cx"> patch-scripts-mysql_secure_installation.sh.diff
</span><span class="cx">
</span><del>- checksums rmd160 a5ba8bedf4027af90a4612a1a7f3a848999cfbf5 \
- sha256 c414a64722ffa89d315152a030661d34764894e293e33792809cea61c8a5303e
</del><ins>+ checksums rmd160 ceee36663abbf135d3ddbebe52ebc537ecba25a6 \
+ sha256 05ebe21305408b24407d14b77607a3e5ffa3c300e03f1359d3066f301989dcb5
</ins><span class="cx">
</span><span class="cx"> depends_lib port:zlib port:tcp_wrappers
</span><span class="cx"> depends_run port:mysql_select
</span><span class="lines">@@ -208,7 +208,7 @@
</span><span class="cx">
</span><span class="cx"> livecheck.type regex
</span><span class="cx"> livecheck.url http://dev.mysql.com/downloads/mysql/${version_branch}.html
</span><del>- livecheck.regex "<h1>MySQL Community Server (${version_branch}(\.\[0-9.\]+)?)</h1>"
</del><ins>+ livecheck.regex "MySQL Community Server (${version_branch}(\.\[0-9.\]+)?)"
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> subport ${name_mysql}-server {
</span></span></pre></div>
<a id="trunkdportsdatabasesmysql51filesmysql51"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql51/files/mysql51 (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql51/files/mysql51 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql51/files/mysql51 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> lib/mysql51/bin/mysql_client_test
</span><span class="cx"> lib/mysql51/bin/mysql_client_test_embedded
</span><span class="cx"> lib/mysql51/bin/mysql_config
</span><ins>+-
</ins><span class="cx"> lib/mysql51/bin/mysql_convert_table_format
</span><ins>+lib/mysql51/bin/mysql_embedded
</ins><span class="cx"> lib/mysql51/bin/mysql_find_rows
</span><span class="cx"> lib/mysql51/bin/mysql_fix_extensions
</span><span class="cx"> lib/mysql51/bin/mysql_fix_privilege_tables
</span></span></pre></div>
<a id="trunkdportsdatabasesmysql55Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql55/Portfile (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql55/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql55/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx">
</span><span class="cx"> name mysql55
</span><span class="cx"> set name_mysql ${name}
</span><del>-version 5.5.42
</del><ins>+version 5.5.44
</ins><span class="cx"> # Set revision_client and revision_server to 0 if you bump version.
</span><span class="cx"> set revision_client 0
</span><span class="cx"> set revision_server 0
</span><span class="lines">@@ -36,8 +36,8 @@
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-cmake-install_layout.cmake.diff
</span><span class="cx">
</span><del>- checksums rmd160 6dc47c5a885439a99585a0a8225a8e234a19e12e \
- sha256 887b12676be4893fa833e4a585c6c8b0c0f18dee30ba7d22cfe860cd85bfc74a
</del><ins>+ checksums rmd160 72faecbd2cae73ac109253e4a512086e74058128 \
+ sha256 85f05b257db39e63c82ff4b5ce4e0c6d2b07560b5fc1646d47d7ae48eab3e5de
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:zlib port:tcp_wrappers
</span><span class="cx"> depends_run-append port:mysql_select
</span><span class="lines">@@ -48,21 +48,21 @@
</span><span class="cx"> archcheck.files lib/libz.dylib lib/libwrap.dylib
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- file mkdir ${configure.dir}/macports
</del><ins>+ file mkdir ${cmake.build_dir}/macports
</ins><span class="cx"> copy ${filespath}/macports-default.cnf \
</span><span class="cx"> ${filespath}/my.cnf \
</span><del>- ${configure.dir}/macports/
</del><ins>+ ${cmake.build_dir}/macports/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><span class="cx"> ${worksrcpath}/cmake/install_layout.cmake
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><del>- ${configure.dir}/macports/macports-default.cnf \
- ${configure.dir}/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" \
</span><del>- ${configure.dir}/macports/macports-default.cnf \
- ${configure.dir}/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> configure.args-delete \
</span><span class="lines">@@ -86,7 +86,8 @@
</span><span class="cx"> -DWITH_SSL:STRING=no
</span><span class="cx">
</span><span class="cx"> post-build {
</span><del>- foreach dir ${configure.dir} {
</del><ins>+ set dirs ${cmake.build_dir}
+ foreach dir ${dirs} {
</ins><span class="cx"> reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span class="cx"> ${dir}/scripts/mysql_config \
</span><span class="cx"> ${dir}/scripts/mysqlbug
</span><span class="lines">@@ -110,11 +111,11 @@
</span><span class="cx"> }
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}
</span><del>- copy ${configure.dir}/macports/macports-default.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/macports-default.cnf \
</ins><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}/
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports
</span><del>- copy ${configure.dir}/macports/my.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/my.cnf \
</ins><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdatabasesmysql55filesmysql55"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql55/files/mysql55 (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql55/files/mysql55 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql55/files/mysql55 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> lib/mysql55/bin/mysql_client_test
</span><span class="cx"> -
</span><span class="cx"> lib/mysql55/bin/mysql_config
</span><ins>+-
</ins><span class="cx"> lib/mysql55/bin/mysql_convert_table_format
</span><ins>+lib/mysql55/bin/mysql_embedded
</ins><span class="cx"> lib/mysql55/bin/mysql_find_rows
</span><span class="cx"> lib/mysql55/bin/mysql_fix_extensions
</span><span class="cx"> -
</span></span></pre></div>
<a id="trunkdportsdatabasesmysql56Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql56/Portfile (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql56/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql56/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx">
</span><span class="cx"> name mysql56
</span><span class="cx"> set name_mysql ${name}
</span><del>-version 5.6.24
</del><ins>+version 5.6.25
</ins><span class="cx"> # Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
</span><span class="cx"> # version bump.
</span><span class="cx"> set revision_client 0
</span><span class="lines">@@ -59,8 +59,8 @@
</span><span class="cx"> configure.compiler gcc
</span><span class="cx"> }
</span><span class="cx">
</span><del>- checksums rmd160 cc1b8e7347e3b0bc0c94a35c1611d1cb82f80799 \
- sha256 37e27305b67d76883c5902dce59c89d596beee9dca7dbadd4a2e117f8101dfeb
</del><ins>+ checksums rmd160 a65b1aa209cb2f08295db7cb7259a7ce294c0713 \
+ sha256 15079c0b83d33a092649cbdf402c9225bcd3f33e87388407be5cdbf1432c7fbd
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:zlib port:tcp_wrappers
</span><span class="cx"> depends_run-append port:mysql_select
</span><span class="lines">@@ -71,21 +71,21 @@
</span><span class="cx"> archcheck.files lib/libz.dylib lib/libwrap.dylib
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- file mkdir ${configure.dir}/macports
</del><ins>+ file mkdir ${cmake.build_dir}/macports
</ins><span class="cx"> copy ${filespath}/macports-default.cnf \
</span><span class="cx"> ${filespath}/my.cnf \
</span><del>- ${configure.dir}/macports/
</del><ins>+ ${cmake.build_dir}/macports/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><span class="cx"> ${worksrcpath}/cmake/install_layout.cmake
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><del>- ${configure.dir}/macports/macports-default.cnf \
- ${configure.dir}/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" \
</span><del>- ${configure.dir}/macports/macports-default.cnf \
- ${configure.dir}/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> reinplace "s|@SYSCONFDIR@|/etc/${name_mysql}|g" \
</span><span class="cx"> ${worksrcpath}/scripts/mysql_install_db.pl.in
</span><span class="cx"> reinplace "s|@SUPPORTFILESDIR@|share/${name_mysql}/support-files|g" \
</span><span class="lines">@@ -133,11 +133,11 @@
</span><span class="cx"> }
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}
</span><del>- copy ${configure.dir}/macports/macports-default.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/macports-default.cnf \
</ins><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}/
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports
</span><del>- copy ${configure.dir}/macports/my.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/my.cnf \
</ins><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
</span><span class="cx"> # Remove file supplied by ${name_mysql}-innodb-memcached-plugin subport.
</span><span class="cx"> delete ${destroot}${prefix}/share/${name_mysql}/innodb_memcached_config.sql
</span></span></pre></div>
<a id="trunkdportsdatabasesmysql56filesmysql56"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql56/files/mysql56 (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql56/files/mysql56 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql56/files/mysql56 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> lib/mysql56/bin/mysql_client_test
</span><span class="cx"> -
</span><span class="cx"> lib/mysql56/bin/mysql_config
</span><ins>+lib/mysql56/bin/mysql_config_editor
</ins><span class="cx"> lib/mysql56/bin/mysql_convert_table_format
</span><ins>+lib/mysql56/bin/mysql_embedded
</ins><span class="cx"> lib/mysql56/bin/mysql_find_rows
</span><span class="cx"> lib/mysql56/bin/mysql_fix_extensions
</span><span class="cx"> -
</span></span></pre></div>
<a id="trunkdportsdatabasesmysql_selectfilesbase"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql_select/files/base (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql_select/files/base 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql_select/files/base 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> bin/mysql_client_test
</span><span class="cx"> bin/mysql_client_test_embedded
</span><span class="cx"> bin/mysql_config
</span><ins>+bin/mysql_config_editor
</ins><span class="cx"> bin/mysql_convert_table_format
</span><ins>+bin/mysql_embedded
</ins><span class="cx"> bin/mysql_find_rows
</span><span class="cx"> bin/mysql_fix_extensions
</span><span class="cx"> bin/mysql_fix_privilege_tables
</span></span></pre></div>
<a id="trunkdportsdatabasesmysql_selectfilesnone"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql_select/files/none (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql_select/files/none 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/mysql_select/files/none 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -139,3 +139,5 @@
</span><span class="cx"> -
</span><span class="cx"> -
</span><span class="cx"> -
</span><ins>+-
+-
</ins></span></pre></div>
<a id="trunkdportsdatabasesperconaPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/percona/Portfile (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/percona/Portfile 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/percona/Portfile 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -6,10 +6,10 @@
</span><span class="cx"> name percona
</span><span class="cx"> set name_mysql ${name}
</span><span class="cx"> set name_package ${name}-server
</span><del>-set version_mysql 5.6.23
-set release 72.1
</del><ins>+set version_mysql 5.6.24
+set release 72.2
</ins><span class="cx"> # Please set revision_client and revision_server to 0 if you bump version_mysql or release.
</span><del>-set revision_client 1
</del><ins>+set revision_client 0
</ins><span class="cx"> set revision_server 0
</span><span class="cx"> version ${version_mysql}-${release}
</span><span class="cx"> categories databases
</span><span class="lines">@@ -32,27 +32,19 @@
</span><span class="cx"> long_description Percona is a fork of the MySQL server, a multi-threaded SQL database.
</span><span class="cx">
</span><span class="cx"> master_sites \
</span><del>- http://www.percona.com/redir/downloads/Percona-Server-${version_branch}/Percona-Server-${version}/source/tarball/:src \
- http://form.percona.com/rs/percona/images/:pdf
</del><ins>+ http://www.percona.com/redir/downloads/Percona-Server-${version_branch}/Percona-Server-${version}/source/tarball
</ins><span class="cx">
</span><span class="cx"> distname ${name_package}-${version}
</span><ins>+ cmake.out_of_source yes
</ins><span class="cx"> distfiles ${distname}${extract.suffix}:src
</span><span class="cx"> use_parallel_build yes
</span><span class="cx">
</span><span class="cx"> patch.pre_args -p1
</span><span class="cx"> patchfiles patch-cmake-install_layout.cmake.diff
</span><span class="cx">
</span><del>- checksums ${distname}${extract.suffix} \
- rmd160 bfc92bb84ca8027ecec9fefb9fbadebf0e06c6da \
- sha256 5382630b98dd05f72e372ede5535ddcad2e389b594311a69f03a3d95f68d4907 \
</del><ins>+ checksums rmd160 1309841316b8b2a472d8b862020878271e5635fc \
+ sha256 5aa6469f3a55fe0fd1cfe315f2f9cacb0ce318620086c93821c9000d6e25c0de
</ins><span class="cx">
</span><del>-# set manual_distfile "PerconaServer-${version} manual.pdf"
-# extract.only ${distname}${extract.suffix}
-# distfiles-append ${manual_distfile}:pdf
-# checksums-append ${manual_distfile} \
-# rmd160 b8040e186bc12079a2f66e0bd02db2bed8d35712 \
-# sha256 6a0195663e7a1e52ed558e2f814d9f06c5455fbe8cca2abd97a68ac20e384ba5
-
</del><span class="cx"> depends_lib-append port:zlib port:tcp_wrappers
</span><span class="cx"> depends_run-append port:mysql_select
</span><span class="cx">
</span><span class="lines">@@ -62,23 +54,21 @@
</span><span class="cx"> archcheck.files lib/libz.dylib lib/libwrap.dylib
</span><span class="cx">
</span><span class="cx"> post-extract {
</span><del>- file mkdir ${worksrcpath}/build_macports/macports
</del><ins>+ file mkdir ${cmake.build_dir}/macports
</ins><span class="cx"> copy ${filespath}/macports-default.cnf \
</span><span class="cx"> ${filespath}/my.cnf \
</span><del>- ${worksrcpath}/build_macports/macports/
-# copy ${distpath}/${manual_distfile} \
-# ${worksrcpath}/build_macports/macports/
</del><ins>+ ${cmake.build_dir}/macports/
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><span class="cx"> ${worksrcpath}/cmake/install_layout.cmake
</span><span class="cx"> reinplace "s|@NAME@|${name_mysql}|g" \
</span><del>- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" \
</span><del>- ${worksrcpath}/build_macports/macports/macports-default.cnf \
- ${worksrcpath}/build_macports/macports/my.cnf
</del><ins>+ ${cmake.build_dir}/macports/macports-default.cnf \
+ ${cmake.build_dir}/macports/my.cnf
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if { (![variant_isset universal] && ${build_arch} eq "i386") || ([variant_isset universal] && [lsearch ${universal_archs} i386] != -1) } {
</span><span class="lines">@@ -86,9 +76,6 @@
</span><span class="cx"> # closest to SET(CMAKE_CXX_COMPILER g++) removed in the patchfile
</span><span class="cx"> configure.compiler gcc
</span><span class="cx"> }
</span><del>- configure.cmd cmake ..
- configure.dir ${worksrcpath}/build_macports
- build.dir ${worksrcpath}/build_macports
</del><span class="cx">
</span><span class="cx"> configure.args-delete \
</span><span class="cx"> -DCMAKE_INSTALL_NAME_DIR=${prefix}/lib
</span><span class="lines">@@ -104,14 +91,13 @@
</span><span class="cx"> -DWITH_UNIT_TESTS:BOOL=ON \
</span><span class="cx"> -DENABLE_GCOV:BOOL=OFF \
</span><span class="cx"> -DENABLE_DTRACE:BOOL=OFF \
</span><del>- -DWITH_READLINE:BOOL=ON \
- -DWITH_LIBEDIT:BOOL=OFF \
</del><ins>+ -DWITH_EDITLINE:STRING=bundled \
</ins><span class="cx"> -DWITH_LIBWRAP:BOOL=ON \
</span><span class="cx"> -DWITH_SSL:STRING=bundled \
</span><span class="cx"> -DWITH_EMBEDDED_SERVER:BOOL=ON
</span><span class="cx">
</span><span class="cx"> post-build {
</span><del>- set dirs ${worksrcpath}/build_macports
</del><ins>+ set dirs ${cmake.build_dir}
</ins><span class="cx"> foreach dir ${dirs} {
</span><span class="cx"> reinplace -E {s|-arch [a-z0-9_]+||g} \
</span><span class="cx"> ${dir}/scripts/mysql_config \
</span><span class="lines">@@ -136,14 +122,12 @@
</span><span class="cx"> }
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}
</span><del>- copy ${worksrcpath}/build_macports/macports/macports-default.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/macports-default.cnf \
</ins><span class="cx"> ${destroot}${prefix}/etc/${name_mysql}/
</span><span class="cx"> xinstall -m 755 -o root -d \
</span><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports
</span><del>- copy ${worksrcpath}/build_macports/macports/my.cnf \
</del><ins>+ copy ${cmake.build_dir}/macports/my.cnf \
</ins><span class="cx"> ${destroot}${prefix}/share/${name_mysql}/support-files/macports/
</span><del>-# copy ${worksrcpath}/build_macports/macports/${manual_distfile} \
-# ${destroot}${prefix}/share/doc/${name_mysql}/
</del><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-install {
</span><span class="lines">@@ -190,8 +174,8 @@
</span><span class="cx"> # "-DWITH_READLINE:BOOL=OFF" has the peculiar meaning "do not use the bundled copy
</span><span class="cx"> # of readline but use the system's (i.e. MacPorts') copy of readline"
</span><span class="cx"> depends_lib-append port:readline
</span><del>- configure.args-delete -DWITH_READLINE:BOOL=ON
- configure.args-append -DWITH_READLINE:BOOL=OFF
</del><ins>+ configure.args-delete -DWITH_EDITLINE:STRING=bundled
+ configure.args-append -DWITH_READLINE:STRING=system
</ins><span class="cx"> archcheck.files-append lib/libreadline.dylib
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre></div>
<a id="trunkdportsdatabasesperconafilespercona"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/percona/files/percona (137068 => 137069)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/percona/files/percona 2015-06-04 01:28:24 UTC (rev 137068)
+++ trunk/dports/databases/percona/files/percona 2015-06-04 03:49:33 UTC (rev 137069)
</span><span class="lines">@@ -14,7 +14,9 @@
</span><span class="cx"> lib/percona/bin/mysql_client_test
</span><span class="cx"> -
</span><span class="cx"> lib/percona/bin/mysql_config
</span><ins>+lib/percona/bin/mysql_config_editor
</ins><span class="cx"> lib/percona/bin/mysql_convert_table_format
</span><ins>+lib/percona/bin/mysql_embedded
</ins><span class="cx"> lib/percona/bin/mysql_find_rows
</span><span class="cx"> lib/percona/bin/mysql_fix_extensions
</span><span class="cx"> -
</span></span></pre>
</div>
</div>
</body>
</html>