Index: head/math/suitesparse/Makefile =================================================================== --- head/math/suitesparse/Makefile (revision 309854) +++ head/math/suitesparse/Makefile (revision 309855) @@ -1,124 +1,131 @@ # New ports collection makefile for: ufspace # Date created: 4 July 2006 # Whom: Maho Nakata # # $FreeBSD$ # 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} MAINTAINER= maho@FreeBSD.org COMMENT= SuiteSparse is a set of packages for sparse matrices calculation LICENSE= GPLv2 LGPL21 LICENSE_COMB= multi .if defined (WITH_METIS) LIB_DEPENDS= metis.1:${PORTSDIR}/math/metis4 RESTRICTED= GPL and METIS licenses are contradictory .endif CONFLICTS= umfpack-* .include -.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 .else WITH_BLAS?= reference .endif CFLAGS+= ${PTHREAD_CFLAGS} LDFLAGS+= -L${LOCALBASE}/lib .if ${WITH_BLAS} == reference LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas 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 BLAS = -lgoto2p LAPACK = -lgoto2p .elif ${WITH_BLAS} == atlas LIB_DEPENDS+= atlas:${PORTSDIR}/math/atlas BLAS= -lptf77blas LAPACK = -lalapack -lptcblas .endif .if ${ARCH} == "sparc64" PICFLAG?= -fPIC .else PICFLAG?= -fpic .endif USE_LDCONFIG= yes USE_GMAKE= yes USE_FORTRAN= yes WRKSRC=${WRKDIR}/SuiteSparse WRKSRC_SHARED=${WRKSRC}_shared SVERSION=1 .if defined (WITH_METIS) METIS=${LOCALBASE}/lib/libmetis.a METIS_PATH=${LOCALBASE}/include/metis CHOLMOD_CONFIG = .else CHOLMOD_CONFIG = -DNPARTITION .endif post-patch: @${FIND} -X ${WRKSRC} -type f -name 'Makefile' -or -name '*.mk' | ${XARGS} \ ${REINPLACE_CMD} -e '\|^AR =|s|ar|${AR}|' \ -e '\|^BLAS =|s|=.*|= ${LDFLAGS} ${BLAS}|' \ -e '\|^CC =|d' \ -e '\|^CFLAGS =|{s|-O[1-9]\{0,1\}||g;s|=|= ${CFLAGS} $${PICFLAG} |;}' \ -e '\|^CHOLMOD_CONFIG =|s|=.*|= ${CHOLMOD_CONFIG}|' \ -e '\|^CPLUSPLUS =|s|=.*|= ${CXX}|' \ -e '\|^F77 =|d' \ -e '\|^F77FLAGS =|s|=.*|= ${FFLAGS} $${PICFLAG}|' \ -e '\|^LAPACK =|s|=.*|= ${LDFLAGS} ${LAPACK}|' \ -e '\|^METIS =|s|=.*|= ${METIS}|' \ -e '\|^METIS_PATH =|s|=.*|= ${METIS_PATH}|' \ -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= \ ${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS} @cd ${WRKSRC_SHARED} ; ${SETENV} ${MAKE_ENV} PICFLAG=${PICFLAG} \ ${GMAKE} ${_MAKE_JOBS} ${MAKE_ARGS} post-build: @for i in `find ${WRKSRC_SHARED} -type f -name '*.a'` ; do \ j=$${i##*/} ; ${LD} -Bshareable -o $${i%.a}.so.${SVERSION} -x \ -soname $${j%.a}.so.${SVERSION} --whole-archive $${i} ; \ done do-install: @${MKDIR} ${PREFIX}/include/suitesparse @${LN} -sf ${PREFIX}/include/suitesparse ${PREFIX}/include/ufsparse .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}/} \ $${i%.a}.so.${SVERSION} ${PREFIX}/lib ; \ j=$${i##*/} ; ${LN} -sf $${j%.a}.so.${SVERSION} ${PREFIX}/lib/$${j%.a}.so ; \ done .include Index: head/math/suitesparse/distinfo =================================================================== --- head/math/suitesparse/distinfo (revision 309854) +++ head/math/suitesparse/distinfo (revision 309855) @@ -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 Index: head/math/suitesparse/files/patch-UFconfig+UFconfig.mk =================================================================== --- head/math/suitesparse/files/patch-UFconfig+UFconfig.mk (revision 309854) +++ head/math/suitesparse/files/patch-UFconfig+UFconfig.mk (nonexistent) @@ -1,28 +0,0 @@ ---- UFconfig/UFconfig.mk.orig 2011-07-19 19:43:11.000000000 -0400 -+++ UFconfig/UFconfig.mk 2011-07-19 19:44:13.000000000 -0400 -@@ -237,18 +237,18 @@ - - # alternatives: - # CFLAGS = -g -fexceptions \ -- -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ -- -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \ -- -funit-at-a-time -+# -Wall -W -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ -+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi \ -+# -funit-at-a-time - # CFLAGS = -O3 -fexceptions \ -- -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ -- -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi -+# -Wall -W -Werror -Wshadow -Wmissing-prototypes -Wstrict-prototypes \ -+# -Wredundant-decls -Wnested-externs -Wdisabled-optimization -ansi - # CFLAGS = -O3 -fexceptions -D_FILE_OFFSET_BITS=64 -D_LARGEFILE64_SOURCE - # CFLAGS = -O3 - # CFLAGS = -O3 -g -fexceptions - # CFLAGS = -g -fexceptions \ -- -Wall -W -Wshadow \ -- -Wredundant-decls -Wdisabled-optimization -ansi -+# -Wall -W -Wshadow \ -+# -Wredundant-decls -Wdisabled-optimization -ansi - - # consider: - # -fforce-addr -fmove-all-movables -freduce-all-givs -ftsp-ordering Property changes on: head/math/suitesparse/files/patch-UFconfig+UFconfig.mk ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/math/suitesparse/files/patch-SPQR+Source+spqr_factorize.cpp =================================================================== --- head/math/suitesparse/files/patch-SPQR+Source+spqr_factorize.cpp (revision 309854) +++ head/math/suitesparse/files/patch-SPQR+Source+spqr_factorize.cpp (nonexistent) @@ -1,10 +0,0 @@ ---- SPQR/Source/spqr_factorize.cpp~ 2008-09-22 06:10:37.000000000 +0900 -+++ SPQR/Source/spqr_factorize.cpp 2009-02-16 15:47:49.000000000 +0900 -@@ -31,6 +31,7 @@ - // ============================================================================= - - #include "spqr.hpp" -+#include - - #define FCHUNK 32 // FUTURE: make a parameter; Householder block size - Property changes on: head/math/suitesparse/files/patch-SPQR+Source+spqr_factorize.cpp ___________________________________________________________________ Deleted: fbsd:nokeywords ## -1 +0,0 ## -yes \ No newline at end of property Index: head/math/suitesparse/pkg-plist =================================================================== --- head/math/suitesparse/pkg-plist (revision 309854) +++ head/math/suitesparse/pkg-plist (revision 309855) @@ -1,111 +1,110 @@ 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 include/suitesparse/btf_internal.h include/suitesparse/camd.h include/suitesparse/camd_internal.h include/suitesparse/ccolamd.h include/suitesparse/cholmod.h include/suitesparse/cholmod_blas.h include/suitesparse/cholmod_check.h include/suitesparse/cholmod_cholesky.h include/suitesparse/cholmod_complexity.h include/suitesparse/cholmod_config.h include/suitesparse/cholmod_core.h include/suitesparse/cholmod_internal.h include/suitesparse/cholmod_io64.h include/suitesparse/cholmod_matrixops.h include/suitesparse/cholmod_modify.h include/suitesparse/cholmod_partition.h include/suitesparse/cholmod_supernodal.h include/suitesparse/cholmod_template.h include/suitesparse/colamd.h include/suitesparse/cs.h include/suitesparse/klu.h include/suitesparse/klu_internal.h include/suitesparse/klu_version.h include/suitesparse/spqr.hpp 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 include/ufsparse @dirrm include/suitesparse lib/libamd.a lib/libamd.so lib/libamd.so.1 lib/libbtf.a lib/libbtf.so lib/libbtf.so.1 lib/libcamd.a lib/libcamd.so lib/libcamd.so.1 lib/libccolamd.a lib/libccolamd.so lib/libccolamd.so.1 lib/libcerbla.a lib/libcerbla.so lib/libcerbla.so.1 lib/libcholmod.a lib/libcholmod.so lib/libcholmod.so.1 lib/libcolamd.a lib/libcolamd.so lib/libcolamd.so.1 lib/libcsparse.a lib/libcsparse.so lib/libcsparse.so.1 lib/libcxsparse.a lib/libcxsparse.so lib/libcxsparse.so.1 lib/libklu.a lib/libklu.so lib/libklu.so.1 lib/libldl.a lib/libldl.so lib/libldl.so.1 lib/librbio.a lib/librbio.so 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