Skip site navigation (1)Skip section navigation (2)
Date:      Tue, 9 Oct 2018 01:26:30 +0000 (UTC)
From:      Yuri Victorovich <yuri@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r481590 - in head: math/sundials science/hypre
Message-ID:  <201810090126.w991QUWR012490@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: yuri
Date: Tue Oct  9 01:26:30 2018
New Revision: 481590
URL: https://svnweb.freebsd.org/changeset/ports/481590

Log:
  science/hypre: Update 2.11.2 -> 2.15.0
  
  Port changes:
  * Move to GitHub
  * Add the NOMPI option
  * Update WWW

Modified:
  head/math/sundials/Makefile
  head/science/hypre/Makefile
  head/science/hypre/distinfo
  head/science/hypre/pkg-descr
  head/science/hypre/pkg-plist

Modified: head/math/sundials/Makefile
==============================================================================
--- head/math/sundials/Makefile	Tue Oct  9 01:23:57 2018	(r481589)
+++ head/math/sundials/Makefile	Tue Oct  9 01:26:30 2018	(r481590)
@@ -2,7 +2,7 @@
 
 PORTNAME=	sundials
 DISTVERSION=	3.1.2
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	math
 MASTER_SITES=	https://computation.llnl.gov/projects/sundials/download/
 

Modified: head/science/hypre/Makefile
==============================================================================
--- head/science/hypre/Makefile	Tue Oct  9 01:23:57 2018	(r481589)
+++ head/science/hypre/Makefile	Tue Oct  9 01:26:30 2018	(r481590)
@@ -2,21 +2,21 @@
 # $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
@@ -28,9 +28,12 @@ CONFIGURE_ARGS=	--with-blas --with-blas-lib=${BLASLIB}
 
 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
@@ -42,22 +45,24 @@ OPENMPI_CONFIGURE_ENV=	CC=${LOCALBASE}/mpi/openmpi/bin
 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 <bsd.port.mk>

Modified: head/science/hypre/distinfo
==============================================================================
--- head/science/hypre/distinfo	Tue Oct  9 01:23:57 2018	(r481589)
+++ head/science/hypre/distinfo	Tue Oct  9 01:26:30 2018	(r481590)
@@ -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

Modified: head/science/hypre/pkg-descr
==============================================================================
--- head/science/hypre/pkg-descr	Tue Oct  9 01:23:57 2018	(r481589)
+++ head/science/hypre/pkg-descr	Tue Oct  9 01:26:30 2018	(r481590)
@@ -4,4 +4,4 @@ HYPRE is a library of high performance preconditioners
 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

Modified: head/science/hypre/pkg-plist
==============================================================================
--- head/science/hypre/pkg-plist	Tue Oct  9 01:23:57 2018	(r481589)
+++ head/science/hypre/pkg-plist	Tue Oct  9 01:26:30 2018	(r481590)
@@ -1,4 +1,3 @@
-include/Cnames.h
 include/HYPRE.h
 include/HYPRE_DistributedMatrixPilutSolver_protos.h
 include/HYPRE_DistributedMatrixPilutSolver_types.h
@@ -37,7 +36,6 @@ 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
@@ -55,25 +53,15 @@ 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



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