Date: Thu, 3 Jan 2013 07:51:25 +0000 (UTC) From: Maho Nakata <maho@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r309855 - in head/math/suitesparse: . files Message-ID: <201301030751.r037pP2j061315@svn.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: maho Date: Thu Jan 3 07:51:24 2013 New Revision: 309855 URL: http://svnweb.freebsd.org/changeset/ports/309855 Log: * update to 4.0.2 * correct openblas dependency [1] Submitted by: Eijiro Shibusawa <phd_kimberlite@yahoo.co.jp> [1] Deleted: head/math/suitesparse/files/patch-SPQR+Source+spqr_factorize.cpp head/math/suitesparse/files/patch-UFconfig+UFconfig.mk Modified: head/math/suitesparse/Makefile head/math/suitesparse/distinfo head/math/suitesparse/pkg-plist Modified: head/math/suitesparse/Makefile ============================================================================== --- head/math/suitesparse/Makefile Thu Jan 3 05:27:36 2013 (r309854) +++ head/math/suitesparse/Makefile Thu Jan 3 07:51:24 2013 (r309855) @@ -6,8 +6,7 @@ # PORTNAME= suitesparse -PORTVERSION= 3.6.1 -PORTREVISION= 2 +PORTVERSION= 4.0.2 CATEGORIES= math MASTER_SITES= http://www.cise.ufl.edu/research/sparse/SuiteSparse/ DISTNAME= SuiteSparse-${PORTVERSION} @@ -28,7 +27,9 @@ CONFLICTS= umfpack-* .include <bsd.port.pre.mk> -.if exists(${LOCALBASE}/lib/libgoto2.so) +.if exists(${LOCALBASE}/lib/libopenblas.so) +WITH_BLAS?= openblas +.elif exists(${LOCALBASE}/lib/libgoto2.so) WITH_BLAS?= gotoblas .elif exists(${LOCALBASE}/lib/libatlas.so) WITH_BLAS?= atlas @@ -44,6 +45,10 @@ LIB_DEPENDS+= blas.2:${PORTSDIR}/math/bl LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack BLAS= -lblas LAPACK= -llapack +.elif ${WITH_BLAS} == openblas +LIB_DEPENDS+= openblas:${PORTSDIR}/math/openblas +BLAS= -lopenblasp +LAPACK= -lopenblasp .elif ${WITH_BLAS} == gotoblas LIB_DEPENDS+= goto2:${PORTSDIR}/math/gotoblas LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack @@ -92,8 +97,11 @@ post-patch: -e 's|-I\$$(METIS_PATH)/Lib|-I${METIS_PATH}|' \ -e '\|^RANLIB =|s|ranlib|${RANLIB}|' \ -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} \ + ${REINPLACE_CMD} -e 's|$$(CFLAGS)|$$(CFLAGS) $$(PICFLAG)|g' do-build: @cd ${WRKSRC} ; ${SETENV} ${MAKE_ENV} PICFLAG= \ @@ -113,7 +121,6 @@ do-install: .for d in AMD BTF CAMD CCOLAMD CHOLMOD COLAMD CXSparse KLU SPQR UMFPACK @${INSTALL_DATA} ${WRKSRC}/${d}/Include/*.h ${PREFIX}/include/suitesparse .endfor - @${INSTALL_DATA} ${WRKSRC}/UFconfig/*.h ${PREFIX}/include/suitesparse @${INSTALL_DATA} ${WRKSRC}/SPQR/Include/*.hpp ${PREFIX}/include/suitesparse @for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \ ${INSTALL_DATA} ${WRKSRC}/$${i##${WRKSRC_SHARED}/} \ Modified: head/math/suitesparse/distinfo ============================================================================== --- head/math/suitesparse/distinfo Thu Jan 3 05:27:36 2013 (r309854) +++ head/math/suitesparse/distinfo Thu Jan 3 07:51:24 2013 (r309855) @@ -1,2 +1,2 @@ -SHA256 (SuiteSparse-3.6.1.tar.gz) = 9876a27ad365ce02610b074167081eb22aa61a18141268dbd84218b7ae37c540 -SIZE (SuiteSparse-3.6.1.tar.gz) = 13043105 +SHA256 (SuiteSparse-4.0.2.tar.gz) = 93b5928987fe010808b3fdff3e7edef42fb2d8cfd65b09dd6d4c41756acb0050 +SIZE (SuiteSparse-4.0.2.tar.gz) = 22421100 Modified: head/math/suitesparse/pkg-plist ============================================================================== --- head/math/suitesparse/pkg-plist Thu Jan 3 05:27:36 2013 (r309854) +++ head/math/suitesparse/pkg-plist Thu Jan 3 07:51:24 2013 (r309855) @@ -1,7 +1,6 @@ include/suitesparse/SuiteSparseQR.hpp include/suitesparse/SuiteSparseQR_C.h include/suitesparse/SuiteSparseQR_definitions.h -include/suitesparse/UFconfig.h include/suitesparse/amd.h include/suitesparse/amd_internal.h include/suitesparse/btf.h @@ -103,9 +102,9 @@ lib/librbio.so.1 lib/libspqr.a lib/libspqr.so lib/libspqr.so.1 -lib/libufconfig.a -lib/libufconfig.so -lib/libufconfig.so.1 +lib/libsuitesparseconfig.a +lib/libsuitesparseconfig.so +lib/libsuitesparseconfig.so.1 lib/libumfpack.a lib/libumfpack.so lib/libumfpack.so.1
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201301030751.r037pP2j061315>