From 641f9e7c8a406e067c864fe3792db0345720081e Mon Sep 17 00:00:00 2001 From: Maho Nakata Date: Wed, 20 Feb 2008 08:31:24 +0000 Subject: Update to 3.1.0. --- math/suitesparse/Makefile | 88 +++++++++++++--------- math/suitesparse/distinfo | 6 +- math/suitesparse/files/patch-CHOLMOD+Lib+Makefile | 11 --- .../files/patch-CSparse+Source+Makefile | 11 --- .../files/patch-CXSparse+Source+Makefile | 11 --- math/suitesparse/files/patch-Makefile | 11 --- math/suitesparse/files/patch-UFconfig+UFconfig.mk | 49 +++++++----- math/suitesparse/pkg-plist | 3 - 8 files changed, 85 insertions(+), 105 deletions(-) delete mode 100644 math/suitesparse/files/patch-CHOLMOD+Lib+Makefile delete mode 100644 math/suitesparse/files/patch-CSparse+Source+Makefile delete mode 100644 math/suitesparse/files/patch-CXSparse+Source+Makefile delete mode 100644 math/suitesparse/files/patch-Makefile (limited to 'math/suitesparse') diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile index fd94ebe14992..7874909bb1c9 100644 --- a/math/suitesparse/Makefile +++ b/math/suitesparse/Makefile @@ -6,7 +6,7 @@ # PORTNAME= suitesparse -PORTVERSION= 2.4.0 +PORTVERSION= 3.1.0 CATEGORIES= math MASTER_SITES= http://www.cise.ufl.edu/research/sparse/SuiteSparse/ DISTNAME= SuiteSparse-${PORTVERSION} @@ -15,24 +15,40 @@ DIST_SUBDIR= ${PORTNAME}/${PORTVERSION} MAINTAINER= maho@FreeBSD.org COMMENT= SuiteSparse is a set of packages for sparse matrices calculation -LIB_DEPENDS= metis:${PORTSDIR}/math/metis +.if defined (WITH_METIS) +LIB_DEPENDS= metis:${PORTSDIR}/math/metis +.endif + +.if defined (WITH_METIS) +RESTRICTED= GPL and METIS license contradicts +.endif CONFLICTS= umfpack-* .include -.if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS) -WITH_ATLAS= yes +USE_BLAS?= reference + +.if exists(${LOCALBASE}/lib/libgoto.so) +USE_BLAS= gotoblas +.elif exists(${LOCALBASE}/lib/libatlas_r.so) +USE_BLAS= atlas .endif -.if defined(WITH_ATLAS) -LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas -BLAS= -L${LOCALBASE}/lib -lf77blas -latlas -lcblas -LAPACK= -L${LOCALBASE}/lib -lalapack -.else + +.if ${USE_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack -BLAS= -L${LOCALBASE}/lib -lblas -LAPACK= -L${LOCALBASE}/lib -llapack +BLAS= -lblas +LAPACK= -llapack +.elif ${USE_BLAS} == gotoblas +LIB_DEPENDS+= goto:${PORTSDIR}/math/gotoblas +LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack +BLAS= -pthread -lgotop +LAPACK= -pthread -lgotop -llapack +.elif ${USE_BLAS} == atlas +LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas +BLAS= -pthread -lptf77blas -lptcblas -latlas_r +LAPACK= -pthread -lalapack_r .endif .if ${ARCH} == "sparc64" || ${ARCH} == "amd64" @@ -50,35 +66,35 @@ CFLAGS_SHARED=${CFLAGS} ${FPIC} FFLAGS_SHARED=${CFLAGS} ${FPIC} SVERSION=1 +.if defined (WITH_METIS) +METIS=${LOCALBASE}/lib/libmetis.a +METIS_PATH=${LOCALBASE}/include/metis +CHOLMOD_CONFIG = +.else +CHOLMOD_CONFIG = -DNPARTITION +.endif + post-patch: ${CP} -r ${WRKSRC} ${WRKSRC_SHARED} @${REINPLACE_CMD} -e 's,%%CC%%,${CC},g' \ - -e 's,%%CFLAGS%%,${CFLAGS},g' \ -e 's,%%F77%%,${F77},g' \ -e 's,%%FC%%,${FC},g' \ - -e 's,%%FFLAGS%%,${FFLAGS},g' \ - -e 's,%%BLAS%%,${BLAS},g' \ - -e 's,%%LAPACK%%,${LAPACK},g' \ + -e 's,%%BLAS%%,-L${LOCALBASE}/lib ${BLAS},g' \ + -e 's,%%LAPACK%%,-L${LOCALBASE}/lib ${LAPACK},g' \ -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ - ${WRKSRC}/UFconfig/UFconfig.mk - @${REINPLACE_CMD} -e 's,%%CC%%,${CC},g' \ - -e 's,%%CFLAGS%%,${CFLAGS},g' \ - ${WRKSRC}/CSparse/Source/Makefile \ - ${WRKSRC}/CXSparse/Source/Makefile + -e 's,%%METIS_PATH%%,${METIS_PATH},g' \ + -e 's,%%METIS%%,${METIS},g' \ + -e 's,%%CHOLMOD_CONFIG%%,${CHOLMOD_CONFIG},g' \ + ${WRKSRC}/UFconfig/UFconfig.mk \ + ${WRKSRC_SHARED}/UFconfig/UFconfig.mk - @${REINPLACE_CMD} -e 's,%%CC%%,${CC},g' \ - -e 's,%%CFLAGS%%,${CFLAGS_SHARED},g' \ - -e 's,%%F77%%,${F77},g' \ - -e 's,%%FC%%,${FC},g' \ - -e 's,%%FFLAGS%%,${FFLAGS_SHARED},g' \ - -e 's,%%BLAS%%,${BLAS},g' \ - -e 's,%%LAPACK%%,${LAPACK},g' \ - -e 's,%%LOCALBASE%%,${LOCALBASE},g' \ + @${REINPLACE_CMD} -e 's,%%CFLAGS%%,${CFLAGS},g' \ + -e 's,%%FFLAGS%%,${FFLAGS},g' \ + ${WRKSRC}/UFconfig/UFconfig.mk \ + + @${REINPLACE_CMD} -e 's,%%CFLAGS%%,${CFLAGS_SHARED},g' \ + -e 's,%%FFLAGS%%,${FFLAGS_SHARED},g' \ ${WRKSRC_SHARED}/UFconfig/UFconfig.mk - @${REINPLACE_CMD} -e 's,%%CC%%,${CC},g' \ - -e 's,%%CFLAGS%%,${CFLAGS_SHARED},g' \ - ${WRKSRC_SHARED}/CSparse/Source/Makefile \ - ${WRKSRC_SHARED}/CXSparse/Source/Makefile do-build: cd ${WRKSRC} ; ${GMAKE} @@ -103,13 +119,13 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/UMFPACK/Include/*.h ${PREFIX}/include/suitesparse ${INSTALL_DATA} ${WRKSRC}/AMD/Include/*.h ${PREFIX}/include/suitesparse ${INSTALL_DATA} ${WRKSRC}/BTF/Include/*.h ${PREFIX}/include/suitesparse - ${INSTALL_DATA} ${WRKSRC}/CCOLAMD/*.h ${PREFIX}/include/suitesparse + ${INSTALL_DATA} ${WRKSRC}/CCOLAMD/Include/*.h ${PREFIX}/include/suitesparse ${INSTALL_DATA} ${WRKSRC}/CHOLMOD/Include/*.h ${PREFIX}/include/suitesparse - ${INSTALL_DATA} ${WRKSRC}/COLAMD/*.h ${PREFIX}/include/suitesparse - ${INSTALL_DATA} ${WRKSRC}/CXSparse/Source/*.h ${PREFIX}/include/suitesparse + ${INSTALL_DATA} ${WRKSRC}/COLAMD/Include/*.h ${PREFIX}/include/suitesparse + ${INSTALL_DATA} ${WRKSRC}/CXSparse/Include/*.h ${PREFIX}/include/suitesparse ${INSTALL_DATA} ${WRKSRC}/KLU/Include/*.h ${PREFIX}/include/suitesparse ${INSTALL_DATA} ${WRKSRC}/CAMD/Include/*.h ${PREFIX}/include/suitesparse - ${INSTALL_DATA} ${WRKDIR}/tmp_static/*.a ${PREFIX}/lib + ${INSTALL_DATA} ${WRKDIR}/tmp_static/*.a ${PREFIX}/lib ${INSTALL_DATA} ${WRKDIR}/tmp_shared/*.so.${SVERSION} ${PREFIX}/lib ${INSTALL_DATA} ${WRKDIR}/tmp_shared/*.so ${PREFIX}/lib diff --git a/math/suitesparse/distinfo b/math/suitesparse/distinfo index d688072e66d4..9987453125eb 100644 --- a/math/suitesparse/distinfo +++ b/math/suitesparse/distinfo @@ -1,3 +1,3 @@ -MD5 (suitesparse/2.4.0/SuiteSparse-2.4.0.tar.gz) = 30233f0b42e9ea12e47a287f0f50fe47 -SHA256 (suitesparse/2.4.0/SuiteSparse-2.4.0.tar.gz) = 68c744a33ed51183f1f0ba0b8cd34fb9f89d0c9dfb8cbb4f9aa7100235ab5114 -SIZE (suitesparse/2.4.0/SuiteSparse-2.4.0.tar.gz) = 7878317 +MD5 (suitesparse/3.1.0/SuiteSparse-3.1.0.tar.gz) = 58d90444feef92fc7c265cbd11a757c6 +SHA256 (suitesparse/3.1.0/SuiteSparse-3.1.0.tar.gz) = cd27e4a18a8924c3aa867ad03328ba08a94cfb157b0945aa440a2e9b646ce4b4 +SIZE (suitesparse/3.1.0/SuiteSparse-3.1.0.tar.gz) = 9051595 diff --git a/math/suitesparse/files/patch-CHOLMOD+Lib+Makefile b/math/suitesparse/files/patch-CHOLMOD+Lib+Makefile deleted file mode 100644 index 15992ea815f9..000000000000 --- a/math/suitesparse/files/patch-CHOLMOD+Lib+Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- CHOLMOD/Lib/Makefile~ Fri Aug 25 22:44:11 2006 -+++ CHOLMOD/Lib/Makefile Sun Sep 17 21:18:07 2006 -@@ -116,7 +116,7 @@ - $(OBJ): $(INC) - - I = -I../../AMD/Include -I../../AMD/Source -I../../COLAMD \ -- -I$(METIS_PATH)/Lib -I../../CCOLAMD -I../../CAMD/Include -I../Include \ -+ -I$(METIS_PATH) -I../../CCOLAMD -I../../CAMD/Include -I../Include \ - -I../../UFconfig - - diff --git a/math/suitesparse/files/patch-CSparse+Source+Makefile b/math/suitesparse/files/patch-CSparse+Source+Makefile deleted file mode 100644 index e950c0252964..000000000000 --- a/math/suitesparse/files/patch-CSparse+Source+Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- CSparse/Source/Makefile.old Sun Nov 19 11:34:50 2006 -+++ CSparse/Source/Makefile Sun Nov 19 11:35:02 2006 -@@ -1,6 +1,6 @@ - # Modify the "-O" optimization option for best performance (-O3 on Linux): --CC = cc --CFLAGS = -O -+CC = %%CC%% -+CFLAGS = %%CFLAGS%% - - AR = ar cr - RANLIB = ranlib diff --git a/math/suitesparse/files/patch-CXSparse+Source+Makefile b/math/suitesparse/files/patch-CXSparse+Source+Makefile deleted file mode 100644 index b3fb3ed84fee..000000000000 --- a/math/suitesparse/files/patch-CXSparse+Source+Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- CXSparse/Source/Makefile~ Sun Nov 19 11:43:12 2006 -+++ CXSparse/Source/Makefile Sun Nov 19 11:43:48 2006 -@@ -1,6 +1,6 @@ - # Modify the "-O" optimization option for best performance (-O3 on Linux): --CC = cc --CFLAGS = -O -+CC = %%CC%% -+CFLAGS = %%CFLAGS%% - I = -I../../UFconfig - - AR = ar cr diff --git a/math/suitesparse/files/patch-Makefile b/math/suitesparse/files/patch-Makefile deleted file mode 100644 index ced710ba1c98..000000000000 --- a/math/suitesparse/files/patch-Makefile +++ /dev/null @@ -1,11 +0,0 @@ ---- Makefile Sat Dec 2 07:31:29 2006 -+++ Makefile Thu Dec 28 09:02:28 2006 -@@ -7,7 +7,7 @@ - # Compile the default rules for each package - default: - ( cd UFconfig/xerbla ; $(MAKE) ) -- ( cd metis-4.0 ; $(MAKE) ) -+# ( cd metis-4.0 ; $(MAKE) ) - ( cd AMD ; $(MAKE) ) - ( cd CAMD ; $(MAKE) ) - ( cd COLAMD ; $(MAKE) ) diff --git a/math/suitesparse/files/patch-UFconfig+UFconfig.mk b/math/suitesparse/files/patch-UFconfig+UFconfig.mk index d0ff8ab143de..b6d2a3f6376b 100644 --- a/math/suitesparse/files/patch-UFconfig+UFconfig.mk +++ b/math/suitesparse/files/patch-UFconfig+UFconfig.mk @@ -1,6 +1,6 @@ ---- UFconfig/UFconfig.mk.orig Wed Dec 13 03:52:47 2006 -+++ UFconfig/UFconfig.mk Sat Feb 10 21:45:50 2007 -@@ -31,8 +31,8 @@ +--- UFconfig/UFconfig.mk.orig 2007-10-24 22:55:44.000000000 +0900 ++++ UFconfig/UFconfig.mk 2008-02-03 12:04:00.000000000 +0900 +@@ -32,8 +32,8 @@ # C compiler and compiler flags: These will normally not give you optimal # performance. You should select the optimization parameters that are best # for your system. On Linux, use "CFLAGS = -O3 -fexceptions" for example. @@ -11,7 +11,7 @@ # ranlib, and ar, for generating libraries RANLIB = ranlib -@@ -43,8 +43,9 @@ +@@ -44,8 +44,9 @@ MV = mv -f # Fortran compiler (not normally required) @@ -23,29 +23,29 @@ F77LIB = # C and Fortran libraries -@@ -73,8 +74,8 @@ - # These settings will probably not work, since there is no fixed convention for - # naming the BLAS and LAPACK library (*.a or *.so) files. Assume the Goto - # BLAS are available. --BLAS = -lgoto -lgfortran -lgfortranbegin +@@ -85,8 +86,8 @@ + # BLAS = -lgoto -lgfortran -lgfortranbegin + + # This is probably slow ... it might connect to the Standard Reference BLAS: +-BLAS = -lblas -lgfortran -lgfortranbegin -LAPACK = -llapack +BLAS = %%BLAS%% +LAPACK = %%LAPACK%% # The BLAS might not contain xerbla, an error-handling routine for LAPACK and # the BLAS. Also, the standard xerbla requires the Fortran I/O library, and -@@ -102,8 +103,8 @@ +@@ -114,8 +115,8 @@ # 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 = %%LOCALBASE%%/include/metis -+METIS = %%LOCALBASE%%/lib/libmetis.a ++METIS_PATH = %%METIS_PATH%% ++METIS = %%METIS%% # If you use CHOLMOD_CONFIG = -DNPARTITION then you must use the following # options: -@@ -126,7 +127,7 @@ +@@ -138,7 +139,7 @@ # -DNRECIPROCAL do not multiply by the reciprocal # -DNO_DIVIDE_BY_ZERO do not divide by zero @@ -54,21 +54,32 @@ #------------------------------------------------------------------------------ # CHOLMOD configuration -@@ -176,12 +177,12 @@ +@@ -177,7 +177,7 @@ + # -DNSUNPERF for Solaris only. If defined, do not use the Sun + # Performance Library + +-CHOLMOD_CONFIG = ++CHOLMOD_CONFIG = %%CHOLMOD_CONFIG%% + + #------------------------------------------------------------------------------ + # Linux +@@ -184,15 +185,15 @@ + + # Using default compilers: + # CC = gcc +-CFLAGS = -O3 ++# CFLAGS = -O3 # alternatives: # CFLAGS = -g -fexceptions \ - -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ - -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi +# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ -+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi ++# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi # CFLAGS = -O3 -fexceptions \ - -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ - -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi --CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE +# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ +# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi -+# CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE + # CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE # CFLAGS = -O3 - - # consider: diff --git a/math/suitesparse/pkg-plist b/math/suitesparse/pkg-plist index de8ecad7da19..6440affc2e91 100644 --- a/math/suitesparse/pkg-plist +++ b/math/suitesparse/pkg-plist @@ -90,9 +90,6 @@ lib/libcxsparse.so.1 lib/libklu.a lib/libklu.so lib/libklu.so.1 -lib/libklu_cholmod.a -lib/libklu_cholmod.so -lib/libklu_cholmod.so.1 lib/libldl.a lib/libldl.so lib/libldl.so.1 -- cgit v1.2.3