[88691] trunk/dports/math/SuiteSparse

[eborisch at macports.org]

Revision: 88691
          http://trac.macports.org/changeset/88691
Author:   eborisch at macports.org
Date:     2012-01-07 20:27:17 -0800 (Sat, 07 Jan 2012)
Log Message:
-----------
SuiteSparse: Return to 3.4.0 until I/someone has inspration to pick apart what needs to happen to fix #32754 (and by extension #32788). Keep change of metis as a variant so the default SuiteSparse is distributable. (Should make py2N-scipy distributatble.)

Modified Paths:
--------------
    trunk/dports/math/SuiteSparse/Portfile
    trunk/dports/math/SuiteSparse/files/UFconfig_UFconfig.mk-patch

Modified: trunk/dports/math/SuiteSparse/Portfile
===================================================================
--- trunk/dports/math/SuiteSparse/Portfile	2012-01-08 02:03:05 UTC (rev 88690)
+++ trunk/dports/math/SuiteSparse/Portfile	2012-01-08 04:27:17 UTC (rev 88691)
@@ -4,7 +4,8 @@
 PortSystem          1.0
 
 name                SuiteSparse
-version             3.7.0
+version             3.4.0
+epoch               20120107
 categories          math science
 platforms           darwin
 maintainers         nomaintainer
@@ -19,9 +20,9 @@
 master_sites        http://www.cise.ufl.edu/research/sparse/SuiteSparse/
 worksrcdir          ${name}
 
-checksums           md5     e7579ba6ab4265b751753649cb63664d \
-                    sha1    a1f57cb7f6bbea5d33911c6ca6acd77ba7dfa117 \
-                    rmd160  981f8645000ab880d1208a6a543dc4c0d2ae8e4c
+checksums           md5     e59dcabc9173b1ba1b3659ae147006b8 \
+                    sha1    6de027d48a573659b40ddf57c10e32b39ab034c6 \
+                    rmd160  77ff7376691d2bc8581de6ae89f246cb289b2708 
 
 patchfiles          makefiles.patch \
                     UFconfig_UFconfig.mk-patch
@@ -65,10 +66,11 @@
         "s|(\[^a-zA-Z\])Imag(\[^a-zA-Z\])|\\1ImagPart\\2|g" \
         ${worksrcpath}/KLU/Include/klu_version.h
     # ranlib after ar
+    # THESE LINES NEED TO HAVE TABS ENCODED IN THE PORTFILE
     reinplace "s|ccolamd_global\.o|ccolamd_global.o\\
-        - \$(RANLIB) libccolamd.a|" ${worksrcpath}/CCOLAMD/Lib/Makefile
+	- \$(RANLIB) libccolamd.a|" ${worksrcpath}/CCOLAMD/Lib/Makefile
     reinplace "s|colamd_global\.o|colamd_global.o\\
-        - \$(RANLIB) libcolamd.a|" ${worksrcpath}/COLAMD/Lib/Makefile
+	- \$(RANLIB) libcolamd.a|" ${worksrcpath}/COLAMD/Lib/Makefile
 }
 
 post-configure {

Modified: trunk/dports/math/SuiteSparse/files/UFconfig_UFconfig.mk-patch
===================================================================
--- trunk/dports/math/SuiteSparse/files/UFconfig_UFconfig.mk-patch	2012-01-08 02:03:05 UTC (rev 88690)
+++ trunk/dports/math/SuiteSparse/files/UFconfig_UFconfig.mk-patch	2012-01-08 04:27:17 UTC (rev 88691)
@@ -1,24 +1,38 @@
---- UFconfig/UFconfig.mk.orig	2012-01-03 12:39:38.000000000 -0600
-+++ UFconfig/UFconfig.mk	2012-01-03 12:41:54.000000000 -0600
-@@ -211,10 +211,10 @@
+--- UFconfig/UFconfig.mk.orig	2012-01-07 22:12:31.000000000 -0600
++++ UFconfig/UFconfig.mk	2012-01-07 22:13:37.000000000 -0600
+@@ -122,13 +122,13 @@
+ # The path is relative to where it is used, in CHOLMOD/Lib, CHOLMOD/MATLAB, etc.
+ # You may wish to use an absolute path.  METIS is optional.  Compile
+ # CHOLMOD with -DNPARTITION if you do not wish to use METIS.
+-METIS_PATH = ../../metis-4.0
+-METIS = ../../metis-4.0/libmetis.a
++# METIS_PATH = ../../metis-4.0
++# METIS = ../../metis-4.0/libmetis.a
+ 
+ # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following
+ # options:
+-# METIS_PATH =
+-# METIS =
++METIS_PATH =
++METIS =
+ 
+ #------------------------------------------------------------------------------
+ # UMFPACK configuration:
+@@ -184,7 +184,7 @@
  # -DNSUNPERF	    for Solaris only.  If defined, do not use the Sun
  #			Performance Library
  
 -CHOLMOD_CONFIG =
-+# CHOLMOD_CONFIG =
++CHOLMOD_CONFIG = -DNPARTITION	    
  
- # uncomment this line to compile CHOLMOD without METIS:
--# CHOLMOD_CONFIG = -DNPARTITION
-+CHOLMOD_CONFIG = -DNPARTITION
- 
  #------------------------------------------------------------------------------
  # SuiteSparseQR configuration:
-@@ -228,7 +228,7 @@
+@@ -198,7 +198,7 @@
  # -DHAVE_TBB        enable the use of Intel's Threading Building Blocks (TBB)
  
  # default, without timing, without TBB:
 -SPQR_CONFIG =
-+SPQR_CONFIG = -DNPARTITION
++SPQR_CONFIG = -DNPARTITION	    
  # with timing and TBB:
  # SPQR_CONFIG = -DTIMING -DHAVE_TBB
  # with timing
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20120107/d05fd9a7/attachment.html>