Index: head/math/mumps/Makefile
===================================================================
--- head/math/mumps/Makefile	(revision 443599)
+++ head/math/mumps/Makefile	(revision 443600)
@@ -1,170 +1,176 @@
 # Created by: Pedro Giffuni
 # $FreeBSD$
 
 PORTNAME=	mumps
 PORTVERSION=	4.10.0	# Please do not upgrade to 5+: if needed repocopy to math/mumps5
-PORTREVISION=	7
+PORTREVISION=	8
 CATEGORIES=	math
 MASTER_SITES=	http://mumps.enseeiht.fr/		\
 		http://graal.ens-lyon.fr/MUMPS/		\
 		http://www.enseeiht.fr/apo/MUMPS/	\
 		http://www.enseeiht.fr/irit/apo/MUMPS/
 DISTNAME=	MUMPS_${PORTVERSION}
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	MUltifrontal Massively Parallel sparse direct Solver
 
 LICENSE=	PD
 LICENSE_FILE=	${WRKSRC}/LICENSE
 
 #-----------------------------------------------------------------------
 
 # WARNING: Non-serviceable parts inside, can break other ports
 # You may define these options/knobs:
 #
 # FFLAGS: Fortran compiler flags for gfortran
 # WITH_OPTIMIZED_FLAGS:Try to use agressive (non-CPU) FFLAGS
 # 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
 
 FORTRANLIBS=	-lgfortran
 GCCLIBDIR=	${LDFLAGS}
 USE_LDCONFIG=	yes
+VEM=		${PORTVERSION:R:R}
+LIBS=		cmumps dmumps mumps_common pord smumps zmumps
 
 .if defined(WITH_OPTIMIZED_FLAGS)
 FFLAGS+=	-O3 -ffast-math
 .endif
 
 .ifdef WITH_METIS
 BUILD_DEPENDS+=	${LOCALBASE}/bin/oemetis:math/metis4
 MAKE_ENV+=	ORDERINGSF=-Dmetis
 .endif
 
-PLIST_SUB+=	MUMPSVERSION=${PORTVERSION}
+PLIST_SUB+=	MUMPSVERSION=${PORTVERSION} MUMPSV=${VEM}
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
 .include <bsd.port.pre.mk>
 
 .if exists(${LOCALBASE}/lib/libatlas.so) && !defined(WITH_BLAS)
 WITH_ATLAS=	yes
 .endif
 .if defined(WITH_ATLAS)
 LIB_DEPENDS+=	libatlas.so:math/atlas
 BLAS_LIBS=	-lf77blas
 LAPACK_LIBS=	-lalapack -lcblas
 .else
 LIB_DEPENDS+=	libblas.so:math/blas
 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
-.for MF in Makefile.inc PORD/lib/Makefile libseq/Makefile src/Makefile
+.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+@CFLAGS@+${CFLAGS} -fPIC+g; \
 	s+@FCFLAGS@+${FCFLAGS} -fPIC+g; \
-	s+@SOVER@+${PORTVERSION}+g; \
+	s+@SOVER@+${VEM}+g; \
 	s+@GCCLIBDIR@+${GCCLIBDIR}+g; \
 	s+@FORTRANLIBS@+${FORTRANLIBS}+g; \
 	s+@BLAS_LIBS@+${BLAS_LIBS}+ ; \
 	s+@LOCALBASE@+${LOCALBASE}+g;' \
 		${WRKSRC}/${MF}
 .endfor
 .ifdef WITH_MPI
 	${REINPLACE_CMD} -e 's+@LAPACK_LIBS@+${LAPACK_LIBS}+g;' ${WRKSRC}/Makefile.inc
 .endif
 .ifdef WITH_METIS
 	${REINPLACE_CMD} -e 's+#LMETIS+LMETIS+' ${WRKSRC}/Makefile.inc
 .endif
 
 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 ${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 ${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
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.pdf ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${WRKSRC}/doc/userguide_${PORTVERSION}.ps ${STAGEDIR}${DOCSDIR}
 	${GZIP_CMD} ${STAGEDIR}${DOCSDIR}/userguide_${PORTVERSION}.ps
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}
 . for ex in Makefile README *.c *.F input_simpletest_*
 	${INSTALL_DATA} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
 . endfor
 . for ex in c_example *simpletest
 	${INSTALL_PROGRAM} ${WRKSRC}/examples/${ex} ${STAGEDIR}${EXAMPLESDIR}
 . 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 ;		\
 	./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/files/patch-Makefile
===================================================================
--- head/math/mumps/files/patch-Makefile	(revision 443599)
+++ head/math/mumps/files/patch-Makefile	(revision 443600)
@@ -1,20 +1,20 @@
 --- Makefile.orig	2011-05-10 12:56:32 UTC
 +++ Makefile
 @@ -51,7 +51,7 @@ zexamples:	z
  	(cd examples ; $(MAKE) z)
  
  
 -requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT)
-+requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT) $(libdir)/libpord$(PLAT).so
++requiredobj: Makefile.inc $(LIBSEQNEEDED) $(libdir)/libpord$(PLAT)$(LIBEXT) $(libdir)/libpord$(PLAT).so.@SOVER@
  
  # dummy MPI library (sequential version)
  
 @@ -65,7 +65,7 @@ $(libdir)/libpord$(PLAT)$(LIBEXT):
  	  $(MAKE) CC="$(CC)" CFLAGS="$(OPTC)" AR="$(AR)" RANLIB="$(RANLIB)" OUTC=$(OUTC) LIBEXT=$(LIBEXT); \
  	fi;
  	if [ "$(LPORDDIR)" != "" ] ; then \
 -	  cp $(LPORDDIR)/libpord$(LIBEXT) $@; \
 +	  cp $(LPORDDIR)/libpord* $(libdir)/; \
  	fi;
  
  clean:
Index: head/math/mumps/files/patch-PORD_lib_Makefile
===================================================================
--- head/math/mumps/files/patch-PORD_lib_Makefile	(revision 443599)
+++ head/math/mumps/files/patch-PORD_lib_Makefile	(revision 443600)
@@ -1,21 +1,20 @@
 --- PORD/lib/Makefile.orig	2011-05-10 12:56:32 UTC
 +++ PORD/lib/Makefile
-@@ -21,10 +21,16 @@ OBJS = graph.o gbipart.o gbisect.o ddcre
+@@ -21,10 +21,15 @@ OBJS = graph.o gbipart.o gbisect.o ddcre
  .c.o:
  	$(CC) $(COPTIONS) -c $*.c $(OUTC)$*.o
  
 -libpord$(LIBEXT):$(OBJS)
 -	$(AR)$@ $(OBJS)
-+all: libpord$(LIBEXT) libpord.so
++all: libpord$(LIBEXT) libpord.so.@SOVER@
 +
 +libpord$(LIBEXT): $(OBJS)
 +	$(AR) $@ $(OBJS)
  	$(RANLIB) $@
  
-+libpord.so: $(OBJS)
-+	$(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT)-@SOVER@.so -o libpord$(PLAT)-@SOVER@.so -Wl,-z,defs
-+	ln -s libpord$(PLAT)-@SOVER@.so $@
++libpord.so.@SOVER@: $(OBJS)
++	$(CC) -shared $(OBJS) -Wl,-soname,libpord$(PLAT).so.@SOVER@ -o libpord$(PLAT).so.@SOVER@ -Wl,-z,defs
 +
  clean:
  	rm -f *.o
  
Index: head/math/mumps/files/patch-libseq_Makefile
===================================================================
--- head/math/mumps/files/patch-libseq_Makefile	(revision 443599)
+++ head/math/mumps/files/patch-libseq_Makefile	(revision 443600)
@@ -1,24 +1,23 @@
 --- libseq/Makefile.orig	2011-05-10 12:56:39 UTC
 +++ libseq/Makefile
-@@ -7,13 +7,19 @@ all: libmpiseq
+@@ -7,13 +7,18 @@ all: libmpiseq
  
  include ../Makefile.inc
  
 -libmpiseq: libmpiseq$(PLAT)$(LIBEXT)
-+libmpiseq: libmpiseq$(PLAT)$(LIBEXT) libmpiseq$(PLAT).so
++libmpiseq: libmpiseq$(PLAT)$(LIBEXT) libmpiseq$(PLAT).so.@SOVER@
  
  libmpiseq$(PLAT)$(LIBEXT): mpi.o mpic.o elapse.o
 -	$(AR)$@ mpi.o mpic.o elapse.o
 +	$(AR) $@ mpi.o mpic.o elapse.o
  	$(RANLIB) $@
 +
-+libmpiseq$(PLAT).so: mpi.o mpic.o elapse.o
-+	$(FC) -shared ${.ALLSRC} -Wl,-soname,libmpiseq$(PLAT)-@SOVER@.so -o libmpiseq$(PLAT)-@SOVER@.so -Wl,-z,defs
-+	ln -s libmpiseq$(PLAT)-@SOVER@.so $@
++libmpiseq$(PLAT).so.@SOVER@: mpi.o mpic.o elapse.o
++	$(FC) -shared ${.ALLSRC} -Wl,-soname,libmpiseq$(PLAT).so.@SOVER@ -o libmpiseq$(PLAT).so.@SOVER@ -Wl,-z,defs
 +
  .f.o:
  	$(FC) $(OPTF)              -c $*.f $(OUTF)$*.o
 +
  .c.o:
  	$(CC) $(OPTC) $(CDEFS) -I. -c $*.c $(OUTC)$*.o
  
Index: head/math/mumps/files/patch-src_Makefile
===================================================================
--- head/math/mumps/files/patch-src_Makefile	(revision 443599)
+++ head/math/mumps/files/patch-src_Makefile	(revision 443600)
@@ -1,37 +1,35 @@
 --- src/Makefile.orig	2011-05-10 12:56:32 UTC
 +++ src/Makefile
 @@ -20,7 +20,9 @@ z:
  include $(topdir)/Makefile.inc
  
  mumps_lib:    $(libdir)/libmumps_common$(PLAT)$(LIBEXT) \
 -              $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT)
-+              $(libdir)/libmumps_common$(PLAT).so \
++              $(libdir)/libmumps_common$(PLAT).so.@SOVER@ \
 +              $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT) \
-+              $(libdir)/lib$(ARITH)mumps$(PLAT).so
++              $(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@
  
  OBJS_COMMON = \
          mumps_part9.o\
-@@ -53,13 +55,21 @@ OBJS = 	$(ARITH)mumps_part1.o\
+@@ -53,13 +55,19 @@ OBJS = 	$(ARITH)mumps_part1.o\
  
  
  $(libdir)/libmumps_common$(PLAT)$(LIBEXT):	$(OBJS_COMMON)
 -	$(AR)$@ $?
 +	$(AR) $@ $?
  	$(RANLIB) $@
  
-+$(libdir)/libmumps_common$(PLAT).so:	$(OBJS_COMMON)
-+	$(FC) -shared ${.ALLSRC} -Wl,-soname,libmumps_common$(PLAT)-@SOVER@.so -L$(libdir) $(LORDERINGS) $(LIBPAR) $(LIBOTHERS) -o $(libdir)/libmumps_common$(PLAT)-@SOVER@.so -Wl,-z,defs
-+	ln -s libmumps_common$(PLAT)-@SOVER@.so $@
++$(libdir)/libmumps_common$(PLAT).so.@SOVER@:	$(OBJS_COMMON)
++	$(FC) -shared ${.ALLSRC} -Wl,-soname,libmumps_common$(PLAT).so.@SOVER@ -L$(libdir) $(LORDERINGS) $(LIBPAR) $(LIBOTHERS) -o $(libdir)/libmumps_common$(PLAT).so.@SOVER@ -Wl,-z,defs
 +
  $(libdir)/lib$(ARITH)mumps$(PLAT)$(LIBEXT):    $(OBJS)
 -	$(AR)$@ $?
 +	$(AR) $@ $?
  	$(RANLIB) $@
  
-+$(libdir)/lib$(ARITH)mumps$(PLAT).so:    $(OBJS)
-+	$(FC) -shared ${.ALLSRC} -Wl,-soname,lib$(ARITH)mumps$(PLAT)-@SOVER@.so -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(LIBPAR) -lblas $(SCALAP) $(LIBOTHERS) -o $(libdir)/lib$(ARITH)mumps$(PLAT)-@SOVER@.so -Wl,-z,defs
-+	ln -s lib$(ARITH)mumps$(PLAT)-@SOVER@.so $@
++$(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@:    $(OBJS)
++	$(FC) -shared ${.ALLSRC} -Wl,-soname,lib$(ARITH)mumps$(PLAT).so.@SOVER@ -L$(libdir) -lmumps_common$(PLAT) $(LORDERINGS) $(LIBPAR) -lblas $(SCALAP) $(LIBOTHERS) -o $(libdir)/lib$(ARITH)mumps$(PLAT).so.@SOVER@ -Wl,-z,defs
 +
  $(ARITH)mumps_load.o:		$(ARITH)mumps_comm_buffer.o \
  				$(ARITH)mumps_struc_def.o
  
Index: head/math/mumps/pkg-plist
===================================================================
--- head/math/mumps/pkg-plist	(revision 443599)
+++ head/math/mumps/pkg-plist	(revision 443600)
@@ -1,51 +1,51 @@
 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
 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-%%MUMPSVERSION%%.so
 lib/libcmumps.a
 lib/libcmumps.so
-lib/libdmumps-%%MUMPSVERSION%%.so
+lib/libcmumps.so.4
 lib/libdmumps.a
 lib/libdmumps.so
-%%WITH_LIBSEQ%%lib/libmpiseq-%%MUMPSVERSION%%.so
+lib/libdmumps.so.4
 %%WITH_LIBSEQ%%lib/libmpiseq.a
 %%WITH_LIBSEQ%%lib/libmpiseq.so
-lib/libmumps_common-%%MUMPSVERSION%%.so
+%%WITH_LIBSEQ%%lib/libmpiseq.so.4
 lib/libmumps_common.a
 lib/libmumps_common.so
-lib/libpord-%%MUMPSVERSION%%.so
+lib/libmumps_common.so.4
 lib/libpord.a
 lib/libpord.so
-lib/libsmumps-%%MUMPSVERSION%%.so
+lib/libpord.so.4
 lib/libsmumps.a
 lib/libsmumps.so
-lib/libzmumps-%%MUMPSVERSION%%.so
+lib/libsmumps.so.4
 lib/libzmumps.a
 lib/libzmumps.so
+lib/libzmumps.so.4
 %%PORTDOCS%%%%DOCSDIR%%/userguide_%%MUMPSVERSION%%.pdf
 %%PORTDOCS%%%%DOCSDIR%%/userguide_%%MUMPSVERSION%%.ps.gz
 %%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%%/ssimpletest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/ssimpletest.F
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zsimpletest
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/zsimpletest.F