[120865] trunk/dports/math/dolfin

[sean at macports.org]

Revision: 120865
          https://trac.macports.org/changeset/120865
Author:   sean at macports.org
Date:     2014-06-10 03:50:39 -0700 (Tue, 10 Jun 2014)
Log Message:
-----------
dolfin: update to 1.4.0; closes #43496

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

Added Paths:
-----------
    trunk/dports/math/dolfin/files/
    trunk/dports/math/dolfin/files/patch-petsc-cmake.diff

Modified: trunk/dports/math/dolfin/Portfile
===================================================================
--- trunk/dports/math/dolfin/Portfile	2014-06-10 10:50:31 UTC (rev 120864)
+++ trunk/dports/math/dolfin/Portfile	2014-06-10 10:50:39 UTC (rev 120865)
@@ -8,8 +8,7 @@
 
 mpi.setup           require
 
-bitbucket.setup     fenics-project dolfin 1.3.0 dolfin-
-revision            4
+bitbucket.setup     fenics-project dolfin 1.4.0 dolfin-
 categories          math
 platforms           darwin
 universal_variant   no
@@ -17,8 +16,8 @@
 description         DOLFIN is a part of FEniCS
 long_description    DOLFIN is a library that functions as the main user interface of FEniCS
 
-checksums           rmd160  0cb3316d43fc487519d967eb5da00756e907aec5 \
-                    sha256  04ea667c25ca57c84436d9dfe0233d610fc7e25c3ade3fb8c6c38b1260d68dae
+checksums           rmd160  42bcfc4a00ae5f2255f434cda1b2ea5996ee7a35 \
+                    sha256  64f058466a312198ea2b9de191bd4fbecaa70eb1c88325d03e680edb606b46cd
 
 configure.args-append \
                     -DPYTHON_EXECUTABLE:FILEPATH=${prefix}/bin/python2.7 \
@@ -26,7 +25,6 @@
                     -DPYTHON_LIBRARY:FILEPATH=${prefix}/lib/libpython2.7.dylib \
                     -DDOLFIN_INSTALL_PYTHON_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages \
                     -DDOLFIN_INSTALL_PYTHON_PURE_MODULE_DIR=${frameworks_dir}/Python.framework/Versions/2.7/lib/python2.7/site-packages \
-                    -DDOLFIN_SKIP_BUILD_TESTS=ON \
                     -DDOLFIN_ENABLE_CGAL:BOOL=OFF \
                     -DDOLFIN_ENABLE_DOCS:BOOL=OFF \
                     -DDOLFIN_ENABLE_HDF5:BOOL=OFF \
@@ -39,9 +37,14 @@
                     -DDOLFIN_ENABLE_SPHINX:BOOL=OFF \
                     -DDOLFIN_ENABLE_TRILINOS:BOOL=OFF \
                     -DDOLFIN_ENABLE_CHOLMOD:BOOL=OFF \
-                    -DDOLFIN_ENABLE_UMFPACK:BOOL=OFF
+                    -DDOLFIN_ENABLE_UMFPACK:BOOL=OFF \
+                    -DDOLFIN_ENABLE_PASTIX:BOOL=OFF
 
-depends_lib         port:py27-ply \
+depends_build-append \
+                    port:pkgconfig
+
+depends_lib-append  port:python27 \
+                    port:py27-ply \
                     port:armadillo \
                     port:py27-ffc \
                     port:qt4-mac \
@@ -77,7 +80,8 @@
                     -DCMAKE_Fortran_COMPILER=${configure.fc} \
                     -DMPI_C_COMPILER=${mpi.cc} \
                     -DMPI_CXX_COMPILER=${mpi.cxx} \
-                    -DMPI_Fortran_COMPILER=${mpi.fc}
+                    -DMPI_Fortran_COMPILER=${mpi.fc} \
+                    -DMPIEXEC=${mpi.exec}
 }
 
 variant cgal {
@@ -125,6 +129,9 @@
 }
 
 variant petsc {
+    # dolfin assumes too much about petsc on the mac so we patch the cmake
+    # files to remove this special logic
+    patchfiles-append     patch-petsc-cmake.diff
     depends_lib-append    port:petsc
     configure.args-delete -DDOLFIN_ENABLE_PETSC:BOOL=OFF
     configure.args-append -DDOLFIN_ENABLE_PETSC:BOOL=ON
@@ -138,4 +145,4 @@
     configure.args-append -DDOLFIN_ENABLE_SLEPC:BOOL=ON
 }
 
-default_variants +petsc +slepc +parmetis +suitesparse
+default_variants +suitesparse

Added: trunk/dports/math/dolfin/files/patch-petsc-cmake.diff
===================================================================
--- trunk/dports/math/dolfin/files/patch-petsc-cmake.diff	                        (rev 0)
+++ trunk/dports/math/dolfin/files/patch-petsc-cmake.diff	2014-06-10 10:50:39 UTC (rev 120865)
@@ -0,0 +1,35 @@
+--- cmake/modules/FindPETSc.cmake.orig	2014-06-10 01:10:50.000000000 -0500
++++ cmake/modules/FindPETSc.cmake	2014-06-10 01:11:08.000000000 -0500
+@@ -164,32 +164,6 @@
+   resolve_libraries(PETSC_LIBRARIES "${PETSC_LIB}")
+   resolve_libraries(PETSC_EXTERNAL_LIBRARIES "${PETSC_EXTERNAL_LIB_BASIC}")
+ 
+-  # Add some extra libraries on OSX
+-  if (APPLE)
+-
+-    # CMake will have troubel finding the gfortan libraries if compiling
+-    # with clang (the libs may be required by 3rd party Fortran libraries)
+-    find_program(GFORTRAN_EXECUTABLE gfortran)
+-    if (GFORTRAN_EXECUTABLE)
+-      execute_process(COMMAND ${GFORTRAN_EXECUTABLE} -print-file-name=libgfortran.dylib
+-      OUTPUT_VARIABLE GFORTRAN_LIBRARY
+-      OUTPUT_STRIP_TRAILING_WHITESPACE)
+-
+-      if (EXISTS "${GFORTRAN_LIBRARY}")
+-        list(APPEND PETSC_EXTERNAL_LIBRARIES ${GFORTRAN_LIBRARY})
+-      endif()
+-    endif()
+-
+-    find_package(X11)
+-    list(APPEND PETSC_INCLUDE_DIRS ${X11_X11_INCLUDE_PATH})
+-    list(APPEND PETSC_EXTERNAL_LIBRARIES ${X11_LIBRARIES})
+-
+-    # ResolveCompilerPaths strips OSX frameworks, so add BLAS here for OSX
+-    petsc_get_variable(PETSC_BLASLAPACK_LIB BLASLAPACK_LIB)
+-    list(APPEND PETSC_EXTERNAL_LIBRARIES ${PETSC_BLASLAPACK_LIB})
+-
+-  endif()
+-
+   # Remove temporary Makefile
+   file(REMOVE ${petsc_config_makefile})
+ 
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140610/e5cbf7d1/attachment-0001.html>