<!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>[119749] trunk/dports/comms/gnokii/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/119749">119749</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-05-05 07:56:02 -0700 (Mon, 05 May 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>gnokii: replace no_x11 by x11 (#39383, maintainer timeout)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportscommsgnokiiPortfile">trunk/dports/comms/gnokii/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportscommsgnokiiPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/comms/gnokii/Portfile (119748 => 119749)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/comms/gnokii/Portfile 2014-05-05 14:46:35 UTC (rev 119748)
+++ trunk/dports/comms/gnokii/Portfile 2014-05-05 14:56:02 UTC (rev 119749)
</span><span class="lines">@@ -30,7 +30,7 @@
</span><span class="cx"> sha256 8f5a083b05c1a66a3402ca5cd80084e14c2c0632c991bb53b03c78e9adb02501
</span><span class="cx">
</span><span class="cx"> depends_build port:intltool
</span><del>-depends_lib port:gtk2 port:libical port:libusb-compat port:iso-codes port:readline
</del><ins>+depends_lib port:libical port:libusb-compat port:iso-codes port:readline port:gettext
</ins><span class="cx">
</span><span class="cx"> post-patch {
</span><span class="cx"> reinplace "s|/etc/gnokiirc|${prefix}/etc/gnokiirc|" ${worksrcpath}/common/cfgreader.c
</span><span class="lines">@@ -43,7 +43,8 @@
</span><span class="cx"> --disable-smsd \
</span><span class="cx"> --with-libiconv-prefix=${prefix} \
</span><span class="cx"> --with-readline=${prefix} \
</span><del>- --disable-bluetooth
</del><ins>+ --disable-bluetooth \
+ --without-x
</ins><span class="cx">
</span><span class="cx"> post-activate {
</span><span class="cx"> if {![file exists ${prefix}/etc/gnokiirc]} {
</span><span class="lines">@@ -51,11 +52,6 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-variant no_x11 {
- depends_lib-delete port:gtk2
- configure.args-append --without-x
-}
-
</del><span class="cx"> # bluetooth does not work anymore on recent versions of Mac OS X, see #34162
</span><span class="cx"> variant bluetooth description {Enable support for bluetooth (broken on Mac OS X >=10.7)} {
</span><span class="cx"> configure.args-replace --disable-bluetooth --enable-bluetooth
</span><span class="lines">@@ -64,6 +60,19 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+# legacy variant - remove after May 2015
+variant no_x11 conflicts x11 description {legacy compatibility variant} {}
+variant x11 conflicts no_x11 {
+ depends_lib-append port:gtk2
+ configure.args-delete --without-x
+}
+
+if {[variant_isset no_x11]} {
+ default_variants -x11
+} else {
+ default_variants +x11
+}
+
</ins><span class="cx"> platform macosx {
</span><span class="cx"> configure.ldflags-append -framework CoreFoundation
</span><span class="cx"> }
</span></span></pre>
</div>
</div>
</body>
</html>