git: d9fcb2eb1e27 - main - math/libmesh: Update 1.6.2 -> 1.7.0

Go to: [ bottom of page ] [ top of archives ] [ this month ]
From: Yuri Victorovich <yuri_at_FreeBSD.org>
Date: Sun, 12 Jun 2022 17:38:58 UTC
The branch main has been updated by yuri:

URL: https://cgit.FreeBSD.org/ports/commit/?id=d9fcb2eb1e27e8ace97cb1fcffa2aa80a02794d9

commit d9fcb2eb1e27e8ace97cb1fcffa2aa80a02794d9
Author:     Yuri Victorovich <yuri@FreeBSD.org>
AuthorDate: 2022-06-12 17:38:04 +0000
Commit:     Yuri Victorovich <yuri@FreeBSD.org>
CommitDate: 2022-06-12 17:38:04 +0000

    math/libmesh: Update 1.6.2 -> 1.7.0
    
    Reported by:    portscout
---
 math/libmesh/Makefile  | 23 +++++++++++++++++------
 math/libmesh/distinfo  |  6 +++---
 math/libmesh/pkg-plist |  7 +++++++
 3 files changed, 27 insertions(+), 9 deletions(-)

diff --git a/math/libmesh/Makefile b/math/libmesh/Makefile
index 4c8e689351cf..2566ad3d3041 100644
--- a/math/libmesh/Makefile
+++ b/math/libmesh/Makefile
@@ -2,8 +2,7 @@
 
 PORTNAME=	libmesh
 DISTVERSIONPREFIX=	v
-DISTVERSION=	1.6.2
-PORTREVISION=	1
+DISTVERSION=	1.7.0
 CATEGORIES=	math
 
 MAINTAINER=	yuri@FreeBSD.org
@@ -12,28 +11,32 @@ COMMENT=	Numerical simulation of partial differential equations
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs	\
-		libmetis.so:math/metis
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs \
+		libnlopt.so:math/nlopt
 
-USES=		compiler:c++11-lang eigen:3 gmake libtool perl5
+USES=		compiler:c++11-lang eigen:3 gmake libtool localbase perl5 pkgconfig
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-static \
 		--with-methods=opt \
 		--with-thread-model=pthread \
 		--datarootdir=${DATADIR} \
 		--enable-amr \
+		--enable-nlopt \
 		--disable-strict-lgpl \
 		--enable-tetgen \
 		--enable-triagle \
 		--with-boost=${LOCALBASE} \
-		--with-metis=${LOCALBASE} \
 		--with-eigen-include=${LOCALBASE}/include/eigen3 \
 		--disable-netcdf --disable-netcdf-4 # https://github.com/libMesh/libmesh/issues/1542
 CONFIGURE_ARGS+=	--disable-metaphysicl # enabling this causes libmesh to install a bundled metaphysicl that would conflict with the metaphysicl package
+CONFIGURE_ARGS+=	--with-nlopt-include=${LOCALBASE}/include --with-nlopt-lib=${LOCALBASE}/lib # workaround for https://github.com/libMesh/libmesh/issues/3314
 MAKE_ARGS=	LDFLAGS="-pthread -lexecinfo -L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
+CXXFLAGS+=	-I${WRKSRC}/contrib/parmetis/include # because parmetis.h isn't found for ./include/libmesh/parmetis_helper.h
+
 INSTALL_TARGET=	install-strip
+TEST_TARGET=	check
 
 USE_GITHUB=	yes
 GH_ACCOUNT=	libMesh
@@ -48,11 +51,17 @@ GLPK_DESC=			Glpk linear programming solver library
 
 GLPK_CONFIGURE_ENABLE=		glpk
 GLPK_LIB_DEPENDS=		libglpk.so:math/glpk
+
 HDF5_CONFIGURE_ENABLE=		hdf5
 HDF5_LIB_DEPENDS=		libhdf5.so:science/hdf5
+
 MPI_CONFIGURE_ENABLE=		mpi
+MPI_CONFIGURE_ON=		--with-mpi=${LOCALBASE} --with-mpi-include=${LOCALBASE}/include --with-mpi-lib=${LOCALBASE}/lib
+MPI_LIB_DEPENDS=		libmpi.so:net/mpich
+
 EXAMPLES_CONFIGURE_ENABLE=	examples
 EXAMPLES_VARS=			PKGMESSAGE=pkg-message-examples
+
 SUB_FILES=			pkg-message-examples
 
 PORTEXAMPLES=	*
@@ -68,6 +77,8 @@ post-install:
 		Make.common \
 		contrib \
 		libdata/pkgconfig/Make.common # https://github.com/libMesh/libmesh/issues/1539
+	# delete metis.h, see https://github.com/libMesh/libmesh/issues/3317
+	${RM} ${STAGEDIR}${PREFIX}/include/metis.h
 
 post-install-EXAMPLES-on:
 	# https://github.com/libMesh/libmesh/issues/1541
diff --git a/math/libmesh/distinfo b/math/libmesh/distinfo
index 3b3b152e1c2f..707994e24ad9 100644
--- a/math/libmesh/distinfo
+++ b/math/libmesh/distinfo
@@ -1,6 +1,6 @@
-TIMESTAMP = 1628019396
-SHA256 (libMesh-libmesh-v1.6.2_GH0.tar.gz) = 653f63cedf8dfef38c62ddcabd51871ddd21845e1a9d80e3f1a82cbf9a59cab6
-SIZE (libMesh-libmesh-v1.6.2_GH0.tar.gz) = 32270066
+TIMESTAMP = 1654985104
+SHA256 (libMesh-libmesh-v1.7.0_GH0.tar.gz) = a1b3579f07d5f9af2b2c73df2a54bbc05f2582c29e0d909dc1843ce9e75653ea
+SIZE (libMesh-libmesh-v1.7.0_GH0.tar.gz) = 34702099
 SHA256 (libMesh-autoconf-submodule-a993d79_GH0.tar.gz) = 0af40bed4fcf0efce6febcda30eb9798da3ec1ad2c872c4875f10edeeca00c0a
 SIZE (libMesh-autoconf-submodule-a993d79_GH0.tar.gz) = 22342
 SHA256 (libMesh-TIMPI-5b3b387_GH0.tar.gz) = 2c0830fb9f72a738132fc6bd1cbc02f7889af7742352ed6fe18301a823d8e352
diff --git a/math/libmesh/pkg-plist b/math/libmesh/pkg-plist
index 99e3e3673933..783bcb5ed5e2 100644
--- a/math/libmesh/pkg-plist
+++ b/math/libmesh/pkg-plist
@@ -55,6 +55,7 @@ include/libmesh/cell_tet10.h
 include/libmesh/cell_tet4.h
 include/libmesh/centroid_partitioner.h
 include/libmesh/checkpoint_io.h
+include/libmesh/chunked_mapvector.h
 include/libmesh/communicator.h
 include/libmesh/compare_elems_by_level.h
 include/libmesh/compare_types.h
@@ -122,9 +123,11 @@ include/libmesh/enum_error_estimator_type.h
 include/libmesh/enum_fe_family.h
 include/libmesh/enum_inf_map_type.h
 include/libmesh/enum_io_package.h
+include/libmesh/enum_matrix_build_type.h
 include/libmesh/enum_norm_type.h
 include/libmesh/enum_order.h
 include/libmesh/enum_parallel_type.h
+include/libmesh/enum_partitioner_type.h
 include/libmesh/enum_point_locator_type.h
 include/libmesh/enum_preconditioner_type.h
 include/libmesh/enum_quadrature_type.h
@@ -211,6 +214,7 @@ include/libmesh/inf_fe_instantiate_3D.h
 include/libmesh/inf_fe_macro.h
 include/libmesh/inf_fe_map.h
 include/libmesh/int_range.h
+include/libmesh/inter_mesh_projection.h
 include/libmesh/jacobi_polynomials.h
 include/libmesh/jump_error_estimator.h
 include/libmesh/kelly_error_estimator.h
@@ -229,6 +233,7 @@ include/libmesh/linear_implicit_system.h
 include/libmesh/linear_partitioner.h
 include/libmesh/linear_solver.h
 include/libmesh/location_maps.h
+include/libmesh/lumped_mass_matrix.h
 include/libmesh/mapped_subdomain_partitioner.h
 include/libmesh/mapvector.h
 include/libmesh/matlab_io.h
@@ -334,6 +339,7 @@ include/libmesh/plane.h
 include/libmesh/plt_loader.h
 include/libmesh/point.h
 include/libmesh/point_locator_base.h
+include/libmesh/point_locator_nanoflann.h
 include/libmesh/point_locator_tree.h
 include/libmesh/point_neighbor_coupling.h
 include/libmesh/pointer_to_pointer_iter.h
@@ -472,6 +478,7 @@ include/libmesh/vtk_io.h
 include/libmesh/weighted_patch_recovery_error_estimator.h
 include/libmesh/wrapped_function.h
 include/libmesh/wrapped_functor.h
+include/libmesh/wrapped_petsc.h
 include/libmesh/xdr_cxx.h
 include/libmesh/xdr_io.h
 include/libmesh/zero_function.h