math/suitesparse: adapt dependency lines after modularization

Do not bump PORTREVISION, because this should not change the resulting
packages.

Note for maintainers: try to not depend on the whole suitesparse package,
especially if your port do not require GraphBLAS (the biggest one).

15 files changed, 22 insertions, 16 deletions

diff --git a/math/arpack++/Makefile b/math/arpack++/Makefile
index 8cf758824846..94db20926803 100644
--- a/math/arpack++/Makefile
+++ b/math/arpack++/Makefile
@@ -13,7 +13,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libsuperlu.so:math/superlu \
-		libumfpack.so:math/suitesparse
+		libumfpack.so:math/suitesparse-umfpack
 
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
diff --git a/math/ceres-solver/Makefile b/math/ceres-solver/Makefile
index 076d4f79d46f..866e71d8bf1c 100644
--- a/math/ceres-solver/Makefile
+++ b/math/ceres-solver/Makefile
@@ -84,7 +84,7 @@ OPENBLAS_IMPLIES=	LAPACK
 
 SPARSE_DESC=		Sparse linear algebra library
 CXSPARSE_DESC=		CXSparse support
-CXSPARSE_LIB_DEPENDS=	libcxsparse.so:math/suitesparse
+CXSPARSE_LIB_DEPENDS=	libcxsparse.so:math/suitesparse-cxsparse
 CXSPARSE_CMAKE_ON=	-DCXSPARSE_INCLUDE_DIR:PATH="${LOCALBASE}/include/suitesparse"
 CXSPARSE_CMAKE_BOOL=	CXSPARSE
 EIGENSPARSE_DESC=	Simplicial Cholesky factorization in Eigen
@@ -92,7 +92,8 @@ EIGENSPARSE_CMAKE_BOOL=	EIGENSPARSE
 EIGENSPARSE_VARS=	LICENSE+=LGPL21+ LICENSE_COMB=multi \
 			LICENSE_FILE_BSD3CLAUSE="${LICENSE_FILE}"
 SUITESPARSE_DESC=	SuiteSparse support
-SUITESPARSE_LIB_DEPENDS=libspqr.so:math/suitesparse
+SUITESPARSE_LIB_DEPENDS=libspqr.so:math/suitesparse-spqr	\
+			libcholmod.so:math/suitesparse-cholmod
 SUITESPARSE_CMAKE_BOOL=	SUITESPARSE
 
 post-patch-DOCS-on:
diff --git a/math/dune-pdelab/Makefile b/math/dune-pdelab/Makefile
index 5d8a54938fb9..6b2d2c53752e 100644
--- a/math/dune-pdelab/Makefile
+++ b/math/dune-pdelab/Makefile
@@ -18,6 +18,7 @@ DUNE_DEPENDS=	dune-common>0:math/dune-common \
 		dune-localfunctions>0:math/dune-localfunctions \
 		dune-typetree>0:math/dune-typetree
 BUILD_DEPENDS=	${DUNE_DEPENDS} \
+		suitesparse>0:math/suitesparse \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
@@ -25,10 +26,10 @@ LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libgmp.so:math/gmp \
 		libmetis.so:math/metis \
 		libopenblas.so:math/openblas \
-		libsuitesparseconfig.so:math/suitesparse \
 		libsuperlu.so:math/superlu \
 		libtbb.so:devel/onetbb
 RUN_DEPENDS=	${DUNE_DEPENDS} \
+		suitesparse>0:math/suitesparse \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
diff --git a/math/dune-vtk/Makefile b/math/dune-vtk/Makefile
index 2016b8143f3c..7fd254a85755 100644
--- a/math/dune-vtk/Makefile
+++ b/math/dune-vtk/Makefile
@@ -12,6 +12,7 @@ HPP_DEPENDS=	${LOCALBASE}/include/dune/foamgrid/foamgrid.hh:math/dune-foamgrid \
 		dune-spgrid>0:math/dune-spgrid
 BUILD_DEPENDS=	${HPP_DEPENDS} \
 		dune-functions>0:math/dune-functions \
+		suitesparse>0:math/suitesparse \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libdunealugrid.so:math/dune-alugrid \
@@ -23,10 +24,10 @@ LIB_DEPENDS=	libarpack.so:math/arpack-ng \
 		libgmp.so:math/gmp \
 		libmetis.so:math/metis \
 		libopenblas.so:math/openblas \
-		libsuitesparseconfig.so:math/suitesparse \
 		libsuperlu.so:math/superlu \
 		libtbb.so:devel/tbb
 RUN_DEPENDS=	${HPP_DEPENDS} \
+		suitesparse>0:math/suitesparse \
 		${LOCALBASE}/mpi/openmpi/lib/libmpi.so:net/openmpi
 
 USES=		cmake compiler:c++17-lang fortran pkgconfig
diff --git a/math/eigen3/Makefile b/math/eigen3/Makefile
index 9b1c7c9e18b5..712ff7e1f3a3 100644
--- a/math/eigen3/Makefile
+++ b/math/eigen3/Makefile
@@ -22,7 +22,8 @@ OPTIONS_DEFAULT=FULL
 FULL_DESC=	Add the support for math dependencies
 FULL_CMAKE_ON=	-DBLAS_DIR:PATH="${LOCALBASE}"
 FULL_USES=	blaslapack:openblas pkgconfig
-FULL_LIB_DEPENDS=	libcholmod.so:math/suitesparse	\
+FULL_LIB_DEPENDS=	libcholmod.so:math/suitesparse-cholmod	\
+			libumfpack.so:math/suitesparse-umfpack	\
 			libsuperlu.so:math/superlu	\
 			libadolc.so:math/adol-c		\
 			libfftw3.so:math/fftw3		\
diff --git a/math/freefem++/Makefile b/math/freefem++/Makefile
index ea7ff1a9e4cb..c3ff5f51ee6b 100644
--- a/math/freefem++/Makefile
+++ b/math/freefem++/Makefile
@@ -16,7 +16,7 @@ BUILD_DEPENDS=	bash:shells/bash		\
 		pipe:misc/pipe			\
 		tetgen:math/tetgen
 LIB_DEPENDS=	libhdf5.so:science/hdf5		\
-		libamd.so:math/suitesparse	\
+		libumfpack.so:math/suitesparse-umfpack	\
 		libarpack.so:math/arpack-ng	\
 		libfftw3.so:math/fftw3		\
 		libgsl.so:math/gsl		\
diff --git a/math/g2o/Makefile b/math/g2o/Makefile
index aa24119bb364..dbfd369c5b54 100644
--- a/math/g2o/Makefile
+++ b/math/g2o/Makefile
@@ -9,7 +9,7 @@ COMMENT=	General framework for graph optimization
 LICENSE=	LGPL3 GPLv3
 LICENSE_COMB=	dual
 
-LIB_DEPENDS=	libcxsparse.so:math/suitesparse \
+LIB_DEPENDS=	libcxsparse.so:math/suitesparse-cxsparse \
 		libQGLViewer-qt5.so:graphics/libQGLViewer \
 		libmetis.so:math/metis \
 		libopenblas.so:math/openblas
diff --git a/math/octave/Makefile b/math/octave/Makefile
index 2c82fe4717b9..22eb956a4f29 100644
--- a/math/octave/Makefile
+++ b/math/octave/Makefile
@@ -29,7 +29,9 @@ LIB_DEPENDS=	libGraphicsMagick.so:graphics/GraphicsMagick \
 		libpcre.so:devel/pcre \
 		libqhull.so.7:math/qhull \
 		libqrupdate.so:math/qrupdate \
-		libumfpack.so:math/suitesparse \
+		libcxsparse.so:math/suitesparse-cxsparse \
+		libklu.so:math/suitesparse-klu \
+		libumfpack.so:math/suitesparse-umfpack \
 		libglpk.so:math/glpk \
 		libgl2ps.so:print/gl2ps \
 		libfontconfig.so:x11-fonts/fontconfig \
diff --git a/math/py-cvxopt/Makefile b/math/py-cvxopt/Makefile
index 05883c58c601..54a339174581 100644
--- a/math/py-cvxopt/Makefile
+++ b/math/py-cvxopt/Makefile
@@ -11,7 +11,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 
 LIB_DEPENDS=	libblas.so:math/blas \
 		liblapack.so:math/lapack \
-		libumfpack.so:math/suitesparse
+		libumfpack.so:math/suitesparse-umfpack
 
 USES=		python:3.6+ localbase:ldflags
 USE_GITHUB=	yes
diff --git a/math/py-numpy/Makefile b/math/py-numpy/Makefile
index 19ce0a36fd7d..b120e392c9bf 100644
--- a/math/py-numpy/Makefile
+++ b/math/py-numpy/Makefile
@@ -44,7 +44,7 @@ NETLIB_VARS=		BLASLIBS="blas, cblas" BLASNAME=atlas LAPACKLIBS=lapack LIBRARIES=
 NETLIB_LIB_DEPENDS=	libcblas.so:math/cblas
 OPENBLAS_USES=		blaslapack:openblas
 OPENBLAS_VARS=		BLASLIBS="openblas, gfortran" BLASNAME=openblas LAPACKLIBS="openblas, gfortran" LIBRARIES=libraries
-SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse
+SUITESPARSE_LIB_DEPENDS=libumfpack.so:math/suitesparse-umfpack
 
 post-extract:
 	@${TOUCH} ${WRKSRC}/numpy/f2py/tests/src/temp
diff --git a/math/py-scikit-umfpack/Makefile b/math/py-scikit-umfpack/Makefile
index 85e4281e8012..85ddcd5f5961 100644
--- a/math/py-scikit-umfpack/Makefile
+++ b/math/py-scikit-umfpack/Makefile
@@ -14,7 +14,7 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 BUILD_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR} \
 		swig:devel/swig
-LIB_DEPENDS=	libumfpack.so:math/suitesparse
+LIB_DEPENDS=	libumfpack.so:math/suitesparse-umfpack
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}
 
diff --git a/math/sage/Makefile b/math/sage/Makefile
index d8e9b590d0a4..b7525e09bb0d 100644
--- a/math/sage/Makefile
+++ b/math/sage/Makefile
@@ -201,7 +201,7 @@ LIB_DEPENDS=	libarb.so:math/arb		\
 		libR.so:math/R			\
 		librw.so:math/rankwidth		\
 		libSingular.so:math/singular	\
-		libamd.so:math/suitesparse	\
+		libumfpack.so:math/suitesparse-umfpack	\
 		libsemigroups.so:math/libsemigroups	\
 		libsymmetrica.so:math/symmetrica\
 		libzmq.so:net/libzmq4		\
diff --git a/math/scilab/Makefile b/math/scilab/Makefile
index a9a0b2ac5761..9448cc113f60 100644
--- a/math/scilab/Makefile
+++ b/math/scilab/Makefile
@@ -22,7 +22,7 @@ LIB_DEPENDS=	libxml2.so:textproc/libxml2 \
 		libarpack.so:math/arpack-ng \
 		libfftw3.so:math/fftw3 \
 		libmatio.so:math/matio \
-		libamd.so:math/suitesparse
+		libamd.so:math/suitesparse-amd
 RUN_DEPENDS=	xdg-open:devel/xdg-utils
 
 USES=		compiler:c++17-lang cpe desktop-file-utils eigen:3,build \
diff --git a/science/mbdyn/Makefile b/science/mbdyn/Makefile
index cd6b63780a8c..db85665031c5 100644
--- a/science/mbdyn/Makefile
+++ b/science/mbdyn/Makefile
@@ -18,7 +18,7 @@ BROKEN_powerpc64=	fails to compile: libraries/libmbutil/parser.h:275:3: error: e
 BUILD_DEPENDS=	libatomic_ops>0:devel/libatomic_ops
 LIB_DEPENDS=	libltdl.so:devel/libltdl \
 		libarpack.so:math/arpack-ng \
-		libumfpack.so:math/suitesparse
+		libumfpack.so:math/suitesparse-umfpack
 
 USES=		compiler:c++11-lib fortran gmake libtool:build localbase
 USE_LDCONFIG=	yes
diff --git a/science/py-scikit-sparse/Makefile b/science/py-scikit-sparse/Makefile
index a3027c2d8f7d..fff545e237ba 100644
--- a/science/py-scikit-sparse/Makefile
+++ b/science/py-scikit-sparse/Makefile
@@ -13,7 +13,7 @@ LICENSE=	BSD2CLAUSE
 LICENSE_FILE=	${WRKSRC}/LICENSE.txt
 
 BUILD_DEPENDS=	${RUN_DEPENDS}
-LIB_DEPENDS=	libumfpack.so:math/suitesparse
+LIB_DEPENDS=	libumfpack.so:math/suitesparse-umfpack
 RUN_DEPENDS=	${PYNUMPY} \
 		${PYTHON_PKGNAMEPREFIX}scipy>0:science/py-scipy@${PY_FLAVOR}