From owner-svn-ports-head@FreeBSD.ORG Tue Mar 18 21:09:07 2014 Return-Path: Delivered-To: svn-ports-head@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2001:1900:2254:206a::19:1]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 1F26C1A3; Tue, 18 Mar 2014 21:09:07 +0000 (UTC) Received: from svn.freebsd.org (svn.freebsd.org [IPv6:2001:1900:2254:2068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (No client certificate requested) by mx1.freebsd.org (Postfix) with ESMTPS id 08A3CE1E; Tue, 18 Mar 2014 21:09:07 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s2IL97v6049430; Tue, 18 Mar 2014 21:09:07 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s2IL93ub049411; Tue, 18 Mar 2014 21:09:03 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201403182109.s2IL93ub049411@svn.freebsd.org> From: Thierry Thomas Date: Tue, 18 Mar 2014 21:09:03 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r348597 - in head: cad/astk-client cad/astk-serveur cad/astk-serveur/files cad/astk-serveur/files.client french/aster french/aster/files french/eficas french/eficas/files french/med fre... X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-head@freebsd.org X-Mailman-Version: 2.1.17 Precedence: list List-Id: SVN commit messages for the ports tree for head List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 18 Mar 2014 21:09:07 -0000 Author: thierry Date: Tue Mar 18 21:09:03 2014 New Revision: 348597 URL: http://svnweb.freebsd.org/changeset/ports/348597 QAT: https://qat.redports.org/buildarchive/r348597/ Log: Upgrade Code_Aster to 11.5.0-4. N.B.: french/aster is still marked BROKEN, but this allows to unbreak other ports sharing the same dependencies. Patch for french/med provided by tijl. Added: head/french/aster/files/patch-check_compilers.py (contents, props changed) head/french/aster/files/patch-setup.py (contents, props changed) head/french/eficas/files/patch-InterfaceQT4_typeNode.py (contents, props changed) head/math/metis-edf/files/patch-Makefile (contents, props changed) head/math/metis-edf/files/patch-Makefile.in (contents, props changed) Deleted: head/french/med/files/ head/math/metis-edf/files/patch-CONFIG::configure head/math/metis-edf/files/patch-CONFIG_onmetis.in head/math/metis-edf/files/patch-Lib::proto.h head/math/metis-edf/files/patch-Programs::Makefile head/math/metis-edf/files/patch-Test::Makefile head/math/metis-edf/files/patch-onmetis Modified: head/cad/astk-client/Makefile head/cad/astk-serveur/Makefile head/cad/astk-serveur/files.client/pkg-message.in head/cad/astk-serveur/files/patch-etc_asrun head/cad/astk-serveur/files/pkg-message.in 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_src.py head/french/aster/files/patch-products.py head/french/eficas/Makefile head/french/eficas/pkg-plist head/french/med/Makefile head/french/med/pkg-plist head/math/metis-edf/Makefile head/math/metis-edf/files/patch-Lib_Makefile head/math/metis-edf/pkg-plist Modified: head/cad/astk-client/Makefile ============================================================================== --- head/cad/astk-client/Makefile Tue Mar 18 20:39:39 2014 (r348596) +++ head/cad/astk-client/Makefile Tue Mar 18 21:09:03 2014 (r348597) @@ -9,5 +9,4 @@ MASTERDIR= ${.CURDIR}/../astk-serveur CLIENT_SEUL= oui -NO_STAGE= yes .include "${MASTERDIR}/Makefile" Modified: head/cad/astk-serveur/Makefile ============================================================================== --- head/cad/astk-serveur/Makefile Tue Mar 18 20:39:39 2014 (r348596) +++ head/cad/astk-serveur/Makefile Tue Mar 18 21:09:03 2014 (r348597) @@ -2,7 +2,7 @@ # $FreeBSD$ PORTNAME= astk -PORTVERSION= 1.11.0 +DISTVERSION= 1.13.3-2 CATEGORIES= cad .if !defined(CLIENT_SEUL) PKGNAMESUFFIX= -serveur @@ -13,8 +13,9 @@ PKGNAMESUFFIX= -client MAINTAINER= ports@FreeBSD.org COMMENT?= Graphical interface for Code_Aster (server side) +LICENSE= GPLv2 + #----------------------------------------------------------------------- -NO_STAGE= yes # You may define these options: # # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among @@ -29,11 +30,9 @@ NO_STAGE= yes RUN_DEPENDS+= ${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP} -LICENSE= GPLv2 - .if !defined(CLIENT_SEUL) USE_PYTHON= yes -USES+= tk:build +USES+= tk:build gettext .else USES+= tk .endif @@ -42,6 +41,8 @@ REINPLACE_ARGS= -i "" EXTRACT_WRKSRC= ${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION:S/-/./:R}/SRC +SUB_FILES= pkg-message +SUB_LIST= inst_dir=${inst_dir} tools_dir=${tools_dir} PKGMESSAGE= ${WRKDIR}/pkg-message LINSTDIR= aster/ASTK inst_dir= ${PREFIX}/${LINSTDIR} @@ -59,7 +60,7 @@ conf_dir= ${WRKSRC}/etc/astkrc .include .if !defined(CLIENT_SEUL) -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASTK_SERV +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV PATCHDIR= ${MASTERDIR}/files PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment " \ vaster=${vaster} @@ -87,7 +88,7 @@ RUN_DEPENDS+= xterm:${PORTSDIR}/x11/xter ${LOCALBASE}/lib/${TKPNG}/pkgIndex.tcl:${PORTSDIR}/graphics/tkpng TKPNG_VER= 0.9 TKPNG= tkpng${TKPNG_VER} -WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION}/ASTK_CLIENT +WRKSRC= ${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_CLIENT PATCHDIR= ${MASTERDIR}/files.client PLIST_SUB= ASTKDIR=${LINSTDIR}/ASTK_CLIENT SERV="@comment " CLIENT="" vaster="" \ BWidget_DIR=${LINSTDIR}/ASTK_CLIENT/lib/BWidget-${BWidget_VER} @@ -140,7 +141,7 @@ WITH_ED= gedit RUN_DEPENDS+= ${LOCALBASE}/bin/gedit:${PORTSDIR}/editors/gedit . elif exists(${LOCALBASE}/bin/kwrite) WITH_ED= kwrite -RUN_DEPENDS+= ${LOCALBASE}/bin/kwrite:${PORTSDIR}/x11/kdebase3 +RUN_DEPENDS+= ${LOCALBASE}/bin/kwrite:${PORTSDIR}/editors/kate . elif exists(${LOCALBASE}/bin/xedit) WITH_ED= xedit RUN_DEPENDS+= ${LOCALBASE}/bin/xedit:${PORTSDIR}/x11/xedit @@ -265,31 +266,22 @@ do-configure: .endif do-install: - ${MKDIR} ${inst_dir} - ${CP} -R ${WRKSRC} ${inst_dir} + ${MKDIR} ${STAGEDIR}${inst_dir} + ${CP} -R ${WRKSRC} ${STAGEDIR}${inst_dir} .if !defined(CLIENT_SEUL) - ${MKDIR} ${ETCDIR} - ${CP} -R ${WRKSRC}/etc/* ${ETCDIR} - ${RM} -rf ${inst_dir}/ASTK_SERV/etc -. for rep in asrun share/codeaster/asrun/examples unittest - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/${rep} - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/${rep} -. endfor - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${ETCDIR}/plugins - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${ETCDIR}/plugins + ${MKDIR} ${STAGEDIR}${ETCDIR} + ${CP} -R ${WRKSRC}/etc/* ${STAGEDIR}${ETCDIR} + ${RM} -rf ${STAGEDIR}${inst_dir}/ASTK_SERV/etc + (cd ${STAGEDIR}${PREFIX} \ + && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${PREFIX} -f aster) + (cd ${STAGEDIR}${PREFIX} \ + && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -d ${PREFIX} -f aster) . if defined(WITH_MPI) - ${ECHO_CMD} "localhost" > ${PREFIX}/aster/aster-mpihosts + ${ECHO_CMD} "localhost" > ${STAGEDIR}${PREFIX}/aster/aster-mpihosts . endif .endif -post-install: - @${ECHO_MSG} - @${SED} -e "s|%%ETCDIR%%|${ETCDIR}|" \ - -e "s|%%inst_dir%%|${inst_dir}|" \ - -e "s|%%tools_dir%%|${tools_dir}|" \ - ${FILESDIR}/pkg-message.in > ${PKGMESSAGE} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} - .include "${.CURDIR}/../../french/aster/bsd.aster.mk" .include Modified: head/cad/astk-serveur/files.client/pkg-message.in ============================================================================== --- head/cad/astk-serveur/files.client/pkg-message.in Tue Mar 18 20:39:39 2014 (r348596) +++ head/cad/astk-serveur/files.client/pkg-message.in Tue Mar 18 21:09:03 2014 (r348597) @@ -1,18 +1,18 @@ -Des fichiers de configuration standards ont été préparés dans le répertoire +Des fichiers de configuration standards ont été préparés dans le répertoire %%inst_dir%%/ASTK_CLIENT/etc/astkrc/. -Veuillez les vérifier, et n'oubliez pas d'installer la partie serveur -sur la machine où Code_Aster a été installé. +Veuillez les vérifier, et n'oubliez pas d'installer la partie serveur +sur la machine où Code_Aster a été installé. -Pour lancer ASTK, entrez : +Pour lancer ASTK, entrez : %%tools_dir%%/astk -une fois Code_Aster installé sur cette machine, sinon : +une fois Code_Aster installé sur cette machine, sinon : %%inst_dir%%/ASTK_CLIENT/bin/astk ASTK utilise le protocole rcp/rsh, il faut donc l'activer (/etc/inetd.conf -et ~/.rhosts) ; le paramètre --check passé à astk permet de vérifier votre +et ~/.rhosts) ; le paramètre --check passé à astk permet de vérifier votre configuration. -ASTK lance xterm avec -display : il ne faut donc pas lancer Xorg avec +ASTK lance xterm avec -display : il ne faut donc pas lancer Xorg avec -nolisten tcp =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Modified: head/cad/astk-serveur/files/patch-etc_asrun ============================================================================== --- head/cad/astk-serveur/files/patch-etc_asrun Tue Mar 18 20:39:39 2014 (r348596) +++ head/cad/astk-serveur/files/patch-etc_asrun Tue Mar 18 21:09:03 2014 (r348597) @@ -1,5 +1,5 @@ ---- etc/asrun.orig 2011-12-20 13:33:00.000000000 +0100 -+++ etc/asrun 2012-01-02 22:07:53.000000000 +0100 +--- etc/asrun.orig 2014-03-05 09:28:59.000000000 +0100 ++++ etc/asrun 2014-03-17 15:46:25.000000000 +0100 @@ -110,6 +110,10 @@ # shared folders = for which remote copy is never necessary (comma separated) shared_folders : @@ -11,26 +11,7 @@ # choose True to create symbolic links instead of copying executable and catalogs symlink : True -@@ -176,12 +180,12 @@ - # batch_kil : to delete jobs - - # --- batch configuration (see examples below) --batch_nom : SunGE --batch_ini : /opt/SunGE6.0/default/common/settings.sh --batch_sub : /opt/SunGE6.0/bin/lx24-x86/qsub --batch_jid : JOB_ID --batch_job : /opt/SunGE6.0/bin/lx24-x86/qstat --batch_kil : /opt/SunGE6.0/bin/lx24-x86/qdel -+#batch_nom : SunGE -+#batch_ini : /opt/SunGE6.0/default/common/settings.sh -+#batch_sub : /opt/SunGE6.0/bin/lx24-x86/qsub -+#batch_jid : JOB_ID -+#batch_job : /opt/SunGE6.0/bin/lx24-x86/qstat -+#batch_kil : /opt/SunGE6.0/bin/lx24-x86/qdel - - # --- Sun Grid Engine example - #batch_nom : SunGE -@@ -200,28 +204,28 @@ +@@ -195,28 +199,28 @@ #batch_kil : /usr/share/lsf/6.2/linux2.6-glibc2.3-ia64/bin/bkill # --- PBS example @@ -67,7 +48,7 @@ # shell command to get processor id # LAM/MPI : echo $LAMRANK -@@ -250,8 +254,11 @@ +@@ -245,8 +249,11 @@ # ps commands : uncomment lines corresponding to your platform #ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand #ps_pid : /bin/ps -e --width=512 -opid -ocommand Modified: head/cad/astk-serveur/files/pkg-message.in ============================================================================== --- head/cad/astk-serveur/files/pkg-message.in Tue Mar 18 20:39:39 2014 (r348596) +++ head/cad/astk-serveur/files/pkg-message.in Tue Mar 18 21:09:03 2014 (r348597) @@ -1,6 +1,6 @@ -Des fichiers de configuration standards ont été préparés : +Des fichiers de configuration standards ont été préparés : %%ETCDIR%%/ -Veuillez les vérifier, et n'oubliez pas d'installer la partie cliente sur vos +Veuillez les vérifier, et n'oubliez pas d'installer la partie cliente sur vos stations. =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=- Modified: head/cad/astk-serveur/pkg-plist ============================================================================== --- head/cad/astk-serveur/pkg-plist Tue Mar 18 20:39:39 2014 (r348596) +++ head/cad/astk-serveur/pkg-plist Tue Mar 18 21:09:03 2014 (r348597) @@ -439,6 +439,7 @@ %%SERV%%%%ASTKDIR%%/i18n/locale/fr/LC_MESSAGES/asrun.mo %%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 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/mpirun_template @@ -476,9 +477,6 @@ %%SERV%%%%ASTKDIR%%/unittest/065_system.py %%SERV%%%%ASTKDIR%%/unittest/065_system.pyc %%SERV%%%%ASTKDIR%%/unittest/065_system.pyo -%%SERV%%%%ASTKDIR%%/unittest/080_agla.py -%%SERV%%%%ASTKDIR%%/unittest/080_agla.pyc -%%SERV%%%%ASTKDIR%%/unittest/080_agla.pyo %%SERV%%%%ASTKDIR%%/unittest/090_devel.py %%SERV%%%%ASTKDIR%%/unittest/090_devel.pyc %%SERV%%%%ASTKDIR%%/unittest/090_devel.pyo @@ -551,6 +549,12 @@ %%SERV%%%%ETCDIR%%/plugins/__init__.py %%SERV%%%%ETCDIR%%/plugins/__init__.pyc %%SERV%%%%ETCDIR%%/plugins/__init__.pyo +%%SERV%%%%ETCDIR%%/plugins/aster4_calcul.py +%%SERV%%%%ETCDIR%%/plugins/aster4_calcul.pyc +%%SERV%%%%ETCDIR%%/plugins/aster4_calcul.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 @@ -558,7 +562,7 @@ %%SERV%%%%ETCDIR%%/profile.sh %%SERV%%@dirrm %%ETCDIR%%/plugins %%SERV%%@dirrm %%ETCDIR%% -@dirrmtry aster/etc +%%SERV%%@dirrmtry aster/etc %%CLIENT%%@dirrm %%BWidget_DIR%%/images %%CLIENT%%@dirrm %%BWidget_DIR%%/lang %%CLIENT%%@dirrm %%BWidget_DIR%% Modified: head/french/aster/Makefile ============================================================================== --- head/french/aster/Makefile Tue Mar 18 20:39:39 2014 (r348596) +++ head/french/aster/Makefile Tue Mar 18 21:09:03 2014 (r348597) @@ -3,14 +3,14 @@ PORTNAME= aster DISTVERSION= ${ASTER_DISTVERSION} -PORTREVISION= 2 CATEGORIES= french cad MAINTAINER= thierry@FreeBSD.org COMMENT= Code_Aster finite element method solver +LICENSE= GPLv2 + #----------------------------------------------------------------------- -NO_STAGE= yes # You may define these options: # # - FFLAGS: fortan compiler's flags (-O2 by default); @@ -33,19 +33,22 @@ NO_STAGE= yes BUILD_DEPENDS+= ${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur \ ${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP} \ + ${LOCALBASE}/lib/libscotch.a:${PORTSDIR}/cad/scotch \ ${PYNUMPY} -LIB_DEPENDS+= hdf5.7:${PORTSDIR}/science/hdf5-18 \ - med.5:${PORTSDIR}/french/med +LIB_DEPENDS+= libhdf5.so.7:${PORTSDIR}/science/hdf5-18 \ + libmed.so:${PORTSDIR}/french/med \ + libmetis.so.0:${PORTSDIR}/math/metis-edf RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Gnuplot:${PORTSDIR}/math/py-gnuplot \ - ${LOCALBASE}/bin/onmetis.exe:${PORTSDIR}/math/metis-edf \ + ${LOCALBASE}/bin/onmetis:${PORTSDIR}/math/metis-edf \ ${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP} \ ${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur -LICENSE= GPLv2 +BROKEN= WIP - to be fixed USES= bison fortran tk -USE_PYTHON= 2 # >2.5 and <3.0 +USE_PYTHON= 2 # >2.5 and <3.0 HAS_CONFIGURE= yes +MAKE_ENV= INCLUDES="${LOCALBASE}/include ${LOCALBASE}/include/metis" REINPLACE_ARGS= -i "" WRKSRC= ${WRKDIR}/${PORTNAME}-full-src-${PORTVERSION:R} @@ -70,10 +73,11 @@ FLAGARCH= -DLINUX64 FFLAGARCH= -fdefault-integer-8 -fdefault-real-8 .endif -.if ${ARCH} == "amd64" +#.if ${ARCH} == "amd64" # python 2.7 causes process runaway -PYTHON_VERSION= 2.6 -.endif +#PYTHON_VERSION= 2.6 +#.endif + # Avoid renaming .f into .F #F90FLAGS= -x f77-cpp-input ${FFLAGS} @@ -81,10 +85,10 @@ PYTHON_VERSION= 2.6 WITH_ATLAS= yes .endif .if defined(WITH_ATLAS) -LIB_DEPENDS+= atlas.2:${PORTSDIR}/math/atlas +LIB_DEPENDS+= libatlas.so:${PORTSDIR}/math/atlas .else -LIB_DEPENDS+= blas.2:${PORTSDIR}/math/blas -LIB_DEPENDS+= lapack.4:${PORTSDIR}/math/lapack +LIB_DEPENDS+= libblas.so:${PORTSDIR}/math/blas +LIB_DEPENDS+= liblapack.so:${PORTSDIR}/math/lapack .endif .if !defined(WITHOUT_ASTK_CLI) @@ -114,28 +118,19 @@ PLIST_SUB+= GRACE="@comment " .if !defined(WITHOUT_MACR_RECAL) RUN_DEPENDS+= ${PYNUMPY} .endif -.if !defined(WITHOUT_SCOTCH) -BUILD_DEPENDS+= ${LOCALBASE}/lib/libscotch.a:${PORTSDIR}/cad/scotch -.endif -.if exists(${LOCALBASE}/lib/libcmumps.a) -WITH_MUMPS= yes -.endif -.if defined(WITH_MUMPS) -WITH_MPI= yes # For the FETI solver -. if exists(${LOCALBASE}/lib/libmpiseq.a) +.if !defined(WITH_MPI) MUMPS_PORT= mumps -. else +.else BUILD_DEPENDS+= ${LOCALBASE}/lib/libblacs.a:${PORTSDIR}/math/blacs \ ${LOCALBASE}/lib/libscalapack.a:${PORTSDIR}/math/scalapack MUMPS_PORT= mumps-mpich MUMPSLIB= -L${LOCALBASE}/lib -ldmumps -lzmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich -lmpl -. endif -BUILD_DEPENDS+= ${LOCALBASE}/lib/libcmumps.a:${PORTSDIR}/math/${MUMPS_PORT} .endif +BUILD_DEPENDS+= ${LOCALBASE}/lib/libcmumps.a:${PORTSDIR}/math/${MUMPS_PORT} .if defined(WITH_MPI) -LIB_DEPENDS+= mpich.2:${PORTSDIR}/net/mpich2 +LIB_DEPENDS+= libmpich.so:${PORTSDIR}/net/mpich2 HOME_MPI= ${LOCALBASE} .endif @@ -195,9 +190,11 @@ hdf_dir= ${LOCALBASE} .if defined(WITH_ATLAS) lib_blas= ptf77blas lib_atlas= atlas +lib_math= "-lptf77blas -latlas" .else lib_blas= blas lib_atlas= # empty +lib_math= "-lblas -llapack" .endif LASTKDIR?= ${PORTNAME}/ASTK/ASTK_CLIENT @@ -213,12 +210,15 @@ pre-everything:: .endif pre-configure: - ${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|' ${WRKSRC}/setup.cfg + ${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|' \ + ${WRKSRC}/setup.cfg ${REINPLACE_CMD} -e 's|/opt/aster|${WRKSRC}/instdir|' \ ${WRKSRC}/setup.cfg ${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${WRKSRC}/instdir|' \ ${WRKSRC}/products.py - ${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g" ${WRKSRC}/check_compilers.py + # -O2 causes failure in compilation of the elements -see GCC Bug 51267 + ${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;s|-O2|-O0|;s|'gcc'|'${CC}'|g" \ + -e "s|'g++'|'${CXX}'|g" ${WRKSRC}/check_compilers.py .for sh in ${BASH2RC} ${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh} .endfor @@ -252,26 +252,29 @@ 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 -.if defined(WITH_MUMPS) + ${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include/metis', ]" \ + >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'" >> ${WRKSRC}/setup.cfg -. if ${MUMPS_PORT} == "mumps-mpich" - # else libmpiseq.a used instead of libmpich, default is OK +.if ${MUMPS_PORT} == "mumps-mpich" ${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'" >> ${WRKSRC}/setup.cfg -. endif .endif ${ECHO_CMD} "CC='${CC}'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "gcc='${CC}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CXX='${CXX}'" >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CXXLIB = '${LDFLAGS} -lstdc++ -lsupc++'" \ - >> ${WRKSRC}/setup.cfg + #${ECHO_CMD} "CXXLIB = '-L${LOCALBASE}/lib/${CC} -lstdc++ -lsupc++'" \ + # >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "LD='${FC}'" >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "F90='${LOCALBASE}/bin/${FC}'" >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic ${PTHREAD_LIBS} -lutil -lm -lz -lgfortran ${PTHREAD_LIBS} -lz'" \ + ${ECHO_CMD} "F90='${FC}'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic -lutil ${PTHREAD_LIBS} -lz'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "SYSLIB='${PTHREAD_LIBS} -lz'" >> ${WRKSRC}/setup.cfg .if defined(WITH_MPI) ${ECHO_CMD} "HOME_MPI = '${HOME_MPI}'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "MPIRUN = 'mpirun'" >> ${WRKSRC}/setup.cfg .else ${ECHO_CMD} "HOME_MPI = ''" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "MPIRUN = ''" >> ${WRKSRC}/setup.cfg .endif ${ECHO_CMD} "HOME_ZMAT = ''" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "HOME_HDF='${hdf_dir}'" >> ${WRKSRC}/setup.cfg @@ -288,26 +291,28 @@ pre-configure: ${ECHO_CMD} "EDITOR='${WITH_ED}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "LDFLAGS='-v ${LDFLAGS}'" >> ${WRKSRC}/setup.cfg # -O2 causes failure in compilation of the elements -see GCC Bug 51267 - ${ECHO_CMD} "FFLAGS='-c ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} ${FFLAGARCH}'" >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "FFLAGS_DBG='-c -g -O -fno-tree-dse ${FLAGARCH} ${FFLAGARCH}'" >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "FFLAGS='-c ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} ${FFLAGARCH}'" \ + >> ${WRKSRC}/setup.cfg + ${ECHO_CMD} "FFLAGS_DBG='-c -g -O -fno-tree-dse ${FLAGARCH} ${FFLAGARCH}'" \ + >> ${WRKSRC}/setup.cfg .if defined(WITH_MPI) - ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} ${FFLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O -fno-tree-dse ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O -fno-tree-dse ${FLAGARCH} ${FFLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg # -O2 causes failure in compilation of the elements -see GCC Bug 51267 - ${ECHO_CMD} "CFLAGS='-c ${CFLAGS:C|O2|O0|} -fno-tree-dse ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "CFLAGS='-c ${CFLAGS:C|O2|O0|} ${PTHREAD_CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe -fno-tree-dse ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${PTHREAD_CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg .else - ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include'" \ + ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} ${FFLAGARCH}'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O -fno-tree-dse ${FLAGARCH} ${FFLAGARCH} -I${LOCALBASE}/include'" \ + ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O -fno-tree-dse ${FLAGARCH} ${FFLAGARCH}'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS='-c ${CFLAGS:C|O2|O0|} -fno-tree-dse ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include'" \ + ${ECHO_CMD} "CFLAGS='-c ${CFLAGS:C|O2|O0|} ${PTHREAD_CFLAGS} ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe -fno-tree-dse ${PTHREAD_CFLAGS} ${FLAGARCH} -I${LOCALBASE}/include'" \ + ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${PTHREAD_CFLAGS} ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg .endif .for is in ${INTERACTIVE_SCRIPTS} @@ -342,7 +347,7 @@ post-configure: do-build: (cd ${BUILD_WRKSRC} && \ - ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} install aster \ + ${MAKE_ENV} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} install aster \ | tee ${BUILD_WRKSRC}/build.log) ${CHMOD} go-x ${WRKSRC}/instdir/${vaster}/materiau/A42_REF_A.NOMI Modified: head/french/aster/bsd.aster.mk ============================================================================== --- head/french/aster/bsd.aster.mk Tue Mar 18 20:39:39 2014 (r348596) +++ head/french/aster/bsd.aster.mk Tue Mar 18 21:09:03 2014 (r348597) @@ -9,19 +9,22 @@ MASTER_SITES= http://www.code-aster.org/ DISTNAME= aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX} DISTINFO_FILE= ${.CURDIR}/../../french/aster/distinfo -BROKEN= Unfetchable -ASTER_VER= 10.8.0 -ASTER_DISTVERSION= ${ASTER_VER}-3 +ASTER_VER= 11.5.0 +ASTER_DISTVERSION= ${ASTER_VER}-4 EXTRACT_WRKSRC= ${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC .if ${PORTNAME} == metis-edf -DVSFX= ${DISTVERSIONSUFFIX} -.elif ${PORTNAME} == homard +TARNAME= ${PORTNAME:C|-edf||} +.else +TARNAME= ${PORTNAME} +.endif + +.if ${PORTNAME} == homard DVSFX= .all .endif .if ${PORTNAME} != aster post-extract: (cd ${WRKDIR} && \ - ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${PORTNAME}${DVPFX}-${DISTVERSION}${DVSFX}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}) + ${EXTRACT_CMD} ${EXTRACT_BEFORE_ARGS} ${EXTRACT_WRKSRC}/${TARNAME}${DVPFX}-${DISTVERSION}${DVSFX}${EXTRACT_SUFX} ${EXTRACT_AFTER_ARGS}) .endif Modified: head/french/aster/distinfo ============================================================================== --- head/french/aster/distinfo Tue Mar 18 20:39:39 2014 (r348596) +++ head/french/aster/distinfo Tue Mar 18 21:09:03 2014 (r348597) @@ -1,2 +1,2 @@ -SHA256 (aster-full-src-10.8.0-3.noarch.tar.gz) = 6126a6ed5776e36db7b0db52c512ee6d98231edd4d657718789cc279cad19655 -SIZE (aster-full-src-10.8.0-3.noarch.tar.gz) = 181659392 +SHA256 (aster-full-src-11.5.0-4.noarch.tar.gz) = de95ad0727f7378216d4544bca5df7e4571b4e92183616564a70f2a593543410 +SIZE (aster-full-src-11.5.0-4.noarch.tar.gz) = 193357107 Modified: head/french/aster/files/patch-as_setup.py ============================================================================== --- head/french/aster/files/patch-as_setup.py Tue Mar 18 20:39:39 2014 (r348596) +++ head/french/aster/files/patch-as_setup.py Tue Mar 18 21:09:03 2014 (r348597) @@ -1,26 +1,51 @@ ---- as_setup.py.orig 2010-07-07 18:18:13.000000000 +0200 -+++ as_setup.py 2010-08-12 19:01:09.000000000 +0200 -@@ -46,6 +46,8 @@ +--- as_setup.py.orig 2014-01-06 14:30:14.000000000 +0100 ++++ as_setup.py 2014-01-17 23:16:39.000000000 +0100 +@@ -45,6 +45,8 @@ import compileall import imp import pprint +import fileinput +import string import distutils.sysconfig as SC - from types import StringTypes - EnumTypes=(list, tuple) -@@ -472,6 +474,17 @@ + from subprocess import Popen, PIPE + +@@ -516,6 +518,42 @@ if iextr_as: self.Clean(to_delete=path) + # Insert FreeBSD patches here -+ file2patch = os.path.join(self.installdir, self.content, 'bibc/utilitai/mempid.c') -+ self._print('different /proc/pid/status => change ' + file2patch) ++ file2patch = os.path.join(self.workdir, self.content, 'bibc/wscript') ++ self._print('FreeBSD patch: no libdl + -O2 (GCC Bug 51267) => modify ' + file2patch) ++ for ligne in fileinput.input(file2patch, inplace=1): ++ nl = 0 ++ nl = string.find(ligne, "uselib_store='SYS', lib='dl'") ++ if nl > 0: ++ ligne =ligne.replace("self.check_cc", "# self.check_cc") ++ else: ++ nl = string.find(ligne, "-O2") ++ if nl > 0: ++ ligne =ligne.replace("-O2", "-O0") ++ sys.stdout.write(ligne) ++ file2patch = os.path.join(self.workdir, self.content, 'bibc/utilitai/hpalloc.c') ++ 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') ++ if nl > 0: ++ ligne =ligne.replace('ir=mallopt', '/* ir=mallopt') ++ ligne =ligne.replace(');', '); */') ++ else: ++ nl = string.find(ligne, "malloc.h") ++ if nl > 0: ++ ligne =ligne.replace("malloc.h", "stdlib.h") ++ sys.stdout.write(ligne) ++ file2patch = os.path.join(self.workdir, self.content, 'bibfor/wscript') ++ self._print('FreeBSD patch: -O2 (GCC Bug 51267) => modify ' + file2patch) + for ligne in fileinput.input(file2patch, inplace=1): + nl = 0 -+ nl = string.find(ligne, 'ifdef _POSIX') ++ nl = string.find(ligne, "-O2") + if nl > 0: -+ ligne =ligne.replace('ifdef _POSIX', 'ifndef __FreeBSD__') ++ ligne =ligne.replace("-O2", "-O0") + sys.stdout.write(ligne) + # End of FreeBSD patches + Added: head/french/aster/files/patch-check_compilers.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/french/aster/files/patch-check_compilers.py Tue Mar 18 21:09:03 2014 (r348597) @@ -0,0 +1,12 @@ +--- check_compilers.py.orig 2014-03-05 09:41:19.000000000 +0100 ++++ check_compilers.py 2014-03-17 18:52:14.000000000 +0100 +@@ -413,8 +413,7 @@ + def after_compilers(self): + """Define libs to search.""" + # prefer always libstdc++.so to the static one +- self.libs.extend([('math', 'lapack'), ('math', 'blas'), +- ('cxx', ['libstdc++.so', 'libstdc++.a']),]) ++ self.libs.extend([('math', 'lapack'), ('math', 'blas'),]) + + def add_on(self): + """After searching compilers, libs... search again other bin or lib.""" Modified: head/french/aster/files/patch-check_compilers_src.py ============================================================================== --- head/french/aster/files/patch-check_compilers_src.py Tue Mar 18 20:39:39 2014 (r348596) +++ head/french/aster/files/patch-check_compilers_src.py Tue Mar 18 21:09:03 2014 (r348597) @@ -1,6 +1,6 @@ ---- check_compilers_src.py.orig 2013-01-28 13:35:55.000000000 +0100 -+++ check_compilers_src.py 2013-03-17 21:11:35.000000000 +0100 -@@ -109,12 +109,15 @@ +--- 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 @@ 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. @@ -10,10 +10,3 @@ ------------------------------------------------------------------------------- """, - 'main.f' : r""" - program testloc -- volatile ius -+C volatile ius - integer*8 ius(1) - integer*8 i,iad,n,loc - common /jvcomm/ ius Modified: head/french/aster/files/patch-products.py ============================================================================== --- head/french/aster/files/patch-products.py Tue Mar 18 20:39:39 2014 (r348596) +++ head/french/aster/files/patch-products.py Tue Mar 18 21:09:03 2014 (r348597) @@ -1,54 +1,12 @@ ---- products.py.orig 2013-01-28 13:35:55.000000000 +0100 -+++ products.py 2013-03-17 21:30:27.000000000 +0100 -@@ -995,9 +995,10 @@ +--- products.py.orig 2014-03-05 09:41:19.000000000 +0100 ++++ products.py 2014-03-17 18:39:24.000000000 +0100 +@@ -701,7 +701,8 @@ 'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB', 'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS', - 'HOME_MED', 'HOME_HDF', 'HOME_CRPCRS', 'HOME_NUMPY', 'USE_NUMPY', -- 'LD', 'CC', 'F77', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ], -- reqobj=['file:?ASTER_ROOT?/bin/as_run', -- 'file:?ASTER_ROOT?/etc/codeaster/profile.sh'], -+ 'LD', 'CC', 'F77', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', 'CFLAGS', + 'HOME_MED', 'HOME_HDF', +- 'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ], ++ 'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', 'CFLAGS', 'LDFLAGS', + 'CFLAGS_DBG', 'FFLAGS', 'FFLAGS_DBG','F90FLAGS', 'F90FLAGS_DBG', 'CXXLIB', ], -+ reqobj=['file:/usr/ports/french/aster/work/aster-full-src-10.8.0/instdir/bin/as_run', -+ 'file:/usr/ports/french/aster/work/aster-full-src-10.8.0/instdir/etc/codeaster/profile.sh'], - set=['MEDLIB', 'HDFLIB', 'MATHLIB', - 'MUMPSLIB', 'ZMATLIB', 'SCOTCHLIB', - 'CINCLUDE', 'FINCLUDE', 'F90INCLUDE', -@@ -1043,6 +1044,19 @@ - if cfg['IFDEF'] in ('LINUX', 'P_LINUX'): - zmat_platform = 'Linux' - mpilibs.extend(['mpich']) -+ elif cfg['IFDEF']=='FREEBSD': -+ # Don't check gfortran, already part of SYSLIB -+ opt['MATH_LIST'] = [cfg['LAPACKLIB'], cfg['BLASLIB']] -+ opt['SYSLIB'] = cfg['SYSLIB'] -+ opt['LDFLAGS'] = cfg['LDFLAGS'] -+ opt['CFLAGS_DBG'] = cfg['CFLAGS_DBG'] -+ opt['CFLAGS'] = cfg['CFLAGS'] -+ opt['FFLAGS_DBG'] = cfg['FFLAGS_DBG'] -+ opt['FFLAGS'] = cfg['FFLAGS'] -+ opt['FINCLUDE'] = '' -+ cxxlibs.extend(['stdc++', 'supc++']) -+ zmat_platform='' -+ mpilibs.extend(['mpich', 'mpl']) - elif cfg['IFDEF'] == 'LINUX64': - mpilibs.extend(['mpich']) - # others have not been tested ! -@@ -1097,11 +1111,12 @@ - - # ----- libs c++ (for MED and ZMAT) - #XXX probably to remove (done by check_compiler) -- if cfg['HOME_MED'] != '' or cfg['HOME_ZMAT'] != '': -- for lib in cxxlibs: -- ftools.findlib_and_set(cfg, 'CXXLIB', lib, -- [cfg['HOME_MED'], cfg['HOME_ZMAT']], -- err=False, append=True, maxdepth=max(ftools.maxdepth,10)) -+ # CXXLIB already set for FreeBSD -+ #if cfg['HOME_MED'] != '' or cfg['HOME_ZMAT'] != '': -+ # for lib in cxxlibs: -+ # ftools.findlib_and_set(cfg, 'CXXLIB', lib, -+ # [cfg['HOME_MED'], cfg['HOME_ZMAT']], -+ # err=False, append=True, maxdepth=max(ftools.maxdepth,10)) - - # ----- METIS - if cfg.get('METISLIB'): + reqobj=['file:?ASTER_ROOT?/bin/as_run', + 'file:?ASTER_ROOT?/etc/codeaster/profile.sh'], + ) Added: head/french/aster/files/patch-setup.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/french/aster/files/patch-setup.py Tue Mar 18 21:09:03 2014 (r348597) @@ -0,0 +1,24 @@ +--- 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 @@ + # 1.4.1g. ----- check for system dependent libraries (and only used by Code_Aster) + cfg['SYSLIB'] = cfg.get('SYSLIB', '') + aster_sys_lib = [] +- if cfg['IFDEF'] in ('LINUX', 'P_LINUX', 'LINUX64'): ++ if cfg['IFDEF'] == 'FREEBSD': ++ cfg['SYSLIB'] += ' -Wl,--allow-multiple-definition -Wl,--export-dynamic' ++ aster_sys_lib.extend(['util', 'm']) ++ elif cfg['IFDEF'] in ('LINUX', 'P_LINUX', 'LINUX64'): + cfg['SYSLIB'] += ' -Wl,--allow-multiple-definition -Wl,--export-dynamic' + aster_sys_lib.extend(['dl', 'util', 'm']) + elif cfg['IFDEF'] == 'TRU64': Modified: head/french/eficas/Makefile ============================================================================== --- head/french/eficas/Makefile Tue Mar 18 20:39:39 2014 (r348596) +++ head/french/eficas/Makefile Tue Mar 18 21:09:03 2014 (r348597) @@ -2,8 +2,7 @@ # $FreeBSD$ PORTNAME= eficas -DISTVERSION= 6.6.0-2 -PORTREVISION= 2 +DISTVERSION= 7.3.0-1 CATEGORIES= french cad MAINTAINER= thierry@FreeBSD.org @@ -16,7 +15,11 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Pmw:${ bash:${PORTSDIR}/shells/bash \ ${PYNUMPY} +BROKEN= ImportError in numpy: cannot import name scimath + +USES= shebangfix USE_PYTHON= yes +SHEBANG_FILES= eficas eficasQt REINPLACE_ARGS= -i "" NO_BUILD= yes @@ -36,27 +39,13 @@ EF_LANG= ang RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:${PORTSDIR}/x11-toolkits/py-qt4-gui \ ${PYTHON_SITELIBDIR}/PyQt4/QtAssistant.so:${PORTSDIR}/devel/py-qt4-assistant -FIXSHQT4= typeNode.py -FIXBASH= Aster/Cata/cataSTA9/Macro/macr_ecre_calc_ops.py \ - Aster/Cata/cataSTA10/Macro/macr_ecre_calc_ops.py FIXUBIN= Openturns_Study/prefs_OPENTURNS_STUDY.py \ - Openturns_Study/prefs_OPENTURNS_STUDY.py.in \ Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py \ - Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py.in \ Aster/prefs_ASTER.py -NO_STAGE= yes pre-configure: -.for FILE in ${FIXSHQT4} - ${REINPLACE_CMD} -e "s|/usr/bin/sh|/bin/sh|" ${WRKSRC}/InterfaceQT4/${FILE} -.endfor ${REINPLACE_CMD} -e "s#lang='fr'#lang='${EF_LANG}'#" \ ${WRKSRC}/Aster/prefs.py -.for cata in ${FIXBASH} - ${REINPLACE_CMD} -e "s|'/bin/bash'|'${LOCALBASE}/bin/bash'|" \ - ${WRKSRC}/${cata} -.endfor - ${REINPLACE_CMD} -e "s|/bin/bash|${LOCALBASE}/bin/bash|" ${WRKSRC}/eficasQt .for FILE in ${FIXUBIN} ${REINPLACE_CMD} -e 's|/usr/bin|${LOCALBASE}/bin|' ${WRKSRC}/${FILE} .endfor @@ -64,18 +53,19 @@ pre-configure: -e 's|%%EFICASDIR%%|${EFICASDIR}|' ${WRKSRC}/eficasQt do-install: - ${MKDIR} ${EFICASDIR} - ${CP} -R ${WRKSRC}/* ${EFICASDIR} - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${EFICASDIR} - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${EFICASDIR} - ${RM} ${EFICASDIR}/convert/Parserv5/Translate.py.orig ${EFICASDIR}/eficasQt.orig - ${INSTALL_SCRIPT} ${WRKSRC}/eficasQt ${PREFIX}/bin - ${LN} -sf ${PREFIX}/bin/eficasQt ${PREFIX}/bin/eficas - -post-install: - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} + ${MKDIR} ${STAGEDIR}${EFICASDIR} + ${CP} -R ${WRKSRC}/* ${STAGEDIR}${EFICASDIR} + (cd ${STAGEDIR}${PREFIX} \ + && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${PREFIX} -f ${EFICASDIR:S;${PREFIX}/;;}) + (cd ${STAGEDIR}${PREFIX} \ + && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -d ${PREFIX} -f ${EFICASDIR:S;${PREFIX}/;;}) + ${RM} ${STAGEDIR}${EFICASDIR}/convert/Parserv5/Translate.py.orig \ + ${STAGEDIR}${EFICASDIR}/eficasQt.orig \ + ${STAGEDIR}${EFICASDIR}/InterfaceQT4/typeNode.py.orig + ${INSTALL_SCRIPT} ${WRKSRC}/eficasQt ${STAGEDIR}${PREFIX}/bin + ${LN} -sf eficasQt ${STAGEDIR}${PREFIX}/bin/eficas .include "${.CURDIR}/../../french/aster/bsd.aster.mk" .include Added: head/french/eficas/files/patch-InterfaceQT4_typeNode.py ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/french/eficas/files/patch-InterfaceQT4_typeNode.py Tue Mar 18 21:09:03 2014 (r348597) @@ -0,0 +1,11 @@ +--- InterfaceQT4/typeNode.py.orig 2013-12-12 11:25:35.000000000 +0100 ++++ InterfaceQT4/typeNode.py 2014-01-16 11:08:00.000000000 +0100 +@@ -182,7 +182,7 @@ + if os.name == 'nt': + os.spawnv(os.P_NOWAIT,commande,(commande,fichier,)) + elif os.name == 'posix': +- script ="#!/usr/bin/sh \n%s %s&" %(commande,fichier) ++ script ="#! /bin/sh \n%s %s&" %(commande,fichier) + pid = os.system(script) + + def addParametersApres(self): Modified: head/french/eficas/pkg-plist ============================================================================== --- head/french/eficas/pkg-plist Tue Mar 18 20:39:39 2014 (r348596) +++ head/french/eficas/pkg-plist Tue Mar 18 21:09:03 2014 (r348597) @@ -1,5 +1,3 @@ -bin/eficas -bin/eficasQt %%EFICASDIR%%/Accas/A_ASSD.py %%EFICASDIR%%/Accas/A_ASSD.pyc %%EFICASDIR%%/Accas/A_ASSD.pyo @@ -87,6 +85,9 @@ bin/eficasQt %%EFICASDIR%%/Accas/A_PROC_ETAPE.py %%EFICASDIR%%/Accas/A_PROC_ETAPE.pyc %%EFICASDIR%%/Accas/A_PROC_ETAPE.pyo +%%EFICASDIR%%/Accas/A_SALOME_ENTRY.py +%%EFICASDIR%%/Accas/A_SALOME_ENTRY.pyc +%%EFICASDIR%%/Accas/A_SALOME_ENTRY.pyo %%EFICASDIR%%/Accas/A_SENSIBILITE.py %%EFICASDIR%%/Accas/A_SENSIBILITE.pyc %%EFICASDIR%%/Accas/A_SENSIBILITE.pyo @@ -105,1456 +106,1467 @@ bin/eficasQt %%EFICASDIR%%/Accas/__init__NonAster.py %%EFICASDIR%%/Accas/__init__NonAster.pyc %%EFICASDIR%%/Accas/__init__NonAster.pyo -%%EFICASDIR%%/Aide/eficas_ASTER.adp %%EFICASDIR%%/Aide/eficas_OPENTURNS_STUDY.adp -%%EFICASDIR%%/Aide/fichiers_ASTER/INSTALL.txt -%%EFICASDIR%%/Aide/fichiers_ASTER/NEWS.txt -%%EFICASDIR%%/Aide/fichiers_ASTER/cata.txt -%%EFICASDIR%%/Aide/fichiers_ASTER/faqs.txt -%%EFICASDIR%%/Aide/fichiers_ASTER/includes.txt -%%EFICASDIR%%/Aide/fichiers_ASTER/index.html +%%EFICASDIR%%/Aide/fichiers_EFICAS/cata.html +%%EFICASDIR%%/Aide/fichiers_EFICAS/faqs.html +%%EFICASDIR%%/Aide/fichiers_EFICAS/includes.html +%%EFICASDIR%%/Aide/fichiers_EFICAS/index.html +%%EFICASDIR%%/Aide/fichiers_EFICAS/news.html %%EFICASDIR%%/Aide/fichiers_OPENTURNS_STUDY/EficasGui.txt %%EFICASDIR%%/Aide/fichiers_OPENTURNS_STUDY/UncertaintyStudy.txt %%EFICASDIR%%/Aide/fichiers_OPENTURNS_STUDY/index.html %%EFICASDIR%%/Aster/Cata/__init__.py %%EFICASDIR%%/Aster/Cata/__init__.pyc %%EFICASDIR%%/Aster/Cata/__init__.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Cata_Utils/__init__.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Cata_Utils/__init__.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Cata_Utils/__init__.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Cata_Utils/t_fonction.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Cata_Utils/t_fonction.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Cata_Utils/t_fonction.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/__init__.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/__init__.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/__init__.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/asse_elem_ssd_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/asse_elem_ssd_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/asse_elem_ssd_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_ecrevisse_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_ecrevisse_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_ecrevisse_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_essai_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_essai_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_essai_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_europlexus_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_europlexus_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_europlexus_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_fonction_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_fonction_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_fonction_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_ifs_dnl_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_ifs_dnl_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_ifs_dnl_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_miss_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_miss_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_miss_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_modal_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_modal_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_modal_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_mode_rotation_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_mode_rotation_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_mode_rotation_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_precont_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_precont_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_precont_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_spec_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_spec_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_spec_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_table_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_table_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/calc_table_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/crea_elem_ssd_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/crea_elem_ssd_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/crea_elem_ssd_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/creation_donnees_homard.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/creation_donnees_homard.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/creation_donnees_homard.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_cable_bp_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_cable_bp_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_cable_bp_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_fonc_elec_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_fonc_elec_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_fonc_elec_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_inte_spec_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_inte_spec_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_inte_spec_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_part_feti_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_part_feti_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_part_feti_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_sol_miss_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_sol_miss_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/defi_sol_miss_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/dyna_iss_vari_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/dyna_iss_vari_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/dyna_iss_vari_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/exec_logiciel_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/exec_logiciel_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/exec_logiciel_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/externe_mess.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/externe_mess.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/externe_mess.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/fiabilite_fichier.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/fiabilite_fichier.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/fiabilite_fichier.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/fiabilite_mefisto.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/fiabilite_mefisto.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/fiabilite_mefisto.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/gene_vari_alea_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/gene_vari_alea_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/gene_vari_alea_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_utils.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_utils.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_diag_campbell_utils.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_fonction_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_fonction_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_fonction_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_oar_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_oar_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_oar_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_table_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_table_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/impr_table_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/info_fonction_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/info_fonction_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/info_fonction_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/lire_fonction_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/lire_fonction_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/lire_fonction_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/lire_inte_spec_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/lire_inte_spec_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/lire_inte_spec_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/lire_table_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/lire_table_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/lire_table_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_adap_mail_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_adap_mail_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_adap_mail_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ascouf_calc_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ascouf_calc_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ascouf_calc_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ascouf_mail_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ascouf_mail_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ascouf_mail_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_aspic_calc_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_aspic_calc_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_aspic_calc_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_aspic_mail_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_aspic_mail_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_aspic_mail_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_cara_poutre_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_cara_poutre_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_cara_poutre_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ecla_pg_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ecla_pg_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ecla_pg_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ecre_calc_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ecre_calc_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ecre_calc_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ecrevisse_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ecrevisse_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_ecrevisse_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_fiab_impr_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_fiab_impr_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_fiab_impr_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_lign_coupe_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_lign_coupe_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_lign_coupe_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_recal_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_recal_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_recal_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_spectre_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_spectre_ops.pyc -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macr_spectre_ops.pyo -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macro_elas_mult_ops.py -%%EFICASDIR%%/Aster/Cata/cataSTA10/Macro/macro_elas_mult_ops.pyc *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***