- Upgrading french/aster from 7.1 to 7.2;

- french/eficas from 1.4 to 1.5;
- cad/metis-edf from 3 to 3.1;
- cad/astk-serveur & cad/astk-client from 1.0.14 to 1.0.21;
- french/homard from 5.5 to 6.2;

. don't install Homard automatically with Aster; like Gibi, Homard
depends on french/aster: this is more compliant with the licenses,
and it will be possible to build packages for Aster.

PR:		59312 59881
Submitted By:	Thierry Thomas <thierry@pompo.net>

3 files changed, 233 insertions, 188 deletions

diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index 3f7758dbaf13..9028fd669269 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	Eficas
-PORTVERSION=	1.4
-PORTREVISION=	1
+PORTVERSION=	1.5
 CATEGORIES=	french cad python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/eficas/
-DISTNAME=	${PORTNAME}V${PORTVERSION:C/\./_/}AsterSTA7
+DISTNAME=	${PORTNAME}V${PORTVERSION:C/\./_/}b3AsterSTA7
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	ASter Command FIle Editor
@@ -32,19 +31,28 @@ LEFICASDIR?=	apps/${PORTNAME}
 EFICASDIR=	${PREFIX}/${LEFICASDIR}
 PLIST_SUB=	EFICASDIR=${LEFICASDIR}
 
-ENV2PYTHON=	Misc/Cyclops.py Aster/eficas_aster.py
+.if defined(LANG) && ${LANG:Mfr*} != ""
+EF_LANG=	fr
+.else
+EF_LANG=	ang
+.endif
+
+ENV2PYTHON=	Misc/Cyclops.py Aster/eficas_aster.py convert/Parserv5/Translate.py
 
 post-patch:
 .for FILE in ${ENV2PYTHON}
 	@${REINPLACE_CMD} -e "s|^#!*./usr/bin/env python|#!${PYTHON_CMD}|"	\
 		${WRKSRC}/${FILE}
 .endfor
+	@${REINPLACE_CMD} -e "s#lang='fr'#lang='${EF_LANG}'#"			\
+		${WRKSRC}/Aster/prefs.py
 	@${REINPLACE_CMD} -e "s#/usr/bin/acroread#${LOCALBASE}/bin/acroread#"	\
+			-e "s#os.path.join(rep_cata,'..','Doc')#\"${DOCSDIR}\"#"	\
 		${WRKSRC}/Aster/editeur.ini
 
 pre-install:
 .if defined(NOPORTDOCS)
-	@${RM} ${WRKSRC}/Aster/Doc/*
+	@${RM} -rf ${WRKSRC}/Aster/Doc
 .endif
 	@${FIND} ${WRKDIR} -type f -exec ${CHMOD} ${SHAREMODE} \{\} \;
 
@@ -58,5 +66,11 @@ do-install:
 	@${REINPLACE_CMD} -e "s#%%EFICASDIR%%#${EFICASDIR}#"		\
 		-e "s#%%PYTHON_CMD%%#${PYTHON_CMD}#" ${WRKDIR}/eficas
 	@${INSTALL_SCRIPT} ${WRKDIR}/eficas ${PREFIX}/bin
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+	@${MV} ${EFICASDIR}/Aster/Doc/* ${DOCSDIR}
+	@${RMDIR} ${EFICASDIR}/Aster/Doc
+	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+.endif
 
 .include <bsd.port.mk>
diff --git a/french/eficas/distinfo b/french/eficas/distinfo
index e0d6b7e35eaf..25dc04457d36 100644
--- a/french/eficas/distinfo
+++ b/french/eficas/distinfo
@@ -1 +1 @@
-MD5 (EficasV1_4AsterSTA7.tar.gz) = 2e6d32661c1becd5c9bf0c05a102ff19
+MD5 (EficasV1_5b3AsterSTA7.tar.gz) = e110284f10050c932abf27f9bf56ab01
diff --git a/french/eficas/pkg-plist b/french/eficas/pkg-plist
index 318fa005f3fb..a1d880dd9054 100644
--- a/french/eficas/pkg-plist
+++ b/french/eficas/pkg-plist
@@ -103,6 +103,9 @@ bin/eficas
 %%EFICASDIR%%/Accas/A_UN_PARMI.py
 %%EFICASDIR%%/Accas/A_UN_PARMI.pyc
 %%EFICASDIR%%/Accas/A_UN_PARMI.pyo
+%%EFICASDIR%%/Accas/A_VALIDATOR.py
+%%EFICASDIR%%/Accas/A_VALIDATOR.pyc
+%%EFICASDIR%%/Accas/A_VALIDATOR.pyo
 %%EFICASDIR%%/Accas/__init__.py
 %%EFICASDIR%%/Accas/__init__.pyc
 %%EFICASDIR%%/Accas/__init__.pyo
@@ -118,6 +121,18 @@ bin/eficas
 %%EFICASDIR%%/Aster/Cata/Macro/defi_cable_bp_ops.py
 %%EFICASDIR%%/Aster/Cata/Macro/defi_cable_bp_ops.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/defi_cable_bp_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/macr_adap_mail_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/macr_adap_mail_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/macr_adap_mail_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_calc_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_calc_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_calc_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_mail_dat.py
+%%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_mail_dat.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_mail_dat.pyo
+%%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_mail_ops.py
+%%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_mail_ops.pyc
+%%EFICASDIR%%/Aster/Cata/Macro/macr_cabri_mail_ops.pyo
 %%EFICASDIR%%/Aster/Cata/Macro/macr_cara_poutre_ops.py
 %%EFICASDIR%%/Aster/Cata/Macro/macr_cara_poutre_ops.pyc
 %%EFICASDIR%%/Aster/Cata/Macro/macr_cara_poutre_ops.pyo
@@ -169,187 +184,6 @@ bin/eficas
 %%EFICASDIR%%/Aster/Cata/ops.py
 %%EFICASDIR%%/Aster/Cata/ops.pyc
 %%EFICASDIR%%/Aster/Cata/ops.pyo
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U40000f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U40201g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41101g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41102g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41103g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41201e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41202b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41301f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41302f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41303f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41401e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U41501e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U42101g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U42201f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U42301f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U42302d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U42303f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U42304d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U42401f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U42501e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43101g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43102g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43103g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43104f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43105e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43106a.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43107a.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43201e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43202f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43203f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43204f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43301e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43401g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43402g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43501d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43502d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43601f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43602f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43603f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43604f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43605f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43606a.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U43607a.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44101g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44201g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44202d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44203f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44301g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44302b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44303g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44304f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44305b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44401g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44402g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44403f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44404f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44405d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44412e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44421f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44422b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U44431d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45101g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45102d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45103f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45201g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45202d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45203f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45204g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45205f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45211f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45212d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45213d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45214f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45301f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45302g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45311f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45321f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45322e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45323d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45401g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45402e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45403c.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45501g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45502g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45503f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U45504f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46101g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46102g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46103f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46111g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46121d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46122g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46123g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46201f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46202f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46301f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46311d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46312f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46313f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46314d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46321f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46322d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46401f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46402f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46501e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46502e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46503e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46504e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46505e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46601d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46602e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46603a.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46611c.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U46621d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47102b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47103f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47104c.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47201g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47202g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47203f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47204b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47205d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47206c.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47301b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47302a.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U47401a.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48101g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48102f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48103g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48111f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48112f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48121e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48122e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48201f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48202e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48203f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48204f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48205b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48206b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48301d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48302d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48311d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48331d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48401e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48402e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48403d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48404e.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48405d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U48501b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U49101g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U49102d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U49103d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U49111g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U49121g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U49201g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U49202f.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U49203c.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U49211c.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U4cf10b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U4cf20b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U4gj10b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U4gj20b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U4gj30b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U4pc10b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U4pc20b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70001b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70101g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70111g.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70201d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70202b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70203a.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70211b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70231d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70301b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70302b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70311b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70401b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70411d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70421b.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70432d.pdf
-%%PORTDOCS%%%%EFICASDIR%%/Aster/Doc/U70433d.pdf
 %%EFICASDIR%%/Aster/editeur.ini
 %%EFICASDIR%%/Aster/eficas_aster.py
 %%EFICASDIR%%/Aster/eficas_aster.pyc
@@ -654,6 +488,9 @@ bin/eficas
 %%EFICASDIR%%/Ihm/I_UN_PARMI.py
 %%EFICASDIR%%/Ihm/I_UN_PARMI.pyc
 %%EFICASDIR%%/Ihm/I_UN_PARMI.pyo
+%%EFICASDIR%%/Ihm/I_VALIDATOR.py
+%%EFICASDIR%%/Ihm/I_VALIDATOR.pyc
+%%EFICASDIR%%/Ihm/I_VALIDATOR.pyo
 %%EFICASDIR%%/Ihm/__init__.py
 %%EFICASDIR%%/Ihm/__init__.pyc
 %%EFICASDIR%%/Ihm/__init__.pyo
@@ -758,6 +595,9 @@ bin/eficas
 %%EFICASDIR%%/Noyau/N_SIMP.py
 %%EFICASDIR%%/Noyau/N_SIMP.pyc
 %%EFICASDIR%%/Noyau/N_SIMP.pyo
+%%EFICASDIR%%/Noyau/N_VALIDATOR.py
+%%EFICASDIR%%/Noyau/N_VALIDATOR.pyc
+%%EFICASDIR%%/Noyau/N_VALIDATOR.pyo
 %%EFICASDIR%%/Noyau/N__F.py
 %%EFICASDIR%%/Noyau/N__F.pyc
 %%EFICASDIR%%/Noyau/N__F.pyo
@@ -890,12 +730,202 @@ bin/eficas
 %%EFICASDIR%%/generator/generator_python.py
 %%EFICASDIR%%/generator/generator_python.pyc
 %%EFICASDIR%%/generator/generator_python.pyo
+%%PORTDOCS%%%%DOCSDIR%%/U40000f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U40201g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41102g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41103g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41201e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41202b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41301f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41302f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41303f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41401e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U41501e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42201f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42301f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42302d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42303f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42304d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42401f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U42501e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43102g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43103g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43104f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43105e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43106a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43107a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43201e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43202f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43203f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43204f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43301e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43401g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43402g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43501d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43502d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43601f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43602f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43603f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43604f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43605f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43606a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U43607a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44201g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44202d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44203f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44204a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44301g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44302b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44303g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44304f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44305b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44401g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44402g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44403f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44404f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44405d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44412e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44421f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44422b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44431d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45102d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45103f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45201g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45202d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45203f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45204g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45205f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45211f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45212d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45213d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45214f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45301f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45302g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45311f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45321f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45322e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45323d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45401g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45402e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45403c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45501g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45502g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45503f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U45504f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46102g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46103f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46111g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46121d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46122g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46123g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46201f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46202f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46301f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46311d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46312f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46313f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46314d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46321f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46322d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46401f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46402f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46501e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46502e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46503e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46504e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46505e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46601d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46602e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46603a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46611c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U46621d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47102b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47103f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47104c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47201g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47202g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47203f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47204b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47205d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47206c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47207a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47301b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47302a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U47401a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48102f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48103g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48111f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48112f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48121e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48122e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48201f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48202e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48203f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48204f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48205b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48206b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48207a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48301d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48302d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48311d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48321b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48331d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48401e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48402e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48403d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48404e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48405d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48501b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49102d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49103d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49111g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49121g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49201g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49202f.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49203c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U49211c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4cf10b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4cf20b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4gj10b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4gj20b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4gj30b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4mk10e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4mk20d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4mk30d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4pc10b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U4pc20b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70001b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70101g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70102e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70111g.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70201d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70202b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70203a.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70211b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70231d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70301b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70302b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70311b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70321c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70401b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70411d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70421b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70431c.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70432d.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70433d.pdf
 @dirrm %%EFICASDIR%%/AIDE/fichiers
 @dirrm %%EFICASDIR%%/AIDE
 @dirrm %%EFICASDIR%%/Accas
 @dirrm %%EFICASDIR%%/Aster/Cata/Macro
 @dirrm %%EFICASDIR%%/Aster/Cata
-@dirrm %%EFICASDIR%%/Aster/Doc
 @dirrm %%EFICASDIR%%/Aster
 @dirrm %%EFICASDIR%%/Editeur/icons
 @dirrm %%EFICASDIR%%/Editeur
@@ -910,4 +940,5 @@ bin/eficas
 @dirrm %%EFICASDIR%%/convert
 @dirrm %%EFICASDIR%%/generator
 @dirrm %%EFICASDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
 @unexec rmdir %D/apps 2>/dev/null || true