<pre style='margin:0'>
Ken (kencu) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/beade6b89e937ecc8844f1b848f7ec3c8571a107">https://github.com/macports/macports-ports/commit/beade6b89e937ecc8844f1b848f7ec3c8571a107</a></p>
<pre style="white-space: pre; background: #F8F8F8"><span style='display:block; white-space:pre;color:#808000;'>commit beade6b89e937ecc8844f1b848f7ec3c8571a107
</span>Author: Ken Cunningham <kencu@macports.org>
AuthorDate: Sat Dec 5 23:32:36 2020 -0800
<span style='display:block; white-space:pre;color:#404040;'> octave: update to 6.1.0
</span>---
math/octave/Portfile | 19 ++++++++++---------
math/octave/files/patch-bsdtar.diff | 13 +------------
math/octave/files/patch-java_version.diff | 2 +-
3 files changed, 12 insertions(+), 22 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 7fa39ad69b6..e8d9dcf8488 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;'>@@ -7,9 +7,10 @@ PortGroup compiler_blacklist_versions 1.0
</span> PortGroup linear_algebra 1.0
name octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-version 5.2.0
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-set package_version 5.x.x
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 7
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+version 6.1.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+set package_version 6.x.x
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span> categories math science
platforms darwin
license GPL-3+
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -24,9 +25,9 @@ homepage https://www.gnu.org/software/octave
</span>
master_sites gnu:octave
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 2877818d2bb06d99bfbb24f93c0f743d73047969 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 2fea62b3c78d6f38e9451da8a4d26023840725977dffee5250d3d180f56595e1 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 33360285
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 4f2094359ae531e08a01460f6b8ac8788cc933da \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 6ff34e401658622c44094ecb67e497672e4337ca2d36c0702d0403ecc60b0a57 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 32592405
</span>
# see https://lists.gnu.org/archive/html/octave-maintainers/2016-05/msg00286.html
compiler.cxx_standard \
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -49,7 +50,7 @@ patchfiles-append patch-configure_make.m.diff
</span> patchfiles-append patch-arch_arg.diff
# see https://savannah.gnu.org/bugs/?50025
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-crash_on_exit.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fails to apply: patchfiles-append patch-crash_on_exit.diff
</span>
# octave compiles in the hostname value
# it is used to determine installation locations
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -65,7 +66,7 @@ patchfiles-append patch-__opengl_info__.diff
</span> patchfiles-append patch-run-octave.diff
# find MacPorts Qt libraries
<span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-link_location.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+# fails to apply: patchfiles-append patch-link_location.diff
</span>
# fix CXXFLAGS when testing for Qt5 properties
# see https://trac.macports.org/ticket/58226
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -618,7 +619,7 @@ post-destroot {
</span> }
# do not force upgrade of every dependency every time the version changes
<span style='display:block; white-space:pre;background:#ffe0e0;'>- foreach lib {liboctave.7.dylib liboctgui.5.dylib liboctinterp.7.dylib} {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ foreach lib {liboctave.8.dylib liboctgui.6.dylib liboctinterp.8.dylib} {
</span> xinstall -d -m 0755 ${destroot}${prefix}/lib/octave/${package_version}
ln -s ../${version}/${lib} ${destroot}${prefix}/lib/octave/${package_version}/${lib}
system "install_name_tool -id ${prefix}/lib/octave/${package_version}/${lib} ${destroot}${prefix}/lib/octave/${version}/${lib}"
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-bsdtar.diff b/math/octave/files/patch-bsdtar.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index f9a4358a2f8..cc2f573c307 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-bsdtar.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-bsdtar.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -22,15 +22,4 @@
</span> @__parse_tar__, false};
commandlist.tarbz = commandlist.tarbz2;
commandlist.tbz2 = commandlist.tarbz2;
<span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -307,8 +307,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- files = cellstr (files(:,14:end));
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfunction
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--function output = __parse_tar__ (output)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+function files = __parse_tar__ (output)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- ## This is a no-op, but it makes things simpler for other cases.
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ files = regexprep (output, '^x (.*)$', '$1');
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- endfunction
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- function files = __parse_gzip__ (output)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-java_version.diff b/math/octave/files/patch-java_version.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index a9ee09a8770..2a53f997b5b 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-java_version.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-java_version.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -4,7 +4,7 @@
</span> $(scripts_java_JAVA_CLASSES) : %.class : %.java | scripts/java/$(octave_dirstamp)
$(OCT_V_JAVAC)$(MKDIR_P) scripts/java/$(org_octave_dir) && \
( cd $(srcdir)/scripts/java; \
<span style='display:block; white-space:pre;background:#ffe0e0;'>-- "$(JAVAC)" -source 1.6 -target 1.6 -Xlint:-options \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- "$(JAVAC)" -source 8 -target 8 -Xlint:-options \
</span> + "$(JAVAC)" -source __MACPORTS_JAVA_VERSION__ -target __MACPORTS_JAVA_VERSION__ -Xlint:-options \
-d $(abs_top_builddir)/scripts/java \
$(org_octave_dir)/$(<F) )
</pre><pre style='margin:0'>
</pre>