- Upgrade to Scotch-5.0

  Changelog at <http://www.labri.fr/perso/pelegrin/scotch/>

- Also install PT-Scotch, unless WITHOUT_MPI is set

- Install a copy of the CeCILL-C license

3 files changed, 66 insertions, 13 deletions

diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index cf40dff9dab3..6c14f3da3fc4 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -6,39 +6,72 @@
 #
 
 PORTNAME=	scotch
-PORTVERSION=	4.0.0
-PORTREVISION=	1
+PORTVERSION=	5.0.0
 CATEGORIES=	cad science
-MASTER_SITES=	http://gforge.inria.fr/frs/download.php/464/
+MASTER_SITES=	http://gforge.inria.fr/frs/download.php/2607/
 DISTNAME=	${PORTNAME}_${PORTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	A package for graph and mesh partitioning and sparse matrix ordering
 
 USE_GMAKE=	yes
+.if defined(MAINTAINER_MODE)
+USE_FORTRAN=	yes
+.endif
 
 WRKSRC=		${WRKDIR}/${DISTNAME:R}
 BUILD_WRKSRC=	${WRKSRC}/src
 INSTALL_WRKSRC=	${WRKSRC}/bin
+ALL_TARGET=	scotch
 
-F77?=		f77
-
+VER=		${PORTVERSION:R}
 BINS=		acpl amk_ccc amk_fft2 amk_grf amk_hy amk_m2 amk_p2 atst	\
-		gcv gmap gmk_hy gmk_m2 gmk_m3 gmk_msh gmk_ub2 gmtst gord\
+		gbase gcv gmap gmk_hy gmk_m2 gmk_m3 gmk_msh gmk_ub2 gmtst gord\
 		gotst gout gtst mcv mmk_m2 mmk_m3 mord mtst
 INCS=		common.h scotch.h scotchf.h
-LIBS=		libcommon.a libscotch.a libscotcherr.a libscotcherrcom.a
-PORTDOCS=	scotch_user4.0.pdf
+LIBS=		libcommon.a libscotch.a libscotcherr.a libscotcherrcom.a\
+		libscotchmetis.a
+LICDOCS=	CeCILL-C_V1-en.txt CeCILL-C_V1-fr.txt
+PORTDOCS=	scotch_user${VER}.pdf
 EXAMPLES=	scotch_example.f
 
+PKGMESSAGE=	${WRKSRC}/LICENSE_en.txt
+
+.if !defined(WITHOUT_MPI)
+BUILD_DEPENDS+=	${LOCALBASE}/mpich2/bin/mpicc:${PORTSDIR}/net/mpich2
+RUN_DEPENDS+=	${LOCALBASE}/mpich2/lib/libmpich.so.0:${PORTSDIR}/net/mpich2
+
+ALL_TARGET+=	ptscotch
+MAKE_ENV+=	PATH=${PATH}:${LOCALBASE}/mpich2/bin
+
+INCS+=		ptscotch.h ptscotchf.h
+LIBS+=		libptscotch.a libptscotcherr.a
+BINS+=		dgord dgscat dgtst
+
+PLIST_SUB+=	MPI=""
+.else
+PLIST_SUB+=	MPI="@comment "
+.endif
+
+pre-evrything::
+.if !defined(WITHOUT_MPI)
+	@${ECHO_MSG}
+	@${ECHO_MSG} "Define WITHOUT_MPI if PT-Scotch is not wanted."
+	@${ECHO_MSG}
+.endif
+
 pre-configure:
 	${LN} -sf ${WRKSRC}/src/Make.inc/Makefile.inc.freebsd	\
 		${WRKSRC}/src/Makefile.inc
+	${REINPLACE_CMD} -e 's|in subdirectory "doc"|under ${DATADIR}|'	\
+		${WRKSRC}/LICENSE_en.txt
 
 do-install:
 	${INSTALL_PROGRAM} ${BINS:S|^|${INSTALL_WRKSRC}/|} ${PREFIX}/bin
 	${INSTALL_DATA} ${INCS:S|^|${INSTALL_WRKSRC}/|} ${PREFIX}/include
 	${INSTALL_DATA} ${LIBS:S|^|${INSTALL_WRKSRC}/|} ${PREFIX}/lib
+	${MKDIR} ${DATADIR}
+	${INSTALL_DATA} ${LICDOCS:S|^|${WRKSRC}/doc/|} ${DATADIR}
 .if !defined(NOPORTDOCS)
 	${MKDIR} ${DOCSDIR} ${EXAMPLESDIR}/grf ${EXAMPLESDIR}/tgt
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${DOCSDIR}
@@ -49,15 +82,23 @@ do-install:
 	@${ECHO_MSG} "===> Examples installed in ${EXAMPLESDIR}."
 .endif
 
+post-install:
+	@${ECHO_MSG}
+	@${CAT} ${PKGMESSAGE}
+	@${ECHO_MSG}
+
 .if defined(MAINTAINER_MODE)
-test:	install
+regression-test:	install
 	(amk_ccc 3 | acpl - ${WRKDIR}/ccc3.tgt &&	\
 	${GUNZIP_CMD} -c ${EXAMPLESDIR}/grf/bump.grf.gz |	\
 	gmap - ${WRKDIR}/ccc3.tgt ${WRKDIR}/brol.map)
 	(cd ${WRKSRC}/doc &&	\
-	${F77} -o scotch_test scotch_example.f	\
+	${FC} -o scotch_test scotch_example.f	\
 		-I${PREFIX}/include -L${PREFIX}/lib -lscotch -lscotcherr -lm	\
 	&& ./scotch_test)
+. if !defined(WITHOUT_MPI)
+	(${GUNZIP_CMD} -c ${EXAMPLESDIR}/grf/bump.grf.gz | dgtst)
+. endif
 .endif
 
 .include <bsd.port.mk>
diff --git a/cad/scotch/distinfo b/cad/scotch/distinfo
index 5d68f5235a19..e24c44659ae4 100644
--- a/cad/scotch/distinfo
+++ b/cad/scotch/distinfo
@@ -1,3 +1,3 @@
-MD5 (scotch_4.0.0.tar.gz) = b7c38940040de6025b7906285cf0e899
-SHA256 (scotch_4.0.0.tar.gz) = 29c23fed8992c9872208190838c60dbeb7e4abd083fcf898e53510daa4993fa8
-SIZE (scotch_4.0.0.tar.gz) = 2534269
+MD5 (scotch_5.0.0.tar.gz) = 7bbfea439eb88d388b937b213d95d958
+SHA256 (scotch_5.0.0.tar.gz) = fc1fbe9797614a90a6da429f15ccd867f4e62e1c20b9f5e6907699163aab7702
+SIZE (scotch_5.0.0.tar.gz) = 3403319
diff --git a/cad/scotch/pkg-plist b/cad/scotch/pkg-plist
index a36c29399f63..6260d44b41f5 100644
--- a/cad/scotch/pkg-plist
+++ b/cad/scotch/pkg-plist
@@ -6,6 +6,10 @@ bin/amk_hy
 bin/amk_m2
 bin/amk_p2
 bin/atst
+%%MPI%%bin/dgord
+%%MPI%%bin/dgscat
+%%MPI%%bin/dgtst
+bin/gbase
 bin/gcv
 bin/gmap
 bin/gmk_hy
@@ -24,12 +28,17 @@ bin/mmk_m3
 bin/mord
 bin/mtst
 include/common.h
+%%MPI%%include/ptscotch.h
+%%MPI%%include/ptscotchf.h
 include/scotch.h
 include/scotchf.h
 lib/libcommon.a
+%%MPI%%lib/libptscotch.a
+%%MPI%%lib/libptscotcherr.a
 lib/libscotch.a
 lib/libscotcherr.a
 lib/libscotcherrcom.a
+lib/libscotchmetis.a
 %%PORTDOCS%%%%EXAMPLESDIR%%/grf/3elt.grf.gz
 %%PORTDOCS%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz
 %%PORTDOCS%%%%EXAMPLESDIR%%/grf/4elt.grf.gz
@@ -108,6 +117,9 @@ lib/libscotcherrcom.a
 %%PORTDOCS%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt
 %%PORTDOCS%%%%EXAMPLESDIR%%/tgt/vhcub.tgt
 %%PORTDOCS%%%%EXAMPLESDIR%%/tgt/void.tgt
+%%DATADIR%%/CeCILL-C_V1-en.txt
+%%DATADIR%%/CeCILL-C_V1-fr.txt
+%%PORTDOCS%%@dirrm %%DATADIR%%
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/tgt
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%/grf
 %%PORTDOCS%%@dirrm %%EXAMPLESDIR%%