From nobody Wed Oct 13 17:13:10 2021 X-Original-To: dev-commits-ports-all@mlmmj.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mlmmj.nyi.freebsd.org (Postfix) with ESMTP id 29E9917FCFE5; Wed, 13 Oct 2021 17:13:11 +0000 (UTC) (envelope-from git@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 "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4HTzd30J0yz3hjc; Wed, 13 Oct 2021 17:13:11 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (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 did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id DE1892BB99; Wed, 13 Oct 2021 17:13:10 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 19DHDAFK001248; Wed, 13 Oct 2021 17:13:10 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 19DHDApu001247; Wed, 13 Oct 2021 17:13:10 GMT (envelope-from git) Date: Wed, 13 Oct 2021 17:13:10 GMT Message-Id: <202110131713.19DHDApu001247@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Thierry Thomas Subject: git: 2f1be8d115b2 - main - french/aster: unbreak and simplify List-Id: Commit messages for all branches of the ports repository List-Archive: https://lists.freebsd.org/archives/dev-commits-ports-all List-Help: List-Post: List-Subscribe: List-Unsubscribe: Sender: owner-dev-commits-ports-all@freebsd.org X-BeenThere: dev-commits-ports-all@freebsd.org MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: thierry X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: 2f1be8d115b2d5ea876a4102986c8ac20abdd1d9 Auto-Submitted: auto-generated X-ThisMailContainsUnwantedMimeParts: N The branch main has been updated by thierry: URL: https://cgit.FreeBSD.org/ports/commit/?id=2f1be8d115b2d5ea876a4102986c8ac20abdd1d9 commit 2f1be8d115b2d5ea876a4102986c8ac20abdd1d9 Author: Thierry Thomas AuthorDate: 2021-06-18 16:31:50 +0000 Commit: Thierry Thomas CommitDate: 2021-10-13 17:08:56 +0000 french/aster: unbreak and simplify - unbreak with Python-3.8 after PR 257864; - remove unused options. --- french/aster/Makefile | 32 +++++++++----------------------- french/aster/pkg-plist | 1 + 2 files changed, 10 insertions(+), 23 deletions(-) diff --git a/french/aster/Makefile b/french/aster/Makefile index f01858f52f8a..64fe23eccf6c 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -12,7 +12,6 @@ LICENSE= GPLv2 NOT_FOR_ARCHS= armv6 armv7 i386 mips powerpc NOT_FOR_ARCHS_REASON= ARG_MAX is too small for Code_Aster on 32 bits systems -BROKEN= ${PYTHON_CMD}-config should honor --embed #----------------------------------------------------------------------- # You may define these options: @@ -20,14 +19,9 @@ BROKEN= ${PYTHON_CMD}-config should honor --embed # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among # zsh (default), bash or ksh; # - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit); -# - WITH_ATLAS: replace blas; -# - WITH_BLAS: don't link with atlas, even if present, but with blas; -# (blas might be slower, but is lighter) # - WITHOUT_ASTK_CLI: won't use the GUI from this machine; # - WITHOUT_GMSH: don't install GMSH (a mesh generator); # - WITHOUT_GRACE: don't install Grace (used to create 2D graph); -# - WITHOUT_MACR_RECAL: don't install Numerical Python -# (required by the macro MACR_RECAL); # - WITH_MUMPS: install the interface between Code_Aster and MUMPS (experimental) # #----------------------------------------------------------------------- @@ -52,17 +46,11 @@ RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ ${PYNUMPY} \ ${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR} -USES= bison fortran gettext python:3.6+ qt:5 tk +USES= bison blaslapack:openblas 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 -USES+= blaslapack:netlib -.endif +#CONFLICTS_BUILD=${PYTHON_PKGNAMEPREFIX}cysignals-1.* HAS_CONFIGURE= yes MAKE_ENV= INCLUDES="${LOCALBASE}/include" \ @@ -129,8 +117,8 @@ PLIST_SUB+= GRACE="" .else PLIST_SUB+= GRACE="@comment " .endif -.if !defined(WITHOUT_MACR_RECAL) -RUN_DEPENDS+= ${PYNUMPY} +.if defined(WITH_BOOST) +LIB_DEPENDS+= ${PY_BOOST} .endif .if !defined(WITH_MPI) @@ -210,7 +198,7 @@ v_ifdef= ${OPSYS:tu} SHELL_INSTALL_ASTER= ${LOCALBASE}/bin/${SHIA} tcl_dir= ${LOCALBASE} hdf_dir= ${LOCALBASE} -lib_math= "-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} ${ATLASLIB} -lscotch -lscotcherr" +lib_math= "-L${LOCALBASE}/lib ${BLASLIB} ${LAPACKLIB} -lscotch -lscotcherr" LASTKDIR?= ${PORTNAME}/ASTK/ASTK_CLIENT ASTKDIR= ${LOCALBASE}/${LASTKDIR} @@ -233,10 +221,6 @@ pre-configure: ${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh} .endfor ${REINPLACE_CMD} -e 's|%%PYTHON_ABIVER%%|${PYTHON_ABIVER}|' ${WRKSRC}/setup.py -.if defined(WITH_ATLAS) - ${REINPLACE_CMD} -e "s|cfg\['BLASLIB'\]|cfg['BLASLIB'], cfg['ATLASLIB']|" \ - ${WRKSRC}/products.py -.endif ${ECHO_CMD} "_install_hdf5 = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_med = False" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "_install_tcl = False" >> ${WRKSRC}/setup.cfg @@ -298,8 +282,10 @@ pre-configure: ${ECHO_CMD} "HOME_HDF='${hdf_dir}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_MED='${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_TCL_TK='${tcl_dir}'" >> ${WRKSRC}/setup.cfg -.if defined(WITH_ATLAS) - ${ECHO_CMD} "ATLASLIB='${_ATLASLIB}'" >> ${WRKSRC}/setup.cfg +.if defined(WITH_BOOST) + ${ECHO_CMD} "HOME_BOOST='${LOCALBASE}'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "LIBPATH_BOOST='${LOCALBASE}/lib'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "LIBNAME_BOOST='${PY_BOOST_LIB}'" >> ${WRKSRC}/setup.cfg .endif ${ECHO_CMD} "BLASLIB='${_BLASLIB}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "LAPACKLIB='lapack'" >> ${WRKSRC}/setup.cfg diff --git a/french/aster/pkg-plist b/french/aster/pkg-plist index b242c153be82..fee01d309845 100644 --- a/french/aster/pkg-plist +++ b/french/aster/pkg-plist @@ -3712,6 +3712,7 @@ aster/%%VE%%/lib/aster/code_aster/__init__.py aster/%%VE%%/lib/aster/code_aster/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc aster/%%VE%%/lib/aster/code_aster/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc aster/%%VE%%/lib/aster/elem.1 +aster/%%VE%%/lib/aster/libAsterMFrOfficial.so aster/%%VE%%/lib/aster/pkginfo.py aster/%%VE%%/profile.sh aster/%%VE%%/%%DATADIR%%/CTestTestfile.cmake