Index: math/suitesparse/Makefile =================================================================== --- math/suitesparse/Makefile (revision 444189) +++ math/suitesparse/Makefile (working copy) @@ -2,20 +2,22 @@ # $FreeBSD$ PORTNAME= suitesparse -PORTVERSION= 4.0.2 -PORTREVISION= 6 +PORTVERSION= 4.5.4 CATEGORIES= math -MASTER_SITES= http://www.cise.ufl.edu/research/sparse/SuiteSparse/ +MASTER_SITES= http://faculty.cse.tamu.edu/davis/SuiteSparse/ DISTNAME= SuiteSparse-${PORTVERSION} -MAINTAINER= maho@FreeBSD.org +MAINTAINER= yuri@rawbw.com COMMENT= SuiteSparse is a set of packages for sparse matrices calculation LICENSE= GPLv2 LGPL21 -LICENSE_COMB= multi +LICENSE_COMB= dual -USES= fortran gmake +LIB_DEPENDS= libmetis.so:math/metis \ + liblapack.so:math/lapack +USES= compiler:openmp fortran gmake + OPTIONS_RADIO= BLAS OPTIONS_RADIO_BLAS= OPENBLAS NETLIB ATLAS OPTIONS_DEFAULT= OPENBLAS @@ -24,16 +26,9 @@ NETLIB_USES= blaslapack:netlib ATLAS_USES= blaslapack:atlas -.if defined (WITH_METIS) -LIB_DEPENDS= libmetis.so:math/metis4 - RESTRICTED= GPL and METIS licenses are contradictory -.endif +CONFLICTS= umfpack-[0-9]* -CONFLICTS= umfpack-* - -LDFLAGS+= -L${LOCALBASE}/lib - .include .if ${ARCH} == "sparc64" @@ -45,19 +40,19 @@ USE_LDCONFIG= yes WRKSRC=${WRKDIR}/SuiteSparse WRKSRC_SHARED=${WRKSRC}_shared -SVERSION=1 -.if defined (WITH_METIS) METIS=${LOCALBASE}/lib/libmetis.a METIS_PATH=${LOCALBASE}/include/metis CHOLMOD_CONFIG= -.else -CHOLMOD_CONFIG= -DNPARTITION -.endif +CFLAGS+=-I${LOCALBASE}/include +CXXFLAGS+=-I${LOCALBASE}/include +MAKE_ARGS+=MY_METIS_LIB="-L${LOCALBASE}/lib -lmetis $(LDFLAGS)" post-patch: + @${RM} -r ${WRKSRC}/metis-5.1.0 ${WRKSRC}_shared/metis-5.1.0 @${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \ - ${REINPLACE_CMD} -e '\|^AR =|s|ar|${AR}|' \ + ${REINPLACE_CMD} -i '' \ + -e '\|^AR =|s|ar|${AR}|' \ -e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLASLIB}|' \ -e '\|^CC =|d' \ -e '\|^CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \ @@ -79,29 +74,19 @@ do-build: @cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} PICFLAG= \ - ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} + LD_LIBRARY_PATH=${WRKDIR}/SuiteSparse/lib ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} @cd ${WRKSRC_SHARED} ; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \ - ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} + LD_LIBRARY_PATH=${WRKDIR}/SuiteSparse/lib ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} -post-build: - @for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \ - j=$${i##*/} ; ${LD} -Bshareable -o $${i%.a}.so.${SVERSION} -x \ - -soname $${j%.a}.so.${SVERSION} --whole-archive $${i} ; \ - done - do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/suitesparse @${LN} -sf ${PREFIX}/include/suitesparse ${STAGEDIR}${PREFIX}/include/ufsparse .for d in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CXSparse KLU SPQR UMFPACK - @${INSTALL_DATA} ${WRKSRC}/${d}/Include/*.h ${STAGEDIR}${PREFIX}/include/suitesparse + ${INSTALL_DATA} ${WRKSRC}/${d}/Include/*.h ${STAGEDIR}${PREFIX}/include/suitesparse .endfor - @${INSTALL_DATA} ${WRKSRC}/SuiteSparse_config/SuiteSparse_config.h ${STAGEDIR}${PREFIX}/include/suitesparse - @${INSTALL_DATA} ${WRKSRC}/UMFPACK/Source/umf_config.h ${STAGEDIR}${PREFIX}/include/suitesparse - @${INSTALL_DATA} ${WRKSRC}/SPQR/Include/*.hpp ${STAGEDIR}${PREFIX}/include/suitesparse - @for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \ - ${INSTALL_DATA} ${WRKSRC}/$${i##${WRKSRC_SHARED}/} \ - $${i%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib ; \ - j=$${i##*/} ; ${LN} -sf $${j%.a}.so.${SVERSION} ${STAGEDIR}${PREFIX}/lib/$${j%.a}.so ; \ - done + ${INSTALL_DATA} ${WRKSRC}/SuiteSparse_config/SuiteSparse_config.h ${STAGEDIR}${PREFIX}/include/suitesparse + ${INSTALL_DATA} ${WRKSRC}/UMFPACK/Source/umf_config.h ${STAGEDIR}${PREFIX}/include/suitesparse + ${INSTALL_DATA} ${WRKSRC}/SPQR/Include/*.hpp ${STAGEDIR}${PREFIX}/include/suitesparse + ${INSTALL_DATA} ${WRKSRC_SHARED}/lib/*.so* ${STAGEDIR}${PREFIX}/lib/ .include Index: math/suitesparse/distinfo =================================================================== --- math/suitesparse/distinfo (revision 444189) +++ math/suitesparse/distinfo (working copy) @@ -1,2 +1,3 @@ -SHA256 (SuiteSparse-4.0.2.tar.gz) = 93b5928987fe010808b3fdff3e7edef42fb2d8cfd65b09dd6d4c41756acb0050 -SIZE (SuiteSparse-4.0.2.tar.gz) = 22421100 +TIMESTAMP = 1498313954 +SHA256 (SuiteSparse-4.5.4.tar.gz) = 698b5c455645bb1ad29a185f0d52025f3bd7cb7261e182c8878b0eb60567a714 +SIZE (SuiteSparse-4.5.4.tar.gz) = 30309663 Index: math/suitesparse/pkg-descr =================================================================== --- math/suitesparse/pkg-descr (revision 444189) +++ math/suitesparse/pkg-descr (working copy) @@ -12,4 +12,4 @@ * CSparse: a concise sparse matrix package * CXSparse: and extended version of CSparse -WWW: http://www.cise.ufl.edu/research/sparse/SuiteSparse/ +WWW: http://faculty.cse.tamu.edu/davis/suitesparse.html Index: math/suitesparse/pkg-plist =================================================================== --- math/suitesparse/pkg-plist (revision 444189) +++ math/suitesparse/pkg-plist (working copy) @@ -1,7 +1,7 @@ -include/suitesparse/SuiteSparse_config.h include/suitesparse/SuiteSparseQR.hpp include/suitesparse/SuiteSparseQR_C.h include/suitesparse/SuiteSparseQR_definitions.h +include/suitesparse/SuiteSparse_config.h include/suitesparse/amd.h include/suitesparse/amd_internal.h include/suitesparse/btf.h @@ -11,11 +11,15 @@ include/suitesparse/ccolamd.h include/suitesparse/cholmod.h include/suitesparse/cholmod_blas.h +include/suitesparse/cholmod_camd.h include/suitesparse/cholmod_check.h include/suitesparse/cholmod_cholesky.h include/suitesparse/cholmod_complexity.h include/suitesparse/cholmod_config.h include/suitesparse/cholmod_core.h +include/suitesparse/cholmod_function.h +include/suitesparse/cholmod_gpu.h +include/suitesparse/cholmod_gpu_kernels.h include/suitesparse/cholmod_internal.h include/suitesparse/cholmod_io64.h include/suitesparse/cholmod_matrixops.h @@ -29,6 +33,8 @@ include/suitesparse/klu_internal.h include/suitesparse/klu_version.h include/suitesparse/spqr.hpp +include/suitesparse/spqrgpu.hpp +include/suitesparse/umf_config.h include/suitesparse/umfpack.h include/suitesparse/umfpack_col_to_triplet.h include/suitesparse/umfpack_defaults.h @@ -62,50 +68,43 @@ include/suitesparse/umfpack_transpose.h include/suitesparse/umfpack_triplet_to_col.h include/suitesparse/umfpack_wsolve.h -include/suitesparse/umf_config.h include/ufsparse -lib/libamd.a lib/libamd.so -lib/libamd.so.1 -lib/libbtf.a +lib/libamd.so.2 +lib/libamd.so.2.4.6 lib/libbtf.so lib/libbtf.so.1 -lib/libcamd.a +lib/libbtf.so.1.2.6 lib/libcamd.so -lib/libcamd.so.1 -lib/libccolamd.a +lib/libcamd.so.2 +lib/libcamd.so.2.4.6 lib/libccolamd.so -lib/libccolamd.so.1 -lib/libcerbla.a -lib/libcerbla.so -lib/libcerbla.so.1 -lib/libcholmod.a +lib/libccolamd.so.2 +lib/libccolamd.so.2.9.6 lib/libcholmod.so -lib/libcholmod.so.1 -lib/libcolamd.a +lib/libcholmod.so.3 +lib/libcholmod.so.3.0.11 lib/libcolamd.so -lib/libcolamd.so.1 -lib/libcsparse.a -lib/libcsparse.so -lib/libcsparse.so.1 -lib/libcxsparse.a +lib/libcolamd.so.2 +lib/libcolamd.so.2.9.6 lib/libcxsparse.so -lib/libcxsparse.so.1 -lib/libklu.a +lib/libcxsparse.so.3 +lib/libcxsparse.so.3.1.9 lib/libklu.so lib/libklu.so.1 -lib/libldl.a +lib/libklu.so.1.3.8 lib/libldl.so -lib/libldl.so.1 -lib/librbio.a +lib/libldl.so.2 +lib/libldl.so.2.2.6 lib/librbio.so -lib/librbio.so.1 -lib/libspqr.a +lib/librbio.so.2 +lib/librbio.so.2.2.6 lib/libspqr.so -lib/libspqr.so.1 -lib/libsuitesparseconfig.a +lib/libspqr.so.2 +lib/libspqr.so.2.0.8 lib/libsuitesparseconfig.so -lib/libsuitesparseconfig.so.1 -lib/libumfpack.a +lib/libsuitesparseconfig.so.4 +lib/libsuitesparseconfig.so.4.5.4 lib/libumfpack.so -lib/libumfpack.so.1 +lib/libumfpack.so.5 +lib/libumfpack.so.5.7.6