diff --git a/math/suitesparse-config/pkg-plist b/math/suitesparse-config/pkg-plist index d3aeab01160d..f22bcd0387d4 100644 --- a/math/suitesparse-config/pkg-plist +++ b/math/suitesparse-config/pkg-plist @@ -1,6 +1,6 @@ include/suitesparse/SuiteSparse_config.h lib/libsuitesparseconfig.so lib/libsuitesparseconfig.so.5 -lib/libsuitesparseconfig.so.5.10.1 +lib/libsuitesparseconfig.so.5.12.0 %%PORTDOCS%%%%DOCSDIR%%/SUITESPARSECONFIG_README.txt %%PORTDOCS%%%%DOCSDIR%%/SuiteSparse_README.md diff --git a/math/suitesparse-graphblas/Makefile b/math/suitesparse-graphblas/Makefile index b5b418ac284e..ef2a07394ee6 100644 --- a/math/suitesparse-graphblas/Makefile +++ b/math/suitesparse-graphblas/Makefile @@ -1,34 +1,33 @@ # Created by: Thierry Thomas () PORTNAME= ${MPORTNAME:tl} -PORTVERSION= 5.0.5 -PORTREVISION= 1 +PORTVERSION= 7.0.3 CATEGORIES= math COMMENT= Graph algorithms in the language of linear algebra LICENSE= APACHE20 USES= cmake:insource localbase:ldflags OMP_NEEDED= yes MPORTNAME= GraphBLAS USE_LDCONFIG= yes PORTDOCS= CSC20_OpenMP_GraphBLAS.pdf GraphBLAS_API_C_v13.pdf \ GraphBLAS_UserGuide.pdf HPEC19.pdf lagraph-grapl19.pdf \ toms_graphblas.pdf .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk" pre-configure-OPENMP-off: ${REINPLACE_CMD} -e '/find_package.*OpenMP/d' \ ${WRKSRC}/GraphBLAS/CMakeLists.txt post-stage-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} .for doc in ${PORTDOCS} ${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/${doc} ${STAGEDIR}${DOCSDIR} .endfor .include diff --git a/math/suitesparse-graphblas/pkg-plist b/math/suitesparse-graphblas/pkg-plist index 207ad332c89b..ede3c1bf57a9 100644 --- a/math/suitesparse-graphblas/pkg-plist +++ b/math/suitesparse-graphblas/pkg-plist @@ -1,5 +1,5 @@ include/suitesparse/GraphBLAS.h lib/libgraphblas.a lib/libgraphblas.so -lib/libgraphblas.so.5 -lib/libgraphblas.so.5.0.5 +lib/libgraphblas.so.7 +lib/libgraphblas.so.7.0.3 diff --git a/math/suitesparse-spqr/Makefile b/math/suitesparse-spqr/Makefile index 9cab4c94bee9..d979315376d8 100644 --- a/math/suitesparse-spqr/Makefile +++ b/math/suitesparse-spqr/Makefile @@ -1,32 +1,32 @@ # Created by: Thierry Thomas () PORTNAME= ${MPORTNAME:tl} -PORTVERSION= 2.0.9 +PORTVERSION= 2.1.0 CATEGORIES= math COMMENT= Sparse QR factorization LICENSE= GPLv2+ LIB_DEPENDS= libamd.so:math/suitesparse-amd \ libcamd.so:math/suitesparse-camd \ libcolamd.so:math/suitesparse-colamd \ libccolamd.so:math/suitesparse-ccolamd \ libcholmod.so:math/suitesparse-cholmod USES= localbase:ldflags BLAS_NEEDED= yes OMP_NEEDED= yes MPORTNAME= SPQR USE_LDCONFIG= yes # See https://github.com/DrTimothyAldenDavis/SuiteSparse/issues/72 and PR 252651 #OPTIONS_DEFINE+= TBB #OPTIONS_DEFAULT+= TBB #TBB_DESC= Intel threading building blocks #TBB_LIB_DEPENDS= libtbb.so:devel/tbb #TBB_MAKE_ENV= TBB="-ltbb" SPQR_CONFIG="-DHAVE_TBB" .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk" .include diff --git a/math/suitesparse-spqr/pkg-plist b/math/suitesparse-spqr/pkg-plist index 3792170306a6..c4a47be52642 100644 --- a/math/suitesparse-spqr/pkg-plist +++ b/math/suitesparse-spqr/pkg-plist @@ -1,9 +1,9 @@ include/suitesparse/SuiteSparseQR.hpp include/suitesparse/SuiteSparseQR_C.h include/suitesparse/SuiteSparseQR_definitions.h include/suitesparse/spqr.hpp lib/libspqr.so lib/libspqr.so.2 -lib/libspqr.so.2.0.9 +lib/libspqr.so.2.1.0 %%PORTDOCS%%%%DOCSDIR%%/SPQR_README.txt %%PORTDOCS%%%%DOCSDIR%%/spqr_user_guide.pdf diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile index 59a3989a8094..44affc2da0b7 100644 --- a/math/suitesparse/Makefile +++ b/math/suitesparse/Makefile @@ -1,33 +1,33 @@ # Created by: Maho Nakata PORTNAME= suitesparse -PORTVERSION= 5.10.1 +PORTVERSION= 5.12.0 CATEGORIES= math MAINTAINER= fortran@FreeBSD.org COMMENT= Set of packages for sparse matrix calculation LICENSE= GPLv2+ RUN_DEPENDS= suitesparse-amd>0:math/suitesparse-amd \ suitesparse-btf>0:math/suitesparse-btf \ suitesparse-ccolamd>0:math/suitesparse-ccolamd \ suitesparse-cholmod>0:math/suitesparse-cholmod \ suitesparse-colamd>0:math/suitesparse-colamd \ suitesparse-config>0:math/suitesparse-config \ suitesparse-cxsparse>0:math/suitesparse-cxsparse \ suitesparse-graphblas>0:math/suitesparse-graphblas \ suitesparse-klu>0:math/suitesparse-klu \ suitesparse-ldl>0:math/suitesparse-ldl \ suitesparse-mongoose>0:math/suitesparse-mongoose \ suitesparse-rbio>0:math/suitesparse-rbio \ suitesparse-slip_lu>0:math/suitesparse-slip_lu \ suitesparse-spqr>0:math/suitesparse-spqr \ suitesparse-umfpack>0:math/suitesparse-umfpack .if !defined(PACKAGE_BUILDING) RUN_DEPENDS+= suitesparse-csparse>0:math/suitesparse-csparse .endif USES= metaport .include diff --git a/math/suitesparse/bsd.suitesparse.mk b/math/suitesparse/bsd.suitesparse.mk index 4c20bede81f5..d3585f06a4f8 100644 --- a/math/suitesparse/bsd.suitesparse.mk +++ b/math/suitesparse/bsd.suitesparse.mk @@ -1,144 +1,144 @@ # Created by: Maho Nakata # # Common elements used by the SuiteSparse modules PKGNAMEPREFIX= suitesparse- SSPNAME= suitesparse -SSPVERSION= 5.10.1 +SSPVERSION= 5.12.0 DISTVERSIONPREFIX= v MAINTAINER= fortran@FreeBSD.org #USE_GITHUB= yes # Does not work with different versions for modules GH_ACCOUNT= DrTimothyAldenDavis GH_PROJECT= SuiteSparse GH_TAGNAME= ${SSPVERSION} MASTER_SITES= https://github.com/${GH_ACCOUNT}/${GH_PROJECT}/archive/refs/tags/ DISTNAME= ${DISTVERSIONPREFIX}${SSPVERSION} DIST_SUBDIR= ${SSPNAME} WRKSRC= ${WRKDIR}/${GH_PROJECT}-${SSPVERSION} .if ${MPORTNAME} != config BUILD_WRKSRC= ${WRKSRC}/${MPORTNAME} .else BUILD_WRKSRC= ${WRKSRC}/SuiteSparse_config .endif .if ${MPORTNAME} != config && \ ${MPORTNAME} != CSparse && \ ${MPORTNAME} != ssget LIB_DEPENDS+= libsuitesparseconfig.so:math/suitesparse-config .endif .if ${MPORTNAME} != config && \ ${MPORTNAME} != BTF && \ ${MPORTNAME} != ssget OPTIONS_DEFINE+=DEMOS .else ALL_TARGET= library .endif USES+= gmake DOCSDIR= ${PREFIX}/share/doc/${SSPNAME} MAKE_ENV= BLAS="${BLASLIB}" LAPACK="${LAPACKLIB}" \ OPTIMIZATION="${OPTIMIZATION}" \ MY_METIS_LIB="-lmetis" \ JOBS="${MAKE_JOBS_NUMBER}" \ CMAKE_OPTIONS='${CMAKE_ARGS}' \ INSTALL="${STAGEDIR}${PREFIX}" \ INSTALL_DOC="${STAGEDIR}${DOCSDIR}" \ INSTALL_INCLUDE="${STAGEDIR}${PREFIX}/include/${SSPNAME}" CMAKE_ARGS= -DCMAKE_INSTALL_INCLUDEDIR:PATH="include/${SSPNAME}" \ -DBUILD_GRB_STATIC_LIBRARY:BOOL=ON LDFLAGS+= -L${WRKSRC}/lib # prevent linking with shared libs from the preinstalled older versions INSTALL_TARGET= install # skip USES=cmake INSTALL_WRKSRC= ${BUILD_WRKSRC} # FIXME: wont work if .CURDIR contains spaces DISTINFO_FILE= ${.CURDIR}/../../math/suitesparse/distinfo OPTIONS_DEFINE+= DOCS OPTIMIZED_CFLAGS OPTIONS_DEFAULT+= OPTIMIZED_CFLAGS .if defined(BLAS_NEEDED) OPTIONS_RADIO+= BLAS OPTIONS_RADIO_BLAS+= ATLAS GOTOBLAS NETLIB OPENBLAS OPTIONS_DEFAULT+= OPENBLAS ATLAS_USES= blaslapack:atlas GOTOBLAS_DESC= Goto blas implementation GOTOBLAS_USES= blaslapack:gotoblas NETLIB_USES= blaslapack:netlib OPENBLAS_USES= blaslapack:openblas .endif .if defined(OMP_NEEDED) OPTIONS_DEFINE+= OPENMP OPTIONS_EXCLUDE_aarch64= OPENMP OPTIONS_EXCLUDE_armv7= OPENMP OPTIONS_EXCLUDE_powerpc= OPENMP OPTIONS_DEFAULT+= OPENMP OPENMP_MAKE_ENV_OFF= CFOPENMP= . if !exists(/usr/include/omp.h) # XXX ports/199603: LLVM openmp in base doesn't support armv6, armv7 yet OPENMP_VARS= OPENMP=gcc- . endif .endif DEMOS_DESC= Build the demonstrations .if ${MPORTNAME} == Mongoose DEMOS_ALL_TARGET= default .else DEMOS_ALL_TARGET= all .endif DEMOS_ALL_TARGET_OFF= library .if !defined(WITH_DEBUG) OPTIMIZED_CFLAGS_VARS= OPTIMIZATION="-O3" LDFLAGS+= -s .endif post-extract: ${RM} -r ${WRKSRC}/metis-* .if ${MPORTNAME} == AMD || \ ${MPORTNAME} == CAMD || \ ${MPORTNAME} == CCOLAMD || \ ${MPORTNAME} == CHOLMOD || \ ${MPORTNAME} == COLAMD || \ ${MPORTNAME} == CSparse || \ ${MPORTNAME} == CXSparse_newfiles || \ ${MPORTNAME} == CXSparse || \ ${MPORTNAME} == GPUQREngine || \ ${MPORTNAME} == KLU || \ ${MPORTNAME} == LDL || \ ${MPORTNAME} == RBio || \ ${MPORTNAME} == SPQR || \ ${MPORTNAME} == UMFPACK pre-configure: ${REINPLACE_CMD} -e 's|-I../../include|-I${STAGEDIR}${PREFIX}/include/suitesparse -I../../SuiteSparse_config -I../../AMD/Include -I../../COLAMD/Include -I../../BTF/Include -I../../CHOLMOD/Include|;\ s|-lsuitesparseconfig|-lsuitesparseconfig -L${LOCALBASE}/lib|' \ ${BUILD_WRKSRC}/Demo/Makefile .endif do-configure: # skip USES=cmake post-install: .if ! ${MPORTNAME} == config @${RM} ${STAGEDIR}${DOCSDIR}/SUITESPARSECONFIG_README.txt \ ${STAGEDIR}${PREFIX}/include/suitesparse/SuiteSparse_config.h .endif .include .if ${ARCH} == i386 # See PR 230888 : Missing 64 bit atomic functions for i386 USE_GCC= yes LDFLAGS+= -latomic .elif defined(PPC_ABI) && ${PPC_ABI} == ELFv1 USE_GCC= yes .else USES+= compiler:c++11-lib .endif diff --git a/math/suitesparse/distinfo b/math/suitesparse/distinfo index 228657da21e8..e2e669e8c22a 100644 --- a/math/suitesparse/distinfo +++ b/math/suitesparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1622466861 -SHA256 (suitesparse/v5.10.1.tar.gz) = acb4d1045f48a237e70294b950153e48dce5b5f9ca8190e86c2b8c54ce00a7ee -SIZE (suitesparse/v5.10.1.tar.gz) = 59919745 +TIMESTAMP = 1649767800 +SHA256 (suitesparse/v5.12.0.tar.gz) = 5fb0064a3398111976f30c5908a8c0b40df44c6dd8f0cc4bfa7b9e45d8c647de +SIZE (suitesparse/v5.12.0.tar.gz) = 65066114