<!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>[145831] trunk/dports/math/octave-devel/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/145831">145831</a></dd>
<dt>Author</dt> <dd>mcalhoun@macports.org</dd>
<dt>Date</dt> <dd>2016-02-18 08:31:00 -0800 (Thu, 18 Feb 2016)</dd>
</dl>
<h3>Log Message</h3>
<pre>octave-devel, octave-devel-rc, octave-devel-release: add docs variant to make building documentation optional</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkdportsmathoctavedevelPortfile">trunk/dports/math/octave-devel/Portfile</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkdportsmathoctavedevelPortfile"></a>
<div class="modfile"><h4>Modified: trunk/dports/math/octave-devel/Portfile (145830 => 145831)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/dports/math/octave-devel/Portfile 2016-02-18 16:26:43 UTC (rev 145830)
+++ trunk/dports/math/octave-devel/Portfile 2016-02-18 16:31:00 UTC (rev 145831)
</span><span class="lines">@@ -268,7 +268,8 @@
</span><span class="cx"> --disable-jit \
</span><span class="cx"> --without-sndfile \
</span><span class="cx"> --without-portaudio \
</span><del>- --without-magick
</del><ins>+ --without-magick \
+ --disable-docs
</ins><span class="cx">
</span><span class="cx"> # in configure.ac, listed as one of "[p]rograms used when running Octave"
</span><span class="cx"> depends_lib-append port:python27
</span><span class="lines">@@ -291,18 +292,6 @@
</span><span class="cx"> depends_lib-append port:fontconfig
</span><span class="cx"> depends_lib-append port:pcre
</span><span class="cx">
</span><del>-#--disable-docs
-depends_build-append port:texinfo
-configure.env-append \
- MAKEINFO=${prefix}/bin/makeinfo \
- TEXI2DVI=${prefix}/bin/texi2dvi \
- TEXI2PDF=${prefix}/bin/texi2pdf
-
-# see https://lists.macosforge.org/pipermail/macports-dev/2016-January/032293.html
-depends_build-append \
- port:texlive-basic \
- port:texlive-latex
-
</del><span class="cx"> #--without-amd
</span><span class="cx"> #--without-camd
</span><span class="cx"> #--without-colamd
</span><span class="lines">@@ -553,6 +542,22 @@
</span><span class="cx"> }
</span><span class="cx"> default_variants-append +app
</span><span class="cx">
</span><ins>+variant docs description {build documentation files} {
+ depends_build-append port:texinfo
+ configure.env-append \
+ MAKEINFO=${prefix}/bin/makeinfo \
+ TEXI2DVI=${prefix}/bin/texi2dvi \
+ TEXI2PDF=${prefix}/bin/texi2pdf
+
+ # see https://lists.macosforge.org/pipermail/macports-dev/2016-January/032293.html
+ depends_build-append \
+ port:texlive-basic \
+ port:texlive-latex
+
+ configure.args-replace --disable-docs --enable-docs
+}
+default_variants-append +docs
+
</ins><span class="cx"> # GraphicsMagick and octave need to be built with the same C++ standard library
</span><span class="cx"> # or else undefined symbols:
</span><span class="cx"> # "Magick::Image::ping(std::__cxx11::basic_string<char, std::char_traits<char>, std::allocator<char> > const&)"
</span><span class="lines">@@ -602,8 +607,10 @@
</span><span class="cx"> # delete since just a link to versioned name
</span><span class="cx"> file delete ${destroot}${prefix}/bin/${bin}
</span><span class="cx">
</span><del>- # put version number in man file to avoid conflict
- move ${destroot}${prefix}/share/man/man1/${bin}.1 ${destroot}${prefix}/share/man/man1/${bin}-${version}.1
</del><ins>+ if { [variant_isset docs] } {
+ # put version number in man file to avoid conflict
+ move ${destroot}${prefix}/share/man/man1/${bin}.1 ${destroot}${prefix}/share/man/man1/${bin}-${version}.1
+ }
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # put any startup commands in ${destroot}${prefix}/share/octave/${version}/m/startup/octaverc
</span></span></pre>
</div>
</div>
</body>
</html>