Skip site navigation (1)Skip section navigation (2)
Date:      Sun, 10 Mar 2019 17:35:09 +0000 (UTC)
From:      Thierry Thomas <thierry@FreeBSD.org>
To:        ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org
Subject:   svn commit: r495304 - in head: . french/aster math math/mumps math/mumps-edf
Message-ID:  <201903101735.x2AHZ9vl044691@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
Author: thierry
Date: Sun Mar 10 17:35:09 2019
New Revision: 495304
URL: https://svnweb.freebsd.org/changeset/ports/495304

Log:
  Move math/mumps-edf to math/mumps.
  
  This port is for MUMPS 5.x.
  
  Reported by:	pfg

Added:
  head/math/mumps/
     - copied from r495303, head/math/mumps-edf/
Deleted:
  head/math/mumps-edf/
Modified:
  head/MOVED
  head/french/aster/Makefile
  head/math/Makefile
  head/math/mumps/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Sun Mar 10 17:23:27 2019	(r495303)
+++ head/MOVED	Sun Mar 10 17:35:09 2019	(r495304)
@@ -11680,3 +11680,4 @@ x11/pantheon-terminal||2019-03-06|Has expired: Broken 
 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

Modified: head/french/aster/Makefile
==============================================================================
--- head/french/aster/Makefile	Sun Mar 10 17:23:27 2019	(r495303)
+++ head/french/aster/Makefile	Sun Mar 10 17:35:09 2019	(r495304)
@@ -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)

Modified: head/math/Makefile
==============================================================================
--- head/math/Makefile	Sun Mar 10 17:23:27 2019	(r495303)
+++ head/math/Makefile	Sun Mar 10 17:35:09 2019	(r495304)
@@ -381,7 +381,7 @@
     SUBDIR += mprime
     SUBDIR += mtrxmath
     SUBDIR += multichoose
-    SUBDIR += mumps-edf
+    SUBDIR += mumps
     SUBDIR += mumps4
     SUBDIR += muparser
     SUBDIR += nanoflann

Modified: head/math/mumps/Makefile
==============================================================================
--- head/math/mumps-edf/Makefile	Sun Mar 10 17:23:27 2019	(r495303)
+++ head/math/mumps/Makefile	Sun Mar 10 17:35:09 2019	(r495304)
@@ -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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201903101735.x2AHZ9vl044691>