<pre style='margin:0'>
Marcus Calhoun-Lopez (MarcusCalhoun-Lopez) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/eb2f14df39b91ef9fce8cb718238434fa5bcbab8">https://github.com/macports/macports-ports/commit/eb2f14df39b91ef9fce8cb718238434fa5bcbab8</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit eb2f14df39b91ef9fce8cb718238434fa5bcbab8
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sat Nov 11 07:56:00 2017 -0700
<span style='display:block; white-space:pre;color:#404040;'> octave: whitespace and comment changes
</span>---
math/octave/Portfile | 14 ++++----------
1 file changed, 4 insertions(+), 10 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/Portfile b/math/octave/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index eaeb5d6..307c28d 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -63,7 +63,7 @@ patchfiles-append patch-host_name.diff
</span> # see https://savannah.gnu.org/bugs/?50234
patchfiles-append patch-file-stat.cc.diff
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# https://savannah.gnu.org/bugs/?50664
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# see https://savannah.gnu.org/bugs/?50664
</span> patchfiles-append patch-crash_on_exit.diff
# see https://savannah.gnu.org/patch/index.php?9439
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -388,13 +388,11 @@ if { ![variant_isset qt4] && ![variant_isset qt5] } {
</span>
variant fltk description {enable fltk as a graphics toolkit for plotting} {
depends_lib-append path:lib/libfltk.dylib:fltk
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> configure.args-replace --without-fltk --with-fltk
}
default_variants-append +fltk
if {[variant_isset fltk] || [variant_isset qt4] || [variant_isset qt5]} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # native_graphics (fltk) and gui (Qt) require OpenGL and font and printing capabilities
depends_lib-append \
port:fontconfig \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -440,7 +438,7 @@ variant app description "build application bundle to launch ${subport}" {
</span>
if {[vercmp ${xcodeversion} 4.5] < 0} {
# need a way to generate icns file for XCode prior to 4.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #51487
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://trac.macports.org/ticket/51487
</span> depends_build-append port:libicns
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -504,9 +502,7 @@ variant app description "build application bundle to launch ${subport}" {
</span> set dpi 90
foreach res {16 32 128 256 512} {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> set hres [expr 2*${res}]
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> # see http://savannah.gnu.org/bugs/?37062
# see http://hg.savannah.gnu.org/hgweb/octave/rev/1687269e31e4
system -W ${worksrcpath} "${prefix}/bin/rsvg-convert -w ${res} ${svg} > Octave.iconset/icon_${res}x${res}.png"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -517,7 +513,7 @@ variant app description "build application bundle to launch ${subport}" {
</span> system -W ${worksrcpath} "/usr/bin/iconutil -c icns -o ${appName}/Contents/Resources/Octave.icns Octave.iconset"
} else {
# /usr/bin/iconutil introduced in XCode 4.5
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #51487
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see http://trac.macports.org/ticket/51487
</span> system -W ${worksrcpath}/Octave.iconset \
"${prefix}/bin/png2icns ${worksrcpath}/${appName}/Contents/Resources/Octave.icns icon_16x16.png icon_32x32.png icon_128x128.png icon_256x256.png icon_512x512.png"
}
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -541,7 +537,7 @@ variant docs description {build documentation files} {
</span> port:texlive-basic \
port:texlive-latex
<span style='display:block; white-space:pre;background:#ffe0e0;'>- # see #51132
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ # see https://trac.macports.org/ticket/51132
</span> depends_build-append \
port:texlive-fonts-recommended
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -581,11 +577,9 @@ if { ${configure.compiler} eq "macports-gcc-6" && [vercmp 4.0 ${xcodeversion}] <
</span> # see https://trac.macports.org/ticket/53021
foreach gccVar ${compilers.gcc_variants} {
if {[variant_exists ${gccVar}] && [variant_isset ${gccVar}] } {
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[vercmp ${xcodeversion} 7.0] >= 0} {
patchfiles-append patch-force_cxx.diff
}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span> if {[vercmp ${xcodeversion} 8.0] >= 0} {
configure.cppflags-append "-isystem ${worksrcpath}/Availability"
post-extract {
</pre><pre style='margin:0'>
</pre>