<pre style='margin:0'>
MarcusCalhoun-Lopez pushed a commit to branch master
in repository macports-ports.

</pre>
<p><a href="https://github.com/macports/macports-ports/commit/a43dddb7fe3ddba0d96c2341fedadd87b4ddd45a">https://github.com/macports/macports-ports/commit/a43dddb7fe3ddba0d96c2341fedadd87b4ddd45a</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 a43dddb  octave: replace patch from octave-devel with correct patch
</span>a43dddb is described below

<span style='display:block; white-space:pre;color:#808000;'>commit a43dddb7fe3ddba0d96c2341fedadd87b4ddd45a
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Sun Dec 4 18:54:06 2016 -0700

<span style='display:block; white-space:pre;color:#404040;'>    octave: replace patch from octave-devel with correct patch
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    A revbump is required since an incorrect build might be possible with
</span><span style='display:block; white-space:pre;color:#404040;'>    a certain combinations of variants.
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Fixes https://trac.macports.org/ticket/53010
</span>---
 math/octave/Portfile                     |  1 +
 math/octave/files/patch-qscintilla2.diff | 13 ++++---------
 2 files changed, 5 insertions(+), 9 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 6a2f17b..dcea094 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;'>@@ -15,6 +15,7 @@ compiler.blacklist-append   {*gcc-3*} {*gcc-4.[0-5]} {clang < 500} cc
</span> 
 name                octave
 version             4.2.0
<span style='display:block; white-space:pre;background:#e0ffe0;'>+revision            1
</span> categories          math science
 platforms           darwin
 license             GPL-3+
<span style='display:block; white-space:pre;color:#808080;'>diff --git a/math/octave/files/patch-qscintilla2.diff b/math/octave/files/patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;color:#808080;'>index dcedb2d..d08241e 100644
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>--- a/math/octave/files/patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;background:#e0e0ff;'>+++ b/math/octave/files/patch-qscintilla2.diff
</span><span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -1,6 +1,6 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>---- m4/acinclude.m4.orig   2016-11-08 13:21:14.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-+++ m4/acinclude.m4        2016-11-11 09:31:48.000000000 -0700
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -1351,7 +1351,7 @@
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+--- configure.orig 2016-11-13 08:22:50.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>++++ configure      2016-12-04 18:39:39.000000000 -0700
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+@@ -34675,7 +34675,7 @@
</span>      ;;
      5)
        QT_MODULES="Qt5Core Qt5Gui Qt5Network Qt5OpenGL Qt5PrintSupport"
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -8,9 +8,4 @@
</span> +      octave_qscintilla_libnames="qscintilla2-qt5 qt5scintilla2 qscintilla2"
      ;;
      *)
<span style='display:block; white-space:pre;background:#ffe0e0;'>-       AC_MSG_ERROR([Unrecognized Qt version $qt_version])
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-@@ -2738,4 +2738,3 @@
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl         End of macros written by Octave developers
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl ------------------------------------------------------------
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>- dnl
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>--
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+       as_fn_error $? "Unrecognized Qt version $qt_version" "$LINENO" 5
</span></pre><pre style='margin:0'>

</pre>