diff options
| author | Oliver Lehmann <oliver@FreeBSD.org> | 2003-12-08 02:07:22 +0000 |
|---|---|---|
| committer | Oliver Lehmann <oliver@FreeBSD.org> | 2003-12-08 02:07:22 +0000 |
| commit | c29377595853802138b1496fc9f863cbc5de7293 (patch) | |
| tree | e17f447c50d55f732d3f1b503915ac39c736785c /french/aster/files | |
| parent | add gibi (french/gibi) (diff) | |
- Upgrading french/aster from 7.1 to 7.2;
- french/eficas from 1.4 to 1.5;
- cad/metis-edf from 3 to 3.1;
- cad/astk-serveur & cad/astk-client from 1.0.14 to 1.0.21;
- french/homard from 5.5 to 6.2;
. don't install Homard automatically with Aster; like Gibi, Homard
depends on french/aster: this is more compliant with the licenses,
and it will be possible to build packages for Aster.
PR: 59312 59881
Submitted By: Thierry Thomas <thierry@pompo.net>
Notes
Notes:
svn path=/head/; revision=95312
Diffstat (limited to 'french/aster/files')
| -rw-r--r-- | french/aster/files/config.txt | 8 | ||||
| -rw-r--r-- | french/aster/files/patch-bibpyt::Execution::E_SUPERV.py | 10 | ||||
| -rw-r--r-- | french/aster/files/patch-tcl::run_aster | 10 |
3 files changed, 15 insertions, 13 deletions
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 |