Ticket #49058: Portfile-apbs.diff.5

Index: Portfile
===================================================================
--- Portfile    (revision 142427)
+++ Portfile    (working copy)
@@ -35,13 +35,10 @@
 depends_lib             port:maloc \
                         port:readline
 
-# dependencies are not managed correctly within this code, so errors such as from Eigen or -lapbs_geoflow might occur
+# dependencies are not managed correctly within this code, so errors such as from -lapbs_geoflow might occur
+# how to solve: first 'make apbs_geoflow', then 'make all'
 use_parallel_build no
 
-# BEM needs 'gfortran', hard-coded, and configure fails without it if BEM is enabled, with a syntax error
-#CMake Error at CMakeLists.txt:217 (get_filename_component):
-#  get_filename_component called with incorrect number of arguments
-# To enable, need not only to fix that check, but also fix configure in tapipb directory to use chosen FC compiler.
 configure.args-append   -DENABLE_OPENMP:BOOL=OFF \
                         -DENABLE_BEM=OFF \
                         -DCMAKE_C_COMPILER_ARG1:STRING="-I${worksrcpath}/include" \
@@ -60,6 +57,13 @@
     mergedx mergedx2 mgmesh multivalue similarity smooth tensor2dx
     uhbd_asc2bin value}
 
+# Some cmake tests will fail with "error: unrecognized option '-arch'" from gcc 4.6 and earlier. Same with dragonegg based on it.
+# llvm-gcc-4.2 will fail to build with: error: unrecognized command line option "-std=c++0x"
+compiler.blacklist      macports-gcc-4.4 macports-gcc-4.5 macports-gcc-4.6 \
+                        macports-dragonegg-3.3 macports-dragonegg-3.4 llvm-gcc-4.2
+# g++ will just fail to link apbs_geoflow. probably about -lstdc++ stuff. So, just use Fortran.
+compilers.choose        fc
+
 switch ${subport} {
     apbs {
         compilers.setup
@@ -99,6 +103,8 @@
                     -DCMAKE_CXX_COMPILER=${configure.cxx} \
                     -DMPI_C_COMPILER=${mpi.cc} \
                     -DMPI_CXX_COMPILER=${mpi.cxx}
+            # sometimes there will be a failure to link without this
+            reinplace -W ${worksrcpath} "s/-lmaloc/-lmaloc -lreadline/" CMakeLists.txt
         }
 
         destroot {
@@ -117,6 +123,28 @@
     }
 }
 
+variant bem description {Build with support for Boundary Element Method} {
+    configure.args-delete  -DENABLE_BEM=OFF
+    configure.args-append  -DENABLE_BEM=ON
+
+    if {![fortran_variant_isset]} {
+        ui_error "+bem requires a Fortran variant, e.g. +gfortran, +gccX, or +g95."
+        return -code error "+bem requires a Fortran variant."
+    }
+
+    # BEM looks for 'gfortran', hard-coded, and configure fails without it if BEM is enabled, with a syntax error
+    #CMake Error at CMakeLists.txt:217 (get_filename_component):
+    #  get_filename_component called with incorrect number of arguments
+    post-patch {
+        reinplace "s|get_filename_component(LIBGFORTRANPATH|#get_filename_component(LIBGFORTRANPATH|g" ${worksrcpath}/CMakeLists.txt 
+        reinplace "s|find_path(LIBGFORTRAN_PATH|#find_path(LIBGFORTRAN_PATH|g" ${worksrcpath}/CMakeLists.txt 
+        # -lstdc++ does not seem necessary and may cause trouble; specifying full paths avoid possible use of -ltabip from an earlier installation in ${prefix}
+        reinplace "s|-L\${LIBGFORTRAN_PATH} -lgfortran -ltabipb -lstdc\+\+|${compilers.libfortran} ${worksrcpath}/lib/libtabipb.a|" ${worksrcpath}/CMakeLists.txt
+        # provide this information to subsidiary cmake command run in tabipb directory during build phase
+        reinplace "s|CMAKE_ARGS|CMAKE_ARGS -DCMAKE_Fortran_COMPILER:STRING=${configure.fc}|" ${worksrcpath}/CMakeLists.txt
+    }
+}
+
 # check for real releases, not github commits
 livecheck.type   regex
 livecheck.url    http://www.poissonboltzmann.org/news/
Index: files/patch-Eigen-include-path.diff
===================================================================
--- files/patch-Eigen-include-path.diff (nonexistent)
+++ files/patch-Eigen-include-path.diff (working copy)
@@ -0,0 +1,22 @@
+--- src/geoflow/Mat.h.orig     2015-11-10 18:03:45.000000000 -0500
++++ src/geoflow/Mat.h  2015-11-10 18:04:15.000000000 -0500
+@@ -57,7 +57,7 @@
+ #include <cmath>
+ #include <vector>
+ 
+-#include <Eigen/Core>
++#include "Eigen/Core"
+ 
+ // The following is from modules.h, which includes this file, Mat.h.  We need
+ // the declaration here because we use it below in the deriv method.  If we
+--- src/geoflow/pbsolvercz.cpp.orig    2015-11-10 18:03:52.000000000 -0500
++++ src/geoflow/pbsolvercz.cpp 2015-11-10 18:04:31.000000000 -0500
+@@ -56,7 +56,7 @@
+ #include <valarray>
+ #include <vector>
+ 
+-#include <Eigen/Sparse>
++#include "Eigen/Sparse"
+ 
+ #include "Mat.h"
+ #include "modules.h"