<!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>[120632] trunk/dports/databases/mysql56/Portfile</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/120632">120632</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2014-06-03 16:20:31 -0700 (Tue, 03 Jun 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>databases/mysql56:
- Build with openssl as yassl does not build on some systems. Closes #43887.
- Include innodb-memcached-plugin in mysql56. Closes #39753.
- Make mysql56-innodb-memcached-plugin replaced_by mysql56.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdatabasesmysql56Portfile">trunk/dports/databases/mysql56/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdatabasesmysql56Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/databases/mysql56/Portfile (120631 => 120632)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql56/Portfile        2014-06-03 22:34:01 UTC (rev 120631)
+++ trunk/dports/databases/mysql56/Portfile        2014-06-03 23:20:31 UTC (rev 120632)
</span><span class="lines">@@ -9,9 +9,9 @@
</span><span class="cx"> version 5.6.19
</span><span class="cx"> # Set revision_client, revision_server and revision_innodb_memcached_plugin to 0 on
</span><span class="cx"> # version bump.
</span><del>-set revision_client 0
-set revision_server 0
-set revision_innodb_memcached_plugin 0
</del><ins>+set revision_client 1
+set revision_server 1
+set revision_innodb_memcached_plugin 1
</ins><span class="cx"> set version_branch [join [lrange [split ${version} .] 0 1] .]
</span><span class="cx"> categories databases
</span><span class="cx"> platforms darwin
</span><span class="lines">@@ -20,7 +20,7 @@
</span><span class="cx"> homepage http://www.mysql.com/
</span><span class="cx"> master_sites mysql:MySQL-${version_branch}
</span><span class="cx">
</span><del>-if {${subport} ne "${name_mysql}-server"} {
</del><ins>+if {${subport} eq ${name_mysql}} {
</ins><span class="cx">
</span><span class="cx"> PortGroup archcheck 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><span class="lines">@@ -100,7 +100,9 @@
</span><span class="cx"> -DENABLE_DTRACE:BOOL=OFF \
</span><span class="cx"> -DWITH_LIBWRAP:BOOL=ON \
</span><span class="cx"> -DWITH_SSL:STRING=bundled \
</span><del>- -DWITH_INNODB_MEMCACHED=0
</del><ins>+ -DWITH_INNODB_MEMCACHED=1
+ configure.cppflags-delete \
+ -I${prefix}/include
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {${subport} eq ${name}} {
</span><span class="lines">@@ -182,7 +184,12 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>- variant openssl description {Enable OpenSSL support} {
</del><ins>+ variant openssl description {Enable OpenSSL support} {}
+ # Until yassl builds use MacPorts openssl.
+ # Getting mysql56 to build with yassl would make the binaries distributable.
+ # When mysql56 builds with yassl remove "true" from the "if" statement below or
+ # put the contents of the "if" block into the openssl variant block.
+ if { true || [variant_isset openssl] } {
</ins><span class="cx"> configure.args-delete -DWITH_SSL:STRING=bundled
</span><span class="cx"> configure.args-append -DWITH_SSL:STRING=${prefix}
</span><span class="cx"> depends_lib-append port:openssl
</span><span class="lines">@@ -265,19 +272,8 @@
</span><span class="cx">
</span><span class="cx"> subport ${name_mysql}-innodb-memcached-plugin {
</span><span class="cx">
</span><del>- revision ${revision_innodb_memcached_plugin}
- license GPL-2
- description InnoDB Memcached Plugin for ${name_mysql}
- long_description ${description}
</del><ins>+ replaced_by ${name_mysql}
+ PortGroup obsolete 1.0
</ins><span class="cx">
</span><del>- distname mysql-${version}
-
- depends_lib-append port:${name_mysql}
-
- configure.args-delete \
- -DWITH_INNODB_MEMCACHED=0
- configure.args-append \
- -DWITH_INNODB_MEMCACHED=1
- build.dir ${worksrcpath}/build_macports/plugin/innodb_memcached
- destroot.dir ${worksrcpath}/build_macports/plugin/innodb_memcached
</del><ins>+ depends_lib port:${name_mysql}
</ins><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>