<!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>[119433] trunk/dports/devel/akonadi/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/119433">119433</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2014-04-25 05:47:30 -0700 (Fri, 25 Apr 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>akonadi: upgrade to 1.12.1
make variant mysql5 obsolete (replaced by mysql51)
make mariadb55 default variant
rename mariadb and percona variants with numbers (ticket #43431)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelakonadiPortfile">trunk/dports/devel/akonadi/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelakonadiPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/akonadi/Portfile (119432 => 119433)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/akonadi/Portfile 2014-04-25 12:08:04 UTC (rev 119432)
+++ trunk/dports/devel/akonadi/Portfile 2014-04-25 12:47:30 UTC (rev 119433)
</span><span class="lines">@@ -6,7 +6,7 @@
</span><span class="cx"> PortGroup compiler_blacklist_versions 1.0
</span><span class="cx">
</span><span class="cx"> name akonadi
</span><del>-version 1.12.0
</del><ins>+version 1.12.1
</ins><span class="cx"> categories devel kde kde4
</span><span class="cx"> maintainers nicos openmaintainer
</span><span class="cx"> license LGPL-2+
</span><span class="lines">@@ -18,8 +18,8 @@
</span><span class="cx"> master_sites kde:stable/${name}/src/
</span><span class="cx"> use_bzip2 yes
</span><span class="cx">
</span><del>-checksums rmd160 bc47b87f8f228d0a8cf8d180d742c65ed1ce4dd0 \
- sha256 35243793b73e8028973c101c68ef80a8a54be0fe9aa562c9473e73b4657fea26
</del><ins>+checksums rmd160 6e486f4a39948af6f470b652bf3223de75af5e53 \
+ sha256 a073228fda8bdbcf836af32d4b4c44dcbe58a3eac6da4e5a286b42ace9d83145
</ins><span class="cx">
</span><span class="cx"> depends_lib-append port:soprano \
</span><span class="cx"> port:boost \
</span><span class="lines">@@ -105,18 +105,10 @@
</span><span class="cx"> destroot.violate_mtree yes
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant mysql5 \
- conflicts sqlite mysql51 mysql55 mysql56 mariadb percona \
- description {build with mysql5 port} {
</del><ins>+variant mysql5 requires mysql51 description {Legacy compatibility variant} {}
</ins><span class="cx">
</span><del>- depends_lib-append port:qt4-mac-mysql5-plugin
- depends_run-append port:mysql5-server
- configure.args-append -DDATABASE_BACKEND=MYSQL \
- -DMYSQLD_EXECUTABLE=${prefix}/libexec/mysqld
-}
-
</del><span class="cx"> variant mysql51 \
</span><del>- conflicts sqlite mysql5 mysql55 mysql56 mariadb percona \
</del><ins>+ conflicts sqlite mysql55 mysql56 mariadb55 percona55 \
</ins><span class="cx"> description {build with mysql51 port} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:qt4-mac-mysql51-plugin
</span><span class="lines">@@ -126,7 +118,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql55 \
</span><del>- conflicts sqlite mysql5 mysql51 mysql56 mariadb percona \
</del><ins>+ conflicts sqlite mysql51 mysql56 mariadb55 percona55 \
</ins><span class="cx"> description {build with mysql55 port} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:qt4-mac-mysql55-plugin
</span><span class="lines">@@ -136,7 +128,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql56 \
</span><del>- conflicts sqlite mysql5 mysql51 mysql55 mariadb percona \
</del><ins>+ conflicts sqlite mysql51 mysql55 mariadb55 percona55 \
</ins><span class="cx"> description {build with mysql56 port} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:qt4-mac-mysql56-plugin
</span><span class="lines">@@ -145,8 +137,10 @@
</span><span class="cx"> -DMYSQLD_EXECUTABLE=${prefix}/lib/mysql55/bin/mysqld
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant mariadb \
- conflicts sqlite mysql5 mysql51 mysql55 mysql56 percona \
</del><ins>+variant mariadb requires mariadb55 description {Legacy compatibility variant} {}
+
+variant mariadb55 \
+ conflicts sqlite mysql51 mysql55 mysql56 percona55 \
</ins><span class="cx"> description {build with mariadb port} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:qt4-mac-mariadb-plugin
</span><span class="lines">@@ -155,10 +149,12 @@
</span><span class="cx"> -DMYSQLD_EXECUTABLE=${prefix}/lib/mariadb/bin/mysqld
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant percona \
- conflicts sqlite mysql5 mysql51 mysql55 mysql56 mariadb \
- description {build with percona port} {
</del><ins>+variant percona requires percona55 description {Legacy compatibility variant} {}
</ins><span class="cx">
</span><ins>+variant percona55 \
+ conflicts sqlite mysql51 mysql55 mysql56 mariadb55 \
+ description {build with percona55 port} {
+
</ins><span class="cx"> depends_lib-append port:qt4-mac-percona-plugin
</span><span class="cx"> depends_run-append port:percona-server
</span><span class="cx"> configure.args-append -DDATABASE_BACKEND=MYSQL \
</span><span class="lines">@@ -166,7 +162,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant sqlite \
</span><del>- conflicts mysql5 mysql51 mysql55 mysql56 mariadb percona \
</del><ins>+ conflicts mysql51 mysql55 mysql56 mariadb55 percona55 \
</ins><span class="cx"> description {Use sqlite backend instead of MySQL} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:qt4-mac-sqlite3-plugin
</span><span class="lines">@@ -175,9 +171,9 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset mysql5] && ![variant_isset mysql51] && ![variant_isset mysql55] \
</span><del>- && ![variant_isset mysql56] && ![variant_isset mariadb] && ![variant_isset percona] \
</del><ins>+ && ![variant_isset mysql56] && ![variant_isset mariadb55] && ![variant_isset percona55] \
</ins><span class="cx"> && ![variant_isset sqlite]} {
</span><del>- default_variants +mysql5
</del><ins>+ default_variants +mariadb55
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> post-patch {
</span></span></pre>
</div>
</div>
</body>
</html>