diff options
| author | thierry <thierry@FreeBSD.org> | 2010-05-26 06:02:10 +0800 |
|---|---|---|
| committer | thierry <thierry@FreeBSD.org> | 2010-05-26 06:02:10 +0800 |
| commit | 6f7d964b280c5429ca3c5c6025003f4ec7a44094 (patch) | |
| tree | 38fa3bb057ec314e6e5582f847b1c1ac7852f998 | |
| parent | 2a2c1440829e8651d08b992037d6e7e4b54aa2c7 (diff) | |
| download | freebsd-ports-gnome-6f7d964b280c5429ca3c5c6025003f4ec7a44094.tar.gz freebsd-ports-gnome-6f7d964b280c5429ca3c5c6025003f4ec7a44094.tar.zst freebsd-ports-gnome-6f7d964b280c5429ca3c5c6025003f4ec7a44094.zip | |
Switch from metis to metis-edf by default, so that Salome can be
installed on a machine where Code_Aster is already installed.
PR: ports/146738
Approved by: maintainer
| -rw-r--r-- | cad/salome/Makefile | 2 | ||||
| -rw-r--r-- | cad/salome/Makefile.ext | 13 |
2 files changed, 10 insertions, 5 deletions
diff --git a/cad/salome/Makefile b/cad/salome/Makefile index 975bbadb3638..47720b7ad94e 100644 --- a/cad/salome/Makefile +++ b/cad/salome/Makefile @@ -6,7 +6,7 @@ PORTNAME= salome PORTVERSION= 5.1.3 -PORTREVISION= 2 +PORTREVISION= 3 CATEGORIES= cad science MASTER_SITES= http://www.stasyan.com/devel/distfiles/ DISTNAME= src5.1.3 diff --git a/cad/salome/Makefile.ext b/cad/salome/Makefile.ext index 8d62fb11fa8c..ae93fa37b7d9 100644 --- a/cad/salome/Makefile.ext +++ b/cad/salome/Makefile.ext @@ -201,10 +201,15 @@ BUILD_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt4/QtXml.so:${PORTSDIR}/textproc/py-qt4 #Dependency from metis & scotsch .if ${SAL_MODULE} == "med" -BUILD_DEPENDS+= kmetis:${PORTSDIR}/math/metis \ - gmap:${PORTSDIR}/cad/scotch -RUN_DEPENDS+= kmetis:${PORTSDIR}/math/metis \ - gmap:${PORTSDIR}/cad/scotch +. if exists(${LOCALBASE}/bin/graphchk) +BUILD_DEPENDS+= kmetis:${PORTSDIR}/math/metis +RUN_DEPENDS+= kmetis:${PORTSDIR}/math/metis +. else +BUILD_DEPENDS+= kmetis:${PORTSDIR}/math/metis-edf +RUN_DEPENDS+= kmetis:${PORTSDIR}/math/metis-edf +.endif +BUILD_DEPENDS+= gmap:${PORTSDIR}/cad/scotch +RUN_DEPENDS+= gmap:${PORTSDIR}/cad/scotch CONFIGURE_ENV+= METISDIR=${LOCALBASE} SCOTCHDIR=${LOCALBASE} CPPFLAGS+= -I${LOCALBASE}/include/metis .endif |