<!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>[131521] trunk/dports/science/gr-fosphor/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/131521">131521</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2015-01-13 07:34:45 -0800 (Tue, 13 Jan 2015)</dd>
</dl>

<h3>Log Message</h3>
<pre>gr-fosphor:
+ use qt4 PortGroup;
+ require Python 2.7; leave +python2[67] legacy variants for now.</pre>

<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportssciencegrfosphorPortfile">trunk/dports/science/gr-fosphor/Portfile</a></li>
</ul>

</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportssciencegrfosphorPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/gr-fosphor/Portfile (131520 => 131521)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/gr-fosphor/Portfile        2015-01-13 15:24:31 UTC (rev 131520)
+++ trunk/dports/science/gr-fosphor/Portfile        2015-01-13 15:34:45 UTC (rev 131521)
</span><span class="lines">@@ -4,6 +4,7 @@
</span><span class="cx"> PortSystem          1.0
</span><span class="cx"> PortGroup           cmake 1.0
</span><span class="cx"> PortGroup           wxWidgets 1.0
</span><ins>+PortGroup           qt4 1.0
</ins><span class="cx"> PortGroup           active_variants 1.1
</span><span class="cx"> 
</span><span class="cx"> wxWidgets.use       wxPython-3.0
</span><span class="lines">@@ -32,12 +33,10 @@
</span><span class="cx">     port:cppunit \
</span><span class="cx">     port:freetype \
</span><span class="cx">     port:glfw \
</span><del>-    port:qt4-mac \
</del><span class="cx">     port:swig-python \
</span><span class="cx">     port:${wxWidgets.port}
</span><span class="cx"> 
</span><span class="cx"> depends_build-append \
</span><del>-    port:pkgconfig \
</del><span class="cx">     port:doxygen
</span><span class="cx"> 
</span><span class="cx"> # do VPATH build
</span><span class="lines">@@ -61,70 +60,31 @@
</span><span class="cx"> 
</span><span class="cx"> build.post_args VERBOSE=1
</span><span class="cx"> 
</span><del>-# set Python variants
</del><ins>+# set Python legacy variants; these can be removed 2016-01-01
</ins><span class="cx"> 
</span><del>-set pythons_suffixes {26 27}
-global chosen_python_suffix
-set chosen_python_suffix &quot;&quot;
</del><ins>+variant python26 description {Legacy variant} {}
+variant python27 description {Legacy variant} {}
</ins><span class="cx"> 
</span><del>-set pythons_ports {}
-foreach s ${pythons_suffixes} {
-    lappend pythons_ports python${s}
-}
</del><ins>+# specify the Python dependencies
</ins><span class="cx"> 
</span><del>-foreach s ${pythons_suffixes} {
-    set p python${s}
-    set v [join [split ${s} &quot;&quot;] &quot;.&quot;]
-    set i [lsearch -exact ${pythons_ports} ${p}]
-    set c [lreplace ${pythons_ports} ${i} ${i}]
-    eval [subst {
-        variant ${p} description &quot;Build ${name} using Python ${v}&quot; \
-            conflicts ${c} {
</del><ins>+depends_lib-append \
+    port:python27
</ins><span class="cx"> 
</span><del>-            set chosen_python_suffix ${s}
</del><ins>+# wxPython is required for configure and runtime
</ins><span class="cx"> 
</span><del>-            # specify the Python dependencies
</del><ins>+depends_lib-append \
+    port:py27-wxpython-3.0
</ins><span class="cx"> 
</span><del>-            depends_lib-append \
-                port:${p}
</del><ins>+# specify the Python version to use
</ins><span class="cx"> 
</span><del>-            # wxPython is required for configure and runtime
</del><ins>+configure.args-append \
+    -DPYTHON_EXECUTABLE=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/bin/python2.7 \
+    -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/Headers \
+    -DPYTHON_LIBRARY=${prefix}/Library/Frameworks/Python.framework/Versions/2.7/Python \
+    -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages
</ins><span class="cx"> 
</span><del>-            depends_lib-append \
-                port:py${s}-wxpython-3.0
</del><ins>+# allow gr-forphor to work with both gnuradio and gnuradio-devel ...
</ins><span class="cx"> 
</span><del>-            # require gnuradio to also have this Python variant
-
-            require_active_variants \
-                path:lib/libgnuradio-runtime.dylib:gnuradio ${p}
-
-            # specify the Python version to use
-
-            configure.args-append \
-                -DPYTHON_EXECUTABLE=${prefix}/bin/python${v} \
-                -DPYTHON_INCLUDE_DIR=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Headers \
-                -DPYTHON_LIBRARY=${prefix}/Library/Frameworks/Python.framework/Versions/${v}/Python \
-                -DGR_PYTHON_DIR=${frameworks_dir}/Python.framework/Versions/${v}/lib/python${v}/site-packages
-
-        }
-    }]
-}
-
-# Python is required; default to 2.7
-
-if {![variant_isset python26] &amp;&amp; ![variant_isset python27]} {
-    default_variants +python27
-}
-
-# Make sure -python27 was not specified alone
-
-if {![variant_isset python26] &amp;&amp; ![variant_isset python27]} {
-    ui_error &quot;This port requires a Python to be selected; you cannot use -python27 as a variant alone.&quot;
-    return -code error &quot;Invalid variant selection&quot;
-}
-
-# allow gr-osmosdr to work with both gnuradio and gnuradio-devel ...
-
</del><span class="cx"> depends_lib-append path:lib/libgnuradio-runtime.dylib:gnuradio
</span><span class="cx"> 
</span><span class="cx"> # ... but not with gnuradio-legacy or gnuradio-next
</span><span class="lines">@@ -132,12 +92,12 @@
</span><span class="cx"> pre-fetch {
</span><span class="cx"> 
</span><span class="cx">     if {![catch {set installed [lindex [registry_active gnuradio-legacy] 0]}]} {
</span><del>-        # gnuradio-legacy is installed; this version of gr-osmosdr does not work with gnuradio-legacy
</del><ins>+        # gnuradio-legacy is installed; this version of gr-forphor does not work with gnuradio-legacy
</ins><span class="cx">         ui_msg &quot;\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-legacy port.  deactivate gnuradio-legacy, and then install or activate gnuradio or gnuradio-devel.\n&quot;
</span><span class="cx">         return -code error &quot;Invalid port dependency: gnuradio-legacy&quot;
</span><span class="cx">     }
</span><span class="cx">     if {![catch {set installed [lindex [registry_active gnuradio-next] 0]}]} {
</span><del>-        # gnuradio-next is installed; this version of gr-osmosdr does not work with gnuradio-next
</del><ins>+        # gnuradio-next is installed; this version of gr-forphor does not work with gnuradio-next
</ins><span class="cx">         ui_msg &quot;\nError: ${name} requires the gnuradio or gnuradio-devel port, and will not work with the gnuradio-next port.  deactivate gnuradio-next, and then install or activate gnuradio or gnuradio-devel.\n&quot;
</span><span class="cx">         return -code error &quot;Invalid port dependency: gnuradio-next&quot;
</span><span class="cx">     }
</span></span></pre>
</div>
</div>

</body>
</html>