Upgrade to 1.8.0.

3 files changed, 215 insertions, 130 deletions

diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index 64c2855c1349..0b0c139df8c8 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	eficas
-PORTVERSION=	1.7.1
+PORTVERSION=	1.8.0
 CATEGORIES=	french cad python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 DISTNAME=	${PORTNAME}-sansdoc-${PORTVERSION}-1
@@ -32,7 +32,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
 LEFICASDIR?=	apps/${PORTNAME}
 EFICASDIR=	${PREFIX}/${LEFICASDIR}
-PLIST_SUB=	EFICASDIR=${LEFICASDIR}
+PLIST_SUB=	EFICASDIR=${LEFICASDIR} STAV=STA8
 
 .if defined(LANG) && ${LANG:Mfr*} != ""
 EF_LANG=	fr
@@ -45,6 +45,7 @@ ENV2PYTHON=	Misc/Cyclops.py Aster/eficas_aster.py convert/Parserv5/Translate.py
 post-patch:
 	@${RM} ${WRKSRC}/convert/Parserv5/Translate.py.orig	\
 		${WRKSRC}/Editeur/bureau.py.orig
+	@${RM} -r ${WRKSRC}/Pmw	# Use our ported Pmw
 
 pre-configure:
 .for FILE in ${ENV2PYTHON}
diff --git a/french/eficas/distinfo b/french/eficas/distinfo
index cbb789d1815a..eb75624f2a07 100644
--- a/french/eficas/distinfo
+++ b/french/eficas/distinfo
@@ -1,4 +1,4 @@
-MD5 (eficas-sansdoc-1.7.1-1) = 0601f9a4ee89e41d56a459280cfa6937
-SIZE (eficas-sansdoc-1.7.1-1) = 680661
-MD5 (eficas-doc-1.7.1-1.tar.gz) = 6f3454538b01bcbec78c23078cbebe20
-SIZE (eficas-doc-1.7.1-1.tar.gz) = 33022520
+MD5 (eficas-sansdoc-1.8.0-1) = a730fdf3a047a70081997261aa043937
+SIZE (eficas-sansdoc-1.8.0-1) = 864338
+MD5 (eficas-doc-1.8.0-1.tar.gz) = 2d05a8041876487e6e33ab80e0bc73ee
+SIZE (eficas-doc-1.8.0-1.tar.gz) = 33171861
diff --git a/french/eficas/pkg-plist b/french/eficas/pkg-plist
index 1b7b46c1fad4..10e4cb664b5e 100644
--- a/french/eficas/pkg-plist
+++ b/french/eficas/pkg-plist
@@ -24,6 +24,9 @@
 %%EFICASDIR%%/Accas/A_AU_MOINS_UN.py
 %%EFICASDIR%%/Accas/A_AU_MOINS_UN.pyc
 %%EFICASDIR%%/Accas/A_AU_MOINS_UN.pyo
+%%EFICASDIR%%/Accas/A_AU_PLUS_UN.py
+%%EFICASDIR%%/Accas/A_AU_PLUS_UN.pyc
+%%EFICASDIR%%/Accas/A_AU_PLUS_UN.pyo
 %%EFICASDIR%%/Accas/A_A_CLASSER.py
 %%EFICASDIR%%/Accas/A_A_CLASSER.pyc
 %%EFICASDIR%%/Accas/A_A_CLASSER.pyo
@@ -108,127 +111,169 @@
 %%EFICASDIR%%/Accas/__init__.py
 %%EFICASDIR%%/Accas/__init__.pyc
 %%EFICASDIR%%/Accas/__init__.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/__init__.py
-%%EFICASDIR%%/Aster/Cata/Macro/__init__.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/__init__.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/ajout_quad_gmsh.py
-%%EFICASDIR%%/Aster/Cata/Macro/ajout_quad_gmsh.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/ajout_quad_gmsh.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/calc_precont_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/calc_precont_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/calc_precont_ops.pyo
-%%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/defi_part_feti_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/defi_part_feti_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/defi_part_feti_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_fichier.py
-%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_fichier.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_fichier.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_mefisto.py
-%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_mefisto.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/fiabilite_mefisto.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/impr_fonction_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/impr_fonction_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/impr_fonction_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/impr_table_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/impr_table_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/impr_table_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/lire_fonction_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/lire_fonction_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/lire_fonction_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/lire_inte_spec_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/lire_inte_spec_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/lire_inte_spec_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/lire_table_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/lire_table_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/lire_table_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_ascouf_calc_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macr_ascouf_calc_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macr_ascouf_calc_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macr_ascouf_mail_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macr_ascouf_mail_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macr_ascouf_mail_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_calc_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_calc_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_calc_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_mail_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_mail_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macr_aspic_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
-%%EFICASDIR%%/Aster/Cata/Macro/macr_ecla_pg_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macr_ecla_pg_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macr_ecla_pg_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macr_fiab_impr_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macr_fiab_impr_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macr_fiab_impr_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macr_fiabilite_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macr_fiabilite_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macr_fiabilite_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macr_lign_coupe_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macr_lign_coupe_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macr_lign_coupe_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macr_recal_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macr_recal_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macr_recal_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macro_elas_mult_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macro_elas_mult_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macro_elas_mult_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macro_matr_ajou_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macro_matr_ajou_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macro_matr_ajou_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macro_matr_asse_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macro_matr_asse_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macro_matr_asse_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macro_miss_3d_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macro_miss_3d_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macro_miss_3d_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macro_mode_meca_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macro_mode_meca_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macro_mode_meca_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/macro_proj_base_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/macro_proj_base_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/macro_proj_base_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/reca_algo.py
-%%EFICASDIR%%/Aster/Cata/Macro/reca_algo.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/reca_algo.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/reca_interp.py
-%%EFICASDIR%%/Aster/Cata/Macro/reca_interp.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/reca_interp.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/reca_message.py
-%%EFICASDIR%%/Aster/Cata/Macro/reca_message.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/reca_message.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/recal.py
-%%EFICASDIR%%/Aster/Cata/Macro/recal.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/recal.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/stanley_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/stanley_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/stanley_ops.pyo
-%%EFICASDIR%%/Aster/Cata/Macro/test_fichier_ops.py
-%%EFICASDIR%%/Aster/Cata/Macro/test_fichier_ops.pyc
-%%EFICASDIR%%/Aster/Cata/Macro/test_fichier_ops.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/Graph.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/Graph.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/Graph.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/Table.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/Table.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/Table.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/UniteAster.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/UniteAster.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/UniteAster.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/Utmess.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/Utmess.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/Utmess.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/__init__.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/__init__.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/__init__.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/courbes.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/courbes.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/courbes.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/funct_root.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/funct_root.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/funct_root.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/partition.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/partition.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/partition.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/sup_gmsh.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/sup_gmsh.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/sup_gmsh.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/t_fonction.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/t_fonction.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/t_fonction.pyo
+%%EFICASDIR%%/Aster/Cata/Utilitai/transpose.py
+%%EFICASDIR%%/Aster/Cata/Utilitai/transpose.pyc
+%%EFICASDIR%%/Aster/Cata/Utilitai/transpose.pyo
 %%EFICASDIR%%/Aster/Cata/__init__.py
 %%EFICASDIR%%/Aster/Cata/__init__.pyc
 %%EFICASDIR%%/Aster/Cata/__init__.pyo
-%%EFICASDIR%%/Aster/Cata/cata_STA7.py
-%%EFICASDIR%%/Aster/Cata/cata_STA7.pyc
-%%EFICASDIR%%/Aster/Cata/cata_STA7.pyo
-%%EFICASDIR%%/Aster/Cata/cata_STA7_clefs_docu
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/__init__.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/__init__.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/__init__.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/ajout_quad_gmsh.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/ajout_quad_gmsh.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/ajout_quad_gmsh.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/calc_fonction_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/calc_fonction_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/calc_fonction_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/calc_precont_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/calc_precont_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/calc_precont_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/defi_cable_bp_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/defi_cable_bp_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/defi_cable_bp_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/defi_part_feti_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/defi_part_feti_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/defi_part_feti_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/fiabilite_fichier.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/fiabilite_fichier.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/fiabilite_fichier.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/fiabilite_mefisto.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/fiabilite_mefisto.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/fiabilite_mefisto.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/impr_fonction_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/impr_fonction_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/impr_fonction_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/impr_table_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/impr_table_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/impr_table_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/info_fonction_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/info_fonction_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/info_fonction_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/lire_fonction_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/lire_fonction_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/lire_fonction_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/lire_inte_spec_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/lire_inte_spec_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/lire_inte_spec_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/lire_table_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/lire_table_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/lire_table_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_adap_mail_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_adap_mail_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_adap_mail_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_ascouf_calc_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_ascouf_calc_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_ascouf_calc_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_ascouf_mail_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_ascouf_mail_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_ascouf_mail_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_aspic_calc_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_aspic_calc_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_aspic_calc_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_aspic_mail_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_aspic_mail_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_aspic_mail_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cabri_calc_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cabri_calc_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cabri_calc_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cabri_mail_dat.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cabri_mail_dat.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cabri_mail_dat.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cabri_mail_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cabri_mail_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cabri_mail_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cara_poutre_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cara_poutre_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_cara_poutre_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_ecla_pg_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_ecla_pg_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_ecla_pg_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_fiab_impr_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_fiab_impr_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_fiab_impr_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_fiabilite_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_fiabilite_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_fiabilite_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_lign_coupe_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_lign_coupe_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_lign_coupe_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_recal_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_recal_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macr_recal_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_elas_mult_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_elas_mult_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_elas_mult_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_matr_ajou_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_matr_ajou_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_matr_ajou_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_matr_asse_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_matr_asse_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_matr_asse_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_miss_3d_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_miss_3d_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_miss_3d_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_mode_meca_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_mode_meca_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_mode_meca_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_proj_base_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_proj_base_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/macro_proj_base_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/reca_algo.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/reca_algo.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/reca_algo.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/reca_interp.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/reca_interp.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/reca_interp.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/reca_message.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/reca_message.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/reca_message.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/recal.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/recal.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/recal.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/stanley_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/stanley_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/stanley_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/test_fichier_ops.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/test_fichier_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro/test_fichier_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/__init__.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/__init__.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/__init__.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/cata.py
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/cata.pyc
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%/cata.pyo
+%%EFICASDIR%%/Aster/Cata/cata%%STAV%%c_clefs_docu
 %%EFICASDIR%%/Aster/Cata/ops.py
 %%EFICASDIR%%/Aster/Cata/ops.pyc
 %%EFICASDIR%%/Aster/Cata/ops.pyo
@@ -259,6 +304,9 @@
 %%EFICASDIR%%/Aster/Cata/pre74/ongletpanel.py
 %%EFICASDIR%%/Aster/Cata/pre74/ongletpanel.pyc
 %%EFICASDIR%%/Aster/Cata/pre74/ongletpanel.pyo
+%%EFICASDIR%%/Aster/aster.py
+%%EFICASDIR%%/Aster/aster.pyc
+%%EFICASDIR%%/Aster/aster.pyo
 %%EFICASDIR%%/Aster/editeur.ini
 %%EFICASDIR%%/Aster/eficas_aster.py
 %%EFICASDIR%%/Aster/eficas_aster.pyc
@@ -287,6 +335,9 @@
 %%EFICASDIR%%/Editeur/autre_analyse_cata.py
 %%EFICASDIR%%/Editeur/autre_analyse_cata.pyc
 %%EFICASDIR%%/Editeur/autre_analyse_cata.pyo
+%%EFICASDIR%%/Editeur/basestyle.py
+%%EFICASDIR%%/Editeur/basestyle.pyc
+%%EFICASDIR%%/Editeur/basestyle.pyo
 %%EFICASDIR%%/Editeur/browser.py
 %%EFICASDIR%%/Editeur/browser.pyc
 %%EFICASDIR%%/Editeur/browser.pyo
@@ -378,10 +429,22 @@
 %%EFICASDIR%%/Editeur/fontes.py
 %%EFICASDIR%%/Editeur/fontes.pyc
 %%EFICASDIR%%/Editeur/fontes.pyo
+%%EFICASDIR%%/Editeur/icons/.xvpics/About24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/Copy24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/Cut24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/Delete24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/Fermer24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/Help24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/New24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/Open24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/Paste24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/Save24.gif
+%%EFICASDIR%%/Editeur/icons/.xvpics/Zoom24.gif
 %%EFICASDIR%%/Editeur/icons/About24.gif
 %%EFICASDIR%%/Editeur/icons/Copy24.gif
 %%EFICASDIR%%/Editeur/icons/Cut24.gif
 %%EFICASDIR%%/Editeur/icons/Delete24.gif
+%%EFICASDIR%%/Editeur/icons/Fermer24.gif
 %%EFICASDIR%%/Editeur/icons/Help24.gif
 %%EFICASDIR%%/Editeur/icons/New24.gif
 %%EFICASDIR%%/Editeur/icons/Open24.gif
@@ -460,6 +523,9 @@
 %%EFICASDIR%%/Editeur/readercata.py
 %%EFICASDIR%%/Editeur/readercata.pyc
 %%EFICASDIR%%/Editeur/readercata.pyo
+%%EFICASDIR%%/Editeur/session.py
+%%EFICASDIR%%/Editeur/session.pyc
+%%EFICASDIR%%/Editeur/session.pyo
 %%EFICASDIR%%/Editeur/shellpanel.py
 %%EFICASDIR%%/Editeur/shellpanel.pyc
 %%EFICASDIR%%/Editeur/shellpanel.pyo
@@ -469,6 +535,9 @@
 %%EFICASDIR%%/Editeur/statusbar.py
 %%EFICASDIR%%/Editeur/statusbar.pyc
 %%EFICASDIR%%/Editeur/statusbar.pyo
+%%EFICASDIR%%/Editeur/styles.py
+%%EFICASDIR%%/Editeur/styles.pyc
+%%EFICASDIR%%/Editeur/styles.pyo
 %%EFICASDIR%%/Editeur/toolbar.py
 %%EFICASDIR%%/Editeur/toolbar.pyc
 %%EFICASDIR%%/Editeur/toolbar.pyo
@@ -548,6 +617,9 @@
 %%EFICASDIR%%/Extensions/pluginloader.pyc
 %%EFICASDIR%%/Extensions/pluginloader.pyo
 %%EFICASDIR%%/INSTALL
+%%EFICASDIR%%/Ihm/CONNECTOR.py
+%%EFICASDIR%%/Ihm/CONNECTOR.pyc
+%%EFICASDIR%%/Ihm/CONNECTOR.pyo
 %%EFICASDIR%%/Ihm/I_ASSD.py
 %%EFICASDIR%%/Ihm/I_ASSD.pyc
 %%EFICASDIR%%/Ihm/I_ASSD.pyo
@@ -736,9 +808,6 @@
 %%EFICASDIR%%/Noyau/nommage.py
 %%EFICASDIR%%/Noyau/nommage.pyc
 %%EFICASDIR%%/Noyau/nommage.pyo
-%%EFICASDIR%%/Noyau/properties.py
-%%EFICASDIR%%/Noyau/properties.pyc
-%%EFICASDIR%%/Noyau/properties.pyo
 %%EFICASDIR%%/Tools/__init__.py
 %%EFICASDIR%%/Tools/__init__.pyc
 %%EFICASDIR%%/Tools/__init__.pyo
@@ -751,9 +820,18 @@
 %%EFICASDIR%%/Tools/foztools/slider.py
 %%EFICASDIR%%/Tools/foztools/slider.pyc
 %%EFICASDIR%%/Tools/foztools/slider.pyo
+%%EFICASDIR%%/Tools/optparse.py
+%%EFICASDIR%%/Tools/optparse.pyc
+%%EFICASDIR%%/Tools/optparse.pyo
+%%EFICASDIR%%/Tools/textwrap.py
+%%EFICASDIR%%/Tools/textwrap.pyc
+%%EFICASDIR%%/Tools/textwrap.pyo
 %%EFICASDIR%%/Validation/V_AU_MOINS_UN.py
 %%EFICASDIR%%/Validation/V_AU_MOINS_UN.pyc
 %%EFICASDIR%%/Validation/V_AU_MOINS_UN.pyo
+%%EFICASDIR%%/Validation/V_AU_PLUS_UN.py
+%%EFICASDIR%%/Validation/V_AU_PLUS_UN.pyc
+%%EFICASDIR%%/Validation/V_AU_PLUS_UN.pyo
 %%EFICASDIR%%/Validation/V_A_CLASSER.py
 %%EFICASDIR%%/Validation/V_A_CLASSER.pyc
 %%EFICASDIR%%/Validation/V_A_CLASSER.pyo
@@ -908,6 +986,7 @@ bin/eficas
 %%PORTDOCS%%%%DOCSDIR%%/U43606b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U43607b.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44101h.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U44111a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44201h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44202d.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U44202e.pdf
@@ -1016,6 +1095,7 @@ bin/eficas
 %%PORTDOCS%%%%DOCSDIR%%/U48205c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48206c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48207b.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48208a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48301e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48302e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48311e.pdf
@@ -1025,7 +1105,7 @@ bin/eficas
 %%PORTDOCS%%%%DOCSDIR%%/U48402f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48403e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48404f.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U48405e.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U48405f.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U48501c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49101h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U49102e.pdf
@@ -1067,7 +1147,7 @@ bin/eficas
 %%PORTDOCS%%%%DOCSDIR%%/U70433e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70441a.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70451a.pdf
-%%PORTDOCS%%%%DOCSDIR%%/U70501h2.pdf
+%%PORTDOCS%%%%DOCSDIR%%/U70501h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70511h.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70521c.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U70531h.pdf
@@ -1083,11 +1163,15 @@ bin/eficas
 @dirrm %%EFICASDIR%%/Misc
 @dirrm %%EFICASDIR%%/Ihm
 @dirrm %%EFICASDIR%%/Extensions
+@dirrm %%EFICASDIR%%/Editeur/icons/.xvpics
 @dirrm %%EFICASDIR%%/Editeur/icons
 @dirrm %%EFICASDIR%%/Editeur
+@dirrm %%EFICASDIR%%/Aster/materiau
 @dirrm %%EFICASDIR%%/Aster/Doc
 @dirrm %%EFICASDIR%%/Aster/Cata/pre74
-@dirrm %%EFICASDIR%%/Aster/Cata/Macro
+@dirrm %%EFICASDIR%%/Aster/Cata/cata%%STAV%%/Macro
+@dirrm %%EFICASDIR%%/Aster/Cata/cata%%STAV%%
+@dirrm %%EFICASDIR%%/Aster/Cata/Utilitai
 @dirrm %%EFICASDIR%%/Aster/Cata
 @dirrm %%EFICASDIR%%/Aster
 @dirrm %%EFICASDIR%%/Accas