[115858] trunk/dports/math/metis

[sean at macports.org]

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

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

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

Modified: trunk/dports/math/metis/Portfile
===================================================================
--- trunk/dports/math/metis/Portfile	2014-01-13 06:10:11 UTC (rev 115857)
+++ trunk/dports/math/metis/Portfile	2014-01-13 06:10:16 UTC (rev 115858)
@@ -3,11 +3,10 @@
 
 PortSystem          1.0
 PortGroup           cmake 1.0
-PortGroup           conflicts_build 1.0
 
 name                metis
 version             5.1.0
-revision            1
+revision            2
 categories          math
 platforms           darwin
 maintainers         sean
@@ -36,12 +35,11 @@
                     missing_includes.patch \
                     cmake_tls.patch \
                     gkl.patch \
-                    cmake_gklib_tls.patch
+                    cmake_gklib_tls.patch \
+                    cmake_system_include.patch
 
-# metis will pick up files in ${prefix}, unfortunately
-conflicts_build     metis
-
-configure.args      -DGKLIB_PATH=${worksrcpath}/GKlib \
+configure.args-append \
+                    -DGKLIB_PATH=${worksrcpath}/GKlib \
                     -DSHARED=1 \
                     -DMETIS_USE_DOUBLEPRECISION=1
 

Added: trunk/dports/math/metis/files/cmake_system_include.patch
===================================================================
--- trunk/dports/math/metis/files/cmake_system_include.patch	                        (rev 0)
+++ trunk/dports/math/metis/files/cmake_system_include.patch	2014-01-13 06:10:16 UTC (rev 115858)
@@ -0,0 +1,16 @@
+diff -r decbfb90b77a CMakeLists.txt
+--- a/CMakeLists.txt	Tue Mar 20 13:54:31 2012 -0500
++++ b/CMakeLists.txt	Sun Jan 12 22:15:09 2014 -0600
+@@ -16,10 +16,12 @@ if(SHARED)
+   set(CMAKE_INSTALL_NAME_DIR "${CMAKE_INSTALL_PREFIX}/lib")
+ else()
+   set(METIS_LIBRARY_TYPE STATIC)
+ endif(SHARED)
+ 
++include_directories(SYSTEM /opt/local/include)
++
+ include(${GKLIB_PATH}/GKlibSystem.cmake)
+ # Add include directories.
+ include_directories(${GKLIB_PATH})
+ include_directories(include)
+ # Recursively look for CMakeLists.txt in subdirs.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20140112/e7a1e5f6/attachment.html>