svn commit: r556969 - head/math/libmesh

[Thierry Thomas]

Author: thierry
Date: Fri Dec  4 10:47:52 2020
New Revision: 556969
URL: https://svnweb.freebsd.org/changeset/ports/556969

Log:
  Avoid unregistered conflict with math/metis by using the external package
  and not the bundled one.
  
  PR:		251561
  Submitted by:	/me
  Approved by:	yuri (maintainer)

Modified:
  head/math/libmesh/Makefile
  head/math/libmesh/pkg-plist

Modified: head/math/libmesh/Makefile
==============================================================================
--- head/math/libmesh/Makefile	Fri Dec  4 10:44:58 2020	(r556968)
+++ head/math/libmesh/Makefile	Fri Dec  4 10:47:52 2020	(r556969)
@@ -4,6 +4,7 @@
 PORTNAME=	libmesh
 DISTVERSIONPREFIX=	v
 DISTVERSION=	1.6.0
+PORTREVISION=	1
 CATEGORIES=	math
 
 MAINTAINER=	yuri at FreeBSD.org
@@ -12,7 +13,8 @@ COMMENT=	Numerical simulation of partial differential 
 LICENSE=	LGPL21
 LICENSE_FILE=	${WRKSRC}/COPYING
 
-LIB_DEPENDS=	libboost_system.so:devel/boost-libs
+LIB_DEPENDS=	libboost_system.so:devel/boost-libs	\
+		libmetis.so:math/metis
 
 USES=		compiler:c++11-lang eigen:3 gmake libtool perl5
 GNU_CONFIGURE=	yes
@@ -25,10 +27,11 @@ CONFIGURE_ARGS=	--disable-static \
 		--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
-MAKE_ARGS=	LDFLAGS="-pthread -lexecinfo"
+MAKE_ARGS=	LDFLAGS="-pthread -lexecinfo -L${LOCALBASE}/lib"
 USE_LDCONFIG=	yes
 
 INSTALL_TARGET=	install-strip

Modified: head/math/libmesh/pkg-plist
==============================================================================
--- head/math/libmesh/pkg-plist	Fri Dec  4 10:44:58 2020	(r556968)
+++ head/math/libmesh/pkg-plist	Fri Dec  4 10:47:52 2020	(r556969)
@@ -475,7 +475,6 @@ include/libmesh/wrapped_functor.h
 include/libmesh/xdr_cxx.h
 include/libmesh/xdr_io.h
 include/libmesh/zero_function.h
-include/metis.h
 include/timpi/attributes.h
 include/timpi/communicator.h
 include/timpi/data_type.h