Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 17 Sep 2019 20:17:46 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r512240 - head/math/suitesparse
Message-ID:  <201909172017.x8HKHkk9012077@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thierry
Date: Tue Sep 17 20:17:46 2019
New Revision: 512240
URL: https://svnweb.freebsd.org/changeset/ports/512240

Log:
  - 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

Modified:
  head/math/suitesparse/Makefile
  head/math/suitesparse/distinfo
  head/math/suitesparse/pkg-plist

Modified: head/math/suitesparse/Makefile
==============================================================================
--- head/math/suitesparse/Makefile	Tue Sep 17 19:57:41 2019	(r512239)
+++ head/math/suitesparse/Makefile	Tue Sep 17 20:17:46 2019	(r512240)
@@ -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

Modified: head/math/suitesparse/distinfo
==============================================================================
--- head/math/suitesparse/distinfo	Tue Sep 17 19:57:41 2019	(r512239)
+++ head/math/suitesparse/distinfo	Tue Sep 17 20:17:46 2019	(r512240)
@@ -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

Modified: head/math/suitesparse/pkg-plist
==============================================================================
--- head/math/suitesparse/pkg-plist	Tue Sep 17 19:57:41 2019	(r512239)
+++ head/math/suitesparse/pkg-plist	Tue Sep 17 20:17:46 2019	(r512240)
@@ -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



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201909172017.x8HKHkk9012077>