<!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>[116163] trunk/dports/gis/grass/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/116163">116163</a></dd>
<dt>Author</dt> <dd>mojca@macports.org</dd>
<dt>Date</dt> <dd>2014-01-20 05:46:28 -0800 (Mon, 20 Jan 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>grass: add support also for Carbon-based wxWidgets 2.8 (untested, temporary before wx3.0 support is complete)</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsgisgrassPortfile">trunk/dports/gis/grass/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsgisgrassPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/gis/grass/Portfile (116162 => 116163)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/gis/grass/Portfile 2014-01-20 10:07:00 UTC (rev 116162)
+++ trunk/dports/gis/grass/Portfile 2014-01-20 13:46:28 UTC (rev 116163)
</span><span class="lines">@@ -351,22 +351,28 @@
</span><span class="cx"> # TODO: in principle wxWidgets is optional and could be disable with
</span><span class="cx"> # --disable-wxwidgets if there is demand for that
</span><span class="cx"> # grass 4.6.3 is not compatible with wxWidgets 3.0 yet
</span><del>-variant wxwidgets30 conflicts wxgtk28 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
</del><ins>+variant wxwidgets30 conflicts wxwidgets28 wxgtk28 description {Use Cocoa-based wxWidgets 3.0 (experimental)} {
</ins><span class="cx"> wxWidgets.use wxPython-3.0
</span><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><span class="cx"> configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</span><span class="cx"> }
</span><del>-variant wxgtk28 conflicts wxwidgets30 description {Use GTK-based wxWidgets 2.8} {
</del><ins>+variant wxwidgets28 conflicts wxwidgets30 wxgtk28 description {Use Carbon-based wxWidgets 2.8} {
+ # untested (might not work)
+ wxWidgets.use wxWidgets-2.8
+ depends_lib-append port:${wxWidgets.port}
+ configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
+}
+variant wxgtk28 conflicts wxwidgets30 wxwidgets28 description {Use GTK-based wxWidgets 2.8} {
</ins><span class="cx"> wxWidgets.use wxGTK-2.8
</span><span class="cx"> depends_lib-append port:${wxWidgets.port}
</span><span class="cx"> configure.args-append --with-wxwidgets=${wxWidgets.wxconfig}
</span><span class="cx"> }
</span><span class="cx">
</span><del>-if {![variant_isset wxwidgets30] && ![variant_isset wxgtk28]} {
</del><ins>+if {![variant_isset wxwidgets30] && ![variant_isset wxwidgets28] && ![variant_isset wxgtk28]} {
</ins><span class="cx"> default_variants-append +wxgtk28
</span><span class="cx"> }
</span><span class="cx"> if {![variant_isset python26] && ![variant_isset python27]} {
</span><del>- if {[variant_isset wxgtk28]} {
</del><ins>+ if {[variant_isset wxgtk28] || [variant_isset wxwidgets28]} {
</ins><span class="cx"> default_variants-append +python26
</span><span class="cx"> } else {
</span><span class="cx"> default_variants-append +python27
</span><span class="lines">@@ -374,21 +380,30 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # TODO: if py27-wxpython-3.0 is installed, grass +wxgtk28 cannot be installed with +python27
</span><del>-# we could remove this by disabling wxpython support altogether
</del><ins>+# we could remove this limitation by disabling wxpython support altogether
</ins><span class="cx"> # (in case there is demand for it)
</span><del>-if {[variant_isset wxgtk28]} {
</del><ins>+# TODO: the code below is ugly; any suggestions for improving it are welcome
+if {[variant_isset wxwidgets30]} {
</ins><span class="cx"> if {[variant_isset python26]} {
</span><del>- depends_lib-append port:py26-wxpython-2.8
- require_active_variants py26-wxpython-2.8 gtk carbon
</del><ins>+ depends_lib-append port:py26-wxpython-3.0
</ins><span class="cx"> } elseif {[variant_isset python27]} {
</span><del>- depends_lib-append port:py27-wxpython-2.8
- require_active_variants py27-wxpython-2.8 gtk carbon
</del><ins>+ depends_lib-append port:py27-wxpython-3.0
</ins><span class="cx"> }
</span><del>-} elseif {[variant_isset wxwidgets30]} {
</del><ins>+} else {
</ins><span class="cx"> if {[variant_isset python26]} {
</span><del>- depends_lib-append port:py26-wxpython-3.0
</del><ins>+ depends_lib-append port:py26-wxpython-2.8
+ if {[variant_isset wxwidgets28]} {
+ require_active_variants py26-wxpython-2.8 carbon gtk
+ } else {
+ require_active_variants py26-wxpython-2.8 gtk carbon
+ }
</ins><span class="cx"> } elseif {[variant_isset python27]} {
</span><del>- depends_lib-append port:py27-wxpython-3.0
</del><ins>+ depends_lib-append port:py27-wxpython-2.8
+ if {[variant_isset wxwidgets28]} {
+ require_active_variants py27-wxpython-2.8 carbon gtk
+ } else {
+ require_active_variants py27-wxpython-2.8 gtk carbon
+ }
</ins><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span></span></pre>
</div>
</div>
</body>
</html>