From owner-svn-ports-head@freebsd.org Sun Jun 14 09:14:41 2020 Return-Path: Delivered-To: svn-ports-head@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 181EF3345D3; Sun, 14 Jun 2020 09:14:41 +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 49l81D6zdxz490R; Sun, 14 Jun 2020 09:14:40 +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 EAD11A41E; Sun, 14 Jun 2020 09:14:40 +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 05E9EeLl001608; Sun, 14 Jun 2020 09:14:40 GMT (envelope-from thierry@FreeBSD.org) Received: (from thierry@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id 05E9EeJV001607; Sun, 14 Jun 2020 09:14:40 GMT (envelope-from thierry@FreeBSD.org) Message-Id: <202006140914.05E9EeJV001607@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 09:14:40 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r538718 - head/french/aster X-SVN-Group: ports-head X-SVN-Commit-Author: thierry X-SVN-Commit-Paths: head/french/aster X-SVN-Commit-Revision: 538718 X-SVN-Commit-Repository: ports MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.33 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Sun, 14 Jun 2020 09:14:41 -0000 Author: thierry Date: Sun Jun 14 09:14:40 2020 New Revision: 538718 URL: https://svnweb.freebsd.org/changeset/ports/538718 Log: Switch from mpich2 to mpich and chase ScaLAPACK´s upgrade. Modified: head/french/aster/Makefile Modified: head/french/aster/Makefile ============================================================================== --- head/french/aster/Makefile Sun Jun 14 09:14:21 2020 (r538717) +++ head/french/aster/Makefile Sun Jun 14 09:14:40 2020 (r538718) @@ -3,7 +3,7 @@ PORTNAME= aster DISTVERSION= ${ASTER_DISTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= french cad MAINTAINER= thierry@FreeBSD.org @@ -55,6 +55,8 @@ USES= bison fortran gettext python:3.6+ qt:5 tk USE_BINUTILS= yes USE_QT= linguisttools_build +CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.* + .if defined(WITH_ATLAS) USES+= blaslapack:atlas .else @@ -127,14 +129,13 @@ MPISEQ= -lmpiseq MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord ${MPISEQ} LIB_DEPENDS+= libmpiseq.so.5:math/mumps .else -BUILD_DEPENDS+= ${LOCALBASE}/lib/libblacs.a:math/blacs \ - ${LOCALBASE}/lib/libscalapack.a:math/scalapack -MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich -lmpl +BUILD_DEPENDS+= ${LOCALBASE}/lib/libscalapack.a:math/scalapack +MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lscalapack -lexecinfo -L${LOCALBASE}/lib -lmpi LIB_DEPENDS+= libcmumps.so.5:math/mumps .endif .if defined(WITH_MPI) -LIB_DEPENDS+= libmpich.so:net/mpich2 +LIB_DEPENDS+= libmpi.so:net/mpich HOME_MPI= ${LOCALBASE} .endif @@ -207,11 +208,6 @@ BASH2RC= products_data.py ExportPATH?= /tmp/maillages -pre-everything:: -.if defined(WITH_MPI) - @${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run \`mpd &'" -.endif - pre-configure: ${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|' \ ${WRKSRC}/setup.cfg @@ -422,8 +418,7 @@ post-install: .for f in aster_pkginfo.cpython-${PYTHON_SUFFIX}.pyc aster_pkginfo.cpython-${PYTHON_SUFFIX}.opt-1.pyc ${RM} ${STAGEDIR}${inst_dir}/${VE}/lib/aster/__pycache__/${f} .endfor - ${FIND} ${STAGEDIR}${inst_dir}/${VE}/share/aster/tests -name "*.datg" | \ - ${XARGS} ${REINPLACE_CMD} -e 's|/home/PHIMECA/maillages/|${ExportPATH}|' + ${FIND} ${STAGEDIR}${PREFIX} -name "*.bak" -delete .if defined(MAINTAINER_MODE) regression-test: install