Index: head/cad/scotch/Makefile
===================================================================
--- head/cad/scotch/Makefile	(revision 566983)
+++ head/cad/scotch/Makefile	(revision 566984)
@@ -1,101 +1,95 @@
 # Created by: thierry@pompo.net
 # $FreeBSD$
 
 PORTNAME=	scotch
 DISTVERSION=	6.0.4-aster7
 PORTREVISION=	3
 CATEGORIES=	cad science
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Package for graph and mesh partitioning and sparse matrix ordering
 
 LICENSE=	CeCILL_C
 LICENSE_NAME=	CeCILL-C
 LICENSE_FILE=	${WRKSRC}/doc/CeCILL-C_V1-en.txt
 LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
-CONFLICTS=	gbase-0.* gmap-2015.*
-
 USES=		bison:alias gmake localbase
 
+CONFLICTS=	gbase-0.* gmap-2015.*
+
 MAKE_JOBS_UNSAFE=yes
 
-OPTIONS_DEFINE=	DOCS EXAMPLES
+OPTIONS_DEFINE=	DOCS EXAMPLES MPICH
+OPTIONS_DEFAULT=MPICH
+OPTIONS_SUB=	yes
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${BUILD_WRKSRC}
 TEST_WRKSRC=	${BUILD_WRKSRC}
 ALL_TARGET=	esmumps
 TEST_TARGET=	check
 MAKE_ENV=	prefix=${STAGEDIR}${PREFIX} mandir=${STAGEDIR}${PREFIX}/share/man	\
 		-DSCOTCH_PTHREAD_NUMBER=2
 USE_LDCONFIG=	yes
 
 DOCVER=		${PORTVERSION:R:R}
 PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf scotch_example.f
 LIBS=		esmumps scotch scotcherr scotcherrexit scotchmetis
 
-.if !defined(WITHOUT_MPI)
-LIB_DEPENDS+=	libmpi.so:net/mpich
+MPICH_USES=		mpi:mpich
+MPICH_ALL_TARGET=	ptesmumps
+MPICH_TEST_TARGET=	ptcheck
+MPICH_LIBS+=	ptesmumps ptscotch ptscotcherr ptscotcherrexit ptscotchparmetis
 
-ALL_TARGET+=	ptesmumps
-TEST_TARGET+=	ptcheck
-
-LIBS+=		ptesmumps ptscotch ptscotcherr ptscotcherrexit ptscotchparmetis
-
-PLIST_SUB+=	MPI=""
-.else
-PLIST_SUB+=	MPI="@comment "
-.endif
-
 .include <bsd.port.options.mk>
 
 .if ${ARCH} == "i386"
 MF=	i686
 .else
 MF=	x86-64
 .endif
 
 pre-everything::
-.if !defined(WITHOUT_MPI)
+.if !defined(WITHOUT_MPICH)
 	@${ECHO_MSG}
 	@${ECHO_MSG} "Define WITHOUT_MPI if PT-Scotch is not wanted."
 	@${ECHO_MSG}
 .endif
 
 pre-configure:
 	${REINPLACE_CMD} -e 's/-lthread/-pthread/;s/-lpthread/-pthread/'\
 		${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd
 	${LN} -sf ${WRKSRC}/src/Make.inc/Makefile.inc.${MF}_pc_freebsd	\
 		${WRKSRC}/src/Makefile.inc
 	${REINPLACE_CMD} -E -e 's|cd (.*) ; * \$$\(MAKE\)|\$$(MAKE) -C \1|'	\
 		-e 's|\&\& \$$\(MAKE\)||' ${WRKSRC}/src/Makefile
 
 post-stage:
 	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/* ${STAGEDIR}${PREFIX}/lib/lib*
 .for l in ${LIBS}
 	${MV} ${STAGEDIR}${PREFIX}/lib/lib${l}.so ${STAGEDIR}${PREFIX}/lib/lib${l}.so.0
 	${LN} -sf lib${l}.so.0 ${STAGEDIR}${PREFIX}/lib/lib${l}.so
 .endfor
 
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
 
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/grf ${STAGEDIR}${EXAMPLESDIR}/tgt
 	${INSTALL_DATA} ${WRKSRC}/grf/* ${STAGEDIR}${EXAMPLESDIR}/grf
 	${INSTALL_DATA} ${WRKSRC}/tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt
 
 .if !defined(WITHOUT_MPI)
 pre-test:
 . 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
 .endif
 
 .include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
Index: head/cad/scotch/pkg-plist
===================================================================
--- head/cad/scotch/pkg-plist	(revision 566983)
+++ head/cad/scotch/pkg-plist	(revision 566984)
@@ -1,163 +1,163 @@
 bin/acpl
 bin/amk_ccc
 bin/amk_fft2
 bin/amk_grf
 bin/amk_hy
 bin/amk_m2
 bin/amk_p2
 bin/atst
-%%MPI%%bin/dggath
-%%MPI%%bin/dgmap
-%%MPI%%bin/dgord
-%%MPI%%bin/dgpart
-%%MPI%%bin/dgscat
-%%MPI%%bin/dgtst
+%%MPICH%%bin/dggath
+%%MPICH%%bin/dgmap
+%%MPICH%%bin/dgord
+%%MPICH%%bin/dgpart
+%%MPICH%%bin/dgscat
+%%MPICH%%bin/dgtst
 bin/gbase
 bin/gcv
 bin/gmap
 bin/gmk_hy
 bin/gmk_m2
 bin/gmk_m3
 bin/gmk_msh
 bin/gmk_ub2
 bin/gmtst
 bin/gord
 bin/gotst
 bin/gout
 bin/gpart
 bin/gscat
 bin/gtst
 bin/mcv
 bin/mmk_m2
 bin/mmk_m3
 bin/mord
 bin/mtst
-include/ptscotch.h
-include/ptscotchf.h
+%%MPICH%%include/ptscotch.h
+%%MPICH%%include/ptscotchf.h
 include/scotch.h
 include/scotchf.h
 lib/libesmumps.so
 lib/libesmumps.so.0
-%%MPI%%lib/libptesmumps.so
-%%MPI%%lib/libptesmumps.so.0
-%%MPI%%lib/libptscotch.so
-%%MPI%%lib/libptscotch.so.0
-%%MPI%%lib/libptscotcherr.so
-%%MPI%%lib/libptscotcherr.so.0
-%%MPI%%lib/libptscotcherrexit.so
-%%MPI%%lib/libptscotcherrexit.so.0
-%%MPI%%lib/libptscotchparmetis.so
-%%MPI%%lib/libptscotchparmetis.so.0
+%%MPICH%%lib/libptesmumps.so
+%%MPICH%%lib/libptesmumps.so.0
+%%MPICH%%lib/libptscotch.so
+%%MPICH%%lib/libptscotch.so.0
+%%MPICH%%lib/libptscotcherr.so
+%%MPICH%%lib/libptscotcherr.so.0
+%%MPICH%%lib/libptscotcherrexit.so
+%%MPICH%%lib/libptscotcherrexit.so.0
+%%MPICH%%lib/libptscotchparmetis.so
+%%MPICH%%lib/libptscotchparmetis.so.0
 lib/libscotch.so
 lib/libscotch.so.0
 lib/libscotcherr.so
 lib/libscotcherr.so.0
 lib/libscotcherrexit.so
 lib/libscotcherrexit.so.0
 lib/libscotchmetis.so
 lib/libscotchmetis.so.0
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/SP2_16.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/T3D_64.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h1.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h10.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h2.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h3.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h4.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h5.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h6.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h7.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h8.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h9.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k1.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k12.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k128.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k16.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k2.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k24.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k256.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k32.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k4.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k48.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k512.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k6.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k64.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k7.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k8.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/k96.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x10.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m10x20.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m11x13.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m16x16.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m16x32.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m17x19.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m19x21.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m19x31.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m21x23.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m23x25.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m24x24.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m25x27.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m27x29.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m29x31.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m2x2.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m2x4x8.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m32x32.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m3x3.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m4x4.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m4x8.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m5x5.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m5x7.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m64x64.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m8x16.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m8x8.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m9x11.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/m9x7.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p128.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p16.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p2.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p256.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p32.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p4.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p512.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p64.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/p8.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/t2x4x8.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/t4x4x4.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vhcub.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/void.tgt
 share/man/man1/amk_ccc.1.gz
 share/man/man1/amk_fft2.1.gz
 share/man/man1/amk_hy.1.gz
 share/man/man1/amk_m2.1.gz
 share/man/man1/amk_p2.1.gz
 share/man/man1/atst.1.gz
 share/man/man1/dgmap.1.gz
 share/man/man1/dgord.1.gz
 share/man/man1/dgpart.1.gz
 share/man/man1/dgscat.1.gz
 share/man/man1/dgtst.1.gz
 share/man/man1/gcv.1.gz
 share/man/man1/gmap.1.gz
 share/man/man1/gmk_hy.1.gz
 share/man/man1/gmk_m2.1.gz
 share/man/man1/gmk_m3.1.gz
 share/man/man1/gmk_msh.1.gz
 share/man/man1/gmk_ub2.1.gz
 share/man/man1/gmtst.1.gz
 share/man/man1/gord.1.gz
 share/man/man1/gotst.1.gz
 share/man/man1/gout.1.gz
 share/man/man1/gpart.1.gz
 share/man/man1/gtst.1.gz
 share/man/man1/mmk_m2.1.gz
 share/man/man1/mmk_m3.1.gz
 share/man/man1/mord.1.gz
 share/man/man1/mtst.1.gz