svn commit: r520739 - in head: cad/astk-serveur cad/scotch french/aster french/aster/files french/homard french/med french/med/files math/mumps
Thierry Thomas
thierry at FreeBSD.org
Mon Dec 23 20:10:11 UTC 2019
Author: thierry
Date: Mon Dec 23 20:10:09 2019
New Revision: 520739
URL: https://svnweb.freebsd.org/changeset/ports/520739
Log:
Upgrade Code_Aster to 14.4.0-1.
PR: 242655
Added:
head/french/aster/files/patch-setup.py (contents, props changed)
head/french/aster/files/post-patch-data__post_install (contents, props changed)
head/french/aster/files/post-patch-waf.engine (contents, props changed)
Deleted:
head/cad/scotch/distinfo
head/math/mumps/distinfo
Modified:
head/cad/astk-serveur/Makefile
head/cad/astk-serveur/pkg-plist
head/cad/scotch/Makefile
head/french/aster/Makefile
head/french/aster/bsd.aster.mk
head/french/aster/distinfo
head/french/aster/files/patch-as_setup.py
head/french/aster/files/patch-check_compilers.py
head/french/aster/files/patch-products.py
head/french/aster/pkg-plist
head/french/homard/Makefile
head/french/homard/pkg-plist
head/french/med/Makefile
head/french/med/files/patch-configure
head/french/med/pkg-plist
head/math/mumps/Makefile
Modified: head/cad/astk-serveur/Makefile
==============================================================================
--- head/cad/astk-serveur/Makefile Mon Dec 23 19:12:59 2019 (r520738)
+++ head/cad/astk-serveur/Makefile Mon Dec 23 20:10:09 2019 (r520739)
@@ -2,7 +2,7 @@
# $FreeBSD$
PORTNAME= astk
-DISTVERSION= 2018.0-1
+DISTVERSION= 2019.0-1
CATEGORIES= cad
.if !defined(CLIENT_SEUL)
PKGNAMESUFFIX= -serveur
@@ -30,8 +30,9 @@ LICENSE= GPLv2
RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:shells/${SHIADEP}
+USES= gettext
.if !defined(CLIENT_SEUL)
-USES+= gettext python:2.7 shebangfix tk:build
+USES+= python:3.6 shebangfix tk:build
SHEBANG_FILES= unittest/run_test.py
.else
USES+= tk
@@ -58,6 +59,12 @@ conf_dir= ${WRKSRC}/etc/astkrc
.include <bsd.port.pre.mk>
+.if ${OPSYS} == FreeBSD && ((${OSREL:R} == 12 && ${OSVERSION} < 1201506) \
+ || (${OSREL:R} > 12 && ${OSVERSION} < 1300068))
+# ASTK is not useful without french/aster
+IGNORE= a larger value of ARG_MAX is needed for Code_Aster, please upgrade your system
+.endif
+
WRKCONF= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/configuration
.if !defined(CLIENT_SEUL)
WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV
@@ -171,6 +178,7 @@ ASTK_LANG= ENG
pre-configure:
${RM} ${PATCH2RM:C|^|${WRKSRC}/|:C|$|.orig|}
+ ${RM} ${WRKSRC}/configuration/*.pyc
do-configure:
.if !defined(CLIENT_SEUL)
@@ -207,7 +215,7 @@ do-configure:
${WRKSRC}/etc/profile.sh
. for libs in ${S_PYLIBS}
${REINPLACE_CMD} -e "s|/opt/aster/NEW9|${aster_dir}|" \
- -e "s|/opt/aster/NEW10|${aster_dir}|" \
+ -e "s|/opt/aster/NEW11|${aster_dir}|" \
-e "s|/opt/aster/ASTK|${inst_dir}|" \
-e "s|/opt/aster|${LOCALBASE}/aster|g" \
-e "s|/usr/bin/editor|${WITH_ED}|" \
Modified: head/cad/astk-serveur/pkg-plist
==============================================================================
--- head/cad/astk-serveur/pkg-plist Mon Dec 23 19:12:59 2019 (r520738)
+++ head/cad/astk-serveur/pkg-plist Mon Dec 23 20:10:09 2019 (r520739)
@@ -216,231 +216,231 @@
%%CLIENT%%%%BWidget_DIR%%/widget.tcl
%%CLIENT%%%%BWidget_DIR%%/wizard.tcl
%%CLIENT%%%%BWidget_DIR%%/xpm2image.tcl
+%%SERV%%%%ASTKDIR%%/asrun/N__F.py
%%SERV%%%%ASTKDIR%%/asrun/__init__.py
-%%SERV%%%%ASTKDIR%%/asrun/__init__.pyc
-%%SERV%%%%ASTKDIR%%/asrun/__init__.pyo
%%SERV%%%%ASTKDIR%%/asrun/__pkginfo__.py
-%%SERV%%%%ASTKDIR%%/asrun/__pkginfo__.pyc
-%%SERV%%%%ASTKDIR%%/asrun/__pkginfo__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/N__F.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/N__F.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/__pkginfo__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/__pkginfo__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/astout.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/astout.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/backward_compatibility.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/backward_compatibility.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/batch.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/batch.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/bddetudes.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/bddetudes.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/build.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/build.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/calcul.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/calcul.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/common_func.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/common_func.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/distrib.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/distrib.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/execute.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/execute.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/execution.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/execution.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/histor.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/histor.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/installation.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/installation.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/job.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/job.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/main.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/maintenance.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/maintenance.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/mpi.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/mpi.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/multiple.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/multiple.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/myconnect.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/myconnect.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/mystring.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/mystring.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/parallel_cp.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/parallel_cp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/parametric.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/parametric.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/parser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/profil.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/profil.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/profile_modifier.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/profile_modifier.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/progress.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/progress.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/repart.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/repart.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/rex.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/rex.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/run.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/run.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/runner.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/runner.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/schema.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/schema.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/services.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/services.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/status.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/status.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/system.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/system.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/system_command.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/system_command.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/testlist.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/testlist.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/thread.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/thread.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/timer.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/timer.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/toolbox.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/toolbox.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/update.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/update.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/asrun/astout.py
-%%SERV%%%%ASTKDIR%%/asrun/astout.pyc
-%%SERV%%%%ASTKDIR%%/asrun/astout.pyo
%%SERV%%%%ASTKDIR%%/asrun/backward_compatibility.py
-%%SERV%%%%ASTKDIR%%/asrun/backward_compatibility.pyc
-%%SERV%%%%ASTKDIR%%/asrun/backward_compatibility.pyo
%%SERV%%%%ASTKDIR%%/asrun/batch.py
-%%SERV%%%%ASTKDIR%%/asrun/batch.pyc
-%%SERV%%%%ASTKDIR%%/asrun/batch.pyo
%%SERV%%%%ASTKDIR%%/asrun/bddetudes.py
-%%SERV%%%%ASTKDIR%%/asrun/bddetudes.pyc
-%%SERV%%%%ASTKDIR%%/asrun/bddetudes.pyo
%%SERV%%%%ASTKDIR%%/asrun/build.py
-%%SERV%%%%ASTKDIR%%/asrun/build.pyc
-%%SERV%%%%ASTKDIR%%/asrun/build.pyo
%%SERV%%%%ASTKDIR%%/asrun/calcul.py
-%%SERV%%%%ASTKDIR%%/asrun/calcul.pyc
-%%SERV%%%%ASTKDIR%%/asrun/calcul.pyo
%%SERV%%%%ASTKDIR%%/asrun/client/__init__.py
-%%SERV%%%%ASTKDIR%%/asrun/client/__init__.pyc
-%%SERV%%%%ASTKDIR%%/asrun/client/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/client/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/client/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/client/__pycache__/calcul_handler.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/client/__pycache__/calcul_handler.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/client/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/client/__pycache__/config.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/asrun/client/calcul_handler.py
-%%SERV%%%%ASTKDIR%%/asrun/client/calcul_handler.pyc
-%%SERV%%%%ASTKDIR%%/asrun/client/calcul_handler.pyo
%%SERV%%%%ASTKDIR%%/asrun/client/config.py
-%%SERV%%%%ASTKDIR%%/asrun/client/config.pyc
-%%SERV%%%%ASTKDIR%%/asrun/client/config.pyo
-%%SERV%%%%ASTKDIR%%/asrun/common_func.py
-%%SERV%%%%ASTKDIR%%/asrun/common_func.pyc
-%%SERV%%%%ASTKDIR%%/asrun/common_func.pyo
%%SERV%%%%ASTKDIR%%/asrun/common/__init__.py
-%%SERV%%%%ASTKDIR%%/asrun/common/__init__.pyc
-%%SERV%%%%ASTKDIR%%/asrun/common/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/i18n.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/lockfile.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/lockfile.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/rcfile.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/rcfile.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/sysutils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/sysutils.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common/__pycache__/utils.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/asrun/common/i18n.py
-%%SERV%%%%ASTKDIR%%/asrun/common/i18n.pyc
-%%SERV%%%%ASTKDIR%%/asrun/common/i18n.pyo
%%SERV%%%%ASTKDIR%%/asrun/common/lockfile.py
-%%SERV%%%%ASTKDIR%%/asrun/common/lockfile.pyc
-%%SERV%%%%ASTKDIR%%/asrun/common/lockfile.pyo
%%SERV%%%%ASTKDIR%%/asrun/common/rcfile.py
-%%SERV%%%%ASTKDIR%%/asrun/common/rcfile.pyc
-%%SERV%%%%ASTKDIR%%/asrun/common/rcfile.pyo
%%SERV%%%%ASTKDIR%%/asrun/common/sysutils.py
-%%SERV%%%%ASTKDIR%%/asrun/common/sysutils.pyc
-%%SERV%%%%ASTKDIR%%/asrun/common/sysutils.pyo
%%SERV%%%%ASTKDIR%%/asrun/common/utils.py
-%%SERV%%%%ASTKDIR%%/asrun/common/utils.pyc
-%%SERV%%%%ASTKDIR%%/asrun/common/utils.pyo
+%%SERV%%%%ASTKDIR%%/asrun/common_func.py
%%SERV%%%%ASTKDIR%%/asrun/config.py
-%%SERV%%%%ASTKDIR%%/asrun/config.pyc
-%%SERV%%%%ASTKDIR%%/asrun/config.pyo
-%%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.py
-%%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.pyc
-%%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.pyo
-%%SERV%%%%ASTKDIR%%/asrun/contrib/copy_version.py
-%%SERV%%%%ASTKDIR%%/asrun/contrib/copy_version.pyc
-%%SERV%%%%ASTKDIR%%/asrun/contrib/copy_version.pyo
%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.py
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.pyc
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.pyo
%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.py
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.pyc
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.pyo
-%%SERV%%%%ASTKDIR%%/asrun/contrib/log_usage.py
-%%SERV%%%%ASTKDIR%%/asrun/contrib/log_usage.pyc
-%%SERV%%%%ASTKDIR%%/asrun/contrib/log_usage.pyo
%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.py
-%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.pyc
-%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.pyo
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.py
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/Fichier.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/Fichier.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/Ligne.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/Ligne.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/OutputParser.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/OutputParser.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/copy_version.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/copy_version.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/log_usage.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/__pycache__/log_usage.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/copy_version.py
+%%SERV%%%%ASTKDIR%%/asrun/contrib/log_usage.py
%%SERV%%%%ASTKDIR%%/asrun/core/__init__.py
-%%SERV%%%%ASTKDIR%%/asrun/core/__init__.pyc
-%%SERV%%%%ASTKDIR%%/asrun/core/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/core/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/core/__pycache__/configuration.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/core/__pycache__/configuration.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/core/__pycache__/default_configuration.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/core/__pycache__/default_configuration.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/core/__pycache__/server.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/core/__pycache__/server.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/asrun/core/configuration.py
-%%SERV%%%%ASTKDIR%%/asrun/core/configuration.pyc
-%%SERV%%%%ASTKDIR%%/asrun/core/configuration.pyo
%%SERV%%%%ASTKDIR%%/asrun/core/default_configuration.py
-%%SERV%%%%ASTKDIR%%/asrun/core/default_configuration.pyc
-%%SERV%%%%ASTKDIR%%/asrun/core/default_configuration.pyo
%%SERV%%%%ASTKDIR%%/asrun/core/server.py
-%%SERV%%%%ASTKDIR%%/asrun/core/server.pyc
-%%SERV%%%%ASTKDIR%%/asrun/core/server.pyo
%%SERV%%%%ASTKDIR%%/asrun/ctl/__init__.py
-%%SERV%%%%ASTKDIR%%/asrun/ctl/__init__.pyc
-%%SERV%%%%ASTKDIR%%/asrun/ctl/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/ctl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/ctl/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/asrun/dev/__init__.py
-%%SERV%%%%ASTKDIR%%/asrun/dev/__init__.pyc
-%%SERV%%%%ASTKDIR%%/asrun/dev/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/dev/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/dev/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/dev/__pycache__/messages.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/dev/__pycache__/messages.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/dev/__pycache__/routines.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/dev/__pycache__/routines.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/asrun/dev/messages.py
-%%SERV%%%%ASTKDIR%%/asrun/dev/messages.pyc
-%%SERV%%%%ASTKDIR%%/asrun/dev/messages.pyo
%%SERV%%%%ASTKDIR%%/asrun/dev/routines.py
-%%SERV%%%%ASTKDIR%%/asrun/dev/routines.pyc
-%%SERV%%%%ASTKDIR%%/asrun/dev/routines.pyo
%%SERV%%%%ASTKDIR%%/asrun/distrib.py
-%%SERV%%%%ASTKDIR%%/asrun/distrib.pyc
-%%SERV%%%%ASTKDIR%%/asrun/distrib.pyo
%%SERV%%%%ASTKDIR%%/asrun/execute.py
-%%SERV%%%%ASTKDIR%%/asrun/execute.pyc
-%%SERV%%%%ASTKDIR%%/asrun/execute.pyo
%%SERV%%%%ASTKDIR%%/asrun/execution.py
-%%SERV%%%%ASTKDIR%%/asrun/execution.pyc
-%%SERV%%%%ASTKDIR%%/asrun/execution.pyo
%%SERV%%%%ASTKDIR%%/asrun/histor.py
-%%SERV%%%%ASTKDIR%%/asrun/histor.pyc
-%%SERV%%%%ASTKDIR%%/asrun/histor.pyo
%%SERV%%%%ASTKDIR%%/asrun/installation.py
-%%SERV%%%%ASTKDIR%%/asrun/installation.pyc
-%%SERV%%%%ASTKDIR%%/asrun/installation.pyo
%%SERV%%%%ASTKDIR%%/asrun/job.py
-%%SERV%%%%ASTKDIR%%/asrun/job.pyc
-%%SERV%%%%ASTKDIR%%/asrun/job.pyo
%%SERV%%%%ASTKDIR%%/asrun/main.py
-%%SERV%%%%ASTKDIR%%/asrun/main.pyc
-%%SERV%%%%ASTKDIR%%/asrun/main.pyo
%%SERV%%%%ASTKDIR%%/asrun/maintenance.py
-%%SERV%%%%ASTKDIR%%/asrun/maintenance.pyc
-%%SERV%%%%ASTKDIR%%/asrun/maintenance.pyo
%%SERV%%%%ASTKDIR%%/asrun/mpi.py
-%%SERV%%%%ASTKDIR%%/asrun/mpi.pyc
-%%SERV%%%%ASTKDIR%%/asrun/mpi.pyo
%%SERV%%%%ASTKDIR%%/asrun/multiple.py
-%%SERV%%%%ASTKDIR%%/asrun/multiple.pyc
-%%SERV%%%%ASTKDIR%%/asrun/multiple.pyo
%%SERV%%%%ASTKDIR%%/asrun/myconnect.py
-%%SERV%%%%ASTKDIR%%/asrun/myconnect.pyc
-%%SERV%%%%ASTKDIR%%/asrun/myconnect.pyo
%%SERV%%%%ASTKDIR%%/asrun/mystring.py
-%%SERV%%%%ASTKDIR%%/asrun/mystring.pyc
-%%SERV%%%%ASTKDIR%%/asrun/mystring.pyo
-%%SERV%%%%ASTKDIR%%/asrun/N__F.py
-%%SERV%%%%ASTKDIR%%/asrun/N__F.pyc
-%%SERV%%%%ASTKDIR%%/asrun/N__F.pyo
%%SERV%%%%ASTKDIR%%/asrun/parallel_cp.py
-%%SERV%%%%ASTKDIR%%/asrun/parallel_cp.pyc
-%%SERV%%%%ASTKDIR%%/asrun/parallel_cp.pyo
%%SERV%%%%ASTKDIR%%/asrun/parametric.py
-%%SERV%%%%ASTKDIR%%/asrun/parametric.pyc
-%%SERV%%%%ASTKDIR%%/asrun/parametric.pyo
%%SERV%%%%ASTKDIR%%/asrun/parser.py
-%%SERV%%%%ASTKDIR%%/asrun/parser.pyc
-%%SERV%%%%ASTKDIR%%/asrun/parser.pyo
%%SERV%%%%ASTKDIR%%/asrun/plugins/__init__.py
-%%SERV%%%%ASTKDIR%%/asrun/plugins/__init__.pyc
-%%SERV%%%%ASTKDIR%%/asrun/plugins/__init__.pyo
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/actions.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/actions.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/default.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/default.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/generic_func.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/generic_func.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/rsh_server.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/rsh_server.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/server.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/server.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/sftp_server.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/sftp_server.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/webdav_server.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/__pycache__/webdav_server.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/asrun/plugins/actions.py
-%%SERV%%%%ASTKDIR%%/asrun/plugins/actions.pyc
-%%SERV%%%%ASTKDIR%%/asrun/plugins/actions.pyo
%%SERV%%%%ASTKDIR%%/asrun/plugins/default.py
-%%SERV%%%%ASTKDIR%%/asrun/plugins/default.pyc
-%%SERV%%%%ASTKDIR%%/asrun/plugins/default.pyo
%%SERV%%%%ASTKDIR%%/asrun/plugins/generic_func.py
-%%SERV%%%%ASTKDIR%%/asrun/plugins/generic_func.pyc
-%%SERV%%%%ASTKDIR%%/asrun/plugins/generic_func.pyo
%%SERV%%%%ASTKDIR%%/asrun/plugins/rsh_server.py
-%%SERV%%%%ASTKDIR%%/asrun/plugins/rsh_server.pyc
-%%SERV%%%%ASTKDIR%%/asrun/plugins/rsh_server.pyo
%%SERV%%%%ASTKDIR%%/asrun/plugins/server.py
-%%SERV%%%%ASTKDIR%%/asrun/plugins/server.pyc
-%%SERV%%%%ASTKDIR%%/asrun/plugins/server.pyo
%%SERV%%%%ASTKDIR%%/asrun/plugins/sftp_server.py
-%%SERV%%%%ASTKDIR%%/asrun/plugins/sftp_server.pyc
-%%SERV%%%%ASTKDIR%%/asrun/plugins/sftp_server.pyo
%%SERV%%%%ASTKDIR%%/asrun/plugins/webdav_server.py
-%%SERV%%%%ASTKDIR%%/asrun/plugins/webdav_server.pyc
-%%SERV%%%%ASTKDIR%%/asrun/plugins/webdav_server.pyo
%%SERV%%%%ASTKDIR%%/asrun/profil.py
-%%SERV%%%%ASTKDIR%%/asrun/profil.pyc
-%%SERV%%%%ASTKDIR%%/asrun/profil.pyo
%%SERV%%%%ASTKDIR%%/asrun/profile_modifier.py
-%%SERV%%%%ASTKDIR%%/asrun/profile_modifier.pyc
-%%SERV%%%%ASTKDIR%%/asrun/profile_modifier.pyo
%%SERV%%%%ASTKDIR%%/asrun/progress.py
-%%SERV%%%%ASTKDIR%%/asrun/progress.pyc
-%%SERV%%%%ASTKDIR%%/asrun/progress.pyo
%%SERV%%%%ASTKDIR%%/asrun/repart.py
-%%SERV%%%%ASTKDIR%%/asrun/repart.pyc
-%%SERV%%%%ASTKDIR%%/asrun/repart.pyo
%%SERV%%%%ASTKDIR%%/asrun/rex.py
-%%SERV%%%%ASTKDIR%%/asrun/rex.pyc
-%%SERV%%%%ASTKDIR%%/asrun/rex.pyo
%%SERV%%%%ASTKDIR%%/asrun/run.py
-%%SERV%%%%ASTKDIR%%/asrun/run.pyc
-%%SERV%%%%ASTKDIR%%/asrun/run.pyo
%%SERV%%%%ASTKDIR%%/asrun/runner.py
-%%SERV%%%%ASTKDIR%%/asrun/runner.pyc
-%%SERV%%%%ASTKDIR%%/asrun/runner.pyo
%%SERV%%%%ASTKDIR%%/asrun/schema.py
-%%SERV%%%%ASTKDIR%%/asrun/schema.pyc
-%%SERV%%%%ASTKDIR%%/asrun/schema.pyo
%%SERV%%%%ASTKDIR%%/asrun/services.py
-%%SERV%%%%ASTKDIR%%/asrun/services.pyc
-%%SERV%%%%ASTKDIR%%/asrun/services.pyo
%%SERV%%%%ASTKDIR%%/asrun/status.py
-%%SERV%%%%ASTKDIR%%/asrun/status.pyc
-%%SERV%%%%ASTKDIR%%/asrun/status.pyo
-%%SERV%%%%ASTKDIR%%/asrun/system_command.py
-%%SERV%%%%ASTKDIR%%/asrun/system_command.pyc
-%%SERV%%%%ASTKDIR%%/asrun/system_command.pyo
%%SERV%%%%ASTKDIR%%/asrun/system.py
-%%SERV%%%%ASTKDIR%%/asrun/system.pyc
-%%SERV%%%%ASTKDIR%%/asrun/system.pyo
+%%SERV%%%%ASTKDIR%%/asrun/system_command.py
%%SERV%%%%ASTKDIR%%/asrun/testlist.py
-%%SERV%%%%ASTKDIR%%/asrun/testlist.pyc
-%%SERV%%%%ASTKDIR%%/asrun/testlist.pyo
%%SERV%%%%ASTKDIR%%/asrun/thread.py
-%%SERV%%%%ASTKDIR%%/asrun/thread.pyc
-%%SERV%%%%ASTKDIR%%/asrun/thread.pyo
%%SERV%%%%ASTKDIR%%/asrun/timer.py
-%%SERV%%%%ASTKDIR%%/asrun/timer.pyc
-%%SERV%%%%ASTKDIR%%/asrun/timer.pyo
%%SERV%%%%ASTKDIR%%/asrun/toolbox.py
-%%SERV%%%%ASTKDIR%%/asrun/toolbox.pyc
-%%SERV%%%%ASTKDIR%%/asrun/toolbox.pyo
%%SERV%%%%ASTKDIR%%/asrun/update.py
-%%SERV%%%%ASTKDIR%%/asrun/update.pyc
-%%SERV%%%%ASTKDIR%%/asrun/update.pyo
%%SERV%%%%ASTKDIR%%/asrun/utils.py
-%%SERV%%%%ASTKDIR%%/asrun/utils.pyc
-%%SERV%%%%ASTKDIR%%/asrun/utils.pyo
%%SERV%%%%ASTKDIR%%/bin/as_run
%%SERV%%%%ASTKDIR%%/bin/parallel_cp
%%SERV%%%%ASTKDIR%%/etc/.mysql_connect_REX
@@ -448,39 +448,44 @@
%%SERV%%%%ASTKDIR%%/etc/aster
%%SERV%%%%ASTKDIR%%/etc/codeaster/astkrc/.keep_me
%%SERV%%%%ASTKDIR%%/etc/config_nodename
+%%SERV%%%%ASTKDIR%%/etc/mpi_hostfile
%%SERV%%%%ASTKDIR%%/etc/plugins/__init__.py
-%%SERV%%%%ASTKDIR%%/etc/plugins/__init__.pyc
-%%SERV%%%%ASTKDIR%%/etc/plugins/__init__.pyo
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/aster4_calcul.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/aster4_calcul.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/aster5.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/aster5.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/athosdev.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/athosdev.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/distribution.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/distribution.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/eole.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/eole.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/gaia.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/gaia.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/ivanoe.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/ivanoe.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/sge_pe.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/sge_pe.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/tail_slurm.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/__pycache__/tail_slurm.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/etc/plugins/aster4_calcul.py
-%%SERV%%%%ASTKDIR%%/etc/plugins/aster4_calcul.pyc
-%%SERV%%%%ASTKDIR%%/etc/plugins/aster4_calcul.pyo
%%SERV%%%%ASTKDIR%%/etc/plugins/aster5.py
-%%SERV%%%%ASTKDIR%%/etc/plugins/aster5.pyc
-%%SERV%%%%ASTKDIR%%/etc/plugins/aster5.pyo
%%SERV%%%%ASTKDIR%%/etc/plugins/athosdev.py
-%%SERV%%%%ASTKDIR%%/etc/plugins/athosdev.pyc
-%%SERV%%%%ASTKDIR%%/etc/plugins/athosdev.pyo
%%SERV%%%%ASTKDIR%%/etc/plugins/distribution.py
-%%SERV%%%%ASTKDIR%%/etc/plugins/distribution.pyc
-%%SERV%%%%ASTKDIR%%/etc/plugins/distribution.pyo
%%SERV%%%%ASTKDIR%%/etc/plugins/eole.py
-%%SERV%%%%ASTKDIR%%/etc/plugins/eole.pyc
-%%SERV%%%%ASTKDIR%%/etc/plugins/eole.pyo
+%%SERV%%%%ASTKDIR%%/etc/plugins/gaia.py
%%SERV%%%%ASTKDIR%%/etc/plugins/ivanoe.py
-%%SERV%%%%ASTKDIR%%/etc/plugins/ivanoe.pyc
-%%SERV%%%%ASTKDIR%%/etc/plugins/ivanoe.pyo
%%SERV%%%%ASTKDIR%%/etc/plugins/sge_pe.py
-%%SERV%%%%ASTKDIR%%/etc/plugins/sge_pe.pyc
-%%SERV%%%%ASTKDIR%%/etc/plugins/sge_pe.pyo
%%SERV%%%%ASTKDIR%%/etc/plugins/tail_slurm.py
-%%SERV%%%%ASTKDIR%%/etc/plugins/tail_slurm.pyc
-%%SERV%%%%ASTKDIR%%/etc/plugins/tail_slurm.pyo
%%SERV%%%%ASTKDIR%%/etc/profile.sh
+%%SERV%%%%ASTKDIR%%/i18n/Makefile
%%SERV%%%%ASTKDIR%%/i18n/asrun.fr.mo
%%SERV%%%%ASTKDIR%%/i18n/asrun.fr.po
%%SERV%%%%ASTKDIR%%/i18n/locale/fr/LC_MESSAGES/asrun.mo
-%%SERV%%%%ASTKDIR%%/i18n/Makefile
%%SERV%%%%ASTKDIR%%/i18n/messages.pot
+%%SERV%%%%ASTKDIR%%/share/codeaster/GPL.txt
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/as_rex_prof
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/convbase.comm
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/meshtool.comm
@@ -488,85 +493,88 @@
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/stanley_post.comm
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/doc/dev_guide.html
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/doc/dev_guide.rst
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/__pycache__/alamain.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/__pycache__/alamain.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/__pycache__/sample_extension.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/__pycache__/sample_extension.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/__pycache__/user_filter.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/__pycache__/user_filter.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/alamain.py
-%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/alamain.pyc
-%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/alamain.pyo
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/sample_extension.py
-%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/sample_extension.pyc
-%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/sample_extension.pyo
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/sample_hostfile_distrib
%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/user_filter.py
-%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/user_filter.pyc
-%%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/user_filter.pyo
-%%SERV%%%%ASTKDIR%%/share/codeaster/GPL.txt
%%SERV%%%%ASTKDIR%%/unittest/010_misc.py
-%%SERV%%%%ASTKDIR%%/unittest/010_misc.pyc
-%%SERV%%%%ASTKDIR%%/unittest/010_misc.pyo
%%SERV%%%%ASTKDIR%%/unittest/015_package.py
-%%SERV%%%%ASTKDIR%%/unittest/015_package.pyc
-%%SERV%%%%ASTKDIR%%/unittest/015_package.pyo
%%SERV%%%%ASTKDIR%%/unittest/020_object.py
-%%SERV%%%%ASTKDIR%%/unittest/020_object.pyc
-%%SERV%%%%ASTKDIR%%/unittest/020_object.pyo
%%SERV%%%%ASTKDIR%%/unittest/030_server.py
-%%SERV%%%%ASTKDIR%%/unittest/030_server.pyc
-%%SERV%%%%ASTKDIR%%/unittest/030_server.pyo
%%SERV%%%%ASTKDIR%%/unittest/050_build_export.py
-%%SERV%%%%ASTKDIR%%/unittest/050_build_export.pyc
-%%SERV%%%%ASTKDIR%%/unittest/050_build_export.pyo
%%SERV%%%%ASTKDIR%%/unittest/060_thread.py
-%%SERV%%%%ASTKDIR%%/unittest/060_thread.pyc
-%%SERV%%%%ASTKDIR%%/unittest/060_thread.pyo
%%SERV%%%%ASTKDIR%%/unittest/065_system.py
-%%SERV%%%%ASTKDIR%%/unittest/065_system.pyc
-%%SERV%%%%ASTKDIR%%/unittest/065_system.pyo
%%SERV%%%%ASTKDIR%%/unittest/090_devel.py
-%%SERV%%%%ASTKDIR%%/unittest/090_devel.pyc
-%%SERV%%%%ASTKDIR%%/unittest/090_devel.pyo
%%SERV%%%%ASTKDIR%%/unittest/100_study.py
-%%SERV%%%%ASTKDIR%%/unittest/100_study.pyc
-%%SERV%%%%ASTKDIR%%/unittest/100_study.pyo
%%SERV%%%%ASTKDIR%%/unittest/110_server.py
-%%SERV%%%%ASTKDIR%%/unittest/110_server.pyc
-%%SERV%%%%ASTKDIR%%/unittest/110_server.pyo
%%SERV%%%%ASTKDIR%%/unittest/150_astout.py
-%%SERV%%%%ASTKDIR%%/unittest/150_astout.pyc
-%%SERV%%%%ASTKDIR%%/unittest/150_astout.pyo
%%SERV%%%%ASTKDIR%%/unittest/160_parametric.py
-%%SERV%%%%ASTKDIR%%/unittest/160_parametric.pyc
-%%SERV%%%%ASTKDIR%%/unittest/160_parametric.pyo
%%SERV%%%%ASTKDIR%%/unittest/200_client.py
-%%SERV%%%%ASTKDIR%%/unittest/200_client.pyc
-%%SERV%%%%ASTKDIR%%/unittest/200_client.pyo
%%SERV%%%%ASTKDIR%%/unittest/210_multi.py
-%%SERV%%%%ASTKDIR%%/unittest/210_multi.pyc
-%%SERV%%%%ASTKDIR%%/unittest/210_multi.pyo
%%SERV%%%%ASTKDIR%%/unittest/300_development.py
-%%SERV%%%%ASTKDIR%%/unittest/300_development.pyc
-%%SERV%%%%ASTKDIR%%/unittest/300_development.pyo
%%SERV%%%%ASTKDIR%%/unittest/301_development_long.py
-%%SERV%%%%ASTKDIR%%/unittest/301_development_long.pyc
-%%SERV%%%%ASTKDIR%%/unittest/301_development_long.pyo
%%SERV%%%%ASTKDIR%%/unittest/310_study_dvp.py
-%%SERV%%%%ASTKDIR%%/unittest/310_study_dvp.pyc
-%%SERV%%%%ASTKDIR%%/unittest/310_study_dvp.pyo
%%SERV%%%%ASTKDIR%%/unittest/320_astout_dvp.py
-%%SERV%%%%ASTKDIR%%/unittest/320_astout_dvp.pyc
-%%SERV%%%%ASTKDIR%%/unittest/320_astout_dvp.pyo
%%SERV%%%%ASTKDIR%%/unittest/901_realistic.py
-%%SERV%%%%ASTKDIR%%/unittest/901_realistic.pyc
-%%SERV%%%%ASTKDIR%%/unittest/901_realistic.pyo
%%SERV%%%%ASTKDIR%%/unittest/999_clean.py
-%%SERV%%%%ASTKDIR%%/unittest/999_clean.pyc
-%%SERV%%%%ASTKDIR%%/unittest/999_clean.pyo
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/010_misc.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/010_misc.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/015_package.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/015_package.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/020_object.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/020_object.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/030_server.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/030_server.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/050_build_export.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/050_build_export.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/060_thread.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/060_thread.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/065_system.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/065_system.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/090_devel.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/090_devel.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/100_study.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/100_study.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/110_server.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/110_server.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/150_astout.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/150_astout.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/160_parametric.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/160_parametric.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/200_client.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/200_client.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/210_multi.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/210_multi.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/300_development.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/300_development.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/301_development_long.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/301_development_long.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/310_study_dvp.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/310_study_dvp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/320_astout_dvp.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/320_astout_dvp.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/901_realistic.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/901_realistic.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/999_clean.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/999_clean.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/common.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/data.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/run_test.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/run_test.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/test_relocate.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ASTKDIR%%/unittest/__pycache__/test_relocate.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ASTKDIR%%/unittest/common.py
-%%SERV%%%%ASTKDIR%%/unittest/common.pyc
-%%SERV%%%%ASTKDIR%%/unittest/common.pyo
%%SERV%%%%ASTKDIR%%/unittest/data.py
-%%SERV%%%%ASTKDIR%%/unittest/data.pyc
-%%SERV%%%%ASTKDIR%%/unittest/data.pyo
-%%SERV%%%%ASTKDIR%%/unittest/datafiles/astout_dvp.list
%%SERV%%%%ASTKDIR%%/unittest/datafiles/astout.list
+%%SERV%%%%ASTKDIR%%/unittest/datafiles/astout_dvp.list
%%SERV%%%%ASTKDIR%%/unittest/datafiles/chg_capy.comm
%%SERV%%%%ASTKDIR%%/unittest/datafiles/config_serveurs
%%SERV%%%%ASTKDIR%%/unittest/datafiles/forma01a.mmed
@@ -581,40 +589,40 @@
%%SERV%%%%ASTKDIR%%/unittest/datafiles/test_profile.sh
%%SERV%%%%ASTKDIR%%/unittest/datafiles/with_win_CR.export
%%SERV%%%%ASTKDIR%%/unittest/run_test.py
-%%SERV%%%%ASTKDIR%%/unittest/run_test.pyc
-%%SERV%%%%ASTKDIR%%/unittest/run_test.pyo
%%SERV%%%%ASTKDIR%%/unittest/test_relocate.py
-%%SERV%%%%ASTKDIR%%/unittest/test_relocate.pyc
-%%SERV%%%%ASTKDIR%%/unittest/test_relocate.pyo
+%%SERV%%aster/aster-mpihosts
%%SERV%%%%ETCDIR%%/asrun
%%SERV%%%%ETCDIR%%/aster
%%SERV%%%%ETCDIR%%/config_nodename
+%%SERV%%%%ETCDIR%%/mpi_hostfile
%%SERV%%%%ETCDIR%%/plugins/__init__.py
-%%SERV%%%%ETCDIR%%/plugins/__init__.pyc
-%%SERV%%%%ETCDIR%%/plugins/__init__.pyo
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/__init__.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/aster4_calcul.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/aster4_calcul.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/aster5.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/aster5.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/athosdev.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/athosdev.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/distribution.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/distribution.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/eole.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/eole.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/gaia.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/gaia.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/ivanoe.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/ivanoe.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/sge_pe.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/sge_pe.cpython-%%PYTHON_SUFFIX%%.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/tail_slurm.cpython-%%PYTHON_SUFFIX%%.opt-1.pyc
+%%SERV%%%%ETCDIR%%/plugins/__pycache__/tail_slurm.cpython-%%PYTHON_SUFFIX%%.pyc
%%SERV%%%%ETCDIR%%/plugins/aster4_calcul.py
-%%SERV%%%%ETCDIR%%/plugins/aster4_calcul.pyc
-%%SERV%%%%ETCDIR%%/plugins/aster4_calcul.pyo
%%SERV%%%%ETCDIR%%/plugins/aster5.py
-%%SERV%%%%ETCDIR%%/plugins/aster5.pyc
-%%SERV%%%%ETCDIR%%/plugins/aster5.pyo
%%SERV%%%%ETCDIR%%/plugins/athosdev.py
-%%SERV%%%%ETCDIR%%/plugins/athosdev.pyc
-%%SERV%%%%ETCDIR%%/plugins/athosdev.pyo
%%SERV%%%%ETCDIR%%/plugins/distribution.py
-%%SERV%%%%ETCDIR%%/plugins/distribution.pyc
-%%SERV%%%%ETCDIR%%/plugins/distribution.pyo
%%SERV%%%%ETCDIR%%/plugins/eole.py
-%%SERV%%%%ETCDIR%%/plugins/eole.pyc
-%%SERV%%%%ETCDIR%%/plugins/eole.pyo
+%%SERV%%%%ETCDIR%%/plugins/gaia.py
%%SERV%%%%ETCDIR%%/plugins/ivanoe.py
-%%SERV%%%%ETCDIR%%/plugins/ivanoe.pyc
-%%SERV%%%%ETCDIR%%/plugins/ivanoe.pyo
%%SERV%%%%ETCDIR%%/plugins/sge_pe.py
-%%SERV%%%%ETCDIR%%/plugins/sge_pe.pyc
-%%SERV%%%%ETCDIR%%/plugins/sge_pe.pyo
%%SERV%%%%ETCDIR%%/plugins/tail_slurm.py
-%%SERV%%%%ETCDIR%%/plugins/tail_slurm.pyc
-%%SERV%%%%ETCDIR%%/plugins/tail_slurm.pyo
%%SERV%%%%ETCDIR%%/profile_astk.sh
-%%SERV%%%%MPI%%aster/aster-mpihosts
Modified: head/cad/scotch/Makefile
==============================================================================
--- head/cad/scotch/Makefile Mon Dec 23 19:12:59 2019 (r520738)
+++ head/cad/scotch/Makefile Mon Dec 23 20:10:09 2019 (r520739)
@@ -2,8 +2,7 @@
# $FreeBSD$
PORTNAME= scotch
-DISTVERSION= 6.0.4-aster5
-PORTREVISION= 3
+DISTVERSION= 6.0.4-aster7
CATEGORIES= cad science
MAINTAINER= thierry at FreeBSD.org
Modified: head/french/aster/Makefile
==============================================================================
--- head/french/aster/Makefile Mon Dec 23 19:12:59 2019 (r520738)
+++ head/french/aster/Makefile Mon Dec 23 20:10:09 2019 (r520739)
@@ -3,7 +3,6 @@
PORTNAME= aster
DISTVERSION= ${ASTER_DISTVERSION}
-PORTREVISION= 6
CATEGORIES= french cad
MAINTAINER= thierry at FreeBSD.org
@@ -11,9 +10,6 @@ COMMENT= Code_Aster finite element method solver
LICENSE= GPLv2
-# Broken since r490369 on math/metis
-BROKEN_amd64= does not build (conflicting types for 'WritePermutation' ibc/renum/onmetl.c vs /usr/local/include/programs/proto.h)
-
#-----------------------------------------------------------------------
# You may define these options:
#
@@ -41,17 +37,15 @@ BUILD_DEPENDS+= astk-serveur>0:cad/astk-serveur \
bash:shells/bash \
${PYNUMPY}
# pylupdate5:textproc/py-qt5-xml
-LIB_DEPENDS+= libhdf5-18.so:science/hdf5-18 \
+LIB_DEPENDS+= libhdf5.so:science/hdf5 \
libmetis.so:math/metis \
- libomp.so:devel/openmp \
libmed.so:french/med
# libAsterInterface.so:science/mfront
# libAsterInterface.so:science/tfel
-RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot@${PY_FLAVOR} \
- ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \
+RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \
astk-serveur>0:cad/astk-serveur
-USES= bison fortran gettext python:2.7 qt:5 tk
+USES= bison fortran gettext python:3.6 qt:5 tk
USE_BINUTILS= yes
USE_QT= linguisttools_build
@@ -62,9 +56,11 @@ USES+= blaslapack:netlib
.endif
HAS_CONFIGURE= yes
-MAKE_ENV= INCLUDES="${LOCALBASE}/include/hdf5-18 ${LOCALBASE}/include" \
- INCLUDEDIR="${LOCALBASE}/include/hdf5-18 ${LOCALBASE}/include" \
+MAKE_ENV= INCLUDES="${LOCALBASE}/include" \
+ INCLUDEDIR="${LOCALBASE}/include" \
LD_PRELOAD="${LOCALBASE}/lib/gcc${_GCC_VER}/libgcc_s.so.1" \
+ PYTHONPATH="${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV" \
+ PYTHONIOENCODING="utf-8" LANG=C LC_ALL="en_US.UTF-8" \
LINKFLAGS="${LDFLAGS}" LD_LIBRARY_PATH="${LOCALBASE}/lib/gcc${_GCC_VER}"
REINPLACE_ARGS= -i ""
@@ -87,6 +83,11 @@ INTERACTIVE_SCRIPTS= check_compilers.py setup.py
.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
.include <bsd.port.pre.mk>
+.if ${OPSYS} == FreeBSD && ((${OSREL:R} == 12 && ${OSVERSION} < 1201506) \
+ || (${OSREL:R} > 12 && ${OSVERSION} < 1300068))
+BROKEN= a larger value of ARG_MAX is needed for Code_Aster, please upgrade your system
+.endif
+
.if ${ARCH} == "i386"
FLAGARCH= -DP_LINUX -DLINUX
.else
@@ -171,11 +172,13 @@ WITH_ED= vi
INST_DAT= elements
INST_SH= as_run parallel_cp
-PFX2FIX= bin/as_run ${VE}/include/aster/asterc_config.h \
- ${VE}/include/aster/asterf_config.h ${VE}/share/aster/profile.sh\
- etc/codeaster/profile.sh etc/codeaster/aster \
- ${VE}/lib/aster/aster_pkginfo.py ${VE}/aster.conf \
- ${VE}/share/aster/CTestTestfile.cmake ${VE}/share/aster/config.txt
+PFX2FIX= bin/as_run etc/codeaster/aster etc/codeaster/profile.sh \
+ ${VE}/aster.conf ${VE}/lib/aster/aster_pkginfo.py \
+ ${VE}/share/aster/CTestTestfile.cmake \
+ ${VE}/include/aster/asterf_config.h \
+ ${VE}/include/aster/asterc_config.h \
+ ${VE}/share/aster/config.txt ${VE}/share/aster/profile.sh
+POSTPY2FIX= post-patch-waf.engine post-patch-data__post_install
inst_dir= ${PREFIX}/${PORTNAME}
tools_dir= ${PREFIX}/${PORTNAME}/outils
tools= cmpfillin gpmetis graphchk m2gmetis mpmetis ndmetis gnuplot
@@ -196,6 +199,8 @@ ASTKDIR= ${LOCALBASE}/${LASTKDIR}
BASH2RC= products_data.py
+ExportPATH?= /tmp/maillages
+
pre-everything::
.if defined(WITH_MPI)
@${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run \`mpd &'"
@@ -210,10 +215,13 @@ pre-configure:
${WRKSRC}/products.py
${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;s|'gcc'|'${CC}'|g" \
-e "s|'g++'|'${CXX}'|g" ${WRKSRC}/check_compilers.py
- ${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/as_setup.py
+ ${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" \
+ -e "s|%%PYTHON_CMD%%|${PYTHON_CMD}|" \
+ -e "s|%%WRKDIR%%|${WRKDIR}|" ${WRKSRC}/as_setup.py
.for sh in ${BASH2RC}
${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
.endfor
+ ${REINPLACE_CMD} -e 's|%%PYTHON_ABIVER%%|${PYTHON_ABIVER}|' ${WRKSRC}/setup.py
.if defined(WITH_ATLAS)
${REINPLACE_CMD} -e "s|cfg\['BLASLIB'\]|cfg['BLASLIB'], cfg['ATLASLIB']|" \
${WRKSRC}/products.py
@@ -243,12 +251,16 @@ pre-configure:
${ECHO_CMD} "_install_aster_Linux = False" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "_install_scotch = False" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "OPT_ENV = 'verbose=True'" >> ${WRKSRC}/setup.cfg
+ ${ECHO_CMD} "PYTHONPATH = '${PYTHON_SITELIBDIR}:${LOCALBASE}/aster/ASTK/ASTK_SERV'"\
+ >> ${WRKSRC}/setup.cfg
+ ${ECHO_CMD} "PYTHON_INCLUDE = '${PYTHON_INCLUDEDIR}'" >> ${WRKSRC}/setup.cfg
+ ${ECHO_CMD} "HOME_PYTHON = '${PYTHONBASE}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "HOME_SCOTCH = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "HOME_METIS = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "HOME_GMSH = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "HOME_GIBI = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "HOME_HOMARD = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
- ${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include/hdf5-18', '${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\
+ ${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\
>> ${WRKSRC}/setup.cfg
${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg
# Disable MFront at the moment (compilation error)
@@ -264,7 +276,7 @@ pre-configure:
${ECHO_CMD} "F90='${FC}'" >> ${WRKSRC}/setup.cfg
${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'" \
>> ${WRKSRC}/setup.cfg
- ${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic ${MPISEQ} -lexecinfo -lutil -lpthread -lz'" \
+ ${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic ${MPISEQ} -lc++ -lexecinfo -lutil -lpthread -lz'" \
>> ${WRKSRC}/setup.cfg
${ECHO_CMD} "SYSLIB='-lpthread -lz'" >> ${WRKSRC}/setup.cfg
.if defined(WITH_MPI)
@@ -320,7 +332,7 @@ pre-configure:
do-configure:
(cd ${CONFIGURE_WRKSRC} \
- && TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} \
+ && TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS} \
--prefix=${STAGEDIR}${inst_dir} test | tee ${CONFIGURE_LOG})
@${ECHO_MSG} "---------------- Debug ------------------"
${CAT} ${CONFIGURE_WRKSRC}/setup.log
@@ -344,9 +356,16 @@ post-configure:
${STAGEDIR}${inst_dir}/${sf}
.endfor
+pre-build:
+ ${MKDIR} ${WRKDIR}/post_patches
+ ${CP} ${FILESDIR}/post-patch-* ${WRKDIR}/post_patches/
+.for pp in ${POSTPY2FIX}
+ ${REINPLACE_CMD} -e 's|%%PYTHON_CMD%%|${PYTHON_CMD}|' ${WRKDIR}/post_patches/${pp}
+.endfor
+
do-build:
(cd ${BUILD_WRKSRC} && \
- TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} install aster \
+ TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.py ${DEBUG_FLAGS} install aster \
--prefix=${STAGEDIR}${inst_dir} | tee ${BUILD_WRKSRC}/build.log)
do-install:
@@ -392,10 +411,16 @@ post-install:
.for f in aster.install_${VE} profile.sh
${MV} ${WRKDIR}/AvoidConflictWithASTK/${f} ${STAGEDIR}${inst_dir}/etc/codeaster/
.endfor
+.for f in aster_pkginfo.cpython-${PYTHON_SUFFIX}.pyc aster_pkginfo.cpython-${PYTHON_SUFFIX}.opt-1.pyc
+ ${RM} ${STAGEDIR}${inst_dir}/${VE}/lib/aster/__pycache__/${f}
+.endfor
+ ${FIND} ${STAGEDIR}${inst_dir}/${VE}/share/aster/tests -name "*.datg" | \
+ ${XARGS} ${REINPLACE_CMD} -e 's|/home/PHIMECA/maillages/|${ExportPATH}|'
.if defined(MAINTAINER_MODE)
regression-test: install
@${ECHO_MSG} "Note: homard must be installed to run some steps succesfully."
+ ${MKDIR} ${ExportPATH}
${CP} ${inst_dir}/${VE}/astout.export /tmp/
(cd ${inst_dir}/${VE} && \
${LOCALBASE}/aster/bin/as_run --list --all --vers=${VE} \
Modified: head/french/aster/bsd.aster.mk
==============================================================================
--- head/french/aster/bsd.aster.mk Mon Dec 23 19:12:59 2019 (r520738)
+++ head/french/aster/bsd.aster.mk Mon Dec 23 20:10:09 2019 (r520739)
@@ -10,7 +10,7 @@ MASTER_SITES= http://www.code-aster.org/FICHIERS/ \
DISTNAME= aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
DISTINFO_FILE= ${.CURDIR}/../../french/aster/distinfo
-ASTER_VER= 13.6.0
+ASTER_VER= 14.4.0
ASTER_DISTVERSION= ${ASTER_VER}-1
EXTRACT_WRKSRC= ${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
Modified: head/french/aster/distinfo
==============================================================================
--- head/french/aster/distinfo Mon Dec 23 19:12:59 2019 (r520738)
+++ head/french/aster/distinfo Mon Dec 23 20:10:09 2019 (r520739)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1534507408
-SHA256 (aster-full-src-13.6.0-1.noarch.tar.gz) = 6e4eba279969506beda797b9908e5a4bc858e7cff7686582ac9d41545daea7a0
-SIZE (aster-full-src-13.6.0-1.noarch.tar.gz) = 265469934
+TIMESTAMP = 1572098780
+SHA256 (aster-full-src-14.4.0-1.noarch.tar.gz) = fd29b85f5dd3370dfa6fcae9d955f94e3eee5e4c633591aa292f0e7ce3f7ab7c
+SIZE (aster-full-src-14.4.0-1.noarch.tar.gz) = 301386329
Modified: head/french/aster/files/patch-as_setup.py
==============================================================================
--- head/french/aster/files/patch-as_setup.py Mon Dec 23 19:12:59 2019 (r520738)
+++ head/french/aster/files/patch-as_setup.py Mon Dec 23 20:10:09 2019 (r520739)
@@ -1,4 +1,4 @@
---- as_setup.py.orig 2017-08-26 13:56:41 UTC
+--- as_setup.py.orig 2019-10-01 12:45:34 UTC
+++ as_setup.py
@@ -45,6 +45,8 @@ import tarfile
import compileall
@@ -15,9 +15,9 @@
"""
+ from as_setup import (SYSTEM)
self._print(self._fmt_title % _('Extraction'))
- if kargs.get('external')<>None:
+ if kargs.get('external')!=None:
self._call_external(**kargs)
-@@ -518,6 +521,76 @@ class SETUP:
+@@ -518,6 +521,78 @@ class SETUP:
if iextr_as:
self.Clean(to_delete=path)
@@ -26,27 +26,27 @@
+ self._print('FreeBSD patch: no libdl => modify ' + file2patch)
+ for ligne in fileinput.input(file2patch, inplace=1):
+ nl = 0
-+ nl = string.find(ligne, "uselib_store='SYS', lib='dl'")
++ nl = ligne.find("uselib_store='SYS', lib='dl'")
+ if nl > 0:
+ ligne =ligne.replace("self.check_cc", "# self.check_cc")
+ sys.stdout.write(ligne)
-+ file2patch = os.path.join(self.workdir, self.content, 'bibcxx/wscript')
-+ self._print('FreeBSD patch: explicit link with libc++ required since Gcc 4.9 => modify ' + file2patch)
-+ for ligne in fileinput.input(file2patch, inplace=1):
-+ nl = 0
-+ nl = string.find(ligne, "uselib_store='CXX', lib='stdc++'")
-+ if nl > 0:
-+ ligne =ligne.replace("lib='stdc++'", "lib='c++ stdc++'")
-+ sys.stdout.write(ligne)
++ # file2patch = os.path.join(self.workdir, self.content, 'bibcxx/wscript')
++ # self._print('FreeBSD patch: explicit link with libc++ required since Gcc 4.9 => modify ' + file2patch)
++ # for ligne in fileinput.input(file2patch, inplace=1):
++ # nl = 0
++ # nl = ligne.find("uselib_store='CXX', lib='stdc++'")
++ # if nl > 0:
++ # ligne =ligne.replace("lib='stdc++'", "lib='c++ stdc++'")
++ # sys.stdout.write(ligne)
+ file2patch = os.path.join(self.workdir, self.content, 'waftools/scotch.py')
+ self._print('FreeBSD patch: int64_t missing => modify ' + file2patch)
+ for ligne in fileinput.input(file2patch, inplace=1):
+ nl = 0
-+ nl = string.find(ligne, 'include "scotch.h"')
++ nl = ligne.find('include "scotch.h"')
+ if nl > 0:
+ sys.stdout.write("#include <sys/types.h>\n")
+ nl = 0
-+ nl = string.find(ligne, "stdio.h stdlib.h scotch.h")
++ nl = ligne.find("stdio.h stdlib.h scotch.h")
+ if nl > 0:
+ ligne =ligne.replace("stdlib.h", "stdlib.h sys/types.h")
+ sys.stdout.write(ligne)
@@ -54,38 +54,40 @@
+ self._print('FreeBSD patch: stdlib + no mallopt => modify ' + file2patch)
+ for ligne in fileinput.input(file2patch, inplace=1):
+ nl = 0
-+ nl = string.find(ligne, 'ir=mallopt')
++ nl = ligne.find('ir=mallopt')
+ if nl > 0:
+ ligne =ligne.replace('ir=mallopt', '/* ir=mallopt')
+ ligne =ligne.replace(');', '); */')
+ else:
-+ nl = string.find(ligne, "malloc.h")
++ nl = ligne.find("malloc.h")
+ if nl > 0:
+ ligne =ligne.replace("malloc.h", "stdlib.h")
+ sys.stdout.write(ligne)
+ system=SYSTEM({ 'verbose' : True, 'debug' : False },
+ **{'maxcmdlen' : 2**31, 'log' : self})
*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
More information about the svn-ports-all
mailing list