From f07eb96a8ff3aa55e94a17b82dc38169089c7c5a Mon Sep 17 00:00:00 2001 From: Thierry Thomas Date: Tue, 17 Sep 2019 20:17:46 +0000 Subject: [PATCH] - Use SSL master_sites (1) - Upgrade to 5.4.0 (Latest stable release) (2) - Since I'm here make the pre-configure operations visible. PR: 239080 (1) Submitted by: imagin8r (T) protonmail.com --- math/suitesparse/Makefile | 27 +++++++++++++++------------ math/suitesparse/distinfo | 6 +++--- math/suitesparse/pkg-plist | 8 ++++---- 3 files changed, 22 insertions(+), 19 deletions(-) diff --git a/math/suitesparse/Makefile b/math/suitesparse/Makefile index 5c0dd39d9d32..29ce0814eed2 100644 --- a/math/suitesparse/Makefile +++ b/math/suitesparse/Makefile @@ -2,10 +2,10 @@ # $FreeBSD$ PORTNAME= suitesparse -DISTVERSION= 5.2.0 -PORTREVISION= 4 +DISTVERSION= 5.4.0 CATEGORIES= math -MASTER_SITES= http://faculty.cse.tamu.edu/davis/SuiteSparse/ +MASTER_SITES= http://faculty.cse.tamu.edu/davis/SuiteSparse/ \ + https://mirror.sobukus.de/files/src/suitesparse/ DISTNAME= SuiteSparse-${PORTVERSION} MAINTAINER= fortran@FreeBSD.org @@ -17,7 +17,7 @@ LICENSE_COMB= dual LIB_DEPENDS= libmetis.so:math/metis \ liblapack.so:math/lapack -USES= compiler:openmp fortran gmake +USES= cmake:insource compiler:openmp fortran gmake USE_LDCONFIG= yes WRKSRC= ${WRKDIR}/SuiteSparse @@ -47,9 +47,9 @@ CXXFLAGS+= -I${LOCALBASE}/include LDFLAGS+= -L${WRKSRC}/lib # prevent linking with shared libs from the preinstalled older versions MAKE_ARGS+= MY_METIS_LIB="-L${LOCALBASE}/lib -lmetis $(LDFLAGS)" -post-patch: - @${RM} -r ${WRKSRC}/metis-5.1.0 - @${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \ +pre-configure: + ${RM} -r ${WRKSRC}/metis-5.1.0 + ${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \ ${REINPLACE_CMD} \ -e '\|^AR =|s|ar|${AR}|' \ -e '\|^ *BLAS =|s|=.*|= ${LDFLAGS} ${BLASLIB}|' \ @@ -67,19 +67,22 @@ post-patch: -e '\|^SPQR_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \ -e 's|# MAKE = gmake|MAKE = gmake|g' \ -e 's|/usr/local|${LOCALBASE}|g' - @${CP} -r ${WRKSRC} ${WRKSRC_SHARED} - @${FIND} -X ${WRKSRC_SHARED} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \ + ${CP} -r ${WRKSRC} ${WRKSRC_SHARED} + ${FIND} -X ${WRKSRC_SHARED} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \ ${REINPLACE_CMD} -e 's|$$(CFLAGS)|$$(CFLAGS) $$(PICFLAG)|g' +do-configure: + @${DO_NADA} + do-build: - @cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} PICFLAG= \ + cd ${WRKSRC} && ${SETENV} ${MAKE_ENV} PICFLAG= \ LD_LIBRARY_PATH=${WRKDIR}/SuiteSparse/lib ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} - @cd ${WRKSRC_SHARED} && ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \ + cd ${WRKSRC_SHARED} && ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \ LD_LIBRARY_PATH=${WRKDIR}/SuiteSparse/lib ${MAKE_CMD} ${_MAKE_JOBS} ${MAKE_ARGS} do-install: @${MKDIR} ${STAGEDIR}${PREFIX}/include/suitesparse - @cd ${STAGEDIR}${PREFIX}/include && ${LN} -s suitesparse ufsparse + cd ${STAGEDIR}${PREFIX}/include && ${LN} -s suitesparse ufsparse .for d in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CSparse CXSparse KLU SPQR UMFPACK # CSparse: shared lib bot built ${INSTALL_DATA} ${WRKSRC}/${d}/Include/*.h ${STAGEDIR}${PREFIX}/include/suitesparse .endfor diff --git a/math/suitesparse/distinfo b/math/suitesparse/distinfo index 5488239bf29e..0945825f761f 100644 --- a/math/suitesparse/distinfo +++ b/math/suitesparse/distinfo @@ -1,3 +1,3 @@ -TIMESTAMP = 1524200823 -SHA256 (SuiteSparse-5.2.0.tar.gz) = 3c46c035ea8217649958a0f73360e825b0c9dcca4e32a9349d2c7678c0d48813 -SIZE (SuiteSparse-5.2.0.tar.gz) = 46053054 +TIMESTAMP = 1568663184 +SHA256 (SuiteSparse-5.4.0.tar.gz) = 374dd136696c653e34ef3212dc8ab5b61d9a67a6791d5ec4841efb838e94dbd1 +SIZE (SuiteSparse-5.4.0.tar.gz) = 52594099 diff --git a/math/suitesparse/pkg-plist b/math/suitesparse/pkg-plist index 9b5bcd70c4cb..6c0a116c52db 100644 --- a/math/suitesparse/pkg-plist +++ b/math/suitesparse/pkg-plist @@ -83,7 +83,7 @@ lib/libccolamd.so.2 lib/libccolamd.so.2.9.6 lib/libcholmod.so lib/libcholmod.so.3 -lib/libcholmod.so.3.0.12 +lib/libcholmod.so.3.0.13 lib/libcolamd.so lib/libcolamd.so.2 lib/libcolamd.so.2.9.6 @@ -101,10 +101,10 @@ lib/librbio.so.2 lib/librbio.so.2.2.6 lib/libspqr.so lib/libspqr.so.2 -lib/libspqr.so.2.0.8 +lib/libspqr.so.2.0.9 lib/libsuitesparseconfig.so lib/libsuitesparseconfig.so.5 -lib/libsuitesparseconfig.so.5.2.0 +lib/libsuitesparseconfig.so.5.4.0 lib/libumfpack.so lib/libumfpack.so.5 -lib/libumfpack.so.5.7.6 +lib/libumfpack.so.5.7.8