From owner-svn-ports-all@freebsd.org Sun Jun 14 10:46:35 2020 Return-Path: Delivered-To: svn-ports-all@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id ADF2133613D; Sun, 14 Jun 2020 10:46:35 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 49lB3H3tK6z4FPM; Sun, 14 Jun 2020 10:46:35 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 80644B0DB; Sun, 14 Jun 2020 10:46:35 +0000 (UTC) (envelope-from thierry@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id 05EAkZIx057919; Sun, 14 Jun 2020 10:46:35 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05EAkYvS057916; Sun, 14 Jun 2020 10:46:34 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202006141046.05EAkYvS057916@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: thierry set sender to thierry@FreeBSD.org using -f From: Thierry Thomas Date: Sun, 14 Jun 2020 10:46:34 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538728 - head/math/mumps X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: head/math/mumps X-SVN-Commit-Revision: 538728 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2020 10:46:35 -0000 Author: thierry Date: Sun Jun 14 10:46:34 2020 New Revision: 538728 URL: https://svnweb.freebsd.org/changeset/ports/538728 Log: Add the _seq suffix to libraries when MPI is disabled and install mpi.h: this is needed for some applications (e.g. FreeFem++). Modified: head/math/mumps/Makefile head/math/mumps/pkg-descr head/math/mumps/pkg-plist Modified: head/math/mumps/Makefile ============================================================================== --- head/math/mumps/Makefile Sun Jun 14 10:42:36 2020 (r538727) +++ head/math/mumps/Makefile Sun Jun 14 10:46:34 2020 (r538728) @@ -3,7 +3,7 @@ PORTNAME= mumps DISTVERSION= 5.1.2-aster6 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math PKGNAMESUFFIX= -edf @@ -25,7 +25,7 @@ GCCLIBDIR= ${LDFLAGS} USE_LDCONFIG= yes VEM= ${PORTVERSION:R:R:R} MUMPSVERSION= ${PORTVERSION:R} -LIBS= cmumps dmumps mumps_common pord smumps zmumps +LIBS= cmumps dmumps mumps_common pord smumps zmumps PLIST_SUB= VE=${VEM} MUMPSVERSION=${MUMPSVERSION} OPTIONS_DEFINE= DOCS EXAMPLES MPI @@ -77,21 +77,30 @@ do-install: ${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/lib/lib*.so.${VEM} ${STAGEDIR}${PREFIX}/lib .for lib in ${LIBS} - (cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so) -. endfor + (cd ${STAGEDIR}${PREFIX}/lib && \ + ${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so) +.endfor ${MKDIR} ${STAGEDIR}${DOCSDIR} ${INSTALL_DATA} ${WRKSRC}/doc/userguide_${MUMPSVERSION}.pdf ${STAGEDIR}${DOCSDIR} ${MKDIR} ${STAGEDIR}${EXAMPLESDIR} -. for ex in Makefile README *.c *.F input_simpletest_* +.for ex in Makefile README *.c *.F input_simpletest_* ${INSTALL_DATA} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR} -. endfor -. for ex in c_example *simpletest +.endfor +.for ex in c_example *simpletest ${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR} -. endfor +.endfor do-install-MPI-off: + ${MKDIR} ${STAGEDIR}${PREFIX}/include/mumps_seq + ${INSTALL_DATA} ${WRKSRC}/libseq/mpi.h ${STAGEDIR}${PREFIX}/include/mumps_seq/mpi.h ${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib ${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so.${VEM} ${STAGEDIR}${PREFIX}/lib +.for lib in ${LIBS} +. for ext in a so so.${VEM} + (cd ${STAGEDIR}${PREFIX}/lib && \ + ${LN} -sf lib${lib}.${ext} ${STAGEDIR}${PREFIX}/lib/lib${lib}_seq.${ext}) +. endfor +.endfor regression-test: install .if defined (WITH_MPI) && defined(MAINTAINER_MODE) Modified: head/math/mumps/pkg-descr ============================================================================== --- head/math/mumps/pkg-descr Sun Jun 14 10:42:36 2020 (r538727) +++ head/math/mumps/pkg-descr Sun Jun 14 10:46:34 2020 (r538728) @@ -13,4 +13,6 @@ format; elemental format. - Partial factorization and Schur complement matrix. - Several orderings interfaced : AMD, AMF, PORD, METIS +When MPI is disabled, libseq is installed. + WWW: http://graal.ens-lyon.fr/MUMPS/ Modified: head/math/mumps/pkg-plist ============================================================================== --- head/math/mumps/pkg-plist Sun Jun 14 10:42:36 2020 (r538727) +++ head/math/mumps/pkg-plist Sun Jun 14 10:46:34 2020 (r538728) @@ -6,6 +6,7 @@ include/dmumps_root.h include/dmumps_struc.h include/mumps_c_types.h include/mumps_compat.h +%%WITH_LIBSEQ%%include/mumps_seq/mpi.h include/smumps_c.h include/smumps_root.h include/smumps_struc.h @@ -15,24 +16,45 @@ include/zmumps_struc.h lib/libcmumps.a lib/libcmumps.so lib/libcmumps.so.%%VE%% +%%WITH_LIBSEQ%%lib/libcmumps_seq.a +%%WITH_LIBSEQ%%lib/libcmumps_seq.so +%%WITH_LIBSEQ%%lib/libcmumps_seq.so.%%VE%% lib/libdmumps.a lib/libdmumps.so lib/libdmumps.so.%%VE%% +%%WITH_LIBSEQ%%lib/libdmumps_seq.a +%%WITH_LIBSEQ%%lib/libdmumps_seq.so +%%WITH_LIBSEQ%%lib/libdmumps_seq.so.%%VE%% %%WITH_LIBSEQ%%lib/libmpiseq.a %%WITH_LIBSEQ%%lib/libmpiseq.so %%WITH_LIBSEQ%%lib/libmpiseq.so.%%VE%% +%%WITH_LIBSEQ%%lib/libmpiseq_seq.a +%%WITH_LIBSEQ%%lib/libmpiseq_seq.so +%%WITH_LIBSEQ%%lib/libmpiseq_seq.so.%%VE%% lib/libmumps_common.a lib/libmumps_common.so lib/libmumps_common.so.%%VE%% +%%WITH_LIBSEQ%%lib/libmumps_common_seq.a +%%WITH_LIBSEQ%%lib/libmumps_common_seq.so +%%WITH_LIBSEQ%%lib/libmumps_common_seq.so.%%VE%% lib/libpord.a lib/libpord.so lib/libpord.so.%%VE%% +%%WITH_LIBSEQ%%lib/libpord_seq.a +%%WITH_LIBSEQ%%lib/libpord_seq.so +%%WITH_LIBSEQ%%lib/libpord_seq.so.%%VE%% lib/libsmumps.a lib/libsmumps.so lib/libsmumps.so.%%VE%% +%%WITH_LIBSEQ%%lib/libsmumps_seq.a +%%WITH_LIBSEQ%%lib/libsmumps_seq.so +%%WITH_LIBSEQ%%lib/libsmumps_seq.so.%%VE%% lib/libzmumps.a lib/libzmumps.so lib/libzmumps.so.%%VE%% +%%WITH_LIBSEQ%%lib/libzmumps_seq.a +%%WITH_LIBSEQ%%lib/libzmumps_seq.so +%%WITH_LIBSEQ%%lib/libzmumps_seq.so.%%VE%% %%PORTDOCS%%%%DOCSDIR%%/userguide_%%MUMPSVERSION%%.pdf %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README