22 files changed, 597 insertions, 318 deletions

diff --git a/cad/astk-client/Makefile b/cad/astk-client/Makefile
index f4a418f469f1..d0c1a8313dc4 100644
--- a/cad/astk-client/Makefile
+++ b/cad/astk-client/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	astk
-PORTREVISION=	2
+PORTREVISION=	0
 
 COMMENT=	Graphical interface for Code_Aster (client side)
 
diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index ce183086c346..27628f1250a9 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,8 +6,7 @@
 #
 
 PORTNAME=	astk
-PORTVERSION=	1.0.14
-PORTREVISION?=	2
+PORTVERSION=	1.0.21
 CATEGORIES=	cad tk84
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/code_aster/
 .if !defined(CLIENT_SEUL)
@@ -15,7 +14,7 @@ PKGNAMESUFFIX=	-serveur
 .else
 PKGNAMESUFFIX=	-client
 .endif
-DISTNAME=	aster_src_${ASTER_VER}
+DISTNAME=	aster-${ASTER_VER}.src
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
@@ -48,24 +47,25 @@ NO_BUILD=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
+EXTDIR=		${WRKDIR}/${DISTNAME}
 .if !defined(CLIENT_SEUL)
-WRKSRC=		${WRKDIR}/ASTK_SERV
+WRKSRC=		${EXTDIR}/ASTK_SERV
 PATCHDIR=	${MASTERDIR}/files
 PLIST_SUB=	SERV="" CLIENT="@comment " vaster=${vaster}
 .else
-WRKSRC=		${WRKDIR}/ASTK_CLIENT
+WRKSRC=		${EXTDIR}/ASTK_CLIENT
 PATCHDIR=	${MASTERDIR}/files.client
 PLIST_SUB=	SERV="@comment " CLIENT="" vaster=""
 PKGMESSAGE=	${PKGDIR}/pkg-message.client
 .endif
 
-SLAVEDIRS=	french/astk-client
+SLAVEDIRS=	cad/astk-client
 
 TK_VER?=	8.4
 TCL_VER?=	${TK_VER}
 
 TKTAB_VER?=	2.8
-ASTER_VER=	7.1
+ASTER_VER=	7.2.0-2
 vaster=		STA${ASTER_VER}
 
 .if defined(WITH_ZSH)
@@ -113,14 +113,20 @@ v_ifdef=	${unames:U}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 gzip!=		dirname `${WHICH} ${GZIP_CMD}`
 
+.if defined(LANG) && ${LANG:Mfr*} != ""
+ASTK_LANG=	FR
+.else
+ASTK_LANG=	ENG
+.endif
+
 post-extract:
-	@(cd ${WRKDIR} && \
-	${TAR} xfz ${WRKDIR}/astk.tar.gz)
+	@(cd ${EXTDIR} && \
+	${TAR} xfz ${EXTDIR}/astk.tar.gz)
 .if !defined(CLIENT_SEUL)
-	@(cd ${WRKDIR} && \
+	@(cd ${EXTDIR} && \
 	${TAR} xf ASTK_SERV.tar)
 .else
-	@(cd ${WRKDIR} && \
+	@(cd ${EXTDIR} && \
 	${TAR} xf ASTK_CLIENT.tar)
 .endif
 
@@ -142,6 +148,7 @@ post-patch:
 	-e "s#/bin/sh#${SHELL_INSTALL_ASTER}#g"					\
 	-e "s#NODE#${SERVER_NAME}#"						\
 	-e "s#%%vaster%%#${vaster}#"						\
+	-e "s#LOCALBASE#${LOCALBASE}#"						\
 	-e "s|#%%v_ifdef%%|${v_ifdef}|" ${WRKSRC}/conf/config
 	@${RM} ${WRKSRC}/conf/config.orig
 	@${CP} ${WRKSRC}/conf/config.NEW7 ${WRKSRC}/conf/config.${vaster}
@@ -183,6 +190,7 @@ post-patch:
 		-e "s#EDITOR#${WITH_ED}#" ${conf_dir}/config_serveurs
 	@${REINPLACE_CMD} -e "s#HOME_XTERM#${X11BASE}/bin#"			\
 		-e "s#VVV#${vaster}#"						\
+		-e "s#langue : ENG#langue : ${ASTK_LANG}#"			\
 		-e "s#EDITOR#${WITH_ED}#" ${conf_dir}/prefs
 	@${REINPLACE_CMD} -e "s#%%LOCALBASE%%#${LOCALBASE}#g"			\
 		${WRKSRC}/share/tkselecteur.tcl
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index 4ed58de58088..cc4651bf25c0 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1 +1 @@
-MD5 (aster_src_7.1.tar) = 6a76b378c2fbab506c5fe1e8f6713007
+MD5 (aster-7.2.0-2.src.tar) = 3c7163dffba0fa70c6b136480c05712e
diff --git a/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils b/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
index 05d02a0b832e..d9f38408d7d6 100644
--- a/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
+++ b/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
@@ -1,6 +1,6 @@
 --- lib/ASTK/astkrc/outils.orig	Mon Jun 23 08:42:59 2003
-+++ lib/ASTK/astkrc/outils	Mon Aug 18 21:27:52 2003
-@@ -13,3 +13,19 @@
++++ lib/ASTK/astkrc/outils	Wed Oct  8 23:45:12 2003
+@@ -13,3 +13,23 @@
  ext : comm com0 com1 com2
  dist : on
  #
@@ -9,14 +9,18 @@
 +ext : geo pos
 +dist : on
 +#
-+# Gibi2000 is not yet implemented (currently for EDF internal use only)
-+#nom : Gibi
-+#cmde : TOOLS_DIR/gibi (@F)
-+#ext : datg
-+#dist : off
++nom : Gibi
++cmde : TOOLS_DIR/gibi (@F)
++ext : dgibi
++dist : on
 +#
 +nom : Grace
 +cmde : TOOLS_DIR/xmgrace (@F)
 +ext : dat
 +dist : on
 +#
++nom : Stanley
++cmde : TOOLS_DIR/../bibpyt/Stanley/stanley.py
++ext : _VIDE
++dist : off
++#
diff --git a/cad/astk-serveur/files/patch-conf::config b/cad/astk-serveur/files/patch-conf::config
index 0634de14bf86..0099bceb5313 100644
--- a/cad/astk-serveur/files/patch-conf::config
+++ b/cad/astk-serveur/files/patch-conf::config
@@ -1,6 +1,6 @@
---- conf/config.orig	Fri Jun 20 13:07:15 2003
-+++ conf/config	Wed Jul 16 12:11:03 2003
-@@ -60,6 +60,7 @@
+--- conf/config.orig	Fri Sep  5 16:48:15 2003
++++ conf/config	Fri Nov 14 22:08:22 2003
+@@ -60,39 +60,43 @@
  # for each version a config.VVV file must be created.
  # DO NOT EDIT FOLLOWING LINE !
  #vers : VVV
@@ -8,7 +8,43 @@
  
  #################################################################
  # batch commands
-@@ -93,6 +94,9 @@
+-batch_nom : LSF
++#batch_nom : LSF
+ # initialisation (shell script, sh/ksh syntax)
+-batch_ini : /usr/opt/lsf/conf/profile.lsf
++#batch_ini : /usr/opt/lsf/conf/profile.lsf
+ # submission
+-batch_sub : /usr/opt/lsf/4.2/alpha5/bin/bsub
++#batch_sub : /usr/opt/lsf/4.2/alpha5/bin/bsub
+ # variable of the job number
+-batch_jid : LSB_JOBID
++#batch_jid : LSB_JOBID
+ # to display information about jobs
+-batch_job : /usr/opt/lsf/4.2/alpha5/bin/bjobs
++#batch_job : /usr/opt/lsf/4.2/alpha5/bin/bjobs
+ # to delete jobs
+-batch_kil : /usr/opt/lsf/4.2/alpha5/bin/bkill
++#batch_kil : /usr/opt/lsf/4.2/alpha5/bin/bkill
+ 
+ # PBS example (experimental)
+-#batch_nom : PBS
++batch_nom : PBS
+ # initialisation
+ #batch_ini : 
+ # submission
+-#batch_sub : /local/openpbs-2.3.16/bin/qsub
++#batch_sub : LOCALBASE/bin/qsub
+ # variable of the job number
+ #batch_jid : PBS_JOBID
+ # to display information about jobs
+-#batch_job : /local/openpbs-2.3.16/bin/qstat
++#batch_job : LOCALBASE/bin/qstat
+ # to delete jobs
+-#batch_kil : /local/openpbs-2.3.16/bin/qdel
++#batch_kil : LOCALBASE/bin/qdel
+ 
+ #################################################################
+ # ps commands : uncomment lines corresponding to your platform
  # LINUX :
  #P_LINUXps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
  #P_LINUXps_pid : /bin/ps -e --width=512 -opid -ocommand
@@ -18,11 +54,11 @@
  # TRU64 :
  #TRU64ps_cpu : /bin/ps -e -ocputime -ocommand
  #TRU64ps_pid : /bin/ps -e -opid -ocommand
-@@ -115,6 +119,7 @@
- #
+@@ -116,6 +120,7 @@
  # GDB :
- #P_LINUXcmd_dbg : gdb --dbx --command=@D @E @C
+ #P_LINUXcmd_post : gdb --dbx --command=@D @E @C
+ #P_LINUXcmd_dbg : ddd --debugger gdb --command=@D @E @C
 +#%%v_ifdef%%cmd_dbg : gdb --dbx --command=@D @E @C
  # DBX -c + filename :
+ #TRU64cmd_post : dbx -c @D @E @C
  #TRU64cmd_dbg : dbx -c @D @E @C
- #IRIXcmd_dbg : dbx -c @D @E @C
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 3366dfab574b..64bf20bd8d2b 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -57,6 +57,7 @@
 %%CLIENT%%ASTK/ASTK_CLIENT/share/appli.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/share/config.tcl
 %%CLIENT%%ASTK/ASTK_CLIENT/share/file_funct.tcl
+%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/sans_helpB.gif
 %%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_browseB.gif
 %%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_browseS.gif
 %%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_comp1.gif
diff --git a/cad/metis-edf/Makefile b/cad/metis-edf/Makefile
index ca2be7eab09b..2244d6d29911 100644
--- a/cad/metis-edf/Makefile
+++ b/cad/metis-edf/Makefile
@@ -6,8 +6,8 @@
 #
 
 PORTNAME=	metis-edf
-PORTVERSION=	3
-PORTREVISION=	1
+PORTVERSION=	3.1
+#PORTREVISION=	1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/metis/
 
diff --git a/cad/metis-edf/distinfo b/cad/metis-edf/distinfo
index 1cd3ed6bed6e..7048bdf4a1df 100644
--- a/cad/metis-edf/distinfo
+++ b/cad/metis-edf/distinfo
@@ -1 +1 @@
-MD5 (metis-edf-3.tar.gz) = 1d989afa8bb0686f815eb2e8e71fadbc
+MD5 (metis-edf-3.1.tar.gz) = 1762b6678d5d017771745c30cf6df0ac
diff --git a/french/aster/Makefile b/french/aster/Makefile
index af2f32c75d5c..2f44113afa03 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -6,11 +6,10 @@
 #
 
 PORTNAME=	aster
-PORTVERSION=	7.1
-PORTREVISION=	1
+PORTVERSION=	7.2.0
 CATEGORIES=	french cad python tk84
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/code_aster/
-DISTNAME=	${PORTNAME}_src_${PORTVERSION}
+DISTNAME=	${PORTNAME}-${PORTVERSION}-2.src
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
@@ -30,11 +29,8 @@ COMMENT=	Analyse des structures et thermo-mécanique
 # - WITHOUT_EFICAS: don't install ASter Command FIle Editor;
 # - WITHOUT_GMSH: don't install GMSH (a mesh generator);
 # - WITHOUT_GRACE: don't install Grace (used to create 2D graph);
-# - WITHOUT_HOMARD: don't install Homard (adaptative mesh capability)
 # - WITHOUT_MACR_RECAL: don't install Numerical Python
 #			(required by the macro MACR_RECAL);
-# - WITH_GIBI: not yet implemented (only for EDF's internal use,
-#			waiting for a license from CEA).
 #
 #-----------------------------------------------------------------------
 
@@ -56,7 +52,7 @@ USE_PYTHON=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
-WRKSRC=		${WRKDIR}/${vaster}
+WRKSRC=		${WRKDIR}/${DISTNAME}/${vaster}
 PLIST_SUB=	ASTERDIR=${PORTNAME}/${vaster}
 .if defined(WITHOUT_ASTK) || defined(WITHOUT_ASTK_CLI)
 PKGMESSAGE=	${PKGDIR}/pkg-message.sans-astk
@@ -96,19 +92,11 @@ PLIST_SUB+=	GRACE=""
 .else
 PLIST_SUB+=	GRACE="@comment "
 .endif
-.if (${ARCH} == "i386") && !defined(WITHOUT_HOMARD)
-RUN_DEPENDS+=	${LOCALBASE}/apps/homard:${PORTSDIR}/french/homard
-PLIST_SUB+=	HOMARD="" HOMARDDIR=${HOMARDDIR}
-.else
-PLIST_SUB+=	HOMARD="@comment " HOMARDDIR=""
-.endif
 .if !defined(WITHOUT_MACR_RECAL)
 RUN_DEPENDS+=	${PYNUMERIC}
 .endif
 
-.if ${OSVERSION} < 500039
-F77=		g77-${USE_GCC:C/\.//}
-.else
+.if !${OSVERSION} < 500039
 F77?=		f77
 .endif
 FFLAGS?=	-O2
@@ -142,7 +130,7 @@ SHIADEP=	bash2
 SHIADEP=	${SHIA}
 .endif
 
-vaster=		STA${PORTVERSION}
+vaster=		STA${PORTVERSION:S/.0//}
 MK_FILES=	make_aster make_cata make_etude make_exec make_lib make_test
 INST_DAT=	astest bibpyt cata_ele.pickled catalo catapy commande	\
 		config.txt elements etude materiau tcl
@@ -155,7 +143,8 @@ SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
 tcl_dir=	${LOCALBASE}
 tcl_bin=	tclsh${TK_VER}
 python_dir=	${PYTHONBASE}/bin
-opt_hdf=	${LOCALBASE}/lib/libhdf5.a
+hdf_dir=	${LOCALBASE}
+opt_hdf=	${hdf_dir}/lib/libhdf5.a
 opt_med=	${LOCALBASE}/lib/libmed.a
 .if defined(WITH_BLAS)
 lib_blas=	-lblas
@@ -166,12 +155,10 @@ home_ar!=	dirname `${WHICH} ${AR}`
 gzip!=		dirname `${WHICH} ${GZIP_CMD}`
 LASTKDIR?=	ASTK/ASTK_CLIENT
 ASTKDIR=	${LOCALBASE}/${LASTKDIR}
-LHOMARDDIR?=	apps/homard
-HOMARDDIR=	${LOCALBASE}/${LHOMARDDIR}
 
 post-extract:
-	@(cd ${WRKDIR} && \
-	${TAR} xfz ${WRKDIR}/${PORTNAME}.tar.gz)
+	@(cd ${WRKDIR}/${DISTNAME} && \
+	${TAR} xfz ${WRKDIR}/${DISTNAME}/${PORTNAME}.tar.gz)
 
 post-patch:
 .for mk_file in ${MK_FILES}
@@ -199,6 +186,7 @@ post-patch:
 	@${GREP} TK_LIB_SPEC ${TKCONFIG} |					\
 		${SED} -e "s#TK_LIB_SPEC='##;s#'##" > ${WRKDIR}/tk_lib_spec
 	@${REINPLACE_CMD} -e "s#OPT_HDF#${opt_hdf}#"				\
+	-e "s#HDF_DIR#${hdf_dir}#"						\
 	-e "s#OPT_MED#${opt_med}#"						\
 	-e "s#OPT_TCL#`${CAT} ${WRKDIR}/tcl_lib_spec`#"				\
 	-e "s#OPT_TK#`${CAT} ${WRKDIR}/tk_lib_spec`#"				\
@@ -258,10 +246,6 @@ post-install:
 .if !defined(WITHOUT_GRACE)
 	${LN} -fs ${X11BASE}/bin/xmgrace ${tools_dir}/
 .endif
-.if (${ARCH} == "i386") && !defined(WITHOUT_HOMARD)
-	${LN} -fs ${HOMARDDIR}/homard ${tools_dir}/
-	${LN} -fs ${HOMARDDIR}/aster_homard_py ${tools_dir}/
-.endif
 	@${ECHO_MSG}
 	@${CAT} ${PKGMESSAGE} | ${SED} -e "s#%%inst_dir%%#${inst_dir}#"
 	@${ECHO_MSG}
diff --git a/french/aster/distinfo b/french/aster/distinfo
index 4ed58de58088..cc4651bf25c0 100644
--- a/french/aster/distinfo
+++ b/french/aster/distinfo
@@ -1 +1 @@
-MD5 (aster_src_7.1.tar) = 6a76b378c2fbab506c5fe1e8f6713007
+MD5 (aster-7.2.0-2.src.tar) = 3c7163dffba0fa70c6b136480c05712e
diff --git a/french/aster/files/config.txt b/french/aster/files/config.txt
index 1641d7f3d990..0b041baff230 100644
--- a/french/aster/files/config.txt
+++ b/french/aster/files/config.txt
@@ -28,14 +28,14 @@ BIBL | fpe    | ?   |
 BIBL | med    | 2.1 | OPT_MED
 BIBL | hdf    | 5.1 | OPT_HDF
 BIBL | blas   | ?   | OPT_BLAS
-BIBL | tcl    | 8.3 | OPT_TCL
-BIBL | tk     | 8.3 | OPT_TK
+BIBL | tcl    | 8.4 | OPT_TCL
+BIBL | tk     | 8.4 | OPT_TK
 BIBL | X11    | ?   | OPT_X11
 BIBL | sys    | ?   | -Xlinker -export-dynamic PTHREAD -lutil -lm -lz -lg2c
 #
-INCL | python | 2.1 | -IHOME_PYTHON/include/pythonPYTHON_VERSION
+INCL | python | 2.3 | -IHOME_PYTHON/include/pythonPYTHON_VERSION -IHDF_DIR/include
 #
-PYTHON | python | 2.1 | HOME_PYTHON/bin/PYTHON_BIN
+PYTHON | python | 2.3 | HOME_PYTHON/bin/PYTHON_BIN
 #
 LINK | link | ? | %%CC%% -v
 #
diff --git a/french/aster/files/patch-bibpyt::Execution::E_SUPERV.py b/french/aster/files/patch-bibpyt::Execution::E_SUPERV.py
index b9e3f3fe927a..65e86f6c0c4f 100644
--- a/french/aster/files/patch-bibpyt::Execution::E_SUPERV.py
+++ b/french/aster/files/patch-bibpyt::Execution::E_SUPERV.py
@@ -1,5 +1,5 @@
---- bibpyt/Execution/E_SUPERV.py.orig	Wed Apr 23 11:45:33 2003
-+++ bibpyt/Execution/E_SUPERV.py	Mon Jul  7 22:18:22 2003
+--- bibpyt/Execution/E_SUPERV.py.orig	Wed Oct 22 07:17:43 2003
++++ bibpyt/Execution/E_SUPERV.py	Sat Nov 15 14:22:56 2003
 @@ -192,7 +192,7 @@
        if j.par_lot == 'NON':
           print "FIN EXECUTION"
@@ -18,12 +18,12 @@
           return 0
        except :
           self.MESSAGE("ERREUR INOPINEE - INTERRUPTION")
-@@ -298,7 +298,7 @@
+@@ -296,7 +296,7 @@
              print ">> JDC.py : FIN RAPPORT"
  
           if j.fico!=None :
 -            os.system('cat ./fort.15 ./ficode >> ./fort.15')
 +            os.system('cat ./ficode >> ./fort.15')
+ 
           return ier
-       except :
-          self.MESSAGE("ERREUR INOPINEE - INTERRUPTION")
+ 
diff --git a/french/aster/files/patch-tcl::run_aster b/french/aster/files/patch-tcl::run_aster
index ab0aa3401032..95ab27220734 100644
--- a/french/aster/files/patch-tcl::run_aster
+++ b/french/aster/files/patch-tcl::run_aster
@@ -1,18 +1,20 @@
---- tcl/run_aster.orig	Thu Jun 26 17:57:43 2003
-+++ tcl/run_aster	Fri Jul 18 23:01:40 2003
-@@ -5,6 +5,7 @@
+--- tcl/run_aster.orig	Wed Nov 19 11:48:05 2003
++++ tcl/run_aster	Mon Dec  1 22:56:03 2003
+@@ -5,6 +5,8 @@
  TCLSH=HOME_TCL_TK/bin/TCL_BIN
  REPTCL=HOME_CODE_ASTER/tcl
  PYTHONHOME=HOME_PYTHON
 +PYTHONPATH=%%PYTHONPATH%%
++HDF5_DISABLE_VERSION_CHECK=1
  
  # lancement de run_aster
  # usage : run_aster [-p ncpu] fichier_parametre
-@@ -32,6 +33,7 @@
+@@ -32,6 +34,8 @@
  fi
  
  export PYTHONHOME
 +export PYTHONPATH
++export HDF5_DISABLE_VERSION_CHECK
  
  OMP_NUM_THREADS=$ncpu
  export OMP_NUM_THREADS
diff --git a/french/aster/pkg-message b/french/aster/pkg-message
index e2f9afb2f75c..22f369217aec 100644
--- a/french/aster/pkg-message
+++ b/french/aster/pkg-message
@@ -3,9 +3,15 @@ run_aster a été installé dans le répertoire %%inst_dir%%/tcl.
 Pour lancer Code_Aster via ASTK, entrez :
 %%inst_dir%%/outils/astk
 
+Sur plate-forme i386, nous vous suggérons d'installer les ports french/gibi
+et french/homard, deux outils de maillage additionnels.
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 run_aster has been installed in the directory %%inst_dir%%/tcl.
 
+On i386 platform, we suggest you install the ports french/gibi and
+french/homard, two additional meshing tools.
+
 To run Code_Aster through ASTK, type:
 %%inst_dir%%/outils/astk
diff --git a/french/aster/pkg-message.sans-astk b/french/aster/pkg-message.sans-astk
index 359477e51b06..0da012a7c086 100644
--- a/french/aster/pkg-message.sans-astk
+++ b/french/aster/pkg-message.sans-astk
@@ -4,10 +4,16 @@ Après avoir installé Code_Aster, vous devriez installer ASTK
 [cad/astk-serveur et cad/astk-client].
 ASTK est une interface graphique qui lance Code_Aster à partir de run_aster.
 
+Sur plate-forme i386, nous vous suggérons d'installer les ports french/gibi
+et french/homard, deux outils de maillage additionnels.
+
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 run_aster has been installed in the directory %%inst_dir%%/tcl.
 
+On i386 platform, we suggest you install the ports french/gibi and
+french/homard, two additional meshing tools.
+
 After Code_Aster installation you could install ASTK
 [cad/astk-serveur and cad/astk-client].
 ASTK is a graphic interface to run Code_Aster using run_aster.
diff --git a/french/aster/pkg-plist b/french/aster/pkg-plist
index c2951f35da8c..fa0e97fb8104 100644
--- a/french/aster/pkg-plist
+++ b/french/aster/pkg-plist
@@ -38,9 +38,6 @@
 %%ASTERDIR%%/astest/ahlv101c.comm
 %%ASTERDIR%%/astest/ahlv101c.msup
 %%ASTERDIR%%/astest/ahlv101c.para
-%%ASTERDIR%%/astest/ascou16a.com0
-%%ASTERDIR%%/astest/ascou16a.comm
-%%ASTERDIR%%/astest/ascou16a.para
 %%ASTERDIR%%/astest/epicu01a.comm
 %%ASTERDIR%%/astest/epicu01a.datg
 %%ASTERDIR%%/astest/epicu01a.mgib
@@ -73,101 +70,176 @@
 %%ASTERDIR%%/astest/fdlv112a.para
 %%ASTERDIR%%/astest/forma01a.17
 %%ASTERDIR%%/astest/forma01a.18
+%%ASTERDIR%%/astest/forma01a.code
 %%ASTERDIR%%/astest/forma01a.comm
 %%ASTERDIR%%/astest/forma01a.datg
 %%ASTERDIR%%/astest/forma01a.mail
+%%ASTERDIR%%/astest/forma01a.mess
 %%ASTERDIR%%/astest/forma01a.mgib
 %%ASTERDIR%%/astest/forma01a.para
+%%ASTERDIR%%/astest/forma01a.resu
+%%ASTERDIR%%/astest/forma01b.code
 %%ASTERDIR%%/astest/forma01b.comm
 %%ASTERDIR%%/astest/forma01b.datg
 %%ASTERDIR%%/astest/forma01b.mail
+%%ASTERDIR%%/astest/forma01b.mess
 %%ASTERDIR%%/astest/forma01b.mgib
 %%ASTERDIR%%/astest/forma01b.para
+%%ASTERDIR%%/astest/forma01b.resu
+%%ASTERDIR%%/astest/forma01c.17
+%%ASTERDIR%%/astest/forma01c.18
+%%ASTERDIR%%/astest/forma01c.21
+%%ASTERDIR%%/astest/forma01c.code
 %%ASTERDIR%%/astest/forma01c.com1
+%%ASTERDIR%%/astest/forma01c.com2
 %%ASTERDIR%%/astest/forma01c.comm
 %%ASTERDIR%%/astest/forma01c.datg
 %%ASTERDIR%%/astest/forma01c.mail
+%%ASTERDIR%%/astest/forma01c.mess
 %%ASTERDIR%%/astest/forma01c.mgib
 %%ASTERDIR%%/astest/forma01c.para
+%%ASTERDIR%%/astest/forma01c.resu
+%%ASTERDIR%%/astest/forma01d.code
 %%ASTERDIR%%/astest/forma01d.comm
 %%ASTERDIR%%/astest/forma01d.datg
+%%ASTERDIR%%/astest/forma01d.mess
 %%ASTERDIR%%/astest/forma01d.mgib
 %%ASTERDIR%%/astest/forma01d.para
+%%ASTERDIR%%/astest/forma01d.resu
+%%ASTERDIR%%/astest/forma01e.code
 %%ASTERDIR%%/astest/forma01e.comm
 %%ASTERDIR%%/astest/forma01e.datg
 %%ASTERDIR%%/astest/forma01e.mail
+%%ASTERDIR%%/astest/forma01e.mess
 %%ASTERDIR%%/astest/forma01e.mgib
 %%ASTERDIR%%/astest/forma01e.para
+%%ASTERDIR%%/astest/forma01e.resu
+%%ASTERDIR%%/astest/forma01f.code
 %%ASTERDIR%%/astest/forma01f.comm
 %%ASTERDIR%%/astest/forma01f.datg
 %%ASTERDIR%%/astest/forma01f.mail
+%%ASTERDIR%%/astest/forma01f.mess
 %%ASTERDIR%%/astest/forma01f.mgib
 %%ASTERDIR%%/astest/forma01f.para
+%%ASTERDIR%%/astest/forma01f.resu
+%%ASTERDIR%%/astest/forma01g.code
 %%ASTERDIR%%/astest/forma01g.comm
 %%ASTERDIR%%/astest/forma01g.datg
 %%ASTERDIR%%/astest/forma01g.mail
+%%ASTERDIR%%/astest/forma01g.mess
 %%ASTERDIR%%/astest/forma01g.mgib
 %%ASTERDIR%%/astest/forma01g.para
+%%ASTERDIR%%/astest/forma01g.resu
+%%ASTERDIR%%/astest/forma01h.code
 %%ASTERDIR%%/astest/forma01h.comm
 %%ASTERDIR%%/astest/forma01h.datg
+%%ASTERDIR%%/astest/forma01h.mess
 %%ASTERDIR%%/astest/forma01h.mgib
 %%ASTERDIR%%/astest/forma01h.para
+%%ASTERDIR%%/astest/forma01h.resu
+%%ASTERDIR%%/astest/forma02a.code
 %%ASTERDIR%%/astest/forma02a.comm
 %%ASTERDIR%%/astest/forma02a.mail
+%%ASTERDIR%%/astest/forma02a.mess
 %%ASTERDIR%%/astest/forma02a.para
+%%ASTERDIR%%/astest/forma02a.resu
+%%ASTERDIR%%/astest/forma02b.code
 %%ASTERDIR%%/astest/forma02b.comm
 %%ASTERDIR%%/astest/forma02b.mail
+%%ASTERDIR%%/astest/forma02b.mess
 %%ASTERDIR%%/astest/forma02b.para
+%%ASTERDIR%%/astest/forma02b.resu
+%%ASTERDIR%%/astest/forma03a.code
+%%ASTERDIR%%/astest/forma03a.com1
 %%ASTERDIR%%/astest/forma03a.comm
 %%ASTERDIR%%/astest/forma03a.datg
+%%ASTERDIR%%/astest/forma03a.mess
 %%ASTERDIR%%/astest/forma03a.mgib
 %%ASTERDIR%%/astest/forma03a.para
+%%ASTERDIR%%/astest/forma03a.resu
+%%ASTERDIR%%/astest/forma03b.code
+%%ASTERDIR%%/astest/forma03b.com1
 %%ASTERDIR%%/astest/forma03b.comm
 %%ASTERDIR%%/astest/forma03b.datg
 %%ASTERDIR%%/astest/forma03b.mail
+%%ASTERDIR%%/astest/forma03b.mess
 %%ASTERDIR%%/astest/forma03b.mgib
 %%ASTERDIR%%/astest/forma03b.para
+%%ASTERDIR%%/astest/forma03b.resu
+%%ASTERDIR%%/astest/forma04a.code
 %%ASTERDIR%%/astest/forma04a.comm
 %%ASTERDIR%%/astest/forma04a.mail
+%%ASTERDIR%%/astest/forma04a.mess
 %%ASTERDIR%%/astest/forma04a.para
+%%ASTERDIR%%/astest/forma04a.resu
+%%ASTERDIR%%/astest/forma04b.code
 %%ASTERDIR%%/astest/forma04b.comm
 %%ASTERDIR%%/astest/forma04b.mail
+%%ASTERDIR%%/astest/forma04b.mess
 %%ASTERDIR%%/astest/forma04b.para
+%%ASTERDIR%%/astest/forma04b.resu
+%%ASTERDIR%%/astest/forma04c.code
 %%ASTERDIR%%/astest/forma04c.comm
 %%ASTERDIR%%/astest/forma04c.mail
+%%ASTERDIR%%/astest/forma04c.mess
 %%ASTERDIR%%/astest/forma04c.para
+%%ASTERDIR%%/astest/forma04c.resu
+%%ASTERDIR%%/astest/forma05a.code
 %%ASTERDIR%%/astest/forma05a.comm
 %%ASTERDIR%%/astest/forma05a.mail
+%%ASTERDIR%%/astest/forma05a.mess
 %%ASTERDIR%%/astest/forma05a.para
+%%ASTERDIR%%/astest/forma05a.resu
 %%ASTERDIR%%/astest/forma05b.21
+%%ASTERDIR%%/astest/forma05b.code
 %%ASTERDIR%%/astest/forma05b.comm
 %%ASTERDIR%%/astest/forma05b.mail
+%%ASTERDIR%%/astest/forma05b.mess
 %%ASTERDIR%%/astest/forma05b.para
+%%ASTERDIR%%/astest/forma05b.resu
+%%ASTERDIR%%/astest/forma06a.code
 %%ASTERDIR%%/astest/forma06a.comm
 %%ASTERDIR%%/astest/forma06a.datg
+%%ASTERDIR%%/astest/forma06a.mess
 %%ASTERDIR%%/astest/forma06a.mgib
 %%ASTERDIR%%/astest/forma06a.para
+%%ASTERDIR%%/astest/forma06a.resu
+%%ASTERDIR%%/astest/forma06b.code
 %%ASTERDIR%%/astest/forma06b.comm
 %%ASTERDIR%%/astest/forma06b.datg
+%%ASTERDIR%%/astest/forma06b.mess
 %%ASTERDIR%%/astest/forma06b.mgib
 %%ASTERDIR%%/astest/forma06b.para
+%%ASTERDIR%%/astest/forma06b.resu
+%%ASTERDIR%%/astest/forma08a.code
 %%ASTERDIR%%/astest/forma08a.comm
 %%ASTERDIR%%/astest/forma08a.datg
+%%ASTERDIR%%/astest/forma08a.mess
 %%ASTERDIR%%/astest/forma08a.mgib
 %%ASTERDIR%%/astest/forma08a.para
+%%ASTERDIR%%/astest/forma08a.resu
+%%ASTERDIR%%/astest/forma08b.code
 %%ASTERDIR%%/astest/forma08b.comm
 %%ASTERDIR%%/astest/forma08b.datg
+%%ASTERDIR%%/astest/forma08b.mess
 %%ASTERDIR%%/astest/forma08b.mgib
 %%ASTERDIR%%/astest/forma08b.para
+%%ASTERDIR%%/astest/forma08b.resu
+%%ASTERDIR%%/astest/forma09a.code
 %%ASTERDIR%%/astest/forma09a.comm
 %%ASTERDIR%%/astest/forma09a.datg
 %%ASTERDIR%%/astest/forma09a.mail
+%%ASTERDIR%%/astest/forma09a.mess
 %%ASTERDIR%%/astest/forma09a.mgib
 %%ASTERDIR%%/astest/forma09a.para
+%%ASTERDIR%%/astest/forma09a.resu
+%%ASTERDIR%%/astest/forma09b.code
 %%ASTERDIR%%/astest/forma09b.comm
 %%ASTERDIR%%/astest/forma09b.datg
+%%ASTERDIR%%/astest/forma09b.mess
 %%ASTERDIR%%/astest/forma09b.mgib
 %%ASTERDIR%%/astest/forma09b.para
+%%ASTERDIR%%/astest/forma09b.resu
 %%ASTERDIR%%/astest/hpla100b.comm
 %%ASTERDIR%%/astest/hpla100b.mail
 %%ASTERDIR%%/astest/hpla100b.para
@@ -441,6 +513,9 @@
 %%ASTERDIR%%/astest/sdls07c.comm
 %%ASTERDIR%%/astest/sdls07c.mail
 %%ASTERDIR%%/astest/sdls07c.para
+%%ASTERDIR%%/astest/sdls08a.comm
+%%ASTERDIR%%/astest/sdls08a.mail
+%%ASTERDIR%%/astest/sdls08a.para
 %%ASTERDIR%%/astest/sdls101a.comm
 %%ASTERDIR%%/astest/sdls101a.mail
 %%ASTERDIR%%/astest/sdls101a.para
@@ -718,6 +793,9 @@
 %%ASTERDIR%%/astest/sdnd102b.comm
 %%ASTERDIR%%/astest/sdnd102b.mail
 %%ASTERDIR%%/astest/sdnd102b.para
+%%ASTERDIR%%/astest/sdnd102c.comm
+%%ASTERDIR%%/astest/sdnd102c.mail
+%%ASTERDIR%%/astest/sdnd102c.para
 %%ASTERDIR%%/astest/sdnd103a.comm
 %%ASTERDIR%%/astest/sdnd103a.mail
 %%ASTERDIR%%/astest/sdnd103a.para
@@ -765,13 +843,6 @@
 %%ASTERDIR%%/astest/sdnv100a.mail
 %%ASTERDIR%%/astest/sdnv100a.mgib
 %%ASTERDIR%%/astest/sdnv100a.para
-%%ASTERDIR%%/astest/sdnv102a.35
-%%ASTERDIR%%/astest/sdnv102a.75
-%%ASTERDIR%%/astest/sdnv102a.com0
-%%ASTERDIR%%/astest/sdnv102a.comm
-%%ASTERDIR%%/astest/sdnv102a.mail
-%%ASTERDIR%%/astest/sdnv102a.msup
-%%ASTERDIR%%/astest/sdnv102a.para
 %%ASTERDIR%%/astest/sdnv103d.comm
 %%ASTERDIR%%/astest/sdnv103d.datg
 %%ASTERDIR%%/astest/sdnv103d.mgib
@@ -781,6 +852,7 @@
 %%ASTERDIR%%/astest/sensd01a.para
 %%ASTERDIR%%/astest/sensd02a.comm
 %%ASTERDIR%%/astest/sensd02a.datg
+%%ASTERDIR%%/astest/sensd02a.mail
 %%ASTERDIR%%/astest/sensd02a.mgib
 %%ASTERDIR%%/astest/sensd02a.para
 %%ASTERDIR%%/astest/sensd03a.comm
@@ -797,6 +869,14 @@
 %%ASTERDIR%%/astest/sensm05a.mail
 %%ASTERDIR%%/astest/sensm05a.mgib
 %%ASTERDIR%%/astest/sensm05a.para
+%%ASTERDIR%%/astest/sensm06a.comm
+%%ASTERDIR%%/astest/sensm06a.datg
+%%ASTERDIR%%/astest/sensm06a.mgib
+%%ASTERDIR%%/astest/sensm06a.para
+%%ASTERDIR%%/astest/sensm06b.comm
+%%ASTERDIR%%/astest/sensm06b.datg
+%%ASTERDIR%%/astest/sensm06b.mgib
+%%ASTERDIR%%/astest/sensm06b.para
 %%ASTERDIR%%/astest/senst01a.com1
 %%ASTERDIR%%/astest/senst01a.comm
 %%ASTERDIR%%/astest/senst01a.mail
@@ -868,6 +948,11 @@
 %%ASTERDIR%%/astest/ssll105c.comm
 %%ASTERDIR%%/astest/ssll105c.mail
 %%ASTERDIR%%/astest/ssll105c.para
+%%ASTERDIR%%/astest/ssll105d.comm
+%%ASTERDIR%%/astest/ssll105d.datg
+%%ASTERDIR%%/astest/ssll105d.mail
+%%ASTERDIR%%/astest/ssll105d.mgib
+%%ASTERDIR%%/astest/ssll105d.para
 %%ASTERDIR%%/astest/ssll106c.comm
 %%ASTERDIR%%/astest/ssll106c.mail
 %%ASTERDIR%%/astest/ssll106c.para
@@ -983,6 +1068,10 @@
 %%ASTERDIR%%/astest/ssls108b.comm
 %%ASTERDIR%%/astest/ssls108b.mail
 %%ASTERDIR%%/astest/ssls108b.para
+%%ASTERDIR%%/astest/ssls108c.comm
+%%ASTERDIR%%/astest/ssls108c.datg
+%%ASTERDIR%%/astest/ssls108c.mgib
+%%ASTERDIR%%/astest/ssls108c.para
 %%ASTERDIR%%/astest/ssls109b.comm
 %%ASTERDIR%%/astest/ssls109b.mail
 %%ASTERDIR%%/astest/ssls109b.para
@@ -1381,9 +1470,6 @@
 %%ASTERDIR%%/astest/ssnv124b.comm
 %%ASTERDIR%%/astest/ssnv124b.mail
 %%ASTERDIR%%/astest/ssnv124b.para
-%%ASTERDIR%%/astest/ssnv125a.comm
-%%ASTERDIR%%/astest/ssnv125a.mail
-%%ASTERDIR%%/astest/ssnv125a.para
 %%ASTERDIR%%/astest/ssnv125b.comm
 %%ASTERDIR%%/astest/ssnv125b.mail
 %%ASTERDIR%%/astest/ssnv125b.para
@@ -1392,6 +1478,24 @@
 %%ASTERDIR%%/astest/ssnv127d.mail
 %%ASTERDIR%%/astest/ssnv127d.mgib
 %%ASTERDIR%%/astest/ssnv127d.para
+%%ASTERDIR%%/astest/ssnv128a.comm
+%%ASTERDIR%%/astest/ssnv128a.datg
+%%ASTERDIR%%/astest/ssnv128a.mgib
+%%ASTERDIR%%/astest/ssnv128a.para
+%%ASTERDIR%%/astest/ssnv128b.comm
+%%ASTERDIR%%/astest/ssnv128b.datg
+%%ASTERDIR%%/astest/ssnv128b.mgib
+%%ASTERDIR%%/astest/ssnv128b.para
+%%ASTERDIR%%/astest/ssnv128e.comm
+%%ASTERDIR%%/astest/ssnv128e.datg
+%%ASTERDIR%%/astest/ssnv128e.mail
+%%ASTERDIR%%/astest/ssnv128e.mgib
+%%ASTERDIR%%/astest/ssnv128e.para
+%%ASTERDIR%%/astest/ssnv128f.comm
+%%ASTERDIR%%/astest/ssnv128f.datg
+%%ASTERDIR%%/astest/ssnv128f.mail
+%%ASTERDIR%%/astest/ssnv128f.mgib
+%%ASTERDIR%%/astest/ssnv128f.para
 %%ASTERDIR%%/astest/ssnv131a.comm
 %%ASTERDIR%%/astest/ssnv131a.mail
 %%ASTERDIR%%/astest/ssnv131a.para
@@ -1477,6 +1581,11 @@
 %%ASTERDIR%%/astest/ssnv503h.datg
 %%ASTERDIR%%/astest/ssnv503h.mgib
 %%ASTERDIR%%/astest/ssnv503h.para
+%%ASTERDIR%%/astest/ssnv504a.comm
+%%ASTERDIR%%/astest/ssnv504a.datg
+%%ASTERDIR%%/astest/ssnv504a.mail
+%%ASTERDIR%%/astest/ssnv504a.mgib
+%%ASTERDIR%%/astest/ssnv504a.para
 %%ASTERDIR%%/astest/ssnx100a.comm
 %%ASTERDIR%%/astest/ssnx100a.para
 %%ASTERDIR%%/astest/szlz100a.comm
@@ -1707,6 +1816,8 @@
 %%ASTERDIR%%/astest/zzzz118b.mail
 %%ASTERDIR%%/astest/zzzz118b.para
 %%ASTERDIR%%/astest/zzzz119a.20
+%%ASTERDIR%%/astest/zzzz119a.com0
+%%ASTERDIR%%/astest/zzzz119a.com1
 %%ASTERDIR%%/astest/zzzz119a.comm
 %%ASTERDIR%%/astest/zzzz119a.datg
 %%ASTERDIR%%/astest/zzzz119a.mgib
@@ -1731,10 +1842,6 @@
 %%ASTERDIR%%/astest/zzzz127a.comm
 %%ASTERDIR%%/astest/zzzz127a.mail
 %%ASTERDIR%%/astest/zzzz127a.para
-%%ASTERDIR%%/astest/zzzz128a.com0
-%%ASTERDIR%%/astest/zzzz128a.comm
-%%ASTERDIR%%/astest/zzzz128a.mail
-%%ASTERDIR%%/astest/zzzz128a.para
 %%ASTERDIR%%/astest/zzzz130a.comm
 %%ASTERDIR%%/astest/zzzz130a.mail
 %%ASTERDIR%%/astest/zzzz130a.para
@@ -1742,11 +1849,6 @@
 %%ASTERDIR%%/astest/zzzz131a.comm
 %%ASTERDIR%%/astest/zzzz131a.mail
 %%ASTERDIR%%/astest/zzzz131a.para
-%%ASTERDIR%%/astest/zzzz131b.21
-%%ASTERDIR%%/astest/zzzz131b.comm
-%%ASTERDIR%%/astest/zzzz131b.datg
-%%ASTERDIR%%/astest/zzzz131b.mgib
-%%ASTERDIR%%/astest/zzzz131b.para
 %%ASTERDIR%%/astest/zzzz132a.21
 %%ASTERDIR%%/astest/zzzz132a.comm
 %%ASTERDIR%%/astest/zzzz132a.para
@@ -1966,6 +2068,18 @@
 %%ASTERDIR%%/bibpyt/Macro/defi_cable_bp_ops.py
 %%ASTERDIR%%/bibpyt/Macro/defi_cable_bp_ops.pyc
 %%ASTERDIR%%/bibpyt/Macro/defi_cable_bp_ops.pyo
+%%ASTERDIR%%/bibpyt/Macro/macr_adap_mail_ops.py
+%%ASTERDIR%%/bibpyt/Macro/macr_adap_mail_ops.pyc
+%%ASTERDIR%%/bibpyt/Macro/macr_adap_mail_ops.pyo
+%%ASTERDIR%%/bibpyt/Macro/macr_cabri_calc_ops.py
+%%ASTERDIR%%/bibpyt/Macro/macr_cabri_calc_ops.pyc
+%%ASTERDIR%%/bibpyt/Macro/macr_cabri_calc_ops.pyo
+%%ASTERDIR%%/bibpyt/Macro/macr_cabri_mail_dat.py
+%%ASTERDIR%%/bibpyt/Macro/macr_cabri_mail_dat.pyc
+%%ASTERDIR%%/bibpyt/Macro/macr_cabri_mail_dat.pyo
+%%ASTERDIR%%/bibpyt/Macro/macr_cabri_mail_ops.py
+%%ASTERDIR%%/bibpyt/Macro/macr_cabri_mail_ops.pyc
+%%ASTERDIR%%/bibpyt/Macro/macr_cabri_mail_ops.pyo
 %%ASTERDIR%%/bibpyt/Macro/macr_cara_poutre_ops.py
 %%ASTERDIR%%/bibpyt/Macro/macr_cara_poutre_ops.pyc
 %%ASTERDIR%%/bibpyt/Macro/macr_cara_poutre_ops.pyo
@@ -2086,6 +2200,9 @@
 %%ASTERDIR%%/bibpyt/Noyau/N_SIMP.py
 %%ASTERDIR%%/bibpyt/Noyau/N_SIMP.pyc
 %%ASTERDIR%%/bibpyt/Noyau/N_SIMP.pyo
+%%ASTERDIR%%/bibpyt/Noyau/N_VALIDATOR.py
+%%ASTERDIR%%/bibpyt/Noyau/N_VALIDATOR.pyc
+%%ASTERDIR%%/bibpyt/Noyau/N_VALIDATOR.pyo
 %%ASTERDIR%%/bibpyt/Noyau/N__F.py
 %%ASTERDIR%%/bibpyt/Noyau/N__F.pyc
 %%ASTERDIR%%/bibpyt/Noyau/N__F.pyo
@@ -2113,6 +2230,9 @@
 %%ASTERDIR%%/bibpyt/Stanley/cata_champs.py
 %%ASTERDIR%%/bibpyt/Stanley/cata_champs.pyc
 %%ASTERDIR%%/bibpyt/Stanley/cata_champs.pyo
+%%ASTERDIR%%/bibpyt/Stanley/exemple_env.py
+%%ASTERDIR%%/bibpyt/Stanley/exemple_env.pyc
+%%ASTERDIR%%/bibpyt/Stanley/exemple_env.pyo
 %%ASTERDIR%%/bibpyt/Stanley/gmsh.py
 %%ASTERDIR%%/bibpyt/Stanley/gmsh.pyc
 %%ASTERDIR%%/bibpyt/Stanley/gmsh.pyo
@@ -2404,6 +2524,9 @@
 %%ASTERDIR%%/catalo/options/meca_ddli_f.cata
 %%ASTERDIR%%/catalo/options/meca_ddli_r.cata
 %%ASTERDIR%%/catalo/options/meca_ddlm_r.cata
+%%ASTERDIR%%/catalo/options/meca_sens_char.cata
+%%ASTERDIR%%/catalo/options/meca_sens_mate.cata
+%%ASTERDIR%%/catalo/options/meca_sens_raph.cata
 %%ASTERDIR%%/catalo/options/meta_elga_refr.cata
 %%ASTERDIR%%/catalo/options/meta_elga_temp.cata
 %%ASTERDIR%%/catalo/options/meta_elno_temp.cata
@@ -2681,6 +2804,7 @@
 %%ASTERDIR%%/catalo/typelem/gener_mepmf1.cata
 %%ASTERDIR%%/catalo/typelem/gener_mepmf2.cata
 %%ASTERDIR%%/catalo/typelem/gener_meq4g1.cata
+%%ASTERDIR%%/catalo/typelem/gener_meshb3.cata
 %%ASTERDIR%%/catalo/typelem/gener_metu61.cata
 %%ASTERDIR%%/catalo/typelem/gener_mf2fi2.cata
 %%ASTERDIR%%/catalo/typelem/gener_mv2d_2.cata
@@ -2703,8 +2827,10 @@
 %%ASTERDIR%%/catalo/typelem/gener_thpl_2.cata
 %%ASTERDIR%%/catalo/typelem/gener_thpld1.cata
 %%ASTERDIR%%/catalo/typelem/gener_thpld2.cata
+%%ASTERDIR%%/catalo/typelem/mecpqs4.cata
 %%ASTERDIR%%/catalo/typelem/mecptr3.cata
 %%ASTERDIR%%/catalo/typelem/mecptr6.cata
+%%ASTERDIR%%/catalo/typelem/medpqs4.cata
 %%ASTERDIR%%/catalo/typelem/medpqs8.cata
 %%ASTERDIR%%/catalo/typelem/medptr6.cata
 %%ASTERDIR%%/catalo/typelem/met3seg3.cata
@@ -2759,12 +2885,14 @@
 %%ASTERDIR%%/catapy/commande/crea_champ.capy
 %%ASTERDIR%%/catapy/commande/crea_maillage.capy
 %%ASTERDIR%%/catapy/commande/crea_resu.capy
+%%ASTERDIR%%/catapy/commande/crea_table.capy
 %%ASTERDIR%%/catapy/commande/debut.capy
 %%ASTERDIR%%/catapy/commande/defi_base_modale.capy
 %%ASTERDIR%%/catapy/commande/defi_cable_bp.capy
 %%ASTERDIR%%/catapy/commande/defi_cable_op.capy
 %%ASTERDIR%%/catapy/commande/defi_constante.capy
 %%ASTERDIR%%/catapy/commande/defi_coqu_mult.capy
+%%ASTERDIR%%/catapy/commande/defi_fichier.capy
 %%ASTERDIR%%/catapy/commande/defi_flui_stru.capy
 %%ASTERDIR%%/catapy/commande/defi_fonc_elec.capy
 %%ASTERDIR%%/catapy/commande/defi_fonc_flui.capy
@@ -2796,11 +2924,13 @@
 %%ASTERDIR%%/catapy/commande/dyna_line_tran.capy
 %%ASTERDIR%%/catapy/commande/dyna_non_line.capy
 %%ASTERDIR%%/catapy/commande/dyna_spec_modal.capy
+%%ASTERDIR%%/catapy/commande/dyna_tran_expli.capy
 %%ASTERDIR%%/catapy/commande/dyna_tran_modal.capy
 %%ASTERDIR%%/catapy/commande/engendre_test.capy
 %%ASTERDIR%%/catapy/commande/exec_logiciel.capy
 %%ASTERDIR%%/catapy/commande/extr_mode.capy
 %%ASTERDIR%%/catapy/commande/extr_resu.capy
+%%ASTERDIR%%/catapy/commande/extr_table.capy
 %%ASTERDIR%%/catapy/commande/fact_grad.capy
 %%ASTERDIR%%/catapy/commande/fact_inte_spec.capy
 %%ASTERDIR%%/catapy/commande/fact_ldlt.capy
@@ -2842,6 +2972,8 @@
 %%ASTERDIR%%/catapy/commande/macr_ascouf_mail.capy
 %%ASTERDIR%%/catapy/commande/macr_aspic_calc.capy
 %%ASTERDIR%%/catapy/commande/macr_aspic_mail.capy
+%%ASTERDIR%%/catapy/commande/macr_cabri_calc.capy
+%%ASTERDIR%%/catapy/commande/macr_cabri_mail.capy
 %%ASTERDIR%%/catapy/commande/macr_cara_poutre.capy
 %%ASTERDIR%%/catapy/commande/macr_elem_dyna.capy
 %%ASTERDIR%%/catapy/commande/macr_elem_stat.capy
@@ -2912,6 +3044,7 @@
 %%ASTERDIR%%/catapy/commande/ther_non_line.capy
 %%ASTERDIR%%/catapy/commande/ther_non_line_mo.capy
 %%ASTERDIR%%/catapy/commun/c_comp_incr.capy
+%%ASTERDIR%%/catapy/commun/c_nom_cham_into.capy
 %%ASTERDIR%%/catapy/entete/accas.capy
 %%ASTERDIR%%/commande/cata.py
 %%ASTERDIR%%/commande/cata.pyc
@@ -2935,8 +3068,12 @@
 %%ASTERDIR%%/etude/forma01b.mgib
 %%ASTERDIR%%/etude/forma01b.para
 %%ASTERDIR%%/etude/forma01b.resu
+%%ASTERDIR%%/etude/forma01c.17
+%%ASTERDIR%%/etude/forma01c.18
+%%ASTERDIR%%/etude/forma01c.21
 %%ASTERDIR%%/etude/forma01c.code
 %%ASTERDIR%%/etude/forma01c.com1
+%%ASTERDIR%%/etude/forma01c.com2
 %%ASTERDIR%%/etude/forma01c.comm
 %%ASTERDIR%%/etude/forma01c.datg
 %%ASTERDIR%%/etude/forma01c.mail
@@ -2995,6 +3132,7 @@
 %%ASTERDIR%%/etude/forma02b.para
 %%ASTERDIR%%/etude/forma02b.resu
 %%ASTERDIR%%/etude/forma03a.code
+%%ASTERDIR%%/etude/forma03a.com1
 %%ASTERDIR%%/etude/forma03a.comm
 %%ASTERDIR%%/etude/forma03a.datg
 %%ASTERDIR%%/etude/forma03a.mess
@@ -3002,6 +3140,7 @@
 %%ASTERDIR%%/etude/forma03a.para
 %%ASTERDIR%%/etude/forma03a.resu
 %%ASTERDIR%%/etude/forma03b.code
+%%ASTERDIR%%/etude/forma03b.com1
 %%ASTERDIR%%/etude/forma03b.comm
 %%ASTERDIR%%/etude/forma03b.datg
 %%ASTERDIR%%/etude/forma03b.mail
@@ -3086,18 +3225,19 @@
 %%ASTERDIR%%/etude/liste_etude
 %%ASTERDIR%%/materiau/A42_REF_A.NOMI
 %%ASTERDIR%%/tcl/aster.tcl
+%%ASTERDIR%%/tcl/maj_aster
+%%ASTERDIR%%/tcl/maj_suppr
 %%ASTERDIR%%/tcl/make_aster
 %%ASTERDIR%%/tcl/make_cata
 %%ASTERDIR%%/tcl/make_etude
 %%ASTERDIR%%/tcl/make_exec
 %%ASTERDIR%%/tcl/make_lib
 %%ASTERDIR%%/tcl/make_test
+%%ASTERDIR%%/tcl/make_test_full
 %%ASTERDIR%%/tcl/mess
 %%ASTERDIR%%/tcl/run_aster
 %%ASTERDIR%%/tcl/run_aster.tcl
 @exec mkdir -p %D/%%ASTERDIR%%/outils
-%%HOMARD%%@exec ln -sf %%HOMARDDIR%%/aster_homard_py %D/%%ASTERDIR%%/outils/
-%%HOMARD%%@unexec rm -f %D/%%ASTERDIR%%/outils/aster_homard_py
 %%ASTK_CLIENT%%@exec ln -sf %%ASTKDIR%%/bin/astk %D/%%ASTERDIR%%/outils/
 %%ASTK_CLIENT%%@unexec rm -f %D/%%ASTERDIR%%/outils/astk
 %%ASTK_CLIENT%%@exec ln -sf %%ASTKDIR%%/bin/bsf %D/%%ASTERDIR%%/outils/
@@ -3108,8 +3248,6 @@
 %%GMSH%%@unexec rm -f  %D/%%ASTERDIR%%/outils/gmsh
 @exec ln -sf %%LOCALBASE%%/bin/gnuplot %D/%%ASTERDIR%%/outils/
 @unexec rm -f  %D/%%ASTERDIR%%/outils/gnuplot
-%%HOMARD%%@exec ln -sf %%HOMARDDIR%%/homard %D/%%ASTERDIR%%/outils/
-%%HOMARD%%@unexec rm -f %D/%%ASTERDIR%%/outils/homard
 @exec ln -sf %%LOCALBASE%%/bin/onmetis %D/%%ASTERDIR%%/outils/
 @unexec rm -f  %D/%%ASTERDIR%%/outils/onmetis
 %%GRACE%%@exec ln -sf %%X11BASE%%/bin/xmgrace %D/%%ASTERDIR%%/outils/
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
diff --git a/french/homard/Makefile b/french/homard/Makefile
index b9da41f240a2..ed5fd94bba16 100644
--- a/french/homard/Makefile
+++ b/french/homard/Makefile
@@ -6,23 +6,23 @@
 #
 
 PORTNAME=	homard
-PORTVERSION=	5.5
-PORTREVISION=	2
+PORTVERSION=	6.2
 CATEGORIES=	french cad linux python
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/homard/
-DISTNAME=	${PORTNAME}_linux_${PORTVERSION}
+DISTNAME=	${PORTNAME:U}_V${PORTVERSION}.Linux
 
 MAINTAINER=	ports@FreeBSD.org
 COMMENT=	A refinement and de-refinement mesh tool
 
+BUILD_DEPENDS=	${LOCALBASE}/aster/${vaster}/asteru.exe:${PORTSDIR}/french/aster
+RUN_DEPENDS=	${LOCALBASE}/aster/${vaster}/asteru.exe:${PORTSDIR}/french/aster
+
 RESTRICTED=	"Toute personne chargeant le logiciel HOMARD s'engage à ne\
-		l'utiliser qu'en couplage avec le logiciel Code_ASTER. Pour\
+		l'utiliser qu'en couplage avec le logiciel Code_Aster. Pour\
 		tout autre usage, un droit de licence est nécessaire.\
 		Contacter les administrateurs de HOMARD à l'adresse :\
 		<homard@edf.fr>."
 
-WRKSRC=		${WRKDIR}/ASTER_HOMARD
-
 ONLY_FOR_ARCHS=	i386
 
 USE_LINUX=	yes
@@ -32,39 +32,53 @@ REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
 
 LHOMARDDIR?=	apps/${PORTNAME}
-ASTER_VER=	7.1
+ASTER_VER=	7.2
 vaster=		STA${ASTER_VER}
 ASTER_TOOLS=	${LOCALBASE}/aster/${vaster}/outils
 HOMARDDIR=	${PREFIX}/${LHOMARDDIR}
 AHPY=		aster_homard_py
+AHPY5=		aster_homard_V5x_py
+HOMARDSCRIPT=	${WRKDIR}/${PORTNAME}_base
 # This name is requested to run aster's make test
 HOMARDPG=	${PORTNAME:U}_V${PORTVERSION}.out
 
+DOCS=		A_Lire.txt Readme.txt
+
 .include <bsd.port.pre.mk>
 
 unames!=	${UNAME} -s
-PLIST_SUB=	HOMARDDIR=${LHOMARDDIR} AHPY=${LHOMARDDIR}/${AHPY} \
-		UNAMES=${unames} HOMARDPG=${HOMARDPG}
+PLIST_SUB=	HOMARDDIR=${LHOMARDDIR} AHPY=${LHOMARDDIR}/${AHPY}			\
+		AHPY5=${LHOMARDDIR}/${AHPY5} UNAMES=${unames} HOMARDPG=${HOMARDPG}	\
+		ASTER_TOOLS=${ASTER_TOOLS}
 
 BRANDELF?=	/usr/bin/brandelf
 
 post-patch:
-	@${REINPLACE_CMD} -e "s#HOMARD_REP_PRO=??????#HOMARD_REP_PRO=${ASTER_TOOLS}#"	\
-		-e "s#HOMARD_REP_EXE=??????#HOMARD_REP_EXE=${PREFIX}/bin#"		\
-		-e "s#PYTHON_EXE=??????#PYTHON_EXE=${PYTHON_CMD}#"			\
-		${WRKSRC}/${PORTNAME}
-	@${CHMOD} u+w ${WRKSRC}/${AHPY}
+	@${REINPLACE_CMD} -e "s#/home/homard/ASTER_HOMARD#${ASTER_TOOLS}#"	\
+		-e "s#/logiciels/HOMARD/HOMARD_PUBLIC#${PREFIX}/bin#"		\
+		-e "s#/local/edf-python-2.1.1/bin/python#${PYTHON_CMD}#"	\
+		${HOMARDSCRIPT}
 
 do-install:
-	${MKDIR} ${HOMARDDIR}
-	${MKDIR} ${PREFIX}/bin/${unames}
-	${INSTALL_PROGRAM} ${WRKDIR}/${HOMARDPG} ${PREFIX}/bin/${unames}
-	${BRANDELF} -t Linux ${PREFIX}/bin/${unames}/${HOMARDPG}
-	${INSTALL_SCRIPT} ${WRKSRC}/${PORTNAME} ${HOMARDDIR}
-	${CP} -R ${WRKSRC}/${AHPY} ${HOMARDDIR}
-	${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${HOMARDDIR}
-	${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${HOMARDDIR}
-	${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HOMARDDIR}
+	@${MKDIR} ${HOMARDDIR}
+	@${MKDIR} ${PREFIX}/bin/${unames}
+	@${INSTALL_PROGRAM} ${WRKSRC}/${HOMARDPG} ${PREFIX}/bin/${unames}
+	@${BRANDELF} -t Linux ${PREFIX}/bin/${unames}/${HOMARDPG}
+	@${INSTALL_SCRIPT} ${HOMARDSCRIPT} ${HOMARDDIR}/${PORTNAME}
+	@${CP} -R ${WRKSRC}/${AHPY} ${HOMARDDIR}
+	@${CP} -R ${WRKSRC}/${AHPY5} ${HOMARDDIR}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${HOMARDDIR}
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${HOMARDDIR}
+	@${CHOWN} -R ${SHAREOWN}:${SHAREGRP} ${HOMARDDIR}
+	@${LN} -fs ${HOMARDDIR}/homard ${ASTER_TOOLS}/
+	@${LN} -fs ${HOMARDDIR}/aster_homard_py ${ASTER_TOOLS}/
+.if !defined(NOPORTDOCS)
+	@${MKDIR} ${DOCSDIR}
+.for doc in ${DOCS}
+	@${INSTALL_DATA} ${WRKDIR}/${doc} ${DOCSDIR}
+.endfor
+	@${ECHO_MSG} "===> Documentation installed in ${DOCSDIR}."
+.endif
 
 post-install:
 	@${ECHO_MSG}
diff --git a/french/homard/distinfo b/french/homard/distinfo
index 62a641913a3c..184db7cec47b 100644
--- a/french/homard/distinfo
+++ b/french/homard/distinfo
@@ -1 +1 @@
-MD5 (homard_linux_5.5.tar.gz) = 79c2a6d0304c4409f53c5198ef366a90
+MD5 (HOMARD_V6.2.Linux.tar.gz) = 4dced6bc6912450d18bd55cf484fc46b
diff --git a/french/homard/pkg-plist b/french/homard/pkg-plist
index 5eafcc350204..663995d58583 100644
--- a/french/homard/pkg-plist
+++ b/french/homard/pkg-plist
@@ -1,4 +1,7 @@
 bin/%%UNAMES%%/%%HOMARDPG%%
+%%AHPY%%/__init__.py
+%%AHPY%%/__init__.pyc
+%%AHPY%%/__init__.pyo
 %%AHPY%%/aster_homard.py
 %%AHPY%%/aster_homard.pyc
 %%AHPY%%/aster_homard.pyo
@@ -17,20 +20,52 @@ bin/%%UNAMES%%/%%HOMARDPG%%
 %%AHPY%%/aster_homard_5.py
 %%AHPY%%/aster_homard_5.pyc
 %%AHPY%%/aster_homard_5.pyo
-%%AHPY%%/aster_homard_6.py
-%%AHPY%%/aster_homard_6.pyc
-%%AHPY%%/aster_homard_6.pyo
-%%AHPY%%/aster_homard_7.py
-%%AHPY%%/aster_homard_7.pyc
-%%AHPY%%/aster_homard_7.pyo
-%%AHPY%%/aster_homard_8.py
-%%AHPY%%/aster_homard_8.pyc
-%%AHPY%%/aster_homard_8.pyo
 %%AHPY%%/aster_homard_utilitaires.py
 %%AHPY%%/aster_homard_utilitaires.pyc
 %%AHPY%%/aster_homard_utilitaires.pyo
+%%AHPY5%%/__init__.py
+%%AHPY5%%/__init__.pyc
+%%AHPY5%%/__init__.pyo
+%%AHPY5%%/aster_homard_1.py
+%%AHPY5%%/aster_homard_1.pyc
+%%AHPY5%%/aster_homard_1.pyo
+%%AHPY5%%/aster_homard_2.py
+%%AHPY5%%/aster_homard_2.pyc
+%%AHPY5%%/aster_homard_2.pyo
+%%AHPY5%%/aster_homard_3.py
+%%AHPY5%%/aster_homard_3.pyc
+%%AHPY5%%/aster_homard_3.pyo
+%%AHPY5%%/aster_homard_4.py
+%%AHPY5%%/aster_homard_4.pyc
+%%AHPY5%%/aster_homard_4.pyo
+%%AHPY5%%/aster_homard_5.py
+%%AHPY5%%/aster_homard_5.pyc
+%%AHPY5%%/aster_homard_5.pyo
+%%AHPY5%%/aster_homard_6.py
+%%AHPY5%%/aster_homard_6.pyc
+%%AHPY5%%/aster_homard_6.pyo
+%%AHPY5%%/aster_homard_7.py
+%%AHPY5%%/aster_homard_7.pyc
+%%AHPY5%%/aster_homard_7.pyo
+%%AHPY5%%/aster_homard_8.py
+%%AHPY5%%/aster_homard_8.pyc
+%%AHPY5%%/aster_homard_8.pyo
+%%AHPY5%%/aster_homard_V5x.py
+%%AHPY5%%/aster_homard_V5x.pyc
+%%AHPY5%%/aster_homard_V5x.pyo
+%%AHPY5%%/aster_homard_utilitaires.py
+%%AHPY5%%/aster_homard_utilitaires.pyc
+%%AHPY5%%/aster_homard_utilitaires.pyo
 %%HOMARDDIR%%/homard
+%%PORTDOCS%%%%DOCSDIR%%/A_Lire.txt
+%%PORTDOCS%%%%DOCSDIR%%/Readme.txt
 @dirrm %%AHPY%%
+@dirrm %%AHPY5%%
 @dirrm %%HOMARDDIR%%
+%%PORTDOCS%%@dirrm %%DOCSDIR%%
+@exec ln -sf %%HOMARDDIR%%/aster_homard_py %%ASTER_TOOLS%%
+@exec ln -sf %%HOMARDDIR%%/homard %%ASTER_TOOLS%%
+@unexec rm -f %%ASTER_TOOLS%%/aster_homard_py
+@unexec rm -f %%ASTER_TOOLS%%/homard
 @unexec rmdir %D/bin/%%UNAMES%% 2>/dev/null || true
 @unexec rmdir %D/apps 2>/dev/null || true