diff options
| -rw-r--r-- | MOVED | 1 | ||||
| -rw-r--r-- | french/aster/Makefile | 4 | ||||
| -rw-r--r-- | math/Makefile | 2 | ||||
| -rw-r--r-- | math/mumps/Makefile (renamed from math/mumps-edf/Makefile) | 2 | ||||
| -rw-r--r-- | math/mumps/distinfo (renamed from math/mumps-edf/distinfo) | 0 | ||||
| -rw-r--r-- | math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR (renamed from math/mumps-edf/files/patch-Make.inc_Makefile.FREEBSD10.PAR) | 0 | ||||
| -rw-r--r-- | math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ (renamed from math/mumps-edf/files/patch-Make.inc_Makefile.FREEBSD10.SEQ) | 0 | ||||
| -rw-r--r-- | math/mumps/files/patch-Makefile (renamed from math/mumps-edf/files/patch-Makefile) | 0 | ||||
| -rw-r--r-- | math/mumps/files/patch-PORD_lib_Makefile (renamed from math/mumps-edf/files/patch-PORD_lib_Makefile) | 0 | ||||
| -rw-r--r-- | math/mumps/files/patch-examples_Makefile (renamed from math/mumps-edf/files/patch-examples_Makefile) | 0 | ||||
| -rw-r--r-- | math/mumps/files/patch-libseq_Makefile (renamed from math/mumps-edf/files/patch-libseq_Makefile) | 0 | ||||
| -rw-r--r-- | math/mumps/files/patch-src_Makefile (renamed from math/mumps-edf/files/patch-src_Makefile) | 0 | ||||
| -rw-r--r-- | math/mumps/pkg-descr (renamed from math/mumps-edf/pkg-descr) | 0 | ||||
| -rw-r--r-- | math/mumps/pkg-plist (renamed from math/mumps-edf/pkg-plist) | 0 |
14 files changed, 5 insertions, 4 deletions
@@ -11680,3 +11680,4 @@ x11/pantheon-terminal||2019-03-06|Has expired: Broken for more than 6 months x11-wm/e-module-everything-websearch||2019-03-06|Has expired: Broken for more than 6 months net-mgmt/py-pysnmp-apps|net-mgmt/py-snmpclitools|2019-02-15|Renamed upstream math/mumps|math/mumps4|2019-03-10|MUMPS 4 is the legacy version +math/mumps-edf|math/mumps|2019-03-10|Use mumps-edf as MUMPS 5 diff --git a/french/aster/Makefile b/french/aster/Makefile index 5c2f08a377df..ec3d0a0acbed 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -118,12 +118,12 @@ RUN_DEPENDS+= ${PYNUMPY} .if !defined(WITH_MPI) MPISEQ= -lmpiseq MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord ${MPISEQ} -LIB_DEPENDS+= libmpiseq.so.5:math/mumps-edf +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 -LIB_DEPENDS+= libcmumps.so.5:math/mumps-edf +LIB_DEPENDS+= libcmumps.so.5:math/mumps .endif .if defined(WITH_MPI) diff --git a/math/Makefile b/math/Makefile index bfc33ee775cb..e35cc896cea9 100644 --- a/math/Makefile +++ b/math/Makefile @@ -381,7 +381,7 @@ SUBDIR += mprime SUBDIR += mtrxmath SUBDIR += multichoose - SUBDIR += mumps-edf + SUBDIR += mumps SUBDIR += mumps4 SUBDIR += muparser SUBDIR += nanoflann diff --git a/math/mumps-edf/Makefile b/math/mumps/Makefile index 2e583d9f9b3b..fe03475b993f 100644 --- a/math/mumps-edf/Makefile +++ b/math/mumps/Makefile @@ -32,7 +32,7 @@ MUMPSVERSION= ${PORTVERSION:R} LIBS= cmumps dmumps mumps_common pord smumps zmumps PLIST_SUB= VE=${VEM} MUMPSVERSION=${MUMPSVERSION} -CONFLICTS= mumps-4* mumps-mpich-4* +CONFLICTS= mumps4-4* OPTIONS_DEFINE= DOCS EXAMPLES diff --git a/math/mumps-edf/distinfo b/math/mumps/distinfo index aca42d6ee1bc..aca42d6ee1bc 100644 --- a/math/mumps-edf/distinfo +++ b/math/mumps/distinfo diff --git a/math/mumps-edf/files/patch-Make.inc_Makefile.FREEBSD10.PAR b/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR index a42435038545..a42435038545 100644 --- a/math/mumps-edf/files/patch-Make.inc_Makefile.FREEBSD10.PAR +++ b/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.PAR diff --git a/math/mumps-edf/files/patch-Make.inc_Makefile.FREEBSD10.SEQ b/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ index a1ac8868dd67..a1ac8868dd67 100644 --- a/math/mumps-edf/files/patch-Make.inc_Makefile.FREEBSD10.SEQ +++ b/math/mumps/files/patch-Make.inc_Makefile.FREEBSD10.SEQ diff --git a/math/mumps-edf/files/patch-Makefile b/math/mumps/files/patch-Makefile index 731981025fdc..731981025fdc 100644 --- a/math/mumps-edf/files/patch-Makefile +++ b/math/mumps/files/patch-Makefile diff --git a/math/mumps-edf/files/patch-PORD_lib_Makefile b/math/mumps/files/patch-PORD_lib_Makefile index b13ad0eea785..b13ad0eea785 100644 --- a/math/mumps-edf/files/patch-PORD_lib_Makefile +++ b/math/mumps/files/patch-PORD_lib_Makefile diff --git a/math/mumps-edf/files/patch-examples_Makefile b/math/mumps/files/patch-examples_Makefile index 69740489ab6a..69740489ab6a 100644 --- a/math/mumps-edf/files/patch-examples_Makefile +++ b/math/mumps/files/patch-examples_Makefile diff --git a/math/mumps-edf/files/patch-libseq_Makefile b/math/mumps/files/patch-libseq_Makefile index 6b8b95b0d229..6b8b95b0d229 100644 --- a/math/mumps-edf/files/patch-libseq_Makefile +++ b/math/mumps/files/patch-libseq_Makefile diff --git a/math/mumps-edf/files/patch-src_Makefile b/math/mumps/files/patch-src_Makefile index 6756a0652a75..6756a0652a75 100644 --- a/math/mumps-edf/files/patch-src_Makefile +++ b/math/mumps/files/patch-src_Makefile diff --git a/math/mumps-edf/pkg-descr b/math/mumps/pkg-descr index ce8f956266a4..ce8f956266a4 100644 --- a/math/mumps-edf/pkg-descr +++ b/math/mumps/pkg-descr diff --git a/math/mumps-edf/pkg-plist b/math/mumps/pkg-plist index 5eca59545f93..5eca59545f93 100644 --- a/math/mumps-edf/pkg-plist +++ b/math/mumps/pkg-plist |