[115860] trunk/dports/math/parmetis

[sean at macports.org]

Revision: 115860
          https://trac.macports.org/changeset/115860
Author:   sean at macports.org
Date:     2014-01-12 22:10:24 -0800 (Sun, 12 Jan 2014)
Log Message:
-----------
parmetis: remove conflicts_build

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

Added Paths:
-----------
    trunk/dports/math/parmetis/files/cmake_system_include.patch

Modified: trunk/dports/math/parmetis/Portfile
===================================================================
--- trunk/dports/math/parmetis/Portfile	2014-01-13 06:10:18 UTC (rev 115859)
+++ trunk/dports/math/parmetis/Portfile	2014-01-13 06:10:24 UTC (rev 115860)
@@ -2,12 +2,11 @@
 # $Id$
 
 PortSystem          1.0
-PortGroup           conflicts_build 1.0
 PortGroup           cmake 1.0
 
 name                parmetis
 version             4.0.3
-revision            1
+revision            2
 categories          math
 platforms           darwin
 maintainers         sean openmaintainer
@@ -26,7 +25,6 @@
                     sha256  f2d9a231b7cf97f1fee6e8c9663113ebf6c240d407d3c118c55b3633d6be6e5f
 
 depends_lib         port:metis
-conflicts_build     parmetis
 
 patch.pre_args      -p1
 patchfiles-append   sharedprefix.patch \
@@ -36,13 +34,13 @@
                     tls.patch \
                     less_than_equal.patch \
                     default_path.patch \
-                    static.patch
+                    static.patch \
+                    cmake_system_include.patch
 
 # mpich-default and openmpi are not universal
 universal_variant   no
 
-configure.args      -DGKLIB_PATH=${worksrcpath}/headers \
-                    -DMETIS_PATH=${worksrcpath}/metis \
+configure.args-append \
                     -DSHARED=1
 
 variant mpich conflicts openmpi description {Build ParMETIS using MPICH} {

Added: trunk/dports/math/parmetis/files/cmake_system_include.patch
===================================================================
--- trunk/dports/math/parmetis/files/cmake_system_include.patch	                        (rev 0)
+++ trunk/dports/math/parmetis/files/cmake_system_include.patch	2014-01-13 06:10:24 UTC (rev 115860)
@@ -0,0 +1,18 @@
+diff -r e2c25776392e CMakeLists.txt
+--- a/CMakeLists.txt	Mon Mar 26 13:48:59 2012 -0500
++++ b/CMakeLists.txt	Sun Jan 12 22:23:06 2014 -0600
+@@ -23,12 +23,12 @@ endif()
+ # List of paths that the compiler will search for header files.
+ # i.e., the -I equivalent
+ include_directories(include)
+ include_directories(${MPI_INCLUDE_PATH})
+ include_directories(${GKLIB_PATH})
+-include_directories(${METIS_PATH}/include)
+-include_directories(${CMAKE_INSTALL_PREFIX}/include)
++include_directories(SYSTEM ${METIS_PATH}/include)
++include_directories(SYSTEM ${CMAKE_INSTALL_PREFIX}/include)
+ 
+ # List of paths that the compiler will search for library files.
+ # i.e., the -L equivalent
+ link_directories(${METIS_PATH}/lib)
+ link_directories(${CMAKE_INSTALL_PREFIX}/lib)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140112/8d5ad451/attachment.html>