[146577] trunk/dports/math/octave-devel/Portfile

[mcalhoun at macports.org]

Revision: 146577
          https://trac.macports.org/changeset/146577
Author:   mcalhoun at macports.org
Date:     2016-03-12 06:01:29 -0800 (Sat, 12 Mar 2016)
Log Message:
-----------
octave-devel, octave-devel-rc, octave-devel-release: move patchfiles that have been fixed upstream into subport block so they can be more easily removed later

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

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2016-03-12 13:30:18 UTC (rev 146576)
+++ trunk/dports/math/octave-devel/Portfile	2016-03-12 14:01:29 UTC (rev 146577)
@@ -32,6 +32,14 @@
     revision        4
     hg.tag          12e98e5ebd13
 
+    # allow osmesa support to at least compile
+    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
+
     checksums-append               \
         ${hg.tag}${extract.suffix} \
         rmd160  173e4f1376ebbbbce553162c7068f72b48ba67af \
@@ -53,6 +61,14 @@
     patchfiles-append \
         patch-e870a68742a6.diff
 
+    # allow osmesa support to at least compile
+    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
+
     checksums-append               \
         ${hg.tag}${extract.suffix} \
         rmd160  5c6fe167b032eb318458a8223838e123f27525e4 \
@@ -78,6 +94,14 @@
     patchfiles-append \
         patch-e870a68742a6.diff
 
+    # allow osmesa support to at least compile
+    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
+
     checksums-append               \
         ${hg.tag}${extract.suffix} \
         rmd160  4bbcc004ffdde859b0735e602aac2d01388d0b2c \
@@ -113,10 +137,6 @@
     move ${worksrcpath}/../gnulib-hg-${hg_gnu_tag} ${worksrcpath}/gnulib-hg
 }
 
-# allow osmesa support to at least compile
-patchfiles-append   \
-    osmesa_mac_fix.patch
-
 # see http://savannah.gnu.org/bugs/?41027
 patchfiles-append   \
     octave-bug_41027.patch
@@ -125,10 +145,6 @@
 patchfiles-append   \
     patch-stdio.in.h.diff
 
-# force "${prefix}/bin/octave-${version} --no-gui-libs" to call octave-cli-${version} instead of octave-cli
-patchfiles-append   \
-    patch-append_version_cli.diff
-
 pre-patch {
     # code located in pre-patch because variants from PortGroup compilers must
     #    be evaluated before it can be determined if clang is being used
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160312/88277f86/attachment.html>