Upgrade - endly! - to Code_Aster 13.4.0-3.

Notes:

- I have (not yet) succeeded to enable MFront in this version;

- it uses math/mumps-edf, repocopied from math/mumps;

- cad/scotch is now taken out of the aster tarball;

- french/eficas is no more used: to be replaced by "aster-study" in Salome_Meca
	(the port cad/salome should be resurrected!)

2 files changed, 59 insertions, 82 deletions

diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 889fc9b5b457..c561e706c1d6 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -2,11 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	scotch
-DISTVERSION=	5.1.12b_esmumps
-PORTREVISION=	8
+DISTVERSION=	6.0.4-aster5
 CATEGORIES=	cad science
-MASTER_SITES=	https://gforge.inria.fr/frs/download.php/28978/
-DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Package for graph and mesh partitioning and sparse matrix ordering
@@ -18,43 +15,31 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 CONFLICTS=	gbase-0.* gmap-2015.*
 
-USES=		gmake
+USES=		bison gmake localbase
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.if defined(MAINTAINER_MODE)
-USES+=		fortran
-.endif
-
-WRKSRC=		${WRKDIR}/${DISTNAME:C/b_/_/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 BUILD_WRKSRC=	${WRKSRC}/src
-ALL_TARGET=	scotch
-
-CFLAGS+=	-I${LOCALBASE}/include
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+TEST_WRKSRC=	${BUILD_WRKSRC}
+ALL_TARGET=	esmumps
+TEST_TARGET=	check
+MAKE_ENV=	prefix=${STAGEDIR}${PREFIX} mandir=${STAGEDIR}${MANDIRS}	\
+		-DSCOTCH_PTHREAD_NUMBER=2
 
-VER=		${PORTVERSION:R}
-BINS=		acpl amk_ccc amk_fft2 amk_grf amk_hy amk_m2 amk_p2 atst	\
-		gbase gcv gmap gmk_hy gmk_m2 gmk_m3 gmk_msh gmk_ub2	\
-		gmtst gord gotst gout gpart gscat gtst mcv mmk_m2 mmk_m3\
-		mord mtst
-INCS=		esmumps.h scotch.h scotchf.h
-LIBS=		libesmumps.a libscotch.a libscotcherr.a libscotcherrexit.a libscotchmetis.a
-DOCVER=		${PORTVERSION:R:R:R}
-PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf
-EXAMPLES=	scotch_example_1.f scotch_example_2.f90
+DOCVER=		${PORTVERSION:R:R}
+PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf scotch_example.f
+EXAMPLES=	scotch_example.f
 
 .if !defined(WITHOUT_MPI)
 LIB_DEPENDS+=	libmpich.so:net/mpich2
 
-ALL_TARGET+=	ptscotch
+ALL_TARGET+=	ptesmumps
 MAKE_ENV+=	PATH=${PATH}:${LOCALBASE}/mpich2/bin
-
-INCS+=		ptscotch.h ptscotchf.h
-LIBS+=		libptesmumps.a libptscotch.a libptscotcherr.a libptscotcherrexit.a	\
-		libptscotchparmetis.a
-BINS+=		dggath dgmap dgord dgpart dgscat dgtst
+TEST_TARGET+=	ptcheck
 
 PLIST_SUB+=	MPI=""
 .else
@@ -85,32 +70,32 @@ pre-configure:
 	${REINPLACE_CMD} -E -e 's|cd (.*) ; * \$$\(MAKE\)|\$$(MAKE) -C \1|'	\
 		-e 's|\&\& \$$\(MAKE\)||' ${WRKSRC}/src/Makefile
 
-do-install:
-	${INSTALL_PROGRAM} ${BINS:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${INCS:S|^|${WRKSRC}/include/|} ${STAGEDIR}${PREFIX}/include
-	${INSTALL_DATA} ${LIBS:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${STAGEDIR}${MANPREFIX}/man/man1
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+
 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} ${EXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/grf/* ${STAGEDIR}${EXAMPLESDIR}/grf
 	${INSTALL_DATA} ${WRKSRC}/tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt
 
-.if defined(MAINTAINER_MODE)
-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}/examples &&	\
-	${FC} -o scotch_test scotch_example_1.f ${FCFLAGS}	\
-		-I${PREFIX}/include ${LDFLAGS} -L${PREFIX}/lib -lscotch -lscotcherr -lm	\
-	&& ./scotch_test)
-. if !defined(WITHOUT_MPI)
-	(${GUNZIP_CMD} -c ${EXAMPLESDIR}/grf/bump.grf.gz | dgtst)
+.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
+	${LOCALBASE}/bin/mpd &
+.endif
+
+.if !defined(WITHOUT_MPI)
+post-test:
+	${LOCALBASE}/bin/mpdallexit
 .endif
 
+.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/cad/scotch/pkg-plist b/cad/scotch/pkg-plist
index 48e305e917e2..61d0ee18b058 100644
--- a/cad/scotch/pkg-plist
+++ b/cad/scotch/pkg-plist
@@ -32,7 +32,6 @@ bin/mmk_m2
 bin/mmk_m3
 bin/mord
 bin/mtst
-include/esmumps.h
 %%MPI%%include/ptscotch.h
 %%MPI%%include/ptscotchf.h
 include/scotch.h
@@ -47,6 +46,34 @@ lib/libscotch.a
 lib/libscotcherr.a
 lib/libscotcherrexit.a
 lib/libscotchmetis.a
+man/man1/amk_ccc.1.gz
+man/man1/amk_fft2.1.gz
+man/man1/amk_hy.1.gz
+man/man1/amk_m2.1.gz
+man/man1/amk_p2.1.gz
+man/man1/atst.1.gz
+man/man1/dgmap.1.gz
+man/man1/dgord.1.gz
+man/man1/dgpart.1.gz
+man/man1/dgscat.1.gz
+man/man1/dgtst.1.gz
+man/man1/gcv.1.gz
+man/man1/gmap.1.gz
+man/man1/gmk_hy.1.gz
+man/man1/gmk_m2.1.gz
+man/man1/gmk_m3.1.gz
+man/man1/gmk_msh.1.gz
+man/man1/gmk_ub2.1.gz
+man/man1/gmtst.1.gz
+man/man1/gord.1.gz
+man/man1/gotst.1.gz
+man/man1/gout.1.gz
+man/man1/gpart.1.gz
+man/man1/gtst.1.gz
+man/man1/mmk_m2.1.gz
+man/man1/mmk_m3.1.gz
+man/man1/mord.1.gz
+man/man1/mtst.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.grf.gz
@@ -55,8 +82,6 @@ lib/libscotchmetis.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.xyz.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scotch_example_1.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scotch_example_2.f90
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/SP2_16.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/T3D_64.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h1.tgt
@@ -126,36 +151,3 @@ lib/libscotchmetis.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vhcub.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/void.tgt
-man/man1/acpl.1.gz
-man/man1/amk_ccc.1.gz
-man/man1/amk_fft2.1.gz
-man/man1/amk_grf.1.gz
-man/man1/amk_hy.1.gz
-man/man1/amk_m2.1.gz
-man/man1/amk_p2.1.gz
-man/man1/atst.1.gz
-man/man1/dggath.1.gz
-man/man1/dgmap.1.gz
-man/man1/dgord.1.gz
-man/man1/dgpart.1.gz
-man/man1/dgscat.1.gz
-man/man1/dgtst.1.gz
-man/man1/gbase.1.gz
-man/man1/gcv.1.gz
-man/man1/gmap.1.gz
-man/man1/gmk_hy.1.gz
-man/man1/gmk_m2.1.gz
-man/man1/gmk_m3.1.gz
-man/man1/gmk_msh.1.gz
-man/man1/gmk_ub2.1.gz
-man/man1/gmtst.1.gz
-man/man1/gord.1.gz
-man/man1/gotst.1.gz
-man/man1/gout.1.gz
-man/man1/gpart.1.gz
-man/man1/gtst.1.gz
-man/man1/mcv.1.gz
-man/man1/mmk_m2.1.gz
-man/man1/mmk_m3.1.gz
-man/man1/mord.1.gz
-man/man1/mtst.1.gz