[105503] trunk/dports/math/SuiteSparse

[michaelld at macports.org]

Revision: 105503
          https://trac.macports.org/changeset/105503
Author:   michaelld at macports.org
Date:     2013-04-22 18:52:27 -0700 (Mon, 22 Apr 2013)
Log Message:
-----------
SuiteSparse:
* fix -I ordering when using METIS from MacPorts, such that the
  MacPorts' entry comes last and thus does not conflict with any
  already-installed headers (uses those just internal to SuiteSparse);
* patch a couple Demo/Makefile's such that they do not try to do
  "cd $(METIS_PATH) && make", where METIS_PATH=${prefix};
* should fully address ticket #38776.

Modified Paths:
--------------
    trunk/dports/math/SuiteSparse/Portfile
    trunk/dports/math/SuiteSparse/files/patch-CHOLMOD_Lib_Makefile.diff

Modified: trunk/dports/math/SuiteSparse/Portfile
===================================================================
--- trunk/dports/math/SuiteSparse/Portfile	2013-04-23 00:47:32 UTC (rev 105502)
+++ trunk/dports/math/SuiteSparse/Portfile	2013-04-23 01:52:27 UTC (rev 105503)
@@ -53,7 +53,10 @@
         # Do not try to build Metis in /opt/local
         reinplace \
             "s|^\$\(METIS\):$|fooblafoo:|" \
-            ${worksrcpath}/UMFPACK/Demo/Makefile
+            ${worksrcpath}/UMFPACK/Demo/Makefile \
+            ${worksrcpath}/SPQR/Demo/Makefile
+        reinplace \
+            "/\$\(METIS_PATH\)/d" ${worksrcpath}/CHOLMOD/Demo/Makefile
 
         # There is a patch on the SuiteSparse homepage to get Metis 5.0 to work with SuiteSparse.
         # It replaces all idxtype with idx_t

Modified: trunk/dports/math/SuiteSparse/files/patch-CHOLMOD_Lib_Makefile.diff
===================================================================
--- trunk/dports/math/SuiteSparse/files/patch-CHOLMOD_Lib_Makefile.diff	2013-04-23 00:47:32 UTC (rev 105502)
+++ trunk/dports/math/SuiteSparse/files/patch-CHOLMOD_Lib_Makefile.diff	2013-04-23 01:52:27 UTC (rev 105503)
@@ -1,12 +1,22 @@
---- CHOLMOD/Lib/Makefile.orig	2013-04-13 09:35:51.000000000 -0400
-+++ CHOLMOD/Lib/Makefile	2013-04-13 09:37:32.000000000 -0400
-@@ -32,7 +32,8 @@
+--- CHOLMOD/Lib/Makefile.orig	2013-04-22 21:13:04.000000000 -0400
++++ CHOLMOD/Lib/Makefile	2013-04-22 21:17:59.000000000 -0400
+@@ -22,8 +22,7 @@
+                 # METIS, CAMD, and CCOLAMD are available
+                 LIB_WITH_PARTITION = $(METIS) ../../CCOLAMD/Lib/libccolamd.a \
+                     ../../CAMD/Lib/libcamd.a
+-                I_WITH_PARTITION = -I$(METIS_PATH)/Lib \
+-                    -I../../CCOLAMD/Include -I../../CAMD/Include
++                I_WITH_PARTITION = -I$(METIS_PATH)/Lib
+                 CONFIG =
+             endif
+         endif
+@@ -32,7 +31,8 @@
  #-------------------------------------------------------------------------------
  
  I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD/Include \
 -	$(I_WITH_PARTITION) -I../Include -I../../SuiteSparse_config
-+	$(I_WITH_PARTITION) -I../Include -I../../SuiteSparse_config \
-+	-I../../CCOLAMD/Include -I../../CAMD/Include
++	-I../Include -I../../SuiteSparse_config \
++	-I../../CCOLAMD/Include -I../../CAMD/Include $(I_WITH_PARTITION)
  
  #-------------------------------------------------------------------------------
  
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130422/ab338fb8/attachment.html>