Changeset 146714 for trunk/dports/math

Timestamp:

Mar 15, 2016, 5:35:59 PM (4 years ago)

Author:

mcalhoun@…

Message:

octave-devel: update to latest version; update necessitates moving patches around

Location:

trunk/dports/math/octave-devel

Files:

• Portfile (modified) (5 diffs)
• files/octave-bug_41027-half.patch (copied) (copied from trunk/dports/math/octave-devel/files/octave-bug_41027.patch) (2 diffs)

trunk/dports/math/octave-devel/Portfile

@@ -30 +30 @@
 if { ${name} eq ${subport} } {
     version         ${version_tip}
-    revision        4
-    hg.tag          12e98e5ebd13
-
-    # allow osmesa support to at least compile
+    revision        5
+    hg.tag          2868abbc88eb
+
+    # see http://savannah.gnu.org/bugs/?41027
     patchfiles-append   \
-        osmesa_mac_fix.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
+        octave-bug_41027-half.patch
 
     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"
@@ -62 +58 @@
         patch-e870a68742a6.diff
 
+    # see http://savannah.gnu.org/bugs/?41027
+    patchfiles-append   \
+        octave-bug_41027.patch
+
     checksums-append               \
         ${hg.tag}${extract.suffix} \
@@ -94 +94 @@
     patchfiles-append   \
         patch-append_version_cli.diff
+
+    # see http://savannah.gnu.org/bugs/?41027
+    patchfiles-append   \
+        octave-bug_41027.patch
 
     checksums-append               \
@@ -129 +133 @@
     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
@@ -590 +590 @@
 }
 
-# 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}
+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}
+        }
     }
 }

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

@@ -2 +2 @@
 --- 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
-@@ -25,7 +25,7 @@
+@@ -27,7 +27,7 @@
  
  #include <string>
@@ -12 +12 @@
  
 diff -r 900b524d9072 libinterp/corefcn/oct.h
---- a/libinterp/corefcn/oct.h   Sat Apr 19 09:28:20 2014 -0700
-+++ libinterp/corefcn/oct.h     Sun May 18 18:09:05 2014 +0200
-@@ -28,7 +28,7 @@
- // config.h needs to be first because it includes #defines that can */
- // affect other header files.
- 
--#include <config.h>
-+#include "config.h"
- 
- #include "Matrix.h"
-