diff options
| author | Thierry Thomas <thierry@FreeBSD.org> | 2018-05-06 08:16:17 +0000 |
|---|---|---|
| committer | Thierry Thomas <thierry@FreeBSD.org> | 2018-05-06 08:16:17 +0000 |
| commit | c85be7dcc7ee224d797e34a0def14348ba0606e6 (patch) | |
| tree | fcc08d3b6683a45f33f32be056e13a8697808c2c | |
| parent | Since the upgrade of math/suitesparse to 5.2.0, it depends unconditionnaly on (diff) | |
Since the upgrade of math/suitesparse to 5.2.0, it depends unconditionnaly on
math/metis. Because math/metis and math/metis-edf are conflicting, this means
that the ports which depend on SuiteSparse and on metis-edf became BROKEN.
To solve this problem, this revison switches from metis-edf to the regular
metis.
Notes
Notes:
svn path=/head/; revision=469182
| -rw-r--r-- | french/aster/Makefile | 9 | ||||
| -rw-r--r-- | math/mumps-edf/Makefile | 5 |
2 files changed, 5 insertions, 9 deletions
diff --git a/french/aster/Makefile b/french/aster/Makefile index 9b30802c9acc..c3cab045cc77 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -3,7 +3,7 @@ PORTNAME= aster DISTVERSION= ${ASTER_DISTVERSION} -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= french cad CATEGORIES= french cad @@ -12,7 +12,7 @@ COMMENT= Code_Aster finite element method solver LICENSE= GPLv2 -BROKEN= conflicting dependencies +BROKEN_FreeBSD_12= does not build (sed: ${STAGEDIR}${inst_dir}/${VE}/aster.conf: No such file or directory) #----------------------------------------------------------------------- # You may define these options: @@ -37,13 +37,12 @@ BROKEN= conflicting dependencies BUILD_DEPENDS+= astk-serveur>0:cad/astk-serveur \ ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ ${LOCALBASE}/lib/libscotch.a:cad/scotch \ - ${LOCALBASE}/lib/libGKlib.a:math/metis-edf \ pylupdate4:textproc/py-qt4-xml \ gnproc:sysutils/coreutils \ bash:shells/bash \ ${PYNUMPY} LIB_DEPENDS+= libhdf5-18.so:science/hdf5-18 \ - libmetis.so.2:math/metis-edf \ + libmetis.so:math/metis \ libomp.so:devel/openmp \ libmed.so:french/med # libAsterInterface.so:science/mfront @@ -52,8 +51,6 @@ RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot@${PY_FLAVOR} \ ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ astk-serveur>0:cad/astk-serveur -BROKEN_FreeBSD_12= does not build (sed: ${STAGEDIR}${inst_dir}/${VE}/aster.conf: No such file or directory) - USES= bison fortran gettext python:2.7 tk USE_BINUTILS= yes USE_QT4= linguisttools_build diff --git a/math/mumps-edf/Makefile b/math/mumps-edf/Makefile index c67cc846297b..100178221857 100644 --- a/math/mumps-edf/Makefile +++ b/math/mumps-edf/Makefile @@ -3,7 +3,7 @@ PORTNAME= mumps DISTVERSION= 5.1.1-aster2 -PORTREVISION= 1 +PORTREVISION= 2 CATEGORIES= math PKGNAMESUFFIX= -edf @@ -15,10 +15,9 @@ LICENSE_NAME= CeCILL-C LICENSE_FILE= ${WRKSRC}/LICENSE LICENSE_PERMS= dist-mirror dist-sell pkg-mirror pkg-sell auto-accept -BUILD_DEPENDS= ${LOCALBASE}/lib/libGKlib.a:math/metis-edf LIB_DEPENDS= libblas.so:math/blas \ liblapack.so:math/lapack \ - libmetis.so:math/metis-edf + libmetis.so:math/metis USES= fortran |