Index: head/math/mumps/Makefile
===================================================================
--- head/math/mumps/Makefile	(revision 538727)
+++ head/math/mumps/Makefile	(revision 538728)
@@ -1,122 +1,131 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	mumps
 DISTVERSION=	5.1.2-aster6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMESUFFIX=	-edf
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	MUltifrontal Massively Parallel sparse direct Solver for Code_Aster
 
 LICENSE=	CeCILL_C
 LICENSE_NAME=	CeCILL-C
 LICENSE_FILE=	${WRKSRC}/LICENSE
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 LIB_DEPENDS=	libmetis.so:math/metis
 
 USES=		blaslapack fortran
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 FORTRANLIBS=	-lgfortran
 GCCLIBDIR=	${LDFLAGS}
 USE_LDCONFIG=	yes
 VEM=		${PORTVERSION:R:R:R}
 MUMPSVERSION=	${PORTVERSION:R}
-LIBS=		cmumps dmumps mumps_common pord smumps zmumps
+LIBS=	cmumps dmumps mumps_common pord smumps zmumps
 PLIST_SUB=	VE=${VEM} MUMPSVERSION=${MUMPSVERSION}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES MPI
 
 MPI_BUILD_DEPENDS_OFF=	${LOCALBASE}/lib/libscotch.a:cad/scotch
 MPI_BUILD_DEPENDS=	${LOCALBASE}/lib/libptscotch.a:cad/scotch
 MPI_LIB_DEPENDS=	libmpi.so:net/mpich		\
 			libparmetis.so:math/parmetis	\
 			libscalapack.so:math/scalapack
 MPI_PLIST_SUB=		WITH_LIBSEQ="@comment "
 MPI_PLIST_SUB_OFF=	WITH_LIBSEQ=""
 MPI_LIBS_OFF=		mpiseq
 
 MAKE_JOBS_UNSAFE=yes
 
 .include <bsd.port.pre.mk>
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 
 .ifdef WITH_MPI
 PKGNAMESUFFIX+=		-mpich
 .endif
 
 post-patch-MPI-on:
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.PAR \
 		${WRKSRC}/Makefile.inc
 
 post-patch-MPI-off:
 	${INSTALL_DATA} ${WRKSRC}/Make.inc/Makefile.FREEBSD10.SEQ \
 		${WRKSRC}/Makefile.inc
 
 pre-configure:
 	${DIRNAME} `${FC} -print-libgcc-file-name` > ${WRKSRC}/LIBDIR
 .for MF in Makefile Makefile.inc PORD/lib/Makefile libseq/Makefile src/Makefile
 	${REINPLACE_CMD} -e 's+@CC@+${CC}+g ; s+@FC@+${FC}+g ; \
 	s+/usr/local+${LOCALBASE}+; \
 	s+@CFLAGS@+${CFLAGS} -fPIC+g; \
 	s+@FCFLAGS@+${FCFLAGS} -fPIC+g; \
 	s+@SOVER@+${VEM}+g; \
 	s+@GCCLIBDIR@+${GCCLIBDIR}+g; \
 	s+@FORTRANLIBS@+${FORTRANLIBS}+g; \
 	s+@BLAS_LIBS@+${BLASLIB}+ ; \
 	s+@LAPACK_LIBS@+${LAPACKLIB}+ ; \
 	s+@LOCALBASE@+${LOCALBASE}+g;' \
 		${WRKSRC}/${MF}
 .endfor
 
 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
 .for lib in ${LIBS}
-	(cd ${STAGEDIR}${PREFIX}/lib && ${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so)
-. endfor
+	(cd ${STAGEDIR}${PREFIX}/lib &&	\
+	${LN} -sf lib${lib}.so.${VEM} ${STAGEDIR}${PREFIX}/lib/lib${lib}.so)
+.endfor
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${MUMPSVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
-. for ex in Makefile README *.c *.F input_simpletest_*
+.for ex in Makefile README *.c *.F input_simpletest_*
 	${INSTALL_DATA} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
-. endfor
-. for ex in c_example *simpletest
+.endfor
+.for ex in c_example *simpletest
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
-. endfor
+.endfor
 
 do-install-MPI-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
 	${INSTALL_LIB} ${WRKSRC}/libseq/libmpiseq*.so.${VEM} ${STAGEDIR}${PREFIX}/lib
+.for lib in ${LIBS}
+. for ext in a so so.${VEM}
+	(cd ${STAGEDIR}${PREFIX}/lib &&	\
+	${LN} -sf lib${lib}.${ext} ${STAGEDIR}${PREFIX}/lib/lib${lib}_seq.${ext})
+. endfor
+.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
 	(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)")
 .else
 	(cd ${WRKSRC}/examples &&	\
 	./ssimpletest < input_simpletest_real ;			\
 	./dsimpletest < input_simpletest_real ;			\
 	./csimpletest < input_simpletest_cmplx ;		\
 	./zsimpletest < input_simpletest_cmplx ;		\
 	${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>
Index: head/math/mumps/pkg-descr
===================================================================
--- head/math/mumps/pkg-descr	(revision 538727)
+++ head/math/mumps/pkg-descr	(revision 538728)
@@ -1,16 +1,18 @@
 MUMPS is a Distributed Multifrontal Solver (F90, MPI based) with Dynamic
 Distributed Scheduling to accomodate both numerical fill-in and multi-user
 environment.
 
 - Solution of large linear systems with symmetric positive definite
 matrices; general symmetric matrices; general unsymmetric matrices.
 - Version for complex arithmetic.
 - Parallel factorization and solve phases (uniprocessor version also
 available).
 - Iterative refinement and backward error analysis.
 - Various matrix input formats: assembled format; distributed assembled
 format; elemental format.
 - Partial factorization and Schur complement matrix.
 - Several orderings interfaced : AMD, AMF, PORD, METIS
 
+When MPI is disabled, libseq is installed.
+
 WWW: http://graal.ens-lyon.fr/MUMPS/
Index: head/math/mumps/pkg-plist
===================================================================
--- head/math/mumps/pkg-plist	(revision 538727)
+++ head/math/mumps/pkg-plist	(revision 538728)
@@ -1,51 +1,73 @@
 include/cmumps_c.h
 include/cmumps_root.h
 include/cmumps_struc.h
 include/dmumps_c.h
 include/dmumps_root.h
 include/dmumps_struc.h
 include/mumps_c_types.h
 include/mumps_compat.h
+%%WITH_LIBSEQ%%include/mumps_seq/mpi.h
 include/smumps_c.h
 include/smumps_root.h
 include/smumps_struc.h
 include/zmumps_c.h
 include/zmumps_root.h
 include/zmumps_struc.h
 lib/libcmumps.a
 lib/libcmumps.so
 lib/libcmumps.so.%%VE%%
+%%WITH_LIBSEQ%%lib/libcmumps_seq.a
+%%WITH_LIBSEQ%%lib/libcmumps_seq.so
+%%WITH_LIBSEQ%%lib/libcmumps_seq.so.%%VE%%
 lib/libdmumps.a
 lib/libdmumps.so
 lib/libdmumps.so.%%VE%%
+%%WITH_LIBSEQ%%lib/libdmumps_seq.a
+%%WITH_LIBSEQ%%lib/libdmumps_seq.so
+%%WITH_LIBSEQ%%lib/libdmumps_seq.so.%%VE%%
 %%WITH_LIBSEQ%%lib/libmpiseq.a
 %%WITH_LIBSEQ%%lib/libmpiseq.so
 %%WITH_LIBSEQ%%lib/libmpiseq.so.%%VE%%
+%%WITH_LIBSEQ%%lib/libmpiseq_seq.a
+%%WITH_LIBSEQ%%lib/libmpiseq_seq.so
+%%WITH_LIBSEQ%%lib/libmpiseq_seq.so.%%VE%%
 lib/libmumps_common.a
 lib/libmumps_common.so
 lib/libmumps_common.so.%%VE%%
+%%WITH_LIBSEQ%%lib/libmumps_common_seq.a
+%%WITH_LIBSEQ%%lib/libmumps_common_seq.so
+%%WITH_LIBSEQ%%lib/libmumps_common_seq.so.%%VE%%
 lib/libpord.a
 lib/libpord.so
 lib/libpord.so.%%VE%%
+%%WITH_LIBSEQ%%lib/libpord_seq.a
+%%WITH_LIBSEQ%%lib/libpord_seq.so
+%%WITH_LIBSEQ%%lib/libpord_seq.so.%%VE%%
 lib/libsmumps.a
 lib/libsmumps.so
 lib/libsmumps.so.%%VE%%
+%%WITH_LIBSEQ%%lib/libsmumps_seq.a
+%%WITH_LIBSEQ%%lib/libsmumps_seq.so
+%%WITH_LIBSEQ%%lib/libsmumps_seq.so.%%VE%%
 lib/libzmumps.a
 lib/libzmumps.so
 lib/libzmumps.so.%%VE%%
+%%WITH_LIBSEQ%%lib/libzmumps_seq.a
+%%WITH_LIBSEQ%%lib/libzmumps_seq.so
+%%WITH_LIBSEQ%%lib/libzmumps_seq.so.%%VE%%
 %%PORTDOCS%%%%DOCSDIR%%/userguide_%%MUMPSVERSION%%.pdf
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/Makefile
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/README
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c_example
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/c_example.c
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/csimpletest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/csimpletest.F
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dsimpletest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/dsimpletest.F
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/input_simpletest_cmplx
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/input_simpletest_real
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/multiple_arithmetics_example.F
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssimpletest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssimpletest.F
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zsimpletest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zsimpletest.F