<!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>[138041] trunk/dports/devel/gwenhywfar4</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/138041">138041</a></dd>
<dt>Author</dt> <dd>mk@macports.org</dd>
<dt>Date</dt> <dd>2015-06-26 14:13:49 -0700 (Fri, 26 Jun 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>gwenhywfar4: closes #47661 (Thanks, RenĂ©)</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsdevelgwenhywfar4Portfile">trunk/dports/devel/gwenhywfar4/Portfile</a></li>
</ul>

<h3>Added Paths</h3>
<ul>
<li>trunk/dports/devel/gwenhywfar4/files/</li>
<li><a href="#trunkdportsdevelgwenhywfar4filespatchshlibextensionsdiff">trunk/dports/devel/gwenhywfar4/files/patch-shlib-extensions.diff</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsdevelgwenhywfar4Portfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/devel/gwenhywfar4/Portfile (138040 => 138041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gwenhywfar4/Portfile        2015-06-26 18:38:55 UTC (rev 138040)
+++ trunk/dports/devel/gwenhywfar4/Portfile        2015-06-26 21:13:49 UTC (rev 138041)
</span><span class="lines">@@ -1,9 +1,11 @@
</span><span class="cx"> # -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:ft=tcl:et:sw=4:ts=4:sts=4
</span><ins>+# kate: backspace-indents true; indent-pasted-text true; indent-width 4; keep-extra-spaces true; remove-trailing-spaces modified; replace-tabs true; replace-tabs-save true; syntax Tcl/Tk; tab-indents true; tab-width 4;
</ins><span class="cx"> # $Id$
</span><span class="cx"> 
</span><span class="cx"> PortSystem        1.0
</span><span class="cx"> 
</span><span class="cx"> name              gwenhywfar4
</span><ins>+revision          1
</ins><span class="cx"> # This port offers the latest stable version (also as a gtk subport)
</span><span class="cx"> # as well as the latest beta version as gwenhywfar4-devel!
</span><span class="cx"> 
</span><span class="lines">@@ -48,6 +50,8 @@
</span><span class="cx"> subport gwenhywfar4-devel {}
</span><span class="cx"> subport gwenhywfar4-gtk-devel {}
</span><span class="cx"> 
</span><ins>+patchfiles      patch-shlib-extensions.diff
+
</ins><span class="cx"> if {[string match &quot;*-devel&quot; $subport]} {
</span><span class="cx">     version                 4.13.1
</span><span class="cx">     # this is specific to this port and *version* for downloading it
</span><span class="lines">@@ -59,12 +63,13 @@
</span><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> if {$subport eq $name || $subport eq &quot;gwenhywfar4-devel&quot;} {
</span><del>-    configure.args-append   --with-qt4-libs=${prefix}/lib \
-                            --with-qt4-includes=${prefix}/include \
-                            --with-qt4-moc=${prefix}/bin/moc \
-                            --with-qt4-uic=${prefix}/bin/uic \
-                            --with-guis=qt4
-    depends_lib-append      path:bin/qmake:qt4-mac
</del><ins>+    # the correct way to depend on Qt4:
+    PortGroup               qt4 1.0
+    configure.args-append   --with-qt4-libs=${qt_libs_dir} \
+                            --with-qt4-includes=${qt_includes_dir} \
+                            --with-qt4-moc=${qt_moc_cmd} \
+                            --with-qt4-uic=${qt_uic_cmd} \
+                            --with-guis=&quot;qt4 cpp cocoa&quot;
</ins><span class="cx"> }
</span><span class="cx"> 
</span><span class="cx"> master_sites      http://www2.aquamaniac.de/sites/download/download.php?package=01&amp;release=${release}&amp;file=01&amp;dummy=
</span><span class="lines">@@ -72,7 +77,7 @@
</span><span class="cx"> 
</span><span class="cx"> if {[string match &quot;gwenhywfar4-gtk*&quot; $subport]} {
</span><span class="cx">     depends_lib-append      port:gtk2
</span><del>-    configure.args-append   --with-guis=gtk2 --disable-qt4
</del><ins>+    configure.args-append   --with-guis=&quot;gtk2 cpp&quot; --disable-qt4
</ins><span class="cx"> 
</span><span class="cx">     # Allow gwenhywfar4-gtk and aqbanking5-gtk to replace the old
</span><span class="cx">     # gwenhywfar and aqbanking by deactivating them if installed. This
</span><span class="lines">@@ -103,6 +108,8 @@
</span><span class="cx">     configure.args-append --enable-debug
</span><span class="cx"> }
</span><span class="cx"> 
</span><ins>+configure.args-append   --disable-dependency-tracking --disable-silent-rules
+
</ins><span class="cx"> livecheck.type    regex
</span><span class="cx"> livecheck.url     http://www2.aquamaniac.de/sites/download/packages.php?package=01&amp;showall=1
</span><span class="cx"> if {[string match &quot;*-devel&quot; $subport]} {
</span></span></pre></div>
<a id="trunkdportsdevelgwenhywfar4filespatchshlibextensionsdiff"></a>
<div class="addfile"><h4>Added: trunk/dports/devel/gwenhywfar4/files/patch-shlib-extensions.diff (0 => 138041)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/devel/gwenhywfar4/files/patch-shlib-extensions.diff                                (rev 0)
+++ trunk/dports/devel/gwenhywfar4/files/patch-shlib-extensions.diff        2015-06-26 21:13:49 UTC (rev 138041)
</span><span class="lines">@@ -0,0 +1,37 @@
</span><ins>+diff --git gui/qt4/gwengui-qt4-config.cmake.in gui/qt4/gwengui-qt4-config.cmake.in
+index 8b2b0fb..8225914 100644
+--- gui/qt4/gwengui-qt4-config.cmake.in
++++ gui/qt4/gwengui-qt4-config.cmake.in
+@@ -22,8 +22,13 @@ if(NOT EXISTS &quot;${_file}&quot;)
+       set_and_check(exec_prefix &quot;@exec_prefix@&quot;)
+       set_and_check(includedir &quot;@includedir@&quot;)
+       set_and_check(GWENGUI_QT4_INCLUDE_DIRS &quot;@gwenhywfar_headerdir@&quot;)
+-      set_and_check(GWENGUI_QT4_LIBRARIES &quot;@libdir@/libgwengui-qt4.so&quot;)
+-      set_and_check(GWENHYWFAR_CPP_LIBRARIES &quot;@libdir@/libgwengui-cpp.so&quot;)
++      if(APPLE)
++        set_and_check(GWENGUI_QT4_LIBRARIES &quot;@libdir@/libgwengui-qt4.dylib&quot;)
++        set_and_check(GWENHYWFAR_CPP_LIBRARIES &quot;@libdir@/libgwengui-cpp.dylib&quot;)
++      else()
++        set_and_check(GWENGUI_QT4_LIBRARIES &quot;@libdir@/libgwengui-qt4.so&quot;)
++        set_and_check(GWENHYWFAR_CPP_LIBRARIES &quot;@libdir@/libgwengui-cpp.so&quot;)
++      endif(APPLE)

+       set(GWENGUI_QT4_LIBRARIES ${GWENGUI_QT4_LIBRARIES} ${GWENHYWFAR_CPP_LIBRARIES})

+diff --git gwenhywfar-config.cmake.in gwenhywfar-config.cmake.in
+index 82955da..fabef61 100644
+--- gwenhywfar-config.cmake.in
++++ gwenhywfar-config.cmake.in
+@@ -23,7 +23,11 @@ set_and_check(prefix &quot;@prefix@&quot;)
+ set_and_check(exec_prefix &quot;@exec_prefix@&quot;)
+ set_and_check(includedir &quot;@includedir@&quot;)
+ set_and_check(GWENHYWFAR_INCLUDE_DIRS &quot;@gwenhywfar_headerdir@&quot;)
+-set_and_check(GWENHYWFAR_LIBRARIES &quot;@libdir@/libgwenhywfar.so.@GWENHYWFAR_SO_EFFECTIVE@&quot;)
++if(APPLE)
++  set_and_check(GWENHYWFAR_LIBRARIES &quot;@libdir@/libgwenhywfar.@GWENHYWFAR_SO_EFFECTIVE@.dylib&quot;)
++else()
++  set_and_check(GWENHYWFAR_LIBRARIES &quot;@libdir@/libgwenhywfar.so.@GWENHYWFAR_SO_EFFECTIVE@&quot;)
++endif(APPLE)

+ # find components

</ins></span></pre>
</div>
</div>

</body>
</html>