<!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>[126808] trunk/dports/science/uhd/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/126808">126808</a></dd>
<dt>Author</dt> <dd>michaelld@macports.org</dd>
<dt>Date</dt> <dd>2014-10-15 11:20:39 -0700 (Wed, 15 Oct 2014)</dd>
</dl>
<h3>Log Message</h3>
<pre>uhd:
+ update versioning to match current actual versions;
+ update devel to 3.8.0rc1 (9780ded0, 20141014), using the GIT master branch;
+ fix devel livecheck to be on master branch (for now);
+ add +manpages variant, enabled by default;
+ remove unused pre-configure script for +manual variant.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsscienceuhdPortfile">trunk/dports/science/uhd/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsscienceuhdPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/science/uhd/Portfile (126807 => 126808)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/science/uhd/Portfile 2014-10-15 17:46:17 UTC (rev 126807)
+++ trunk/dports/science/uhd/Portfile 2014-10-15 18:20:39 UTC (rev 126808)
</span><span class="lines">@@ -15,10 +15,11 @@
</span><span class="cx"> platforms darwin
</span><span class="cx">
</span><span class="cx"> dist_subdir uhd
</span><del>-set branch 3.7
</del><ins>+set major 3
+set minor 7
</ins><span class="cx"> set patch 3
</span><del>-set base_version [join "${branch} ${patch}" .]
-set devel_version [join "${branch} [expr {${patch} + 1}]" .]
</del><ins>+set base_version [join "${major} ${minor} ${patch}" .]
+set devel_version [join "${major} [expr {${minor} + 1}]" .]
</ins><span class="cx">
</span><span class="cx"> if {${subport} eq ${name}} {
</span><span class="cx">
</span><span class="lines">@@ -41,18 +42,19 @@
</span><span class="cx"> subport uhd-devel {
</span><span class="cx">
</span><span class="cx"> long_description ${description}: \
</span><del>-Provides the GIT maint version, which is typically updated every few days to week.
</del><ins>+Provides the UHD GIT maint or master branch, depending on which is more advanced, and is typically updated every few days to week.
</ins><span class="cx">
</span><del>- github.setup EttusResearch uhd e10df19c89d21ce860a36bb071b4a26b2f067460
- version ${devel_version}_20141006
</del><ins>+ github.setup EttusResearch uhd 9780ded0661214203d08b9cea2d522fbf5bf9cb2
+ version ${devel_version}_20141014
</ins><span class="cx"> name uhd-devel
</span><span class="cx"> conflicts uhd
</span><del>- checksums rmd160 42243c0fefa2531f3f1da90969d7b2fb700babf4 \
- sha256 c171210ea37b739d41af3189130ef34c2cfb37bbaa9095559796a23e12ddde16
</del><ins>+ checksums rmd160 4aadb3c4bbefab1e13c554beee4b96e7215c9258 \
+ sha256 b2c64681bfd9b9beca5ecffb9b0bcc924198e56763bd125668b92421801bdd31
</ins><span class="cx">
</span><del>- # overload the github livecheck URL with the correct branch
</del><ins>+ # overload the github livecheck URL with the maint branch,
+ # when it is more advanced
</ins><span class="cx">
</span><del>- livecheck.url ${github.homepage}/commits/maint.atom
</del><ins>+ # livecheck.url ${github.homepage}/commits/maint.atom
</ins><span class="cx">
</span><span class="cx"> }
</span><span class="cx">
</span><span class="lines">@@ -110,7 +112,7 @@
</span><span class="cx">
</span><span class="cx"> # per user concensus: enable all variants except +debug and +universal
</span><span class="cx">
</span><del>-default_variants +docs +examples +libusb +manual +test +orc
</del><ins>+default_variants +docs +examples +libusb +manual +test +orc +manpages
</ins><span class="cx">
</span><span class="cx"> # set Python variants
</span><span class="cx">
</span><span class="lines">@@ -204,17 +206,22 @@
</span><span class="cx"> variant manual description {build manual} {
</span><span class="cx"> depends_lib-append \
</span><span class="cx"> port:py${chosen_python_suffix}-docutils
</span><del>- pre-configure {
- set v [join [split ${chosen_python_suffix} ""] "."]
- configure.args-append -DENABLE_MANUAL=ON \
- -DRST2HTML_EXECUTABLE=${prefix}/bin/rst2html-${v}.py
- }
</del><ins>+ configure.args-append -DENABLE_MANUAL=ON
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> if {![variant_isset manual]} {
</span><span class="cx"> configure.args-append -DENABLE_MANUAL=OFF
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+variant manpages description {build man pages} {
+ depends_run-append port:gzip
+ configure.args-append -DENABLE_MAN_PAGES=ON
+}
+
+if {![variant_isset manpages]} {
+ configure.args-append -DENABLE_MAN_PAGES=OFF
+}
+
</ins><span class="cx"> variant orc description {enable ORC support} {
</span><span class="cx"> depends_lib-append port:orc
</span><span class="cx"> configure.args-append -DENABLE_ORC=ON
</span></span></pre>
</div>
</div>
</body>
</html>