Index: head/math/sundials/Makefile =================================================================== --- head/math/sundials/Makefile (revision 481589) +++ head/math/sundials/Makefile (revision 481590) @@ -1,80 +1,80 @@ # $FreeBSD$ PORTNAME= sundials DISTVERSION= 3.1.2 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= math MASTER_SITES= https://computation.llnl.gov/projects/sundials/download/ MAINTAINER= yuri@FreeBSD.org COMMENT= SUite of Nonlinear and DIfferential/ALgebraic Equation Solvers LICENSE= BSD3CLAUSE LICENSE_FILE= ${WRKSRC}/LICENSE USES= cmake:outsource,noninja python:build # ninja doesn't support fortran USE_LDCONFIG= yes CMAKE_ARGS= -DPTHREAD_ENABLE:BOOL=ON \ -DBUILD_STATIC_LIBS:BOOL=OFF PLIST_SUB= SHL3=${DISTVERSION} SHL1=${DISTVERSION:R:R} SHLX3=1.1.2 SHLX1=1 OPTIONS_DEFINE= BLAS EXAMPLES LAPACK MPI SUPERLUMT # OPENMP detection is broken in cmake: https://gitlab.kitware.com/cmake/cmake/issues/17474 OPTIONS_DEFAULT= LAPACK OPTIONS_GROUP= VECTORS OPTIONS_GROUP_VECTORS= HYPRE PETSC VECTORS_DESC= Alternative vector libraries BLAS_DESC= Enable BLAS support HYPRE_DESC= HYPRE vectors support (also enables MPI) LAPACK_DESC= Use Lapack linear algebra (sets SUNDIALS_INDEX_TYPE=int32) PETSC_DESC= PETSc vectors support (also enables MPI) SUPERLUMT_DESC= Sparse matrix factorization through SUPERLUMT OPTIONS_SUB= yes BLAS_CMAKE_BOOL= BLAS_ENABLE BLAS_USES= blaslapack:openblas fortran BLAS_CMAKE_ON= -DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used EXAMPLES_CMAKE_BOOL= EXAMPLES_ENABLE_C EXAMPLES_ENABLE_CXX EXAMPLES_ENABLE_F77 EXAMPLES_ENABLE_F90 EXAMPLES_CMAKE_ON= -DEXAMPLES_INSTALL_PATH=${EXAMPLESDIR} HYPRE_CMAKE_BOOL= HYPRE_ENABLE HYPRE_CMAKE_ON= -DHYPRE_INCLUDE_DIR=${LOCALBASE}/include \ -DHYPRE_LIBRARY_DIR=${LOCALBASE}/lib HYPRE_LIB_DEPENDS= libHYPRE.so:science/hypre HYPRE_IMPLIES= MPI HYPRE_PREVENTS= LAPACK # error: Incompatible sunindextype for LAPACK; disable LAPACK and rebuild LAPACK_USES= blaslapack:openblas fortran LAPACK_CMAKE_BOOL= LAPACK_ENABLE LAPACK_CMAKE_ON= -DSUNDIALS_INDEX_TYPE:STRING=int32_t \ -DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used MPI_CMAKE_ON= -DMPI_ENABLE:BOOL=ON MPI_LIB_DEPENDS= libmpich.so:net/mpich PETSC_CMAKE_BOOL= PETSC_ENABLE PETSC_CMAKE_ON= -DPETSC_INCLUDE_DIR=${LOCALBASE}/include \ -DPETSC_LIBRARY_DIR=${LOCALBASE}/lib PETSC_LIB_DEPENDS= libpetsc.so:science/PETSc PETSC_IMPLIES= MPI PETSC_PREVENTS= LAPACK # error: Incompatible sunindextype for LAPACK; disable LAPACK and rebuild SUPERLUMT_CMAKE_BOOL= SUPERLUMT_ENABLE SUPERLUMT_CMAKE_ON= -DSUPERLUMT_INCLUDE_DIR=${LOCALBASE}/include/superlu_mt \ -DSUPERLUMT_LIBRARY_DIR=${LOCALBASE}/lib \ -DSUPERLUMT_THREAD_TYPE=Pthread \ -DFREEBSD_GCC_DIR:STRING=${LOCALBASE}/lib/gcc${GCC_DEFAULT:S/.//} # assumes that fortran:gcc is used SUPERLUMT_LIB_DEPENDS= libsuperlu_mt_PTHREAD.so:math/superlu_mt SUPERLUMT_PREVENTS= LAPACK # LAPACK requires SUNDIALS_INDEX_TYPE=int32, and SUPERLUMT requires SUNDIALS_INDEX_TYPE=int64 PORTEXAMPLES= * post-patch: @${FIND} ${WRKSRC}/examples -name "*.c" -o -name "*.cpp" | ${XARGS} ${REINPLACE_CMD} -E 's/"(ESYM|FSYM)"/" \1 "/g' post-install: @${RM} ${STAGEDIR}${PREFIX}/include/sundials/LICENSE .include Index: head/science/hypre/Makefile =================================================================== --- head/science/hypre/Makefile (revision 481589) +++ head/science/hypre/Makefile (revision 481590) @@ -1,63 +1,68 @@ # Created by: Pedro Giffuni # $FreeBSD$ PORTNAME= hypre -DISTVERSION= 2.11.2 -PORTREVISION= 4 +DISTVERSIONPREFIX= v +DISTVERSION= 2.15.0 CATEGORIES= science -MASTER_SITES= https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods/download/ MAINTAINER= yuri@FreeBSD.org COMMENT= Scalable Linear Solvers and Multigrid Methods LICENSE= LGPL21 -LICENSE_FILE= ${WRKDIR}/${DISTNAME}/COPYING.LESSER +LICENSE_FILE= ${WRKSRC}/../COPYING.LESSER BROKEN_powerpc64= fails to compile: ./DistributedMatrixPilutSolver.h:97:20: expected ')' before '->' token USES= blaslapack fortran localbase - +USE_GITHUB= yes +GH_ACCOUNT= LLNL USE_LDCONFIG= yes WRKSRC_SUBDIR= src HAS_CONFIGURE= yes CONFIGURE_ARGS= --with-blas --with-blas-lib=${BLASLIB} \ --with-lapack --with-lapack-lib=${LAPACKLIB} \ --enable-shared OPTIONS_DEFINE= DOCS OPTIONS_SINGLE= MPI -OPTIONS_SINGLE_MPI= MPICH OPENMPI +OPTIONS_SINGLE_MPI= NOMPI MPICH OPENMPI OPTIONS_DEFAULT= MPICH +NOMPI_DESC= Build without parallel processing support +NOMPI_CONFIGURE_ON= --without-MPI + MPICH_DESC= Parallel processing support via MPICH MPICH_LIB_DEPENDS= libmpich.so:net/mpich MPICH_CONFIGURE_ENV= CC=${LOCALBASE}/bin/mpicc CXX=${LOCALBASE}/bin/mpicxx MPICH_CONFIGURE_WITH= MPI-include=${LOCALBASE}/include \ MPI-lib-dirs=${LOCALBASE}/lib OPENMPI_LIB_DEPENDS= libmpi.so:net/openmpi OPENMPI_CONFIGURE_ENV= CC=${LOCALBASE}/mpi/openmpi/bin/mpicc \ CXX=${LOCALBASE}/mpi/openmpi/bin/mpicxx OPENMPI_CONFIGURE_WITH= MPI-include=${LOCALBASE}/mpi/openmpi/include \ MPI-lib-dirs=${LOCALBASE}/mpi/openmpi/lib -.ifdef MAINTAINER_MODE TEST_TARGET= check -.endif +SHL3= ${PORTVERSION} +SHL2= ${SHL3:R} +SHL1= ${SHL2:R} + do-install: ${INSTALL_DATA} ${WRKSRC}/hypre/include/* ${STAGEDIR}${PREFIX}/include - ${INSTALL_LIB} ${WRKSRC}/hypre/lib/libHYPRE-2.11.2.so \ - ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.2.11 - ${RLN} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.2.11 \ - ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.2 - ${RLN} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.2.11 \ + ${INSTALL_LIB} ${WRKSRC}/hypre/lib/libHYPRE-${SHL3}.so \ + ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.${SHL2} + ${RLN} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.${SHL2} \ + ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.${SHL1} + ${RLN} ${STAGEDIR}${PREFIX}/lib/libHYPRE.so.${SHL2} \ ${STAGEDIR}${PREFIX}/lib/libHYPRE.so post-install-DOCS-on: ${MKDIR} ${STAGEDIR}${DOCSDIR} - ${INSTALL_DATA} ${WRKDIR}/${DISTNAME}/docs/*.pdf \ + ${INSTALL_DATA} ${WRKSRC}/../docs/*.pdf \ ${STAGEDIR}${DOCSDIR} .include Index: head/science/hypre/distinfo =================================================================== --- head/science/hypre/distinfo (revision 481589) +++ head/science/hypre/distinfo (revision 481590) @@ -1,3 +1,3 @@ -TIMESTAMP = 1496033213 -SHA256 (hypre-2.11.2.tar.gz) = 25b6c1226411593f71bb5cf3891431afaa8c3fd487bdfe4faeeb55c6fdfb269e -SIZE (hypre-2.11.2.tar.gz) = 8077407 +TIMESTAMP = 1539045623 +SHA256 (LLNL-hypre-v2.15.0_GH0.tar.gz) = 07cad10bb328d1a7d40057c25469354e2945e534a8520604f10fa9fbb6afef94 +SIZE (LLNL-hypre-v2.15.0_GH0.tar.gz) = 7348422 Index: head/science/hypre/pkg-descr =================================================================== --- head/science/hypre/pkg-descr (revision 481589) +++ head/science/hypre/pkg-descr (revision 481590) @@ -1,7 +1,7 @@ HYPRE: Scalable Linear Solvers and Multigrid Methods HYPRE is a library of high performance preconditioners and solvers featuring multigrid methods for the solution of large, sparse linear systems of equations on massively parallel computers. -WWW: http://www.llnl.gov/casc/hypre/ +WWW: https://computation.llnl.gov/projects/hypre-scalable-linear-solvers-multigrid-methods Index: head/science/hypre/pkg-plist =================================================================== --- head/science/hypre/pkg-plist (revision 481589) +++ head/science/hypre/pkg-plist (revision 481590) @@ -1,79 +1,67 @@ -include/Cnames.h include/HYPRE.h include/HYPRE_DistributedMatrixPilutSolver_protos.h include/HYPRE_DistributedMatrixPilutSolver_types.h include/HYPRE_FEI.h include/HYPRE_FEI_includes.h include/HYPRE_IJ_mv.h include/HYPRE_LinSysCore.h include/HYPRE_MatvecFunctions.h include/HYPRE_config.h include/HYPRE_error_f.h include/HYPRE_krylov.h include/HYPRE_lobpcg.h include/HYPRE_matrix_matrix_protos.h include/HYPRE_parcsr_ls.h include/HYPRE_parcsr_mv.h include/HYPRE_seq_mv.h include/HYPRE_sstruct_ls.h include/HYPRE_sstruct_mv.h include/HYPRE_struct_ls.h include/HYPRE_struct_mv.h include/HYPRE_utilities.h include/HYPREf.h include/LLNL_FEI_Fei.h include/LLNL_FEI_Impl.h include/LLNL_FEI_LSCore.h include/LLNL_FEI_Matrix.h include/LLNL_FEI_Solver.h include/_hypre_IJ_mv.h include/_hypre_parcsr_ls.h include/_hypre_parcsr_mv.h include/_hypre_sstruct_ls.h include/_hypre_sstruct_mv.h include/_hypre_struct_ls.h include/_hypre_struct_mv.h include/_hypre_utilities.h include/cfei-hypre.h include/cfei.h include/cfei_hypre.h -include/colamd.h include/csr_block_matrix.h include/csr_matmultivec.h include/distributed_matrix.h include/fei_Data.hpp include/fei_LinearSystemCore.hpp include/fei_Lookup.hpp include/fei_bool.h include/fei_defs.h include/fei_mpi.h include/fortran.h include/fortran_matrix.h include/hypre_cfei.h include/hypre_hopscotch_hash.h include/interpreter.h include/krylov.h include/lobpcg.h include/multivector.h -include/old_colamd.h include/par_csr_block_matrix.h include/par_csr_matmultivec.h include/par_csr_pmvcomm.h include/par_multivector.h include/seq_multivector.h include/seq_mv.h -include/slu_Cnames.h -include/slu_cdefs.h -include/slu_dcomplex.h -include/slu_ddefs.h -include/slu_scomplex.h -include/slu_sdefs.h -include/slu_util.h -include/slu_zdefs.h -include/supermatrix.h include/temp_multivector.h lib/libHYPRE.so lib/libHYPRE.so.2 -lib/libHYPRE.so.2.11 +lib/libHYPRE.so.2.15 %%PORTDOCS%%%%DOCSDIR%%/HYPRE_ref_manual.pdf %%PORTDOCS%%%%DOCSDIR%%/HYPRE_usr_manual.pdf