svn commit: r494845 - head/math/mumps

[Rene Ladan]

Author: rene
Date: Wed Mar  6 21:36:28 2019
New Revision: 494845
URL: https://svnweb.freebsd.org/changeset/ports/494845

Log:
  math/mumps: remove support for expired mumps-mpich slave port.

Modified:
  head/math/mumps/Makefile
  head/math/mumps/pkg-plist

Modified: head/math/mumps/Makefile
==============================================================================
--- head/math/mumps/Makefile	Wed Mar  6 21:30:03 2019	(r494844)
+++ head/math/mumps/Makefile	Wed Mar  6 21:36:28 2019	(r494845)
@@ -27,11 +27,8 @@ LICENSE_FILE=	${WRKSRC}/LICENSE
 # BLAS_LIBS: specify other version of BLAS
 # WITH_ATLAS: Use ATLAS instead of the regular BLAS
 # WITH_METIS: Add METIS ordering
-# WITH_MPI: Use mpich for the parallel version
 #-----------------------------------------------------------------------
 
-SLAVEDIRS=	math/mumps-mpich
-
 USES=		fortran
 
 MAKE_JOBS_UNSAFE=yes
@@ -72,37 +69,14 @@ BLAS_LIBS=	-lblas
 LAPACK_LIBS=	-llapack
 .endif
 
-.ifdef WITH_MPI
-PKGNAMESUFFIX+=		-mpich
-BUILD_DEPENDS+=	${LOCALBASE}/include/mpif.h:net/mpich2 \
-		${LOCALBASE}/lib/libblacs.a:math/blacs \
-		${LOCALBASE}/lib/libscalapack.a:math/scalapack
-LIB_DEPENDS+=	liblapack.so:math/lapack
-# Note: -l?mumps still requires to be linked with -lblacs + -lscalapack
-RUN_DEPENDS+=	${LOCALBASE}/bin/mpirun:net/mpich2 \
-		${LOCALBASE}/lib/libblacs.a:math/blacs \
-		${LOCALBASE}/lib/libscalapack.a:math/scalapack
-CONFLICTS+=	mumps-4*
-.else
 CONFLICTS+=	mumps-mpich-4*
-.endif
 
-.ifndef WITH_MPI
-PLIST_SUB+=	WITH_LIBSEQ=""
 LIBS+=		mpiseq
-.else
-PLIST_SUB+=	WITH_LIBSEQ="@comment "
-.endif
 
 pre-configure:
-.ifdef WITH_MPI
-	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic \
-		${WRKSRC}/Makefile.inc
-.else
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.inc.generic.SEQ \
 		${WRKSRC}/Makefile.inc
 	${REINPLACE_CMD} -e 's+LIBPAR+LIBSEQ+' ${WRKSRC}/src/Makefile
-.endif
 
 pre-build:
 	${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
@@ -117,9 +91,6 @@ pre-build:
 	s+ at LOCALBASE@+${LOCALBASE}+g;' \
 		${WRKSRC}/${MF}
 .endfor
-.ifdef WITH_MPI
-	${REINPLACE_CMD} -e 's+ at LAPACK_LIBS@+${LAPACK_LIBS}+g;' ${WRKSRC}/Makefile.inc
-.endif
 .ifdef WITH_METIS
 	${REINPLACE_CMD} -e 's+#LMETIS+LMETIS+' ${WRKSRC}/Makefile.inc
 .endif
@@ -128,10 +99,8 @@ do-install:
 	${INSTALL_DATA} ${WRKSRC}/include/*.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${WRKSRC}/lib/lib*.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/lib/lib*.so.${VEM} ${STAGEDIR}${PREFIX}/lib
-.ifndef WITH_MPI
 	${INSTALL_DATA} ${WRKSRC}/libseq/libmpiseq.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so.${VEM} ${STAGEDIR}${PREFIX}/lib
-.endif
 .for lib in ${LIBS}
 	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so)
 . endfor
@@ -148,24 +117,7 @@ do-install:
 . endfor
 
 regression-test:	install
-.if defined (WITH_MPI) && defined(MAINTAINER_MODE)
-.  if !exists(${HOME}/.mpd.conf)
-	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
-	${CHMOD} go-r ${HOME}/.mpd.conf
-	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
-.  endif
-	${LOCALBASE}/bin/mpd &
 	(cd ${WRKSRC}/examples &&	\
-	${LOCALBASE}/bin/mpirun -np 2 ./ssimpletest < input_simpletest_real ;	\
-	${LOCALBASE}/bin/mpirun -np 2 ./dsimpletest < input_simpletest_real ;	\
-	${LOCALBASE}/bin/mpirun -np 2 ./csimpletest < input_simpletest_cmplx ;	\
-	${LOCALBASE}/bin/mpirun -np 2 ./zsimpletest < input_simpletest_cmplx ;	\
-	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
-	${LOCALBASE}/bin/mpirun -np 3 ./c_example ;	\
-	${ECHO_MSG} "The solution should be (1,2)")
-	${LOCALBASE}/bin/mpdallexit
-.else
-	(cd ${WRKSRC}/examples &&	\
 	./ssimpletest < input_simpletest_real ;			\
 	./dsimpletest < input_simpletest_real ;			\
 	./csimpletest < input_simpletest_cmplx ;		\
@@ -173,6 +125,5 @@ regression-test:	install
 	${ECHO_MSG} "The solution should be (1,2,3,4,5)" ;	\
 	./c_example ;						\
 	${ECHO_MSG} "The solution should be (1,2)")
-.endif
 
 .include <bsd.port.post.mk>

Modified: head/math/mumps/pkg-plist
==============================================================================
--- head/math/mumps/pkg-plist	Wed Mar  6 21:30:03 2019	(r494844)
+++ head/math/mumps/pkg-plist	Wed Mar  6 21:36:28 2019	(r494845)
@@ -18,9 +18,9 @@ lib/libcmumps.so.4
 lib/libdmumps.a
 lib/libdmumps.so
 lib/libdmumps.so.4
-%%WITH_LIBSEQ%%lib/libmpiseq.a
-%%WITH_LIBSEQ%%lib/libmpiseq.so
-%%WITH_LIBSEQ%%lib/libmpiseq.so.4
+lib/libmpiseq.a
+lib/libmpiseq.so
+lib/libmpiseq.so.4
 lib/libmumps_common.a
 lib/libmumps_common.so
 lib/libmumps_common.so.4