Ticket #40989: atlas-worksrcdir.diff

Portfile

@@ -47 +47 @@
                         rmd160  8740c35c9a85b71424fe1ffeed192256aebeb431 \
                         sha256  60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
 
+worksrcdir              ATLAS
+
 compiler.blacklist       macports-clang-3.1 macports-clang-3.0 \
                          macports-clang-2.9
 
@@ -371 +373 @@
 # 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 +684 @@
                 [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 +720 @@
 
         foreach arch ${universal_archs_to_use} {
 
-            lappend atlas_paths ${workpath}/${name}-${version}-${arch}
+            lappend atlas_paths ${worksrcpath}-${arch}
         }
     } else {
 
@@ -782 +779 @@
 
         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