8 files changed, 202 insertions, 66 deletions

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/