<!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>[119774] trunk/dports/kde/amarok</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/119774">119774</a></dd>
<dt>Author</dt> <dd>nicos@macports.org</dd>
<dt>Date</dt> <dd>2014-05-06 05:31:01 -0700 (Tue, 06 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>amarok: adding proper detection of the sql variant</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportskdeamarokPortfile">trunk/dports/kde/amarok/Portfile</a></li>
</ul>
<h3>Added Paths</h3>
<ul>
<li><a href="#trunkdportskdeamarokfilespatchFindMySQLAmarokdiff">trunk/dports/kde/amarok/files/patch-FindMySQLAmarok.diff</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportskdeamarokPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/kde/amarok/Portfile (119773 => 119774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/amarok/Portfile 2014-05-06 12:19:25 UTC (rev 119773)
+++ trunk/dports/kde/amarok/Portfile 2014-05-06 12:31:01 UTC (rev 119774)
</span><span class="lines">@@ -7,7 +7,7 @@
</span><span class="cx"> name amarok
</span><span class="cx"> conflicts amarok-devel
</span><span class="cx"> version 2.6.0
</span><del>-revision 1
</del><ins>+revision 2
</ins><span class="cx"> categories kde kde4
</span><span class="cx"> maintainers nomaintainer
</span><span class="cx"> license LGPL-2.1+ GPL-2+
</span><span class="lines">@@ -31,16 +31,27 @@
</span><span class="cx"> port:loudmouth port:qca port:libmtp port:libgpod
</span><span class="cx">
</span><span class="cx"> patchfiles patch-src-app_mac.cpp.diff \
</span><del>- patch-TrayIcon.diff
</del><ins>+ patch-TrayIcon.diff \
+ patch-FindMySQLAmarok.diff
</ins><span class="cx">
</span><span class="cx"> # prototype for 'Dynamic::BiasPtr Dynamic::AbstractBiasFactory::createFromXml(QCoreXmlStreamReader*)' does not match any in class 'Dynamic::AbstractBiasFactory'
</span><span class="cx"> universal_variant no
</span><span class="cx">
</span><ins>+pre-configure {
+ reinplace "s|@PREFIX@|${prefix}|g" \
+ ${worksrcpath}/cmake/modules/FindMySQLAmarok.cmake
+}
+
</ins><span class="cx"> variant mysql51 \
</span><span class="cx"> conflicts mysql55 mysql56 mariadb55 percona55 \
</span><span class="cx"> description {build with mysql51 port} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:mysql51
</span><ins>+
+ pre-configure {
+ reinplace "s|@MYSQL@|mysql51|g" \
+ ${worksrcpath}/cmake/modules/FindMySQLAmarok.cmake
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql55 \
</span><span class="lines">@@ -48,6 +59,11 @@
</span><span class="cx"> description {build with mysql55 port} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:mysql55
</span><ins>+
+ pre-configure {
+ reinplace "s|@MYSQL@|mysql55|g" \
+ ${worksrcpath}/cmake/modules/FindMySQLAmarok.cmake
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mysql56 \
</span><span class="lines">@@ -55,6 +71,11 @@
</span><span class="cx"> description {build with mysql56 port} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:mysql56
</span><ins>+
+ pre-configure {
+ reinplace "s|@MYSQL@|mysql56|g" \
+ ${worksrcpath}/cmake/modules/FindMySQLAmarok.cmake
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant mariadb55 \
</span><span class="lines">@@ -62,6 +83,11 @@
</span><span class="cx"> description {build with mariadb port} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:mariadb
</span><ins>+
+ pre-configure {
+ reinplace "s|@MYSQL@|mariadb|g" \
+ ${worksrcpath}/cmake/modules/FindMySQLAmarok.cmake
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> variant percona55 \
</span><span class="lines">@@ -69,6 +95,11 @@
</span><span class="cx"> description {build with percona55 port} {
</span><span class="cx">
</span><span class="cx"> depends_lib-append port:percona
</span><ins>+
+ pre-configure {
+ reinplace "s|@MYSQL@|percona|g" \
+ ${worksrcpath}/cmake/modules/FindMySQLAmarok.cmake
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset mysql51] && ![variant_isset mysql55] && ![variant_isset mysql56] \
</span></span></pre></div>
<a id="trunkdportskdeamarokfilespatchFindMySQLAmarokdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/kde/amarok/files/patch-FindMySQLAmarok.diff (0 => 119774)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/kde/amarok/files/patch-FindMySQLAmarok.diff (rev 0)
+++ trunk/dports/kde/amarok/files/patch-FindMySQLAmarok.diff 2014-05-06 12:31:01 UTC (rev 119774)
</span><span class="lines">@@ -0,0 +1,24 @@
</span><ins>+--- cmake/modules/FindMySQLAmarok.cmake.orig 2014-05-06 20:23:58.000000000 +0900
++++ cmake/modules/FindMySQLAmarok.cmake 2014-05-06 21:08:32.000000000 +0900
+@@ -13,19 +13,10 @@
+ # For details see the accompanying COPYING-CMAKE-SCRIPTS file.
+
+ if(NOT WIN32)
+- find_program(MYSQLCONFIG_EXECUTABLE NAMES mysql_config mysql_config5 PATHS ${BIN_INSTALL_DIR} ~/usr/bin /usr/local/bin)
++ set(MYSQLCONFIG_EXECUTABLE @PREFIX@/lib/@MYSQL@/bin/mysql_config)
+ endif(NOT WIN32)
+
+-find_path(MYSQL_INCLUDE_DIR mysql.h
+- /opt/local/include/mysql5/mysql
+- /opt/mysql/mysql/include
+- /opt/mysqle/include/mysql
+- /opt/ports/include/mysql5/mysql
+- /usr/include/mysql
+- /usr/local/include/mysql
+- /usr/mysql/include/mysql
+- ~/usr/include/mysql
+-)
++set(MYSQL_INCLUDE_DIR @PREFIX@/include/@MYSQL@/mysql)
+
+ if(MYSQLCONFIG_EXECUTABLE)
+ exec_program(${MYSQLCONFIG_EXECUTABLE} ARGS --cflags RETURN_VALUE _return_VALUE OUTPUT_VARIABLE MYSQL_CFLAGS)
</ins></span></pre>
</div>
</div>
</body>
</html>