Date: Sun, 13 Nov 2016 12:44:13 +0000 (UTC) From: Thierry Thomas <thierry@FreeBSD.org> To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r426042 - in head: cad/astk-serveur cad/astk-serveur/files cad/astk-serveur/files.client french/aster french/aster/files french/eficas french/eficas/files french/homard french/med frenc... Message-ID: <201611131244.uADCiDoE096954@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
Author: thierry Date: Sun Nov 13 12:44:13 2016 New Revision: 426042 URL: https://svnweb.freebsd.org/changeset/ports/426042 Log: Upgrade Code_Aster to 12.0.6-4. This brings french/eficas to 2016.0.1, cad/astk-serveur and astk-client to 1.13.8.2, french/med to 3.2.0 (built against hdf5-18), bump PORTREVSION to math/metis-edf and fix soname, and french/homard to 11.7-1. Added: head/french/med/files/patch-configure (contents, props changed) Deleted: head/cad/astk-serveur/files/patch-etc_profile.csh head/french/aster/files/bibc_utilitai_mempid.c.diff Modified: head/cad/astk-serveur/Makefile head/cad/astk-serveur/files.client/patch-bin_astk head/cad/astk-serveur/pkg-plist 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-check_compilers_src.py head/french/aster/files/patch-products.py head/french/aster/files/patch-setup.cfg head/french/aster/files/patch-setup.py head/french/aster/files/pkg-message.in head/french/aster/files/pkg-message.sans-astk.in head/french/aster/pkg-plist head/french/eficas/Makefile head/french/eficas/files/patch-eficasQt head/french/eficas/pkg-message head/french/eficas/pkg-plist head/french/homard/Makefile head/french/homard/pkg-message head/french/med/Makefile head/french/med/pkg-plist head/math/metis-edf/Makefile Modified: head/cad/astk-serveur/Makefile ============================================================================== --- head/cad/astk-serveur/Makefile Sun Nov 13 12:43:21 2016 (r426041) +++ head/cad/astk-serveur/Makefile Sun Nov 13 12:44:13 2016 (r426042) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= astk -DISTVERSION= 1.13.5-1 +DISTVERSION= 1.13.8-2 CATEGORIES= cad .if !defined(CLIENT_SEUL) PKGNAMESUFFIX= -serveur @@ -40,6 +40,7 @@ REINPLACE_ARGS= -i "" EXTRACT_WRKSRC= ${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION:S/-/./:R}/SRC +NO_ARCH= yes SUB_FILES= pkg-message SUB_LIST= inst_dir=${inst_dir} tools_dir=${tools_dir} PKGMESSAGE= ${WRKDIR}/pkg-message @@ -47,8 +48,7 @@ LINSTDIR= aster/ASTK inst_dir= ${PREFIX}/${LINSTDIR} aster_dir= ${LOCALBASE}/aster/${vaster} S_SCRIPTS= bin/as_run bin/parallel_cp asrun/installation.py \ - share/codeaster/asrun/data/mpirun_template \ - etc/profile.csh + share/codeaster/asrun/data/mpirun_template S_PYLIBS= share/codeaster/asrun/examples/alamain.py \ unittest/datafiles/config_serveurs unittest/010_misc.py \ unittest/015_package.py unittest/run_test.py @@ -58,13 +58,14 @@ conf_dir= ${WRKSRC}/etc/astkrc .include <bsd.port.pre.mk> +WRKCONF= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/configuration .if !defined(CLIENT_SEUL) WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV PATCHDIR= ${MASTERDIR}/files -PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment " \ +PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "\ vaster=${vaster} -PATCH2RM= bin/as_run bin/parallel_cp etc/asrun etc/profile.csh etc/profile.sh \ - asrun/config.py asrun/installation.py asrun/system.py \ +PATCH2RM= bin/as_run bin/parallel_cp etc/asrun etc/profile.sh \ + asrun/config.py asrun/installation.py asrun/system.py \ asrun/common/sysutils.py asrun/system_command.py . if exists(${LOCALBASE}/sbin/pbs_server) WITH_PBS= yes @@ -121,6 +122,9 @@ SHIA= zsh .endif SHIADEP= ${SHIA} BASH2RC= asrun/calcul.py share/codeaster/asrun/data/mpirun_template +BASH2RC2= lib/tkselecteur.tcl +BASH2RC3= deprecated_outils.sh extract_info.py deprecated_client.sh \ + deprecated_server.sh .if !defined(WITH_ED) . if exists(${LOCALBASE}/bin/nedit) @@ -132,9 +136,6 @@ RUN_DEPENDS+= ${LOCALBASE}/bin/gvim:edit . elif exists(${LOCALBASE}/bin/emacs) WITH_ED= emacs RUN_DEPENDS+= ${LOCALBASE}/bin/emacs:editors/emacs -. elif exists(${LOCALBASE}/bin/xemacs) -WITH_ED= xemacs -RUN_DEPENDS+= ${LOCALBASE}/bin/xemacs:editors/xemacs . elif exists(${LOCALBASE}/bin/gedit) WITH_ED= gedit RUN_DEPENDS+= ${LOCALBASE}/bin/gedit:editors/gedit @@ -197,16 +198,14 @@ do-configure: -e "s|LOCALBASE|${LOCALBASE}|" \ ${WRKSRC}/etc/${sc} . endfor -. for sh in sh csh ${REINPLACE_CMD} -e "s|?ASTER_ROOT?|${LOCALBASE}/aster|" \ -e 's|?HOME_PYTHON?|${PYTHONBASE}|' \ -e 's|?ASRUN_SITE_PKG?|${PREFIX}/${LINSTDIR}/ASTK_SERV|' \ -e 's|?PYTHON_EXE?|${PYTHON_CMD}|' \ -e 's|?HOME_MED?|${LOCALBASE}|' \ -e 's|?HOME_HDF?|${LOCALBASE}|' \ - -e "s|?WISH_EXE?|${WISH}|" \ - ${WRKSRC}/etc/profile.${sh} -. endfor + -e "s|?WISH_EXE?|${WISH}|" \ + ${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}|" \ @@ -262,7 +261,13 @@ do-configure: ${WRKSRC}/lib/tkselecteur.tcl ${REINPLACE_CMD} -e "s|%%unamesm%%|${unamesm}|" \ ${WRKSRC}/lib/init.tcl +. for sh in ${BASH2RC2} + ${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh} +. endfor .endif +.for sh in ${BASH2RC3} + ${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKCONF}/${sh} +.endfor do-install: ${MKDIR} ${STAGEDIR}${inst_dir} @@ -278,6 +283,7 @@ do-install: (cd ${STAGEDIR}${PREFIX} \ && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ -d ${PREFIX} -f aster) + ${MV} ${STAGEDIR}${ETCDIR}/profile.sh ${STAGEDIR}${ETCDIR}/profile_astk.sh . if defined(WITH_MPI) ${ECHO_CMD} "localhost" > ${STAGEDIR}${PREFIX}/aster/aster-mpihosts . endif Modified: head/cad/astk-serveur/files.client/patch-bin_astk ============================================================================== --- head/cad/astk-serveur/files.client/patch-bin_astk Sun Nov 13 12:43:21 2016 (r426041) +++ head/cad/astk-serveur/files.client/patch-bin_astk Sun Nov 13 12:44:13 2016 (r426042) @@ -1,5 +1,5 @@ ---- bin/astk.orig 2011-12-20 13:33:00.000000000 +0100 -+++ bin/astk 2012-05-08 12:31:09.000000000 +0200 +--- bin/astk.orig 2015-08-05 15:37:44 UTC ++++ bin/astk @@ -17,15 +17,9 @@ # 1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE. # ============================================================================== @@ -9,19 +9,18 @@ - local bin=`dirname $this` - prefix=`dirname $bin` -} +- +-set_prefix $0 +prefix=%%inst_dir%%/ASTK_CLIENT --set_prefix $0 -- -ASTER_ROOT=$prefix +ASTER_ROOT=?ASTER_ROOT? ASTER_ETC=$ASTER_ROOT/etc if [ "$ASTER_ROOT" = "/usr" ]; then ASTER_ETC=/etc -@@ -43,5 +37,5 @@ +@@ -43,4 +37,4 @@ if [ -z "$WISHEXECUTABLE" ]; then WISHEXECUTABLE=wish fi -$WISHEXECUTABLE $ASTER_ROOT/lib/astk/astk.tcl -- $* & +$WISHEXECUTABLE $prefix/lib/astk.tcl -- $* & - Modified: head/cad/astk-serveur/pkg-plist ============================================================================== --- head/cad/astk-serveur/pkg-plist Sun Nov 13 12:43:21 2016 (r426041) +++ head/cad/astk-serveur/pkg-plist Sun Nov 13 12:44:13 2016 (r426042) @@ -372,6 +372,9 @@ %%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 @@ -381,6 +384,9 @@ %%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 @@ -399,6 +405,9 @@ %%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 @@ -448,13 +457,18 @@ %%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/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/profile.csh +%%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 @@ -579,11 +593,16 @@ %%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/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%%/profile.csh -%%SERV%%%%ETCDIR%%/profile.sh +%%SERV%%%%ETCDIR%%/plugins/tail_slurm.py +%%SERV%%%%ETCDIR%%/plugins/tail_slurm.pyc +%%SERV%%%%ETCDIR%%/plugins/tail_slurm.pyo +%%SERV%%%%ETCDIR%%/profile_astk.sh Modified: head/french/aster/Makefile ============================================================================== --- head/french/aster/Makefile Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/Makefile Sun Nov 13 12:44:13 2016 (r426042) @@ -3,7 +3,7 @@ PORTNAME= aster DISTVERSION= ${ASTER_DISTVERSION} -PORTREVISION= 2 +CATEGORIES= french cad CATEGORIES= french cad MAINTAINER= thierry@FreeBSD.org @@ -32,19 +32,20 @@ LICENSE= GPLv2 #----------------------------------------------------------------------- BUILD_DEPENDS+= astk-serveur>0:cad/astk-serveur \ - ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ + ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ ${LOCALBASE}/lib/libscotch.a:cad/scotch \ - python:lang/python \ + python:lang/python \ ${PYNUMPY} -LIB_DEPENDS+= libhdf5.so:science/hdf5 \ +LIB_DEPENDS+= libhdf5-18.so:science/hdf5-18 \ libmed.so:french/med \ - libmetis.so.0:math/metis-edf -RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot \ + libmetis.so.0:math/metis-edf \ + libAsterInterface.so:science/tfel +RUN_DEPENDS+= ${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot\ ${LOCALBASE}/bin/onmetis:math/metis-edf \ - ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ + ${SHELL_INSTALL_ASTER}:shells/${SHIADEP} \ astk-serveur>0:cad/astk-serveur -USES= bison fortran tk python:2 +USES= bison fortran gettext python:2 tk USE_BINUTILS= yes .if defined(WITH_ATLAS) @@ -54,7 +55,7 @@ USES+= blaslapack:netlib .endif HAS_CONFIGURE= yes -MAKE_ENV= INCLUDES="${LOCALBASE}/include ${LOCALBASE}/include/metis" +MAKE_ENV= INCLUDES="${LOCALBASE}/include/hdf5-18 ${LOCALBASE}/include ${LOCALBASE}/include/metis" REINPLACE_ARGS= -i "" VER= ${PORTVERSION:R} @@ -163,12 +164,11 @@ WITH_ED= vi INST_DAT= elements INST_SH= as_run parallel_cp -PFX2FIX= bin/as_run ${VE}/include/aster/asterc_config.h ${VE}/config.txt \ - ${VE}/include/aster/asterf_config.h ${VE}/profile.sh \ - ${VE}/lib/aster/aster_pkginfo.py -V_HOMARD= V11_2 -V_HOMARD0= V10_6 -V_H2FIX= ${VE}/lib/aster/Cata/cata.py ${VE}/tests/zzzz121a.comm +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 inst_dir= ${PREFIX}/${PORTNAME} tools_dir= ${PREFIX}/${PORTNAME}/outils tools= kmetis onmetis pmetis gnuplot @@ -240,9 +240,10 @@ pre-configure: ${ECHO_CMD} "OPT_ENV = 'verbose=True'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_SCOTCH = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_METIS = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\ + ${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include/hdf5-18', '${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "HOME_MFRONT = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg .if ${MUMPS_PORT} == "mumps-mpich" ${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'" >> ${WRKSRC}/setup.cfg .endif @@ -276,7 +277,7 @@ pre-configure: ${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "TERMINAL='xterm'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "EDITOR='${WITH_ED}'" >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "LDFLAGS='-v ${LDFLAGS}'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "LDFLAGS='${LDFLAGS}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "FFLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'" \ @@ -309,8 +310,8 @@ pre-configure: do-configure: (cd ${CONFIGURE_WRKSRC} \ - && TMPDIR=${WRKDIR} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} test \ - --prefix=${STAGEDIR}${inst_dir} | tee ${CONFIGURE_LOG}) + && TMPDIR=${WRKDIR} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} \ + --prefix=${STAGEDIR}${inst_dir} test | tee ${CONFIGURE_LOG}) @${ECHO_MSG} "---------------- Debug ------------------" ${CAT} ${CONFIGURE_WRKSRC}/setup.log @${ECHO_MSG} "------------ Fin debug ------------------" @@ -325,6 +326,8 @@ post-configure: ${STAGEDIR}${inst_dir} ${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|' \ ${STAGEDIR}${inst_dir}/bin/as_run + ${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/profile_astk.sh \ + ${STAGEDIR}${inst_dir}/etc/codeaster/profile.sh .for sf in etc/codeaster/profile.sh asrun/installation.py ${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${STAGEDIR}${inst_dir}|g' \ -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|g' \ @@ -341,15 +344,6 @@ do-install: @${DO_NADA} post-install: - ${RM} -r ${STAGEDIR}${inst_dir}/etc # Installed by cad/astk-serveur - ${MV} ${STAGEDIR}${inst_dir}/${VE}/share/aster/tests \ - ${STAGEDIR}${inst_dir}/${VE}/ - ${MV} ${STAGEDIR}${inst_dir}/${VE}/share/aster/* \ - ${STAGEDIR}${inst_dir}/${VE}/ - ${RM} -r ${STAGEDIR}${inst_dir}/${VE}/share -.for f in ${V_H2FIX} - ${REINPLACE_CMD} -e 's|${V_HOMARD0}|${V_HOMARD}|' ${STAGEDIR}${inst_dir}/${f} -.endfor .for f in ${PFX2FIX} ${REINPLACE_CMD} -e 's|${STAGEDIR}||g' ${STAGEDIR}${inst_dir}/${f} .endfor @@ -364,6 +358,10 @@ post-install: > ${STAGEDIR}${inst_dir}/${VE}/astout.export (cd ${STAGEDIR}${inst_dir} && \ ${LN} -fs ${VE} ${STAGEDIR}${inst_dir}/STA${VE}) +.for conf in config.txt profile.sh + (cd ${STAGEDIR} && ${LN} -fs ${inst_dir}/${VE}/share/aster/${conf} \ + ${STAGEDIR}${inst_dir}/STA${VE}/${conf}) +.endfor .for outil in ${tools} ${LN} -fs ${LOCALBASE}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil} .endfor @@ -375,6 +373,14 @@ post-install: ${LN} -fs ${ASTKDIR}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil} . endfor .endif + ${MKDIR} ${WRKDIR}/AvoidConflictWithASTK +.for f in aster.install_${VE} profile.sh + ${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/${f} ${WRKDIR}/AvoidConflictWithASTK/ +.endfor + ${RM} -r ${STAGEDIR}${inst_dir}/etc/codeaster/* +.for f in aster.install_${VE} profile.sh + ${MV} ${WRKDIR}/AvoidConflictWithASTK/${f} ${STAGEDIR}${inst_dir}/etc/codeaster/ +.endfor .if defined(MAINTAINER_MODE) regression-test: install Modified: head/french/aster/bsd.aster.mk ============================================================================== --- head/french/aster/bsd.aster.mk Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/bsd.aster.mk Sun Nov 13 12:44:13 2016 (r426042) @@ -10,8 +10,8 @@ MASTER_SITES= http://www.code-aster.org/ DISTNAME= aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX} DISTINFO_FILE= ${.CURDIR}/../../french/aster/distinfo -ASTER_VER= 11.7.0 -ASTER_DISTVERSION= ${ASTER_VER}-1 +ASTER_VER= 12.6.0 +ASTER_DISTVERSION= ${ASTER_VER}-4 EXTRACT_WRKSRC= ${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC .if ${PORTNAME} == metis-edf Modified: head/french/aster/distinfo ============================================================================== --- head/french/aster/distinfo Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/distinfo Sun Nov 13 12:44:13 2016 (r426042) @@ -1,2 +1,3 @@ -SHA256 (aster-full-src-11.7.0-1.noarch.tar.gz) = 94632f3801249d7464be0031f9aeaa4760f0a3ebde575cb0bdfe64f0fcdd316c -SIZE (aster-full-src-11.7.0-1.noarch.tar.gz) = 186807735 +TIMESTAMP = 1473583156 +SHA256 (aster-full-src-12.6.0-4.noarch.tar.gz) = 8bf9eafed2b4cd28469eb18fc1e305d8708479f5beefe3f241bc259d07db7f8e +SIZE (aster-full-src-12.6.0-4.noarch.tar.gz) = 286459637 Modified: head/french/aster/files/patch-as_setup.py ============================================================================== --- head/french/aster/files/patch-as_setup.py Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/files/patch-as_setup.py Sun Nov 13 12:44:13 2016 (r426042) @@ -1,6 +1,6 @@ ---- as_setup.py.orig 2014-03-05 09:41:19.000000000 +0100 -+++ as_setup.py 2014-05-24 15:16:48.000000000 +0200 -@@ -45,6 +45,8 @@ +--- as_setup.py.orig 2016-09-07 08:44:22 UTC ++++ as_setup.py +@@ -45,6 +45,8 @@ import tarfile import compileall import imp import pprint @@ -9,7 +9,7 @@ import distutils.sysconfig as SC from subprocess import Popen, PIPE -@@ -408,6 +410,7 @@ +@@ -410,6 +412,7 @@ class SETUP: archive filename !), extract_as : rename content. """ @@ -17,7 +17,7 @@ self._print(self._fmt_title % _('Extraction')) if kargs.get('external')<>None: self._call_external(**kargs) -@@ -516,6 +519,47 @@ +@@ -518,6 +521,52 @@ class SETUP: if iextr_as: self.Clean(to_delete=path) @@ -55,11 +55,16 @@ + if nl > 0: + ligne =ligne.replace("malloc.h", "stdlib.h") + sys.stdout.write(ligne) -+ file2patch = os.path.join(self.workdir, self.content, 'bibc/utilitai/mempid.c') -+ self._print('FreeBSD patch: VmData VmSize and VmPeak in /proc/%pid%/status ' + file2patch) + system=SYSTEM({ 'verbose' : True, 'debug' : False }, + **{'maxcmdlen' : 2**31, 'log' : self}) -+ iret, out = system.local_shell('cd ' + os.path.join(self.workdir, self.content) + '&& /usr/bin/patch -p0 < ' + '%%FILESDIR%%' + '/bibc_utilitai_mempid.c.diff') ++ file2patch = os.path.join(self.workdir, self.content, 'waftools/med.py') ++ self._print('FreeBSD patch: only hdf5-18 is supported ' + file2patch) ++ for ligne in fileinput.input(file2patch, inplace=1): ++ nl = 0 ++ nl = string.find(ligne, "opts.hdf5_libs = 'hdf5'") ++ if nl > 0: ++ ligne =ligne.replace("'hdf5'", "'hdf5-18'") ++ sys.stdout.write(ligne) + # End of FreeBSD patches + #------------------------------------------------------------------------------- Modified: head/french/aster/files/patch-check_compilers.py ============================================================================== --- head/french/aster/files/patch-check_compilers.py Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/files/patch-check_compilers.py Sun Nov 13 12:44:13 2016 (r426042) @@ -1,6 +1,6 @@ ---- check_compilers.py.orig 2014-07-07 21:31:29.000000000 +0200 -+++ check_compilers.py 2014-08-17 17:54:05.000000000 +0200 -@@ -420,8 +420,7 @@ +--- check_compilers.py.orig 2016-09-07 08:44:22 UTC ++++ check_compilers.py +@@ -420,8 +420,7 @@ class GNU_COMPILER(CONFIGURE_COMPILER): def after_compilers(self): """Define libs to search.""" # prefer always libstdc++.so to the static one Modified: head/french/aster/files/patch-check_compilers_src.py ============================================================================== --- head/french/aster/files/patch-check_compilers_src.py Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/files/patch-check_compilers_src.py Sun Nov 13 12:44:13 2016 (r426042) @@ -1,6 +1,6 @@ ---- check_compilers_src.py.orig 2013-12-19 15:44:50.000000000 +0100 -+++ check_compilers_src.py 2013-12-28 15:09:39.000000000 +0100 -@@ -109,6 +109,9 @@ +--- check_compilers_src.py.orig 2016-09-07 08:44:22 UTC ++++ check_compilers_src.py +@@ -109,6 +109,9 @@ Code_Aster will be compiled without erro You must choose another compiler or change the optimization level. You can cancel now or make the changes later in the config.txt file of Code_Aster and rebuild it. Modified: head/french/aster/files/patch-products.py ============================================================================== --- head/french/aster/files/patch-products.py Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/files/patch-products.py Sun Nov 13 12:44:13 2016 (r426042) @@ -1,16 +1,29 @@ ---- products.py.orig 2014-12-19 10:21:30.000000000 +0100 -+++ products.py 2015-02-15 19:39:55.000000000 +0100 -@@ -777,7 +777,8 @@ +--- products.py.orig 2016-09-07 08:44:22 UTC ++++ products.py +@@ -117,8 +117,8 @@ def setup_hdf5(dep, summary, **kargs): + + actions=( + ('IsInstalled', { 'filename' : +- [osp.join('__setup.installdir__', 'lib', 'libhdf5.a'), +- osp.join('__setup.installdir__', 'include', 'hdf5.h')] ++ [osp.join('__setup.installdir__', 'lib', 'libhdf5-18.a'), ++ osp.join('__setup.installdir__', 'include/hdf5-18', 'hdf5.h')] + } ), + ('Extract' , {}), + # gcc>=4.9 not supported by configure, should not use -ansi +@@ -842,8 +842,9 @@ def setup_aster(dep, summary, **kargs): + req=['ASTER_ROOT', 'ASTER_VERSION', 'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB', 'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS', - 'HOME_MED', 'HOME_HDF', # 'HOME_MFRONT', because of v11 branch +- 'HOME_MED', 'HOME_HDF', # 'HOME_MFRONT', because of v11 branch - 'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ], ++ 'HOME_MED', 'HOME_HDF', 'HOME_MFRONT', + 'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', 'CFLAGS', 'LDFLAGS', + 'CFLAGS_DBG', 'FFLAGS', 'FFLAGS_DBG','F90FLAGS', 'F90FLAGS_DBG', 'CXXLIB', ], reqobj=['file:?ASTER_ROOT?/bin/as_run', 'file:?ASTER_ROOT?/etc/codeaster/profile.sh'], ) -@@ -817,7 +818,8 @@ +@@ -885,7 +886,8 @@ def setup_aster(dep, summary, **kargs): 'capturestderr' : False, }), ('Make' , { Modified: head/french/aster/files/patch-setup.cfg ============================================================================== --- head/french/aster/files/patch-setup.cfg Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/files/patch-setup.cfg Sun Nov 13 12:44:13 2016 (r426042) @@ -1,6 +1,6 @@ ---- setup.cfg.orig 2012-01-11 16:29:00.000000000 +0100 -+++ setup.cfg 2012-04-30 18:11:37.000000000 +0200 -@@ -66,7 +66,7 @@ +--- setup.cfg.orig 2016-09-07 08:44:22 UTC ++++ setup.cfg +@@ -69,7 +69,7 @@ PREFER_COMPILER = 'GNU' # If a file or library is not found in these directories, you may try # using 'locate' command. Default is not to use locate because it usually # causes failure with inconsistent versions. @@ -9,7 +9,7 @@ USE_LOCATE = False #------------------------------------------------------------------------------- -@@ -111,7 +111,7 @@ +@@ -109,7 +109,7 @@ USE_LOCATE = False #INCLUDEDIR=['/myprefix/include', ] # To search for shared libraries first Modified: head/french/aster/files/patch-setup.py ============================================================================== --- head/french/aster/files/patch-setup.py Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/files/patch-setup.py Sun Nov 13 12:44:13 2016 (r426042) @@ -1,16 +1,15 @@ ---- setup.py.orig 2013-07-29 11:39:57.000000000 +0200 -+++ setup.py 2013-08-15 17:14:57.000000000 +0200 -@@ -330,7 +330,8 @@ - log._print(_separ, """Installation on : - %s""" % sident, _separ) - -- common_libs = ['pthread', 'z'] -+ # FreeBSD patch: no -lpthread, but PTHREAD_LIBS already added -+ common_libs = ['z'] - if plt.startswith('linux'): - plt = 'linux' - if plt == 'win32': -@@ -502,7 +503,10 @@ +--- setup.py.orig 2016-09-07 08:44:22 UTC ++++ setup.py +@@ -357,7 +357,7 @@ def main(): + else: + cfg['IFDEF'] = 'DARWIN' + elif plt.startswith('freebsd'): +- common_libs = [] ++ common_libs = ['z'] + cfg['IFDEF']='FREEBSD' + cfg['ARCH'] = 'x86' + if machine.endswith('64'): +@@ -513,7 +513,10 @@ def main(): # 1.4.1g. ----- check for system dependent libraries (and only used by Code_Aster) cfg['SYSLIB'] = cfg.get('SYSLIB', '') aster_sys_lib = [] Modified: head/french/aster/files/pkg-message.in ============================================================================== --- head/french/aster/files/pkg-message.in Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/files/pkg-message.in Sun Nov 13 12:44:13 2016 (r426042) @@ -1,11 +1,3 @@ -Pour lancer Code_Aster via ASTK, entrez : -%%tools_dir%%/astk - -Sur plates-formes i386 ou amd64, nous vous suggérons d'installer les ports -french/gibi et french/homard, deux outils de maillage additionnels. - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - To run Code_Aster through ASTK, type: %%tools_dir%%/astk Modified: head/french/aster/files/pkg-message.sans-astk.in ============================================================================== --- head/french/aster/files/pkg-message.sans-astk.in Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/files/pkg-message.sans-astk.in Sun Nov 13 12:44:13 2016 (r426042) @@ -1,12 +1,3 @@ -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. - -Sur plate-forme i386, nous vous suggérons d'installer les ports french/gibi -et french/homard, deux outils de maillage additionnels. - -=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- - After Code_Aster installation you could install ASTK [cad/astk-serveur and cad/astk-client]. ASTK is a graphic interface to run Code_Aster. Modified: head/french/aster/pkg-plist ============================================================================== --- head/french/aster/pkg-plist Sun Nov 13 12:43:21 2016 (r426041) +++ head/french/aster/pkg-plist Sun Nov 13 12:44:13 2016 (r426042) @@ -1,23 +1,25 @@ -aster/%%VE%%/aster_full_config.py -aster/%%VE%%/aster_full_config.pyc -aster/%%VE%%/aster_full_config.pyo +aster/%%VE%%/aster.conf aster/%%VE%%/astout.export aster/%%VE%%/bin/aster aster/%%VE%%/bin/asterd aster/%%VE%%/config.txt aster/%%VE%%/include/aster/aster.h -aster/%%VE%%/include/aster/aster_core.h +aster/%%VE%%/include/aster/aster_core_module.h aster/%%VE%%/include/aster/aster_depend.h -aster/%%VE%%/include/aster/aster_error.h aster/%%VE%%/include/aster/aster_exceptions.h +aster/%%VE%%/include/aster/aster_fonctions_module.h aster/%%VE%%/include/aster/aster_fort.h aster/%%VE%%/include/aster/aster_module.h +aster/%%VE%%/include/aster/aster_mpi.h aster/%%VE%%/include/aster/aster_utils.h aster/%%VE%%/include/aster/asterc_config.h +aster/%%VE%%/include/aster/asterc_debug.h aster/%%VE%%/include/aster/asterf_config.h aster/%%VE%%/include/aster/definition.h aster/%%VE%%/include/aster/definition_pt.h +aster/%%VE%%/include/aster/dll_mfront.h aster/%%VE%%/include/aster/dll_register.h +aster/%%VE%%/include/aster/med_aster_module.h aster/%%VE%%/include/aster/shared_vars.h aster/%%VE%%/lib/aster/Accas/A_AU_MOINS_UN.py aster/%%VE%%/lib/aster/Accas/A_AU_MOINS_UN.pyc @@ -97,9 +99,6 @@ aster/%%VE%%/lib/aster/Accas/__init__.py aster/%%VE%%/lib/aster/Accas/pkginfo.py aster/%%VE%%/lib/aster/Accas/pkginfo.pyc aster/%%VE%%/lib/aster/Accas/pkginfo.pyo -aster/%%VE%%/lib/aster/Accas/properties.py -aster/%%VE%%/lib/aster/Accas/properties.pyc -aster/%%VE%%/lib/aster/Accas/properties.pyo aster/%%VE%%/lib/aster/Build/B_CODE.py aster/%%VE%%/lib/aster/Build/B_CODE.pyc aster/%%VE%%/lib/aster/Build/B_CODE.pyo @@ -130,6 +129,36 @@ aster/%%VE%%/lib/aster/Build/__init__.py aster/%%VE%%/lib/aster/Build/codex.py aster/%%VE%%/lib/aster/Build/codex.pyc aster/%%VE%%/lib/aster/Build/codex.pyo +aster/%%VE%%/lib/aster/Calc_epx/__init__.py +aster/%%VE%%/lib/aster/Calc_epx/__init__.pyc +aster/%%VE%%/lib/aster/Calc_epx/__init__.pyo +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_cara.py +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_cara.pyc +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_cara.pyo +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_cata.py +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_cata.pyc +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_cata.pyo +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_char.py +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_char.pyc +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_char.pyo +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_geom.py +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_geom.pyc +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_geom.pyo +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_mate.py +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_mate.pyc +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_mate.pyo +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_poutre.py +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_poutre.pyc +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_poutre.pyo +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_struc.py +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_struc.pyc +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_struc.pyo +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_utils.py +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_utils.pyc +aster/%%VE%%/lib/aster/Calc_epx/calc_epx_utils.pyo +aster/%%VE%%/lib/aster/Calc_epx/trans_var_int.py +aster/%%VE%%/lib/aster/Calc_epx/trans_var_int.pyc +aster/%%VE%%/lib/aster/Calc_epx/trans_var_int.pyo aster/%%VE%%/lib/aster/Calc_essai/__init__.py aster/%%VE%%/lib/aster/Calc_essai/__init__.pyc aster/%%VE%%/lib/aster/Calc_essai/__init__.pyo @@ -184,18 +213,123 @@ aster/%%VE%%/lib/aster/Cata_Utils/__init aster/%%VE%%/lib/aster/Cata_Utils/t_fonction.py aster/%%VE%%/lib/aster/Cata_Utils/t_fonction.pyc aster/%%VE%%/lib/aster/Cata_Utils/t_fonction.pyo -aster/%%VE%%/lib/aster/Comportement/GDEF_HYPO_ELAS.py -aster/%%VE%%/lib/aster/Comportement/GDEF_HYPO_ELAS.pyc -aster/%%VE%%/lib/aster/Comportement/GDEF_HYPO_ELAS.pyo -aster/%%VE%%/lib/aster/Comportement/GDEF_LOG.py -aster/%%VE%%/lib/aster/Comportement/GDEF_LOG.pyc -aster/%%VE%%/lib/aster/Comportement/GDEF_LOG.pyo +aster/%%VE%%/lib/aster/Comportement/AnisoLemaitreMFront.py +aster/%%VE%%/lib/aster/Comportement/AnisoLemaitreMFront.pyc +aster/%%VE%%/lib/aster/Comportement/AnisoLemaitreMFront.pyo +aster/%%VE%%/lib/aster/Comportement/BurgerAgeingMFront.py +aster/%%VE%%/lib/aster/Comportement/BurgerAgeingMFront.pyc +aster/%%VE%%/lib/aster/Comportement/BurgerAgeingMFront.pyo +aster/%%VE%%/lib/aster/Comportement/BurgerMFront.py +aster/%%VE%%/lib/aster/Comportement/BurgerMFront.pyc +aster/%%VE%%/lib/aster/Comportement/BurgerMFront.pyo +aster/%%VE%%/lib/aster/Comportement/ChabocheMFront.py +aster/%%VE%%/lib/aster/Comportement/ChabocheMFront.pyc +aster/%%VE%%/lib/aster/Comportement/ChabocheMFront.pyo +aster/%%VE%%/lib/aster/Comportement/DruckPragEcroLinMFront.py +aster/%%VE%%/lib/aster/Comportement/DruckPragEcroLinMFront.pyc +aster/%%VE%%/lib/aster/Comportement/DruckPragEcroLinMFront.pyo +aster/%%VE%%/lib/aster/Comportement/DruckerPragerMFront.py +aster/%%VE%%/lib/aster/Comportement/DruckerPragerMFront.pyc +aster/%%VE%%/lib/aster/Comportement/DruckerPragerMFront.pyo +aster/%%VE%%/lib/aster/Comportement/ENDO_PORO_BETON.py +aster/%%VE%%/lib/aster/Comportement/ENDO_PORO_BETON.pyc +aster/%%VE%%/lib/aster/Comportement/ENDO_PORO_BETON.pyo +aster/%%VE%%/lib/aster/Comportement/FLUA_PORO_BETON.py +aster/%%VE%%/lib/aster/Comportement/FLUA_PORO_BETON.pyc +aster/%%VE%%/lib/aster/Comportement/FLUA_PORO_BETON.pyo +aster/%%VE%%/lib/aster/Comportement/GTNMFront.py +aster/%%VE%%/lib/aster/Comportement/GTNMFront.pyc +aster/%%VE%%/lib/aster/Comportement/GTNMFront.pyo +aster/%%VE%%/lib/aster/Comportement/GdefMonoCrystalMFront.py +aster/%%VE%%/lib/aster/Comportement/GdefMonoCrystalMFront.pyc +aster/%%VE%%/lib/aster/Comportement/GdefMonoCrystalMFront.pyo +aster/%%VE%%/lib/aster/Comportement/GdefMono_JacnumMFront.py +aster/%%VE%%/lib/aster/Comportement/GdefMono_JacnumMFront.pyc +aster/%%VE%%/lib/aster/Comportement/GdefMono_JacnumMFront.pyo +aster/%%VE%%/lib/aster/Comportement/HayhurstMFront.py +aster/%%VE%%/lib/aster/Comportement/HayhurstMFront.pyc +aster/%%VE%%/lib/aster/Comportement/HayhurstMFront.pyo +aster/%%VE%%/lib/aster/Comportement/ImplicitHayhurstMFront.py +aster/%%VE%%/lib/aster/Comportement/ImplicitHayhurstMFront.pyc +aster/%%VE%%/lib/aster/Comportement/ImplicitHayhurstMFront.pyo +aster/%%VE%%/lib/aster/Comportement/ImplicitMazarsMFront.py +aster/%%VE%%/lib/aster/Comportement/ImplicitMazarsMFront.pyc +aster/%%VE%%/lib/aster/Comportement/ImplicitMazarsMFront.pyo +aster/%%VE%%/lib/aster/Comportement/ImplicitNortonMFront.py +aster/%%VE%%/lib/aster/Comportement/ImplicitNortonMFront.pyc +aster/%%VE%%/lib/aster/Comportement/ImplicitNortonMFront.pyo +aster/%%VE%%/lib/aster/Comportement/MazarsMFront.py +aster/%%VE%%/lib/aster/Comportement/MazarsMFront.pyc +aster/%%VE%%/lib/aster/Comportement/MazarsMFront.pyo +aster/%%VE%%/lib/aster/Comportement/MonoCrystalDDCCMFront.py +aster/%%VE%%/lib/aster/Comportement/MonoCrystalDDCCMFront.pyc +aster/%%VE%%/lib/aster/Comportement/MonoCrystalDDCCMFront.pyo +aster/%%VE%%/lib/aster/Comportement/MonoCrystalDDCFCMFront.py +aster/%%VE%%/lib/aster/Comportement/MonoCrystalDDCFCMFront.pyc +aster/%%VE%%/lib/aster/Comportement/MonoCrystalDDCFCMFront.pyo +aster/%%VE%%/lib/aster/Comportement/MonoCrystal_CFCMFront.py +aster/%%VE%%/lib/aster/Comportement/MonoCrystal_CFCMFront.pyc +aster/%%VE%%/lib/aster/Comportement/MonoCrystal_CFCMFront.pyo +aster/%%VE%%/lib/aster/Comportement/MonoDDCC_IrraMFront.py +aster/%%VE%%/lib/aster/Comportement/MonoDDCC_IrraMFront.pyc +aster/%%VE%%/lib/aster/Comportement/MonoDDCC_IrraMFront.pyo +aster/%%VE%%/lib/aster/Comportement/MonoDDCFC_IrraMFront.py +aster/%%VE%%/lib/aster/Comportement/MonoDDCFC_IrraMFront.pyc +aster/%%VE%%/lib/aster/Comportement/MonoDDCFC_IrraMFront.pyo +aster/%%VE%%/lib/aster/Comportement/NortonMFront.py +aster/%%VE%%/lib/aster/Comportement/NortonMFront.pyc +aster/%%VE%%/lib/aster/Comportement/NortonMFront.pyo +aster/%%VE%%/lib/aster/Comportement/Norton_JacnumMFront.py +aster/%%VE%%/lib/aster/Comportement/Norton_JacnumMFront.pyc +aster/%%VE%%/lib/aster/Comportement/Norton_JacnumMFront.pyo +aster/%%VE%%/lib/aster/Comportement/Norton_RK54MFront.py +aster/%%VE%%/lib/aster/Comportement/Norton_RK54MFront.pyc +aster/%%VE%%/lib/aster/Comportement/Norton_RK54MFront.pyo +aster/%%VE%%/lib/aster/Comportement/OrthotropicElastMFront.py +aster/%%VE%%/lib/aster/Comportement/OrthotropicElastMFront.pyc +aster/%%VE%%/lib/aster/Comportement/OrthotropicElastMFront.pyo +aster/%%VE%%/lib/aster/Comportement/PlasticityMFront.py +aster/%%VE%%/lib/aster/Comportement/PlasticityMFront.pyc +aster/%%VE%%/lib/aster/Comportement/PlasticityMFront.pyo +aster/%%VE%%/lib/aster/Comportement/PlasticityTHMFront.py +aster/%%VE%%/lib/aster/Comportement/PlasticityTHMFront.pyc +aster/%%VE%%/lib/aster/Comportement/PlasticityTHMFront.pyo +aster/%%VE%%/lib/aster/Comportement/PolyCrystalDDCCMFront.py +aster/%%VE%%/lib/aster/Comportement/PolyCrystalDDCCMFront.pyc +aster/%%VE%%/lib/aster/Comportement/PolyCrystalDDCCMFront.pyo +aster/%%VE%%/lib/aster/Comportement/PolyCrystalDDCFCMFront.py +aster/%%VE%%/lib/aster/Comportement/PolyCrystalDDCFCMFront.pyc +aster/%%VE%%/lib/aster/Comportement/PolyCrystalDDCFCMFront.pyo +aster/%%VE%%/lib/aster/Comportement/PolyCrystal_MCMFront.py +aster/%%VE%%/lib/aster/Comportement/PolyCrystal_MCMFront.pyc +aster/%%VE%%/lib/aster/Comportement/PolyCrystal_MCMFront.pyo +aster/%%VE%%/lib/aster/Comportement/RGI_BETON.py +aster/%%VE%%/lib/aster/Comportement/RGI_BETON.pyc +aster/%%VE%%/lib/aster/Comportement/RGI_BETON.pyo +aster/%%VE%%/lib/aster/Comportement/SVenantKirchhoffMFront.py +aster/%%VE%%/lib/aster/Comportement/SVenantKirchhoffMFront.pyc +aster/%%VE%%/lib/aster/Comportement/SVenantKirchhoffMFront.pyo +aster/%%VE%%/lib/aster/Comportement/SimoMieheVmisMFront.py +aster/%%VE%%/lib/aster/Comportement/SimoMieheVmisMFront.pyc +aster/%%VE%%/lib/aster/Comportement/SimoMieheVmisMFront.pyo +aster/%%VE%%/lib/aster/Comportement/TvergaardMFront.py +aster/%%VE%%/lib/aster/Comportement/TvergaardMFront.pyc +aster/%%VE%%/lib/aster/Comportement/TvergaardMFront.pyo +aster/%%VE%%/lib/aster/Comportement/ViscoChabocheMFront.py +aster/%%VE%%/lib/aster/Comportement/ViscoChabocheMFront.pyc +aster/%%VE%%/lib/aster/Comportement/ViscoChabocheMFront.pyo +aster/%%VE%%/lib/aster/Comportement/ViscoMemoNradMFront.py +aster/%%VE%%/lib/aster/Comportement/ViscoMemoNradMFront.pyc +aster/%%VE%%/lib/aster/Comportement/ViscoMemoNradMFront.pyo aster/%%VE%%/lib/aster/Comportement/__init__.py aster/%%VE%%/lib/aster/Comportement/__init__.pyc aster/%%VE%%/lib/aster/Comportement/__init__.pyo aster/%%VE%%/lib/aster/Comportement/acier.py aster/%%VE%%/lib/aster/Comportement/acier.pyc aster/%%VE%%/lib/aster/Comportement/acier.pyo +aster/%%VE%%/lib/aster/Comportement/analytique.py +aster/%%VE%%/lib/aster/Comportement/analytique.pyc +aster/%%VE%%/lib/aster/Comportement/analytique.pyo aster/%%VE%%/lib/aster/Comportement/arme.py aster/%%VE%%/lib/aster/Comportement/arme.pyc aster/%%VE%%/lib/aster/Comportement/arme.pyo @@ -223,6 +357,9 @@ aster/%%VE%%/lib/aster/Comportement/beto aster/%%VE%%/lib/aster/Comportement/cable.py aster/%%VE%%/lib/aster/Comportement/cable.pyc aster/%%VE%%/lib/aster/Comportement/cable.pyo +aster/%%VE%%/lib/aster/Comportement/cable_gaine_frot.py +aster/%%VE%%/lib/aster/Comportement/cable_gaine_frot.pyc +aster/%%VE%%/lib/aster/Comportement/cable_gaine_frot.pyo aster/%%VE%%/lib/aster/Comportement/cam_clay.py aster/%%VE%%/lib/aster/Comportement/cam_clay.pyc aster/%%VE%%/lib/aster/Comportement/cam_clay.pyo @@ -238,9 +375,15 @@ aster/%%VE%%/lib/aster/Comportement/cjs. aster/%%VE%%/lib/aster/Comportement/corr_acier.py aster/%%VE%%/lib/aster/Comportement/corr_acier.pyc aster/%%VE%%/lib/aster/Comportement/corr_acier.pyo +aster/%%VE%%/lib/aster/Comportement/crit_rupt.py +aster/%%VE%%/lib/aster/Comportement/crit_rupt.pyc +aster/%%VE%%/lib/aster/Comportement/crit_rupt.pyo aster/%%VE%%/lib/aster/Comportement/czm_exp.py aster/%%VE%%/lib/aster/Comportement/czm_exp.pyc aster/%%VE%%/lib/aster/Comportement/czm_exp.pyo +aster/%%VE%%/lib/aster/Comportement/czm_exp_mix.py +aster/%%VE%%/lib/aster/Comportement/czm_exp_mix.pyc +aster/%%VE%%/lib/aster/Comportement/czm_exp_mix.pyo aster/%%VE%%/lib/aster/Comportement/czm_exp_reg.py aster/%%VE%%/lib/aster/Comportement/czm_exp_reg.pyc aster/%%VE%%/lib/aster/Comportement/czm_exp_reg.pyo @@ -262,9 +405,15 @@ aster/%%VE%%/lib/aster/Comportement/czm_ aster/%%VE%%/lib/aster/Comportement/czm_tra_mix.py aster/%%VE%%/lib/aster/Comportement/czm_tra_mix.pyc aster/%%VE%%/lib/aster/Comportement/czm_tra_mix.pyo +aster/%%VE%%/lib/aster/Comportement/ddi_plas_endo.py +aster/%%VE%%/lib/aster/Comportement/ddi_plas_endo.pyc +aster/%%VE%%/lib/aster/Comportement/ddi_plas_endo.pyo aster/%%VE%%/lib/aster/Comportement/deborst.py aster/%%VE%%/lib/aster/Comportement/deborst.pyc aster/%%VE%%/lib/aster/Comportement/deborst.pyo +aster/%%VE%%/lib/aster/Comportement/dhrc.py +aster/%%VE%%/lib/aster/Comportement/dhrc.pyc +aster/%%VE%%/lib/aster/Comportement/dhrc.pyo aster/%%VE%%/lib/aster/Comportement/dis_bili_elas.py aster/%%VE%%/lib/aster/Comportement/dis_bili_elas.pyc aster/%%VE%%/lib/aster/Comportement/dis_bili_elas.pyo @@ -292,9 +441,6 @@ aster/%%VE%%/lib/aster/Comportement/druc aster/%%VE%%/lib/aster/Comportement/druck_prager.py aster/%%VE%%/lib/aster/Comportement/druck_prager.pyc aster/%%VE%%/lib/aster/Comportement/druck_prager.pyo -aster/%%VE%%/lib/aster/Comportement/ecro_cine_1d.py -aster/%%VE%%/lib/aster/Comportement/ecro_cine_1d.pyc -aster/%%VE%%/lib/aster/Comportement/ecro_cine_1d.pyo aster/%%VE%%/lib/aster/Comportement/elas.py aster/%%VE%%/lib/aster/Comportement/elas.pyc aster/%%VE%%/lib/aster/Comportement/elas.pyo @@ -319,6 +465,9 @@ aster/%%VE%%/lib/aster/Comportement/elas aster/%%VE%%/lib/aster/Comportement/endo_carre.py aster/%%VE%%/lib/aster/Comportement/endo_carre.pyc aster/%%VE%%/lib/aster/Comportement/endo_carre.pyo +aster/%%VE%%/lib/aster/Comportement/endo_fiss_exp.py +aster/%%VE%%/lib/aster/Comportement/endo_fiss_exp.pyc +aster/%%VE%%/lib/aster/Comportement/endo_fiss_exp.pyo aster/%%VE%%/lib/aster/Comportement/endo_fragile.py aster/%%VE%%/lib/aster/Comportement/endo_fragile.pyc aster/%%VE%%/lib/aster/Comportement/endo_fragile.pyo @@ -340,6 +489,12 @@ aster/%%VE%%/lib/aster/Comportement/gatt aster/%%VE%%/lib/aster/Comportement/gaz.py aster/%%VE%%/lib/aster/Comportement/gaz.pyc aster/%%VE%%/lib/aster/Comportement/gaz.pyo +aster/%%VE%%/lib/aster/Comportement/gdef_hypo_elas.py +aster/%%VE%%/lib/aster/Comportement/gdef_hypo_elas.pyc +aster/%%VE%%/lib/aster/Comportement/gdef_hypo_elas.pyo +aster/%%VE%%/lib/aster/Comportement/gdef_log.py +aster/%%VE%%/lib/aster/Comportement/gdef_log.pyc +aster/%%VE%%/lib/aster/Comportement/gdef_log.pyo aster/%%VE%%/lib/aster/Comportement/glrc_damage.py aster/%%VE%%/lib/aster/Comportement/glrc_damage.pyc aster/%%VE%%/lib/aster/Comportement/glrc_damage.pyo @@ -349,9 +504,6 @@ aster/%%VE%%/lib/aster/Comportement/glrc aster/%%VE%%/lib/aster/Comportement/gran_irra_log.py aster/%%VE%%/lib/aster/Comportement/gran_irra_log.pyc aster/%%VE%%/lib/aster/Comportement/gran_irra_log.pyo -aster/%%VE%%/lib/aster/Comportement/granger_fp.py -aster/%%VE%%/lib/aster/Comportement/granger_fp.pyc -aster/%%VE%%/lib/aster/Comportement/granger_fp.pyo aster/%%VE%%/lib/aster/Comportement/granger_fp_indt.py aster/%%VE%%/lib/aster/Comportement/granger_fp_indt.pyc aster/%%VE%%/lib/aster/Comportement/granger_fp_indt.pyo @@ -415,6 +567,9 @@ aster/%%VE%%/lib/aster/Comportement/join aster/%%VE%%/lib/aster/Comportement/joint_meca_rupt.py aster/%%VE%%/lib/aster/Comportement/joint_meca_rupt.pyc aster/%%VE%%/lib/aster/Comportement/joint_meca_rupt.pyo +aster/%%VE%%/lib/aster/Comportement/kit_cg.py +aster/%%VE%%/lib/aster/Comportement/kit_cg.pyc +aster/%%VE%%/lib/aster/Comportement/kit_cg.pyo aster/%%VE%%/lib/aster/Comportement/kit_ddi.py aster/%%VE%%/lib/aster/Comportement/kit_ddi.pyc aster/%%VE%%/lib/aster/Comportement/kit_ddi.pyo @@ -442,9 +597,6 @@ aster/%%VE%%/lib/aster/Comportement/kit_ aster/%%VE%%/lib/aster/Comportement/kit_thv.py aster/%%VE%%/lib/aster/Comportement/kit_thv.pyc aster/%%VE%%/lib/aster/Comportement/kit_thv.pyo -aster/%%VE%%/lib/aster/Comportement/labord_1d.py -aster/%%VE%%/lib/aster/Comportement/labord_1d.pyc -aster/%%VE%%/lib/aster/Comportement/labord_1d.pyo aster/%%VE%%/lib/aster/Comportement/laigle.py aster/%%VE%%/lib/aster/Comportement/laigle.pyc aster/%%VE%%/lib/aster/Comportement/laigle.pyo @@ -481,15 +633,9 @@ aster/%%VE%%/lib/aster/Comportement/liqu aster/%%VE%%/lib/aster/Comportement/liqu_vape_gaz.py aster/%%VE%%/lib/aster/Comportement/liqu_vape_gaz.pyc aster/%%VE%%/lib/aster/Comportement/liqu_vape_gaz.pyo -aster/%%VE%%/lib/aster/Comportement/lmarc_irra.py -aster/%%VE%%/lib/aster/Comportement/lmarc_irra.pyc -aster/%%VE%%/lib/aster/Comportement/lmarc_irra.pyo aster/%%VE%%/lib/aster/Comportement/mazars.py aster/%%VE%%/lib/aster/Comportement/mazars.pyc aster/%%VE%%/lib/aster/Comportement/mazars.pyo -aster/%%VE%%/lib/aster/Comportement/mazars_1d.py -aster/%%VE%%/lib/aster/Comportement/mazars_1d.pyc -aster/%%VE%%/lib/aster/Comportement/mazars_1d.pyo aster/%%VE%%/lib/aster/Comportement/mazars_gc.py aster/%%VE%%/lib/aster/Comportement/mazars_gc.pyc aster/%%VE%%/lib/aster/Comportement/mazars_gc.pyo @@ -571,6 +717,9 @@ aster/%%VE%%/lib/aster/Comportement/meta aster/%%VE%%/lib/aster/Comportement/mfront.py aster/%%VE%%/lib/aster/Comportement/mfront.pyc aster/%%VE%%/lib/aster/Comportement/mfront.pyo +aster/%%VE%%/lib/aster/Comportement/mohr_coulomb.py +aster/%%VE%%/lib/aster/Comportement/mohr_coulomb.pyc +aster/%%VE%%/lib/aster/Comportement/mohr_coulomb.pyo aster/%%VE%%/lib/aster/Comportement/monocristal.py aster/%%VE%%/lib/aster/Comportement/monocristal.pyc aster/%%VE%%/lib/aster/Comportement/monocristal.pyo @@ -625,6 +774,9 @@ aster/%%VE%%/lib/aster/Comportement/sech aster/%%VE%%/lib/aster/Comportement/simo_miehe.py aster/%%VE%%/lib/aster/Comportement/simo_miehe.pyc aster/%%VE%%/lib/aster/Comportement/simo_miehe.pyo +aster/%%VE%%/lib/aster/Comportement/tangente_secante.py +aster/%%VE%%/lib/aster/Comportement/tangente_secante.pyc +aster/%%VE%%/lib/aster/Comportement/tangente_secante.pyo aster/%%VE%%/lib/aster/Comportement/ther.py aster/%%VE%%/lib/aster/Comportement/ther.pyc aster/%%VE%%/lib/aster/Comportement/ther.pyo @@ -724,15 +876,45 @@ aster/%%VE%%/lib/aster/Comportement/vmis aster/%%VE%%/lib/aster/Comportement/zirc.py aster/%%VE%%/lib/aster/Comportement/zirc.pyc aster/%%VE%%/lib/aster/Comportement/zirc.pyo -aster/%%VE%%/lib/aster/Comportement/zmat.py -aster/%%VE%%/lib/aster/Comportement/zmat.pyc -aster/%%VE%%/lib/aster/Comportement/zmat.pyo aster/%%VE%%/lib/aster/Contrib/__init__.py aster/%%VE%%/lib/aster/Contrib/__init__.pyc aster/%%VE%%/lib/aster/Contrib/__init__.pyo +aster/%%VE%%/lib/aster/Contrib/calc_ecrevisse.py +aster/%%VE%%/lib/aster/Contrib/calc_ecrevisse.pyc +aster/%%VE%%/lib/aster/Contrib/calc_ecrevisse.pyo +aster/%%VE%%/lib/aster/Contrib/calc_forc_ajou.py +aster/%%VE%%/lib/aster/Contrib/calc_forc_ajou.pyc +aster/%%VE%%/lib/aster/Contrib/calc_forc_ajou.pyo +aster/%%VE%%/lib/aster/Contrib/calc_ifs_dnl.py +aster/%%VE%%/lib/aster/Contrib/calc_ifs_dnl.pyc +aster/%%VE%%/lib/aster/Contrib/calc_ifs_dnl.pyo +aster/%%VE%%/lib/aster/Contrib/calc_point_mat.py +aster/%%VE%%/lib/aster/Contrib/calc_point_mat.pyc +aster/%%VE%%/lib/aster/Contrib/calc_point_mat.pyo +aster/%%VE%%/lib/aster/Contrib/calc_spec.py +aster/%%VE%%/lib/aster/Contrib/calc_spec.pyc +aster/%%VE%%/lib/aster/Contrib/calc_spec.pyo +aster/%%VE%%/lib/aster/Contrib/defi_cable_op.py +aster/%%VE%%/lib/aster/Contrib/defi_cable_op.pyc +aster/%%VE%%/lib/aster/Contrib/defi_cable_op.pyo aster/%%VE%%/lib/aster/Contrib/diffusion_H2.py aster/%%VE%%/lib/aster/Contrib/diffusion_H2.pyc aster/%%VE%%/lib/aster/Contrib/diffusion_H2.pyo +aster/%%VE%%/lib/aster/Contrib/env_cine_yacs.py +aster/%%VE%%/lib/aster/Contrib/env_cine_yacs.pyc +aster/%%VE%%/lib/aster/Contrib/env_cine_yacs.pyo +aster/%%VE%%/lib/aster/Contrib/essai_triaxial.py +aster/%%VE%%/lib/aster/Contrib/essai_triaxial.pyc +aster/%%VE%%/lib/aster/Contrib/essai_triaxial.pyo +aster/%%VE%%/lib/aster/Contrib/impr_mail_yacs.py +aster/%%VE%%/lib/aster/Contrib/impr_mail_yacs.pyc +aster/%%VE%%/lib/aster/Contrib/impr_mail_yacs.pyo +aster/%%VE%%/lib/aster/Contrib/init_compo.py +aster/%%VE%%/lib/aster/Contrib/init_compo.pyc +aster/%%VE%%/lib/aster/Contrib/init_compo.pyo +aster/%%VE%%/lib/aster/Contrib/macr_ecre_calc.py +aster/%%VE%%/lib/aster/Contrib/macr_ecre_calc.pyc +aster/%%VE%%/lib/aster/Contrib/macr_ecre_calc.pyo aster/%%VE%%/lib/aster/Contrib/macro_bascule_schema_cata.py aster/%%VE%%/lib/aster/Contrib/macro_bascule_schema_cata.pyc aster/%%VE%%/lib/aster/Contrib/macro_bascule_schema_cata.pyo @@ -742,12 +924,27 @@ aster/%%VE%%/lib/aster/Contrib/macro_bas aster/%%VE%%/lib/aster/Contrib/macro_rota_globale.py aster/%%VE%%/lib/aster/Contrib/macro_rota_globale.pyc aster/%%VE%%/lib/aster/Contrib/macro_rota_globale.pyo +aster/%%VE%%/lib/aster/Contrib/modi_char_yacs.py +aster/%%VE%%/lib/aster/Contrib/modi_char_yacs.pyc +aster/%%VE%%/lib/aster/Contrib/modi_char_yacs.pyo +aster/%%VE%%/lib/aster/Contrib/proj_resu_base.py +aster/%%VE%%/lib/aster/Contrib/proj_resu_base.pyc +aster/%%VE%%/lib/aster/Contrib/proj_resu_base.pyo +aster/%%VE%%/lib/aster/Contrib/propa_xfem.py +aster/%%VE%%/lib/aster/Contrib/propa_xfem.pyc +aster/%%VE%%/lib/aster/Contrib/propa_xfem.pyo +aster/%%VE%%/lib/aster/Contrib/raff_xfem_zone.py +aster/%%VE%%/lib/aster/Contrib/raff_xfem_zone.pyc +aster/%%VE%%/lib/aster/Contrib/raff_xfem_zone.pyo +aster/%%VE%%/lib/aster/Contrib/recu_para_yacs.py +aster/%%VE%%/lib/aster/Contrib/recu_para_yacs.pyc +aster/%%VE%%/lib/aster/Contrib/recu_para_yacs.pyo +aster/%%VE%%/lib/aster/Contrib/testcase_tools.py +aster/%%VE%%/lib/aster/Contrib/testcase_tools.pyc +aster/%%VE%%/lib/aster/Contrib/testcase_tools.pyo aster/%%VE%%/lib/aster/Contrib/veri_matr_tang.py aster/%%VE%%/lib/aster/Contrib/veri_matr_tang.pyc aster/%%VE%%/lib/aster/Contrib/veri_matr_tang.pyo -aster/%%VE%%/lib/aster/Execution/E_Core.py *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201611131244.uADCiDoE096954>