Modified: trunk/dports/lang/julia/Portfile (144226 => 144227)

--- trunk/dports/lang/julia/Portfile	2016-01-05 00:49:21 UTC (rev 144226)
+++ trunk/dports/lang/julia/Portfile	2016-01-05 00:49:23 UTC (rev 144227)
@@ -6,6 +6,7 @@
 PortGroup           compilers 1.0
 
 github.setup        JuliaLang julia 0.4.2 v
+revision            1
 categories-append   lang math science
 maintainers         sean openmaintainer
 platforms           darwin
@@ -42,7 +43,8 @@
     port:fftw-3-single \
     port:ncurses \
     port:arpack \
-    port:libgit2
+    port:libgit2 \
+    port:OpenBLAS
 
 use_configure       no
 # use_parallel_build  no
@@ -60,17 +62,11 @@
     ln -s ${prefix}/lib/libcholmod.dylib ${worksrcpath}/usr/lib/
     ln -s ${prefix}/lib/libsuitesparseconfig.dylib ${worksrcpath}/usr/lib/
     ln -s ${prefix}/lib/libarpack.dylib ${worksrcpath}/usr/lib/
+    ln -s ${prefix}/lib/libopenblas.dylib ${worksrcpath}/usr/lib/
 }
 
 build {}
 
-# julia can't use Apple's Accelerate framework so the choices are to build
-# lapack (32-bit interface) or build OpenBLAS (64-bit interface).
-# Alternatively, we could try to use MacPorts' own OpenBLAS port but that would
-# need to be updated to build the 64-bit interface which is inocmpatible with
-# the 32-bit interface. Since that could break other ports dependent on
-# OpenBLAS, we'll just stick with having julia download and build its own
-# internal OpenBLAS.
 pre-destroot {
     destroot.args-append \
         CC=${configure.cc} \
@@ -87,7 +83,14 @@
         USE_SYSTEM_FFTW=1 \
         USE_SYSTEM_ARPACK=1 \
         USE_SYSTEM_SUITESPARSE=1 \
-        USE_SYSTEM_LIBGIT2=1
+        USE_SYSTEM_LIBGIT2=1 \
+        USE_SYSTEM_BLAS=1 \
+        USE_SYSTEM_LAPACK=1 \
+        USE_BLAS64=0 \
+        LIBBLAS=-lopenblas \
+        LIBBLASNAME=libopenblas \
+        LIBLAPACK=-lopenblas \
+        LIBLAPACKNAME=libopenblas
 }
 
 post-destroot {
@@ -106,4 +109,20 @@
     }
 }
 
+variant blas64 description {Build internal OpenBLAS with 64-bit interface} {
+    depends_lib-delete \
+        port:OpenBLAS
+
+    pre-destroot {
+        destroot.args-delete \
+            USE_SYSTEM_BLAS=1 \
+            USE_SYSTEM_LAPACK=1 \
+            USE_BLAS64=0 \
+            LIBBLAS=-lopenblas \
+            LIBBLASNAME=libopenblas \
+            LIBLAPACK=-lopenblas \
+            LIBLAPACKNAME=libopenblas
+    }
+}
+
 livecheck.regex     archive/[join ${github.tag_prefix} ""](\[^"-\]+)${extract.suffix}