Index: head/science/hypre/Makefile
===================================================================
--- head/science/hypre/Makefile	(revision 521899)
+++ head/science/hypre/Makefile	(revision 521900)
@@ -1,75 +1,76 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	hypre
 DISTVERSIONPREFIX=	v
-DISTVERSION=	2.16.0
-PORTREVISION=	1
+DISTVERSION=	2.18.2
 CATEGORIES=	science
 
 MAINTAINER=	yuri@FreeBSD.org
 COMMENT=	Scalable Linear Solvers and Multigrid Methods
 
-LICENSE=	LGPL21
-LICENSE_FILE=	${WRKSRC}/../COPYING.LESSER
+LICENSE=	APACHE20 MIT
+LICENSE_COMB=	dual
+LICENSE_FILE_MIT=	${WRKSRC}/../LICENSE-APACHE
+LICENSE_FILE_APACHE20=	${WRKSRC}/../LICENSE-MIT
 
 BROKEN_powerpc64=	fails to compile: ./DistributedMatrixPilutSolver.h:97:20: expected ')' before '->' token
 
 USES=		blaslapack fortran gmake localbase # gmake is only for the 'test' target
 USE_GITHUB=	yes
 GH_ACCOUNT=	hypre-space
 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=	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
 
 TEST_TARGET=	check
 
 SHL3=	${PORTVERSION}
 SHL2=	${SHL3:R}
 SHL1=	${SHL2:R}
 
 PORTDOCS=	*
 
 post-patch:
 # Avoid conflict with C++20 <version> by ignoring <...> under WRKSRC
 	@${REINPLACE_CMD} -i .c++20 '/utilities/s/-I/-iquote/' \
 		${WRKSRC}/FEI_mv/*/Makefile
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/hypre/include/* ${STAGEDIR}${PREFIX}/include
 	${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}
 	${COPYTREE_SHARE} ${WRKSRC}/docs/usr-manual ${STAGEDIR}${DOCSDIR}
 
 .include <bsd.port.mk>
Index: head/science/hypre/distinfo
===================================================================
--- head/science/hypre/distinfo	(revision 521899)
+++ head/science/hypre/distinfo	(revision 521900)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1557728492
-SHA256 (hypre-space-hypre-v2.16.0_GH0.tar.gz) = 33f8a27041e697343b820d0426e74694670f955e21bbf3fcb07ee95b22c59e90
-SIZE (hypre-space-hypre-v2.16.0_GH0.tar.gz) = 5765897
+TIMESTAMP = 1578026320
+SHA256 (hypre-space-hypre-v2.18.2_GH0.tar.gz) = 28007b5b584eaf9397f933032d8367788707a2d356d78e47b99e551ab10cc76a
+SIZE (hypre-space-hypre-v2.18.2_GH0.tar.gz) = 5699792
Index: head/science/hypre/pkg-plist
===================================================================
--- head/science/hypre/pkg-plist	(revision 521899)
+++ head/science/hypre/pkg-plist	(revision 521900)
@@ -1,65 +1,47 @@
 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/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/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/temp_multivector.h
 lib/libHYPRE.so
 lib/libHYPRE.so.2
-lib/libHYPRE.so.2.16
+lib/libHYPRE.so.2.18