diff --git a/math/suitesparse-config/Makefile b/math/suitesparse-config/Makefile index 9f6c1505f727..e3c4e3f8c8b8 100644 --- a/math/suitesparse-config/Makefile +++ b/math/suitesparse-config/Makefile @@ -1,23 +1,22 @@ PORTNAME= ${MPORTNAME:tl} PORTVERSION= ${SSPVERSION} -PORTREVISION= 1 CATEGORIES= math COMMENT= Common library for SuiteSparse WWW= https://faculty.cse.tamu.edu/davis/suitesparse.html LICENSE= GPLv2+ MPORTNAME= config USE_LDCONFIG= yes .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk" post-stage-DOCS-on: @${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/README.md \ ${STAGEDIR}${DOCSDIR}/SuiteSparse_README.md ${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt \ ${STAGEDIR}${DOCSDIR}/${PORTNAME}_README.txt .include diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile index 26620042d7a1..7aab1b4a3e1a 100644 --- a/math/suitesparse/Makefile +++ b/math/suitesparse/Makefile @@ -1,31 +1,32 @@ PORTNAME= suitesparse -PORTVERSION= 7.3.1 +PORTVERSION= 7.4.0 CATEGORIES= math MAINTAINER= fortran@FreeBSD.org COMMENT= Set of packages for sparse matrix calculation WWW= https://faculty.cse.tamu.edu/davis/suitesparse.html RUN_DEPENDS= suitesparse-config>0:math/suitesparse-config \ suitesparse-amd>0:math/suitesparse-amd \ suitesparse-btf>0:math/suitesparse-btf \ suitesparse-camd>0:math/suitesparse-camd \ suitesparse-ccolamd>0:math/suitesparse-ccolamd \ suitesparse-colamd>0:math/suitesparse-colamd \ suitesparse-cholmod>0:math/suitesparse-cholmod \ suitesparse-cxsparse>0:math/suitesparse-cxsparse \ suitesparse-graphblas>0:math/suitesparse-graphblas \ suitesparse-klu>0:math/suitesparse-klu \ + suitesparse-lagraph>0:math/suitesparse-lagraph \ suitesparse-ldl>0:math/suitesparse-ldl \ suitesparse-mongoose>0:math/suitesparse-mongoose \ suitesparse-rbio>0:math/suitesparse-rbio \ suitesparse-spex>0:math/suitesparse-spex \ 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 7efd113b1f84..12cc02251f47 100644 --- a/math/suitesparse/bsd.suitesparse.mk +++ b/math/suitesparse/bsd.suitesparse.mk @@ -1,119 +1,115 @@ # Created by: Maho Nakata # # Common elements used by the SuiteSparse modules PKGNAMEPREFIX= suitesparse- SSPNAME= suitesparse -SSPVERSION= 7.3.1 +SSPVERSION= 7.4.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 CONFIGURE_WRKSRC=${WRKSRC}/${MPORTNAME} .else CONFIGURE_WRKSRC=${WRKSRC}/SuiteSparse_config .endif BUILD_WRKSRC= ${CONFIGURE_WRKSRC} CMAKE_SOURCE_PATH= ${CONFIGURE_WRKSRC} .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 .endif USES+= cmake:insource pathfix DOCSDIR= ${PREFIX}/share/doc/${SSPNAME} MAKE_ENV= 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}" LDFLAGS+= -L${WRKSRC}/lib # prevent linking with shared libs from the preinstalled older versions INSTALL_TARGET= install # skip USES=cmake INSTALL_WRKSRC= ${BUILD_WRKSRC} PLIST_SUB+= VER=${PORTVERSION} # FIXME: wont work if .CURDIR contains spaces DISTINFO_FILE= ${.CURDIR}/../../math/suitesparse/distinfo OPTIONS_DEFINE+= DOCS OPTIMIZED_CFLAGS OPTIONS_DEFAULT+= OPTIMIZED_CFLAGS .if ${MPORTNAME} == config || \ ${MPORTNAME} == CHOLMOD || \ ${MPORTNAME} == SPQR || \ ${MPORTNAME} == UMFPACK OPTIONS_RADIO+= BLAS OPTIONS_RADIO_BLAS+= ATLAS BLIS NETLIB OPENBLAS OPTIONS_DEFAULT+= OPENBLAS BLIS_DESC= BLAS implemntation from FLAME ATLAS_USES= blaslapack:atlas BLIS_USES= blaslapack:blis NETLIB_USES= blaslapack:netlib OPENBLAS_USES= blaslapack:openblas .endif 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 OPENMP_CMAKE_BOOL= OPENMP OPENMP_CMAKE_BOOL_OFF= NOPENMP DEMOS_DESC= Build the demonstrations -DEMOS_CMAKE_BOOL= DEMO +DEMOS_CMAKE_BOOL= SUITESPARSE_DEMOS .if !defined(WITH_DEBUG) OPTIMIZED_CFLAGS_CFLAGS= -O3 OPTIMIZED_CFLAGS_CXXFLAGS= -O3 LDFLAGS+= -s .endif -post-extract: - ${RM} -r ${WRKSRC}/metis-* - 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 a49020c66a12..bc2ef04891bc 100644 --- a/math/suitesparse/distinfo +++ b/math/suitesparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1699195880 -SHA256 (suitesparse/v7.3.1.tar.gz) = b512484396a80750acf3082adc1807ba0aabb103c2e09be5691f46f14d0a9718 -SIZE (suitesparse/v7.3.1.tar.gz) = 65341950 +TIMESTAMP = 1703951596 +SHA256 (suitesparse/v7.4.0.tar.gz) = f9a5cc2316a967198463198f7bf10fb8c4332de6189b0e405419a7092bc921b7 +SIZE (suitesparse/v7.4.0.tar.gz) = 85395023