svn commit: r495653 - in head/math: mumps mumps4

[Thierry Thomas]

Author: thierry
Date: Wed Mar 13 20:21:04 2019
New Revision: 495653
URL: https://svnweb.freebsd.org/changeset/ports/495653

Log:
  Remove conflict between math/mumps and math/mumps4.
  
  Submitted by:	pfg

Modified:
  head/math/mumps/Makefile
  head/math/mumps4/Makefile

Modified: head/math/mumps/Makefile
==============================================================================
--- head/math/mumps/Makefile	Wed Mar 13 20:15:56 2019	(r495652)
+++ head/math/mumps/Makefile	Wed Mar 13 20:21:04 2019	(r495653)
@@ -32,8 +32,6 @@ MUMPSVERSION=	${PORTVERSION:R}
 LIBS=		cmumps dmumps mumps_common pord smumps zmumps
 PLIST_SUB=	VE=${VEM} MUMPSVERSION=${MUMPSVERSION}
 
-CONFLICTS=	mumps4-4*
-
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 MAKE_JOBS_UNSAFE=yes
@@ -54,12 +52,10 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:net/mpich2	\
 		${LOCALBASE}/lib/libblacs.a:math/blacs	\
 		${LOCALBASE}/lib/libscalapack.a:math/scalapack
 PLIST_SUB+=	WITH_LIBSEQ="@comment "
-CONFLICTS+=	mumps-5*
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libscotch.a:cad/scotch
 PLIST_SUB+=	WITH_LIBSEQ=""
 LIBS+=		mpiseq
-CONFLICTS+=	mumps-mpich-5*
 .endif
 
 pre-configure:

Modified: head/math/mumps4/Makefile
==============================================================================
--- head/math/mumps4/Makefile	Wed Mar 13 20:15:56 2019	(r495652)
+++ head/math/mumps4/Makefile	Wed Mar 13 20:21:04 2019	(r495653)
@@ -38,8 +38,6 @@ USE_LDCONFIG=	yes
 VEM=		${PORTVERSION:R:R}
 LIBS=		cmumps dmumps mumps_common pord smumps zmumps
 
-CONFLICTS=	mumps-edf-5*
-
 .if defined(WITH_OPTIMIZED_FLAGS)
 FFLAGS+=	-O3 -ffast-math
 .endif