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

[mcalhoun at macports.org]

Revision: 148703
          https://trac.macports.org/changeset/148703
Author:   mcalhoun at macports.org
Date:     2016-05-15 03:39:30 -0700 (Sun, 15 May 2016)
Log Message:
-----------
octave-devel-rc, octave-devel-release: remove from header file whitespace in front of architecture flag

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

Modified: trunk/dports/math/octave-devel/Portfile
===================================================================
--- trunk/dports/math/octave-devel/Portfile	2016-05-15 10:31:53 UTC (rev 148702)
+++ trunk/dports/math/octave-devel/Portfile	2016-05-15 10:39:30 UTC (rev 148703)
@@ -47,7 +47,7 @@
 
 subport octave-devel-rc {
     version         ${version_rc}
-    revision        5
+    revision        6
     hg.tag          2b66f30a0de7
 
     if {${version_rc} eq ${version_release}} {
@@ -72,7 +72,7 @@
 
 subport octave-devel-release {
     version         ${version_release}
-    revision        1
+    revision        2
     hg.tag          5162cdfb56d8
 
     if {${version_release} eq ${version_rc}} {
@@ -616,17 +616,17 @@
         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}
+                reinplace -E "s:\\w*-arch ${arch}::g" ${hfile}
+                reinplace -E {s:\\w*-m32::g}          ${hfile}
+                reinplace -E {s:\\w*-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}
+            reinplace -E "s:\\w*-arch ${build_arch}::g" ${hfile}
+            reinplace -E {s:\\w*-m32::g}                ${hfile}
+            reinplace -E {s:\\w*-m64::g}                ${hfile}
         }
     }
 }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20160515/22346487/attachment-0001.html>