svn commit: r566985 - head/math/mumps

Thierry Thomas thierry at FreeBSD.org
Tue Mar 2 21:17:40 UTC 2021


Author: thierry
Date: Tue Mar  2 21:17:39 2021
New Revision: 566985
URL: https://svnweb.freebsd.org/changeset/ports/566985

Log:
  Set USES=mpi and rename the TEST_TARGET.

Modified:
  head/math/mumps/Makefile

Modified: head/math/mumps/Makefile
==============================================================================
--- head/math/mumps/Makefile	Tue Mar  2 21:16:59 2021	(r566984)
+++ head/math/mumps/Makefile	Tue Mar  2 21:17:39 2021	(r566985)
@@ -28,16 +28,16 @@ MUMPSVERSION=	${PORTVERSION:R}
 LIBS=	cmumps dmumps mumps_common pord smumps zmumps
 PLIST_SUB=	VE=${VEM} MUMPSVERSION=${MUMPSVERSION}
 
-OPTIONS_DEFINE=	DOCS EXAMPLES MPI
+OPTIONS_DEFINE=	DOCS EXAMPLES MPICH
 
-MPI_LIB_DEPENDS_OFF=	libscotch.so:cad/scotch
-MPI_LIB_DEPENDS=	libmpi.so:net/mpich		\
-			libparmetis.so:math/parmetis	\
+MPICH_USES=		mpi:mpich
+MPICH_LIB_DEPENDS_OFF=	libscotch.so:cad/scotch
+MPICH_LIB_DEPENDS=	libparmetis.so:math/parmetis	\
 			libptscotch.so:cad/scotch	\
 			libscalapack.so:math/scalapack
-MPI_PLIST_SUB=		WITH_LIBSEQ="@comment "
-MPI_PLIST_SUB_OFF=	WITH_LIBSEQ=""
-MPI_LIBS_OFF=		mpiseq
+MPICH_PLIST_SUB=	WITH_LIBSEQ="@comment "
+MPICH_PLIST_SUB_OFF=	WITH_LIBSEQ=""
+MPICH_LIBS_OFF=		mpiseq
 
 MAKE_JOBS_UNSAFE=yes
 
@@ -49,7 +49,7 @@ MAKE_JOBS_UNSAFE=yes
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
-.ifdef WITH_MPI
+.ifdef WITH_MPICH
 PKGNAMESUFFIX+=		-mpich
 .endif
 
@@ -57,11 +57,11 @@ PKGNAMESUFFIX+=		-mpich
 FCFLAGS+=	-fallow-argument-mismatch
 .endif
 
-post-patch-MPI-on:
+post-patch-MPICH-on:
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.PAR \
 		${WRKSRC}/Makefile.inc
 
-post-patch-MPI-off:
+post-patch-MPICH-off:
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.SEQ \
 		${WRKSRC}/Makefile.inc
 
@@ -80,12 +80,13 @@ pre-configure:
 	s+ at LOCALBASE@+${LOCALBASE}+g;' \
 		${WRKSRC}/${MF}
 .endfor
-.ifdef WITH_MPI
+
+pre-configure-MPICH-on:
 	${REINPLACE_CMD} -e '/lptscotch/s|#LSCOTCH|LSCOTCH|'	\
 		-e 's|^LMETIS|##LMETIS|;s|^#LMETIS|LMETIS|' ${WRKSRC}/Makefile.inc
-.else
+
+pre-configure-MPICH-off:
 	${REINPLACE_CMD} -e '/lscotch/s|#LSCOTCH|LSCOTCH|' ${WRKSRC}/Makefile.inc
-.endif
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
@@ -105,7 +106,7 @@ do-install:
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
 .endfor
 
-do-install-MPI-off:
+do-install-MPICH-off:
 	${MKDIR} ${STAGEDIR}${PREFIX}/include/mumps_seq
 	${INSTALL_DATA} ${WRKSRC}/libseq/mpi.h ${STAGEDIR}${PREFIX}/include/mumps_seq/mpi.h
 	${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib
@@ -117,8 +118,8 @@ do-install-MPI-off:
 . endfor
 .endfor
 
-regression-test:	install
-.if defined (WITH_MPI) && defined(MAINTAINER_MODE)
+test:	install
+.if defined (WITH_MPICH) && defined(MAINTAINER_MODE)
 .  if !exists(${HOME}/.mpd.conf)
 	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
 	${CHMOD} go-r ${HOME}/.mpd.conf


More information about the svn-ports-head mailing list