From 8f2142d0c95689e682c14d6b2d100c2df9c659c2 Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Mon, 14 Nov 2022 18:21:07 +0100 Subject: [PATCH] math/suitesparse-umfpack: upgrade to 6.0.1 PR: 267742 --- math/suitesparse-umfpack/Makefile | 14 +++++-- .../files/patch-UMFPACK_Demo_Makefile | 16 -------- math/suitesparse-umfpack/pkg-plist | 38 ++----------------- 3 files changed, 15 insertions(+), 53 deletions(-) delete mode 100644 math/suitesparse-umfpack/files/patch-UMFPACK_Demo_Makefile diff --git a/math/suitesparse-umfpack/Makefile b/math/suitesparse-umfpack/Makefile index c4d788e2bc59..a1e5cf5c64c9 100644 --- a/math/suitesparse-umfpack/Makefile +++ b/math/suitesparse-umfpack/Makefile @@ -1,5 +1,5 @@ PORTNAME= ${MPORTNAME:tl} -PORTVERSION= 5.7.9 +PORTVERSION= 6.0.1 CATEGORIES= math COMMENT= Sparse multifrontal LU factorization @@ -15,11 +15,19 @@ LIB_DEPENDS= libmetis.so:math/metis \ libcholmod.so:math/suitesparse-cholmod USES= localbase:ldflags -BLAS_NEEDED= yes -OMP_NEEDED= yes MPORTNAME= UMFPACK USE_LDCONFIG= yes .include "${.CURDIR}/../../math/suitesparse/bsd.suitesparse.mk" + +post-stage-DOCS-on: + @${MKDIR} ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/README.txt \ + ${STAGEDIR}${DOCSDIR}/${MPORTNAME}_README.txt + ${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/${MPORTNAME}_QuickStart.pdf \ + ${STAGEDIR}${DOCSDIR} + ${INSTALL_DATA} ${BUILD_WRKSRC}/Doc/${MPORTNAME}_UserGuide.pdf \ + ${STAGEDIR}${DOCSDIR} + .include diff --git a/math/suitesparse-umfpack/files/patch-UMFPACK_Demo_Makefile b/math/suitesparse-umfpack/files/patch-UMFPACK_Demo_Makefile deleted file mode 100644 index df69a4e05eac..000000000000 --- a/math/suitesparse-umfpack/files/patch-UMFPACK_Demo_Makefile +++ /dev/null @@ -1,16 +0,0 @@ ---- UMFPACK/Demo/Makefile.orig 2021-05-17 01:04:52 UTC -+++ UMFPACK/Demo/Makefile -@@ -31,13 +31,7 @@ LIBS = $(LDLIBS) -L../../lib -lumfpack -lamd -lsuitesp - $(LIB_WITH_CHOLMOD) $(LAPACK) $(BLAS) - - libs: metis -- ( cd ../../SuiteSparse_config ; $(MAKE) ) -- ( cd ../../AMD ; $(MAKE) library ) - ( cd ../Lib ; $(MAKE) ) -- - ( cd ../../CHOLMOD && $(MAKE) library ) -- - ( cd ../../COLAMD && $(MAKE) library ) -- - ( cd ../../CCOLAMD ; $(MAKE) library ) -- - ( cd ../../CAMD ; $(MAKE) library ) - - metis: ../../include/metis.h - diff --git a/math/suitesparse-umfpack/pkg-plist b/math/suitesparse-umfpack/pkg-plist index 6e4a239ac24c..0dd14544d7f0 100644 --- a/math/suitesparse-umfpack/pkg-plist +++ b/math/suitesparse-umfpack/pkg-plist @@ -1,39 +1,9 @@ include/suitesparse/umfpack.h -include/suitesparse/umfpack_col_to_triplet.h -include/suitesparse/umfpack_defaults.h -include/suitesparse/umfpack_free_numeric.h -include/suitesparse/umfpack_free_symbolic.h -include/suitesparse/umfpack_get_determinant.h -include/suitesparse/umfpack_get_lunz.h -include/suitesparse/umfpack_get_numeric.h -include/suitesparse/umfpack_get_symbolic.h -include/suitesparse/umfpack_global.h -include/suitesparse/umfpack_load_numeric.h -include/suitesparse/umfpack_load_symbolic.h -include/suitesparse/umfpack_numeric.h -include/suitesparse/umfpack_qsymbolic.h -include/suitesparse/umfpack_report_control.h -include/suitesparse/umfpack_report_info.h -include/suitesparse/umfpack_report_matrix.h -include/suitesparse/umfpack_report_numeric.h -include/suitesparse/umfpack_report_perm.h -include/suitesparse/umfpack_report_status.h -include/suitesparse/umfpack_report_symbolic.h -include/suitesparse/umfpack_report_triplet.h -include/suitesparse/umfpack_report_vector.h -include/suitesparse/umfpack_save_numeric.h -include/suitesparse/umfpack_save_symbolic.h -include/suitesparse/umfpack_scale.h -include/suitesparse/umfpack_solve.h -include/suitesparse/umfpack_symbolic.h -include/suitesparse/umfpack_tictoc.h -include/suitesparse/umfpack_timer.h -include/suitesparse/umfpack_transpose.h -include/suitesparse/umfpack_triplet_to_col.h -include/suitesparse/umfpack_wsolve.h +lib/cmake/SuiteSparse/FindUMFPACK.cmake +lib/libumfpack.a lib/libumfpack.so -lib/libumfpack.so.5 -lib/libumfpack.so.5.7.9 +lib/libumfpack.so.6 +lib/libumfpack.so.6.0.1 %%PORTDOCS%%%%DOCSDIR%%/UMFPACK_QuickStart.pdf %%PORTDOCS%%%%DOCSDIR%%/UMFPACK_README.txt %%PORTDOCS%%%%DOCSDIR%%/UMFPACK_UserGuide.pdf