[146714] trunk/dports/math/octave-devel

[mcalhoun at macports.org]

Revision: 146714
          https://trac.macports.org/changeset/146714
Author:   mcalhoun at macports.org
Date:     2016-03-15 10:35:59 -0700 (Tue, 15 Mar 2016)
Log Message:
-----------
octave-devel: update to latest version; update necessitates moving patches around

Modified Paths:
--------------
    trunk/dports/math/octave-devel/Portfile

Added Paths:
-----------
    trunk/dports/math/octave-devel/files/octave-bug_41027-half.patch

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2016-03-15 17:28:46 UTC (rev 146713)
+++ trunk/dports/math/octave-devel/Portfile	2016-03-15 17:35:59 UTC (rev 146714)
@@ -29,21 +29,17 @@
 
 if { ${name} eq ${subport} } {
     version         ${version_tip}
-    revision        4
-    hg.tag          12e98e5ebd13
+    revision        5
+    hg.tag          2868abbc88eb
 
-    # allow osmesa support to at least compile
+    # see http://savannah.gnu.org/bugs/?41027
     patchfiles-append   \
-        osmesa_mac_fix.patch
+        octave-bug_41027-half.patch
 
-    # force "${prefix}/bin/octave-${version} --no-gui-libs" to call octave-cli-${version} instead of octave-cli
-    patchfiles-append   \
-        patch-append_version_cli.diff
-
     checksums-append               \
         ${hg.tag}${extract.suffix} \
-        rmd160  173e4f1376ebbbbce553162c7068f72b48ba67af \
-        sha256  8dcf8a3caaffee78492119b57b79981fd26e9c8330fa2ebc0cd219e504ffed81
+        rmd160  0a5fd063e2587d451a1c8bde668e1c9b542d5fde \
+        sha256  58b725674c43ea866c87235da7e7c9a75e9629b3215908c0c8c20aa60ee818b4
 
     livecheck.regex   "<a href=\"/hgweb/octave/rev/(\[a-zA-Z0-9.\]+)\">\ntip"
 }
@@ -61,6 +57,10 @@
     patchfiles-append \
         patch-e870a68742a6.diff
 
+    # see http://savannah.gnu.org/bugs/?41027
+    patchfiles-append   \
+        octave-bug_41027.patch
+
     checksums-append               \
         ${hg.tag}${extract.suffix} \
         rmd160  4bf919790f28f21752381e127cf55b3a5f4d7344 \
@@ -94,6 +94,10 @@
     patchfiles-append   \
         patch-append_version_cli.diff
 
+    # see http://savannah.gnu.org/bugs/?41027
+    patchfiles-append   \
+        octave-bug_41027.patch
+
     checksums-append               \
         ${hg.tag}${extract.suffix} \
         rmd160  4bbcc004ffdde859b0735e602aac2d01388d0b2c \
@@ -129,10 +133,6 @@
     move ${worksrcpath}/../gnulib-hg-${hg_gnu_tag} ${worksrcpath}/gnulib-hg
 }
 
-# see http://savannah.gnu.org/bugs/?41027
-patchfiles-append   \
-    octave-bug_41027.patch
-
 # see http://git.savannah.gnu.org/cgit/gnulib.git/commit/lib/stdio.in.h?id=d6176702c3ffb6c56e6620397470e1b3bd540b10
 patchfiles-append   \
     patch-stdio.in.h.diff
@@ -589,23 +589,25 @@
     default_variants-append +graphicsmagick
 }
 
-# remove architecture flags from header file
-if { [variant_exists universal] && [variant_isset universal] } {
-    merger-post-destroot {
-        foreach arch ${universal_archs_to_use} {
-            set hfile ${destroot}-${arch}${prefix}/include/octave-${version}/octave/oct-conf.h
-            reinplace "s:-arch ${arch}::g"   ${hfile}
-            reinplace {s:-m32::g}            ${hfile}
-            reinplace {s:-m64::g}            ${hfile}
+if { ${subport} eq "octave-devel-rc" || ${subport} eq "octave-devel-release" } {
+    # remove architecture flags from header file
+    if { [variant_exists universal] && [variant_isset universal] } {
+        merger-post-destroot {
+            foreach arch ${universal_archs_to_use} {
+                set hfile ${destroot}-${arch}${prefix}/include/octave-${version}/octave/oct-conf.h
+                reinplace "s:-arch ${arch}::g"   ${hfile}
+                reinplace {s:-m32::g}                ${hfile}
+                reinplace {s:-m64::g}                ${hfile}
+            }
         }
+    } else {
+        post-destroot {
+            set hfile ${destroot}${prefix}/include/octave-${version}/octave/oct-conf.h
+            reinplace "s:-arch ${build_arch}::g" ${hfile}
+            reinplace {s:-m32::g}                ${hfile}
+            reinplace {s:-m64::g}                ${hfile}
+        }
     }
-} else {
-    post-destroot {
-        set hfile ${destroot}${prefix}/include/octave-${version}/octave/oct-conf.h
-        reinplace "s:-arch ${build_arch}::g" ${hfile}
-        reinplace {s:-m32::g}                ${hfile}
-        reinplace {s:-m64::g}                ${hfile}
-    }
 }
 
 # remove or rename conflicting files

Copied: trunk/dports/math/octave-devel/files/octave-bug_41027-half.patch (from rev 146572, trunk/dports/math/octave-devel/files/octave-bug_41027.patch)
===================================================================
--- trunk/dports/math/octave-devel/files/octave-bug_41027-half.patch	                        (rev 0)
+++ trunk/dports/math/octave-devel/files/octave-bug_41027-half.patch	2016-03-15 17:35:59 UTC (rev 146714)
@@ -0,0 +1,13 @@
+diff -r 900b524d9072 libinterp/corefcn/comment-list.h
+--- a/libinterp/corefcn/comment-list.h	Sat Apr 19 09:28:20 2014 -0700
++++ libinterp/corefcn/comment-list.h	Sun May 18 18:09:05 2014 +0200
+@@ -27,7 +27,7 @@
+ 
+ #include <string>
+ 
+-#include <base-list.h>
++#include "base-list.h"
+ 
+ extern std::string get_comment_text (void);
+ 
+diff -r 900b524d9072 libinterp/corefcn/oct.h
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160315/5593dd9f/attachment-0001.html>