[112587] trunk/dports/math/atlas/Portfile

[vince at macports.org]

Revision: 112587
          https://trac.macports.org/changeset/112587
Author:   vince at macports.org
Date:     2013-10-27 06:42:16 -0700 (Sun, 27 Oct 2013)
Log Message:
-----------
Implement Ryan’s further improvements. Thanks!

Modified Paths:
--------------
    trunk/dports/math/atlas/Portfile

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2013-10-27 12:50:31 UTC (rev 112586)
+++ trunk/dports/math/atlas/Portfile	2013-10-27 13:42:16 UTC (rev 112587)
@@ -47,9 +47,11 @@
                         rmd160  8740c35c9a85b71424fe1ffeed192256aebeb431 \
                         sha256  60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
 
-compiler.blacklist       macports-clang-3.1 macports-clang-3.0 \
-                         macports-clang-2.9
+worksrcdir              ATLAS
 
+compiler.blacklist      macports-clang-3.1 macports-clang-3.0 \
+                        macports-clang-2.9
+
 set     gcc_version      0
 set     use_clang        ""
 
@@ -371,15 +373,11 @@
 # Phases
 # Work around some bugs in the 3.10.1 tarball:
 # https://code.google.com/p/libarchive/issues/detail?id=299
-# https://sourceforge.net/p/math-atlas/support-request/884
+# https://sourceforge.net/p/math-atlas/support-requests/884
 
 extract.post_args-replace   -xf -xkf
 extract.post_args-append    {|| true}
 
-post-extract {
-    move ${workpath}/ATLAS ${worksrcpath}
-}
-
 post-patch {
     if {${build_arch} == "ppc" || ${build_arch} == "ppc64"} {
     
@@ -686,9 +684,8 @@
                 [join [split $merger_configure_args(${arch}) "{}"]]
                 
             # Create ${arch} build tree
-            copy ${workpath}/${name}-${version} \
-                ${workpath}/${name}-${version}-${arch}
-            file mkdir ${workpath}/${name}-${version}-${arch}/build
+            copy ${worksrcpath} ${worksrcpath}-${arch}
+            file mkdir ${worksrcpath}-${arch}/build
         }
     }
     
@@ -723,7 +720,7 @@
 
         foreach arch ${universal_archs_to_use} {
 
-            lappend atlas_paths ${workpath}/${name}-${version}-${arch}
+            lappend atlas_paths ${worksrcpath}-${arch}
         }
     } else {
 
@@ -782,7 +779,7 @@
 
         foreach arch ${universal_archs_to_use} {
 
-            set libdir ${workpath}/${name}-${version}-${arch}/build/lib
+            set libdir ${worksrcpath}-${arch}/build/lib
             reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
                 ${libdir}/Makefile
             reinplace "s|dynamic|dynamiclib|g" ${libdir}/Makefile
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20131027/0266e1ae/attachment.html>