Add the _seq suffix to libraries when MPI is disabled and install mpi.h:

this is needed for some applications (e.g. FreeFem++).

3 files changed, 41 insertions, 8 deletions

diff --git a/math/mumps/Makefile b/math/mumps/Makefile
index 425ce7773f50..dcd31609c966 100644
--- a/math/mumps/Makefile
+++ b/math/mumps/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	mumps
 DISTVERSION=	5.1.2-aster6
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math
 PKGNAMESUFFIX=	-edf
 
@@ -25,7 +25,7 @@ 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
@@ -77,21 +77,30 @@ do-install:
 	${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)
diff --git a/math/mumps/pkg-descr b/math/mumps/pkg-descr
index ce8f956266a4..4ced9a5fca1e 100644
--- a/math/mumps/pkg-descr
+++ b/math/mumps/pkg-descr
@@ -13,4 +13,6 @@ 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/
diff --git a/math/mumps/pkg-plist b/math/mumps/pkg-plist
index 5eca59545f93..0f02f1cb7f8f 100644
--- a/math/mumps/pkg-plist
+++ b/math/mumps/pkg-plist
@@ -6,6 +6,7 @@ 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
@@ -15,24 +16,45 @@ 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