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

[vince at macports.org]

Revision: 98544
          http://trac.macports.org//changeset/98544
Author:   vince at macports.org
Date:     2012-10-08 06:25:11 -0700 (Mon, 08 Oct 2012)
Log Message:
-----------
1. Correct a bug of the previous patch that did not handle correctly universal builds;
2. Bump to LAPACK 3.4.2 (wherefore the _1 revision).

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

Modified: trunk/dports/math/atlas/Portfile
===================================================================
--- trunk/dports/math/atlas/Portfile	2012-10-08 13:08:54 UTC (rev 98543)
+++ trunk/dports/math/atlas/Portfile	2012-10-08 13:25:11 UTC (rev 98544)
@@ -7,9 +7,10 @@
 license                         BSD
 name                            atlas
 version                         3.10.0
+revision						1
 
 # additional versions
-set lapackversion               3.4.1
+set lapackversion               3.4.2
 set lapackname                  lapack
 set atlasdist                   ${name}${version}.tar.bz2
 set lapackdist                  ${lapackname}-${lapackversion}.tgz
@@ -36,9 +37,9 @@
 checksums           atlas3.10.0.tar.bz2 \
 rmd160  4e969dfee2662c536e2f2bfc49b51e8ef5bc2c94 \
 sha256  a90a2e3463504e3297b56edc13769d766732e82bd8f1de951cfc78444f148465 \
-                    lapack-3.4.1.tgz \
-rmd160  3b715aff2924b47a45433376cfb9b66ffeeeb46d \
-sha256  93b910f94f6091a2e71b59809c4db4a14655db527cfc5821ade2e8c8ab75380f
+                    lapack-3.4.2.tgz \
+rmd160  8740c35c9a85b71424fe1ffeed192256aebeb431 \
+sha256  60a65daaf16ec315034675942618a2230521ea7adf85eea788ee54841072faf0
 
 
 variant gcc47                   conflicts gcc45 gcc46 clang mpclang31 mpclang32\
@@ -430,20 +431,12 @@
     }
 
     if {[variant_isset universal]} {
-        set    archs ${universal_archs_to_use}
+        foreach arch ${universal_archs_to_use} {
+			file mkdir ${workpath}/${name}-${version}-${arch}/build
+		}
     } else {
-        set    archs ${build_arch}
+        file mkdir ${workpath}/${name}-${version}/build
     }
-
-    foreach arch ${archs} {
-        if {![variant_isset universal]} {
-            set    atlas_path ${workpath}/${name}-${version}
-        } else {
-            set    atlas_path ${workpath}/${name}-${version}-${arch}
-        }
-
-        file mkdir ${atlas_path}/build
-    }
 }
 
 # We configure from the build directory
@@ -482,11 +475,22 @@
 build.dir               ${workpath}/${name}-${version}/build
 
 post-build {
-    reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
-        ${build.dir}/lib/Makefile
-    reinplace "s|dynamic|dynamiclib|g" \
-        ${build.dir}/lib/Makefile
-    system "cd ${build.dir}/lib && ${build.cmd} shared_all"
+	if {! [variant_isset universal]} {
+		reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+			${build.dir}/lib/Makefile
+		reinplace "s|dynamic|dynamiclib|g" \
+			${build.dir}/lib/Makefile
+		system "cd ${build.dir}/lib && ${build.cmd} shared_all"
+	} else {
+        foreach arch ${universal_archs_to_use} {
+			reinplace "s|^LIBTOOL=.*$|LIBTOOL=\$\(GCC\) \$\(GCCFLAGS\)|" \
+				${workpath}/${name}-${version}-${arch}/build/lib/Makefile
+			reinplace "s|dynamic|dynamiclib|g" \
+				${workpath}/${name}-${version}-${arch}/build/lib/Makefile
+			system "cd ${workpath}/${name}-${version}-${arch}/build/lib && \
+					${build.cmd} shared_all"
+		}
+	}
 }
 
 destroot.dir            ${build.dir}
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20121008/259004ee/attachment-0001.html>