<!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>[94476] trunk/dports/python/py-mysql</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/94476">94476</a></dd>
<dt>Author</dt> <dd>blair@macports.org</dd>
<dt>Date</dt> <dd>2012-06-19 23:04:36 -0700 (Tue, 19 Jun 2012)</dd>
</dl>
<h3>Log Message</h3>
<pre>py-mysql: rename +mysql5 to +mysql51, add +mysql55, drop support for
mysql*-devel versions providing mysql_config.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportspythonpymysqlPortfile">trunk/dports/python/py-mysql/Portfile</a></li>
<li><a href="#trunkdportspythonpymysqlfilespatchsitecfgdiff">trunk/dports/python/py-mysql/files/patch-site.cfg.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportspythonpymysqlPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-mysql/Portfile (94475 => 94476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-mysql/Portfile 2012-06-20 05:10:01 UTC (rev 94475)
+++ trunk/dports/python/py-mysql/Portfile 2012-06-20 06:04:36 UTC (rev 94476)
</span><span class="lines">@@ -35,13 +35,15 @@
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|@PREFIX@|${prefix}|g" \
</span><span class="cx"> ${worksrcpath}/site.cfg
</span><del>- reinplace "s|@MYSQL_SUFFIX@|${mysql_suffix}|g" \
</del><ins>+ reinplace "s|@MYSQL_CONFIG@|${mysql_config}|g" \
</ins><span class="cx"> ${worksrcpath}/site.cfg
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> pre-configure {
</span><del>- if {![variant_isset mysql4] && ![variant_isset mysql5]} {
- return -code error "you must select either mysql4 or mysql5"
</del><ins>+ if {![variant_isset mysql4] &&
+ ![variant_isset mysql51] &&
+ ![variant_isset mysql55]} {
+ return -code error "you must select either mysql4, mysql51 or mysql55"
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -52,18 +54,21 @@
</span><span class="cx"> ${destroot}${prefix}/share/doc/${subport}
</span><span class="cx"> }
</span><span class="cx">
</span><del>- variant mysql4 conflicts mysql5 description {Build with MySQL 4} {
</del><ins>+ set mysql_config {}
+
+ variant mysql4 conflicts mysql51 mysql55 description {Build with MySQL 4} {
</ins><span class="cx"> depends_lib-append port:mysql4
</span><ins>+ set mysql_config bin/mysql_config
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- variant mysql5 conflicts mysql4 description {Build with MySQL 5} {
- depends_lib-append path:bin/mysql_config5:mysql5
</del><ins>+ variant mysql51 conflicts mysql4 mysql55 description {Build with MySQL 5.1} {
+ depends_lib-append port:mysql51
+ set mysql_config lib/mysql51/bin/mysql_config
</ins><span class="cx"> }
</span><span class="cx">
</span><del>- set mysql_suffix {}
- if {![variant_isset mysql4]} {
- set mysql_suffix 5
- default_variants +mysql5
</del><ins>+ variant mysql55 conflicts mysql4 mysql51 description {Build with MySQL 5.5} {
+ depends_lib-append port:mysql55
+ set mysql_config lib/mysql55/bin/mysql_config
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> livecheck.type none
</span></span></pre></div>
<a id="trunkdportspythonpymysqlfilespatchsitecfgdiff"></a>
<div class="modfile"><h4>Modified: trunk/dports/python/py-mysql/files/patch-site.cfg.diff (94475 => 94476)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/python/py-mysql/files/patch-site.cfg.diff 2012-06-20 05:10:01 UTC (rev 94475)
+++ trunk/dports/python/py-mysql/files/patch-site.cfg.diff 2012-06-20 06:04:36 UTC (rev 94476)
</span><span class="lines">@@ -5,7 +5,7 @@
</span><span class="cx"> # Only use this if mysql_config is not on your PATH, or you have some weird
</span><span class="cx"> # setup that requires it.
</span><span class="cx"> -#mysql_config = /usr/local/bin/mysql_config
</span><del>-+mysql_config = @PREFIX@/bin/mysql_config@MYSQL_SUFFIX@
</del><ins>++mysql_config = @PREFIX@/@MYSQL_CONFIG@
</ins><span class="cx">
</span><span class="cx"> # The Windows registry key for MySQL.
</span><span class="cx"> # This has to be set for Windows builds to work.
</span></span></pre>
</div>
</div>
</body>
</html>