<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/76b326ad796c8c88cdf51842c2692c619df8b3b9">https://github.com/macports/macports-ports/commit/76b326ad796c8c88cdf51842c2692c619df8b3b9</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 76b326a  octave: fix java.version search
</span>76b326a is described below

<span style='display:block; white-space:pre;color:#808000;'>commit 76b326ad796c8c88cdf51842c2692c619df8b3b9
</span>Author: Marcus Calhoun-Lopez <mcalhoun@macports.org>
AuthorDate: Fri Dec 6 06:20:16 2019 -0700

<span style='display:block; white-space:pre;color:#404040;'>    octave: fix java.version search
</span><span style='display:block; white-space:pre;color:#404040;'>    
</span><span style='display:block; white-space:pre;color:#404040;'>    Search for java.version 1.8+ instead of 1.8.
</span>---
 math/octave/Portfile | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 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 3040772..d356f7d 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;'>@@ -70,7 +70,14 @@ patchfiles-append patch-link_location.diff
</span> patchfiles-append patch-qt5-cxxflags.diff
 
 # see https://savannah.gnu.org/patch/index.php?9806
<span style='display:block; white-space:pre;background:#e0ffe0;'>+set java_version 1.8
</span> patchfiles-append patch-java_version.diff
<span style='display:block; white-space:pre;background:#e0ffe0;'>+post-patch {
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    reinplace \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        "s|__MACPORTS_JAVA_VERSION__|${java_version}|g" \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/Makefile.in \
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+        ${worksrcpath}/scripts/java/module.mk
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+}
</span> 
 post-patch {
     if { ${os.arch} eq "i386" } {
<span style='display:block; white-space:pre;background:#e0e0e0;'>@@ -394,13 +401,7 @@ pre-configure {
</span> variant java description {enable Java interface} {
     PortGroup java 1.0
     configure.args-replace --disable-java --enable-java
<span style='display:block; white-space:pre;background:#ffe0e0;'>-    java.version 1.8
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    post-patch {
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-        reinplace \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            "s|__MACPORTS_JAVA_VERSION__|${java.version}|g" \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/Makefile.in \
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-            ${worksrcpath}/scripts/java/module.mk
</span><span style='display:block; white-space:pre;background:#ffe0e0;'>-    }
</span><span style='display:block; white-space:pre;background:#e0ffe0;'>+    java.version ${java_version}+
</span> }
 # java variant seems to cause problems for both users and build bots
 #    https://lists.macosforge.org/pipermail/macports-users/2016-May/thread.html#41052
</pre><pre style='margin:0'>

</pre>