<pre style='margin:0'>
Marius Schamschula (Schamschula) pushed a commit to branch master
in repository macports-ports.
</pre>
<p><a href="https://github.com/macports/macports-ports/commit/5b127a23b69a6a06a04575d619a1d8eb8eb17260">https://github.com/macports/macports-ports/commit/5b127a23b69a6a06a04575d619a1d8eb8eb17260</a></p>
<pre style="white-space: pre; background: #F8F8F8">The following commit(s) were added to refs/heads/master by this push:
<span style='display:block; white-space:pre;color:#404040;'> new 5b127a2 octave-parallel: update to 4.0.0
</span>5b127a2 is described below
<span style='display:block; white-space:pre;color:#808000;'>commit 5b127a23b69a6a06a04575d619a1d8eb8eb17260
</span>Author: Marius Schamschula <mps@macports.org>
AuthorDate: Mon Apr 20 16:03:05 2020 -0500
<span style='display:block; white-space:pre;color:#404040;'> octave-parallel: update to 4.0.0
</span>---
math/octave-parallel/Portfile | 13 +++--
math/octave-parallel/files/patch-octave5.diff | 56 ----------------------
.../files/patch-src-gnutls-callbacks.cc.diff | 23 +++++++++
3 files changed, 29 insertions(+), 63 deletions(-)
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-parallel/Portfile b/math/octave-parallel/Portfile
</span><span style='display:block; white-space:pre;color:#808080;'>index 3e237ed..e7f3cb5 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-parallel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-parallel/Portfile
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -3,20 +3,19 @@
</span> PortSystem 1.0
PortGroup octave 1.0
<span style='display:block; white-space:pre;background:#ffe0e0;'>-octave.setup parallel 3.1.3
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-revision 2
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+octave.setup parallel 4.0.0
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+revision 0
</span> platforms darwin
license GPL-2+ GPL-3+
maintainers {mps @Schamschula} openmaintainer
description Parallel execution package for cluster computers.
long_description ${description}
<span style='display:block; white-space:pre;background:#ffe0e0;'>-checksums rmd160 ce9ccc6aa3bc44bcceeebdbabf6c2aee4c9186b4 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- sha256 bf4001b688da33df9a6a88e97f5e4fc32ba0c4ad5a30a686ecf9e1ab284bb4f8 \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- size 206468
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+checksums rmd160 7347f2f38b49002b6abc55e55523e24561057c7c \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ sha256 28eeeaa6f726e4a59cd0c979ac4f0925f04e9bd4eee88896cd8ce91cc054b772 \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size 753202
</span>
depends_lib-append port:gnutls \
port:octave-struct
<span style='display:block; white-space:pre;background:#ffe0e0;'>-# compensate for Octave 5 changes
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-patchfiles-append patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+patchfiles-append patch-src-gnutls-callbacks.cc.diff
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-parallel/files/patch-octave5.diff b/math/octave-parallel/files/patch-octave5.diff
</span>deleted file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 9ee0dab..0000000
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave-parallel/files/patch-octave5.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,56 +0,0 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pserver.cc.orig 2018-08-03 00:41:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pserver.cc 2019-03-09 09:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -169,7 +169,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (octave_completion_matches_called)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- octave_completion_matches_called = false;
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- command_editor::increment_current_command_number ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::command_editor::increment_current_command_number ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dsprintf ("reval loop, no error, after caring for Octave command number\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1116,10 +1116,10 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- OCTAVE__INTERPRETER__SYMBOL_TABLE__ASSIGN ("sockets", sockets);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dsprintf ("'sockets' installed\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- int cd_ok = octave_env::chdir (directory.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ int cd_ok = octave::sys::env::chdir (directory.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- if (! cd_ok)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- octave_env::chdir ("/tmp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ octave::sys::env::chdir ("/tmp");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dsprintf ("performed chdir to /tmp\n");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- else
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/minimal-load-save.cc.orig 2018-08-03 00:41:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/minimal-load-save.cc 2019-03-09 09:59:43.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -58,7 +58,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- flt_fmt = mopt_digit_to_float_format (tmp);
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- if (flt_fmt == OCTAVE__MACH_INFO::flt_fmt_unknown)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ if (flt_fmt == OCTAVE__MACH_INFO::float_format::flt_fmt_unknown)
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- _p_error ("unrecognized binary format");
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/pconnect.cc.orig 2018-08-03 00:41:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/pconnect.cc 2019-03-09 09:50:11.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -533,7 +533,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dcprintf ("hostname %i written (%s)\n", j, hosts(j).c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- }
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-- std::string directory = octave_env::get_current_directory ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+ std::string directory = octave::sys::env::get_current_directory ();
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- conn->get_cmd_stream ()->network_send_string (directory.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dcprintf ("directory written (%s)\n", directory.c_str ());
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- src/error-helpers.cc.orig 2018-08-03 00:41:42.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ src/error-helpers.cc 2019-03-09 09:49:55.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -20,6 +20,7 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include <octave/oct.h>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #include "error-helpers.h"
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+#include <iostream>
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- // call verror
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- #ifdef HAVE_OCTAVE_VERROR_ARG_EXC
</span><span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave-parallel/files/patch-src-gnutls-callbacks.cc.diff b/math/octave-parallel/files/patch-src-gnutls-callbacks.cc.diff
</span>new file mode 100644
<span style='display:block; white-space:pre;color:#808080;'>index 0000000..34af779
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--- /dev/null
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave-parallel/files/patch-src-gnutls-callbacks.cc.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -0,0 +1,23 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- src/gnutls-callbacks.cc.orig 2020-04-20 14:02:40.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ src/gnutls-callbacks.cc 2020-04-20 15:55:26.000000000 -0500
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -32,18 +32,12 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#ifdef HAVE_MALLOC_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#elif HAVE_SYS_MALLOC_H
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#include <sys/malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#else
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#error "No malloc.h present."
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+-#endif
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++#include <malloc/malloc.h>
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ static inline
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ size_t malloc_usable_size_wrapper (void *ptr)
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+- return malloc_usable_size (ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++ return malloc_size (ptr);
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+ #endif
</span></pre><pre style='margin:0'>
</pre>