<!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>[134646] 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/134646">134646</a></dd>
<dt>Author</dt> <dd>pixilla@macports.org</dd>
<dt>Date</dt> <dd>2015-04-01 15:35:51 -0700 (Wed, 01 Apr 2015)</dd>
</dl>
<h3>Log Message</h3>
<pre>databases/mysql56:
- Use cmake.out_of_source. See #47197
- Minor organizational edits.</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 (134645 => 134646)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/databases/mysql56/Portfile 2015-04-01 21:52:39 UTC (rev 134645)
+++ trunk/dports/databases/mysql56/Portfile 2015-04-01 22:35:51 UTC (rev 134646)
</span><span class="lines">@@ -18,14 +18,22 @@
</span><span class="cx"> license GPL-2
</span><span class="cx"> maintainers pixilla openmaintainer
</span><span class="cx"> homepage http://www.mysql.com/
</span><del>-master_sites mysql:MySQL-${version_branch}
</del><span class="cx">
</span><del>-if {${subport} eq ${name_mysql}} {
</del><ins>+if {$subport eq $name} {
</ins><span class="cx">
</span><span class="cx"> PortGroup archcheck 1.0
</span><span class="cx"> PortGroup cmake 1.0
</span><ins>+ PortGroup select 1.0
</ins><span class="cx">
</span><ins>+ revision ${revision_client}
+ license GPL-2
+ description Multithreaded SQL database server
+ long_description MySQL is an open-source, multi-threaded SQL database.
+
+ master_sites mysql:MySQL-${version_branch}
+
</ins><span class="cx"> distname mysql-${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="lines">@@ -58,24 +66,30 @@
</span><span class="cx"> checksums rmd160 90e1b18264493434d986f39962d249c176b8469a \
</span><span class="cx"> sha256 3bd21af06a9304e372daba41fa5612bb54ac1bc05a4349b3160d0cda972ac098
</span><span class="cx">
</span><ins>+ depends_lib-append port:zlib port:tcp_wrappers
+ depends_run-append port:mysql_select
+
+ select.group mysql
+ select.file ${filespath}/${name_mysql}
+
</ins><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 ${configure.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>+ ${configure.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>+ ${configure.dir}/macports/macports-default.cnf \
+ ${configure.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>+ ${configure.dir}/macports/macports-default.cnf \
+ ${configure.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">@@ -84,8 +98,6 @@
</span><span class="cx"> ${worksrcpath}/scripts/mysql_secure_installation.pl.in
</span><span class="cx"> }
</span><span class="cx">
</span><del>- configure.dir ${worksrcpath}/build_macports
- configure.cmd cmake ..
</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">@@ -107,33 +119,7 @@
</span><span class="cx"> -DWITH_INNODB_MEMCACHED=1
</span><span class="cx"> configure.cppflags-delete \
</span><span class="cx"> -I${prefix}/include
</span><del>-}
</del><span class="cx">
</span><del>-if {${subport} eq ${name}} {
-
- PortGroup select 1.0
-
- revision ${revision_client}
- license GPL-2
- description Multithreaded SQL database server
- long_description MySQL is an open-source, multi-threaded SQL database.
-
- depends_lib-append port:zlib port:tcp_wrappers
- depends_run-append port:mysql_select
-
- select.group mysql
- select.file ${filespath}/${name_mysql}
-
- build.dir ${worksrcpath}/build_macports
- post-build {
- set dirs ${worksrcpath}/build_macports
- foreach dir ${dirs} {
- reinplace -E {s|-arch [a-z0-9_]+||g} \
- ${dir}/scripts/mysql_config \
- ${dir}/scripts/mysqlbug
- }
- }
-
</del><span class="cx"> post-destroot {
</span><span class="cx"> # proc portdestroot::destroot_finish fails to find and compress our man pages
</span><span class="cx"> # so borrow the compress command and run on our files now.
</span><span class="lines">@@ -151,11 +137,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 ${configure.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 ${configure.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>
</div>
</body>
</html>