From owner-svn-ports-all@FreeBSD.ORG Tue May 13 21:48:28 2014 Return-Path: Delivered-To: svn-ports-all@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1 with cipher ADH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 966D6E30; Tue, 13 May 2014 21:48:28 +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)) (Client did not present a certificate) by mx1.freebsd.org (Postfix) with ESMTPS id 82C8D2258; Tue, 13 May 2014 21:48:28 +0000 (UTC) Received: from svn.freebsd.org ([127.0.1.70]) by svn.freebsd.org (8.14.8/8.14.8) with ESMTP id s4DLmSDu014138; Tue, 13 May 2014 21:48:28 GMT (envelope-from thierry@svn.freebsd.org) Received: (from thierry@localhost) by svn.freebsd.org (8.14.8/8.14.8/Submit) id s4DLmRuW014131; Tue, 13 May 2014 21:48:27 GMT (envelope-from thierry@svn.freebsd.org) Message-Id: <201405132148.s4DLmRuW014131@svn.freebsd.org> From: Thierry Thomas Date: Tue, 13 May 2014 21:48:27 +0000 (UTC) To: ports-committers@freebsd.org, svn-ports-all@freebsd.org, svn-ports-head@freebsd.org Subject: svn commit: r354003 - in head/french/aster: . files X-SVN-Group: ports-head MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-ports-all@freebsd.org X-Mailman-Version: 2.1.18 Precedence: list List-Id: SVN commit messages for the ports tree List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Tue, 13 May 2014 21:48:28 -0000 Author: thierry Date: Tue May 13 21:48:27 2014 New Revision: 354003 URL: http://svnweb.freebsd.org/changeset/ports/354003 QAT: https://qat.redports.org/buildarchive/r354003/ Log: Fix several problems: it now builds cleanly and can run the tests. Still marked BROKEN because there is some rough edges, but interesting users can remove this line. Added: head/french/aster/files/astout.export (contents, props changed) Modified: head/french/aster/Makefile head/french/aster/bsd.aster.mk head/french/aster/files/patch-as_setup.py head/french/aster/files/pkg-message.in head/french/aster/pkg-plist Modified: head/french/aster/Makefile ============================================================================== --- head/french/aster/Makefile Tue May 13 21:45:49 2014 (r354002) +++ head/french/aster/Makefile Tue May 13 21:48:27 2014 (r354003) @@ -1,10 +1,10 @@ # Created by: thierry@pompo.net # $FreeBSD$ -PORTNAME= aster -DISTVERSION= ${ASTER_DISTVERSION} +PORTNAME= aster +DISTVERSION= ${ASTER_DISTVERSION} PORTREVISION= 1 -CATEGORIES= french cad +CATEGORIES= french cad MAINTAINER= thierry@FreeBSD.org COMMENT= Code_Aster finite element method solver @@ -14,7 +14,6 @@ LICENSE= GPLv2 #----------------------------------------------------------------------- # You may define these options: # -# - FFLAGS: fortan compiler's flags (-O2 by default); # - WITH_ZSH or WITH_BASH or WITH_KSH: select a shell among # zsh (default), bash or ksh; # - WITH_ED: select an editor accepting '-display' (e.g. gvim, nedit); @@ -44,16 +43,18 @@ RUN_DEPENDS+= ${PYTHON_SITELIBDIR}/Gnupl ${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP} \ ${LOCALBASE}/aster/ASTK/ASTK_SERV:${PORTSDIR}/cad/astk-serveur -BROKEN= WIP - to be fixed - +BROKEN= WIP - it builds and runs, but yet some rough edges USES= bison fortran tk 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} -PLIST_SUB= ASTERDIR=${PORTNAME}/${vaster} TOOLDIR=${PORTNAME}/outils +VER= ${PORTVERSION:R} +VE= ${VER:R} +WRKSRC= ${WRKDIR}/${PORTNAME}-full-src-${VER} + +PLIST_SUB= VE=${VE} .if defined(WITHOUT_ASTK_CLI) SUB_FILES= pkg-message.sans-astk .else @@ -66,19 +67,16 @@ INTERACTIVE_SCRIPTS= check_compilers.py .include "${.CURDIR}/../../french/aster/bsd.aster.mk" .include +.if !exists(/compat/linux/proc/) +IGNORE= /compat/linux/proc/ must be mounted to build elements # Fixme +.endif + .if ${ARCH} == "i386" FLAGARCH= -DP_LINUX -DLINUX -FFLAGARCH= .else FLAGARCH= -DLINUX64 -FFLAGARCH= -fdefault-integer-8 -fdefault-real-8 .endif -#.if ${ARCH} == "amd64" -# python 2.7 causes process runaway -#PYTHON_VERSION= 2.6 -#.endif - # Avoid renaming .f into .F #F90FLAGS= -x f77-cpp-input ${FFLAGS} @@ -176,14 +174,22 @@ WITH_ED= vi . endif .endif -vaster= STA${PORTVERSION:R:R} -INST_DAT= LICENSE.TERMS astest cata_ele.pickled catalo catapy \ - elements materiau -INST_PY= bibpyt commande +INST_DAT= elements INST_SH= as_run parallel_cp -DAT2FIX= astout.export config.txt forma01a.export -inst_dir= ${PREFIX}/${PORTNAME}/${vaster} +PFX2FIX= bin/as_run ${VE}/include/aster/asterc_config.h ${VE}/config.txt \ + ${VE}/include/aster/asterf_config.h ${VE}/profile.sh +inst_dir= ${PREFIX}/${PORTNAME} tools_dir= ${PREFIX}/${PORTNAME}/outils +tools= kmetis onmetis pmetis gnuplot +.if !defined(WITHOUT_EFICAS) +tools+= eficas eficasQt +.endif +.if !defined(WITHOUT_GMSH) +tools+= gmsh +.endif +.if !defined(WITHOUT_GRACE) +tools+= gracebat xmgrace +.endif v_ifdef= ${OPSYS:tu} SHELL_INSTALL_ASTER= ${LOCALBASE}/bin/${SHIA} tcl_dir= ${LOCALBASE} @@ -191,11 +197,11 @@ hdf_dir= ${LOCALBASE} .if defined(WITH_ATLAS) lib_blas= ptf77blas lib_atlas= atlas -lib_math= "-lptf77blas -latlas" +lib_math= "-L${LOCALBASE}/lib -lptf77blas -latlas" .else lib_blas= blas lib_atlas= # empty -lib_math= "-lblas -llapack" +lib_math= "-L${LOCALBASE}/lib -lblas -llapack" .endif LASTKDIR?= ${PORTNAME}/ASTK/ASTK_CLIENT @@ -203,8 +209,6 @@ ASTKDIR= ${LOCALBASE}/${LASTKDIR} BASH2RC= products_data.py -${WRKSRC}/instdir/${vaster}/elements: build - pre-everything:: .if defined(WITH_MPI) @${ECHO_MSG} "To build Code_Aster with MPI enabled, you need to run \`mpd &'" @@ -213,12 +217,11 @@ pre-everything:: pre-configure: ${REINPLACE_CMD} -e 's|PREFER_SHARED_LIBS=False|PREFER_SHARED_LIBS=True|' \ ${WRKSRC}/setup.cfg - ${REINPLACE_CMD} -e 's|/opt/aster|${WRKSRC}/instdir|' \ + ${REINPLACE_CMD} -e 's|/opt/aster|${STAGEDIR}${inst_dir}|' \ ${WRKSRC}/setup.cfg - ${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${WRKSRC}/instdir|' \ + ${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${STAGEDIR}${inst_dir}|' \ ${WRKSRC}/products.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" \ + ${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;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} @@ -262,8 +265,6 @@ pre-configure: ${ECHO_CMD} "CC='${CC}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "gcc='${CC}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CXX='${CXX}'" >> ${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='${FC}'" >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm'" >> ${WRKSRC}/setup.cfg @@ -291,27 +292,25 @@ pre-configure: ${ECHO_CMD} "TERMINAL='xterm'" >> ${WRKSRC}/setup.cfg ${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}'" \ + ${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "FFLAGS_DBG='-c -g -O -fno-tree-dse ${FLAGARCH} ${FFLAGARCH}'" \ + ${ECHO_CMD} "FFLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg .if defined(WITH_MPI) - ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} ${FFLAGARCH} -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O -fno-tree-dse ${FLAGARCH} ${FFLAGARCH} -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH} -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|} ${PTHREAD_CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'" \ + ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${PTHREAD_CFLAGS} ${FLAGARCH} -I${HOME_MPI}/include'" \ >> ${WRKSRC}/setup.cfg ${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}'" \ + ${ECHO_CMD} "F90FLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "F90FLAGS_DBG='-c -g -O -fno-tree-dse ${FLAGARCH} ${FFLAGARCH}'" \ + ${ECHO_CMD} "F90FLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg - ${ECHO_CMD} "CFLAGS='-c ${CFLAGS:C|O2|O0|} ${PTHREAD_CFLAGS} ${FLAGARCH}'" \ + ${ECHO_CMD} "CFLAGS='-c ${CFLAGS} ${PTHREAD_CFLAGS} ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg ${ECHO_CMD} "CFLAGS_DBG='-c -g -O -pipe ${PTHREAD_CFLAGS} ${FLAGARCH}'" \ >> ${WRKSRC}/setup.cfg @@ -324,99 +323,74 @@ pre-configure: @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${WRKSRC} do-configure: - (cd ${CONFIGURE_WRKSRC} && ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} test \ - | tee ${CONFIGURE_LOG}) + (cd ${CONFIGURE_WRKSRC} \ + && TMPDIR=${WRKDIR} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} test \ + --prefix=${STAGEDIR}${inst_dir} | tee ${CONFIGURE_LOG}) @${ECHO_MSG} "---------------- Debug ------------------" ${CAT} ${CONFIGURE_WRKSRC}/setup.log @${ECHO_MSG} "------------ Fin debug ------------------" post-configure: - ${MKDIR} ${WRKSRC}/instdir/etc/ - ${CP} -R ${LOCALBASE}/aster/etc/codeaster ${WRKSRC}/instdir/etc/ - ${ECHO_CMD} "#?vers : VVV?" >> ${WRKSRC}/instdir/etc/codeaster/aster + ${MKDIR} ${STAGEDIR}${inst_dir}/etc + ${CP} -R ${LOCALBASE}/aster/etc/codeaster ${STAGEDIR}${inst_dir}/etc/ + ${ECHO_CMD} "#?vers : VVV?" >> ${STAGEDIR}${inst_dir}/etc/codeaster/aster ${CP} -R ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin \ ${LOCALBASE}/aster/ASTK/ASTK_SERV/asrun \ ${LOCALBASE}/aster/ASTK/ASTK_SERV/share \ - ${WRKSRC}/instdir/ - ${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|' \ - ${WRKSRC}/instdir/bin/as_run + ${STAGEDIR}${inst_dir} + ${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|' \ + ${STAGEDIR}${inst_dir}/bin/as_run .for sf in etc/codeaster/profile.sh asrun/installation.py - ${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${WRKSRC}/instdir|g' \ - -e 's|${LOCALBASE}/aster|${WRKSRC}/instdir|g' \ - ${WRKSRC}/instdir/${sf} + ${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${STAGEDIR}${inst_dir}|g' \ + -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|g' \ + ${STAGEDIR}${inst_dir}/${sf} .endfor do-build: (cd ${BUILD_WRKSRC} && \ - ${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 + TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} install aster \ + --prefix=${STAGEDIR}${inst_dir} | tee ${BUILD_WRKSRC}/build.log) do-install: - ${MKDIR} ${tools_dir} ${inst_dir} ${PREFIX}/${PORTNAME}/bin - ${INSTALL_PROGRAM} ${WRKSRC}/instdir/${vaster}/asteru ${inst_dir} - #${INSTALL_SCRIPT} ${WRKSRC}/instdir/${vaster}/asterd ${inst_dir} # Don't strip! - ${INSTALL_SCRIPT} ${WRKSRC}/instdir/${vaster}/profile.sh ${inst_dir} - ${ECHO_CMD} "" >> ${inst_dir}/profile.sh - ${ECHO_CMD} "HDF5_DISABLE_VERSION_CHECK=1" >> ${inst_dir}/profile.sh -.for FILE in ${DAT2FIX} - ${SED} -e 's|${WRKSRC}/instdir/${vaster}|${inst_dir}|g' \ - -e 's|${WRKSRC}/instdir/outils|${tools_dir}|g' \ - -e 's|${WRKSRC}/instdir|${inst_dir}|g' \ - -e 's|^F list|@F list|' \ - -e 's|^#F list|F list|' \ - -e 's|^@F list|#F list|' \ - -e 's|P mode astout|P mode interactif|' \ - -e 's|P mode forma01a|P mode interactif|' \ - -e 's|R resu_test ${inst_dir}|R resu_test /tmp|' \ - < ${WRKSRC}/instdir/${vaster}/${FILE} > ${inst_dir}/${FILE} -.endfor - ${LN} -sf ${inst_dir}/config.txt ${PREFIX}/${PORTNAME}/ -.for FILE in ${INST_DAT} ${INST_PY} - ${CP} -R ${WRKSRC}/instdir/${vaster}/${FILE} ${inst_dir} -.endfor -.for FILE in ${INST_SH} - ${SED} -e 's|${WRKSRC}/instdir|${PREFIX}/${PORTNAME}|' \ - < ${WRKSRC}/instdir/bin/${FILE} > ${PREFIX}/${PORTNAME}/bin/${FILE} - ${CHMOD} a+x ${PREFIX}/${PORTNAME}/bin/${FILE} -.endfor - ${REINPLACE_CMD} -e 's|cat ./fort.15 ./ficode|cat ./ficode|' \ - ${inst_dir}/bibpyt/Execution/E_SUPERV.py -.for FILE in ${INST_PY} - @${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/${FILE} - @${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/${FILE} -.endfor + # build: already did the installation + @${DO_NADA} post-install: - ${LN} -fs ${LOCALBASE}/bin/kmetis ${tools_dir}/ - ${LN} -fs ${LOCALBASE}/bin/onmetis ${tools_dir}/ - ${LN} -fs ${LOCALBASE}/bin/pmetis ${tools_dir}/ - ${LN} -fs ${LOCALBASE}/bin/gnuplot ${tools_dir}/ + ${RM} -rf ${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} -rf ${STAGEDIR}${inst_dir}/${VE}/share +.for f in ${PFX2FIX} + ${REINPLACE_CMD} -e 's|${STAGEDIR}||g' ${STAGEDIR}${inst_dir}/${f} +.endfor + (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py \ + -d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||}) + (cd ${STAGEDIR}${PREFIX} && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \ + -d ${PREFIX} -f ${inst_dir:S|${PREFIX}/||}) + ${STRIP_CMD} ${STAGEDIR}${inst_dir}/${VE}/bin/aster + ${SED} -e 's|%%VER%%|${VE}|' < ${FILESDIR}/astout.export \ + > ${STAGEDIR}${inst_dir}/${VE}/astout.export + (cd ${STAGEDIR}${inst_dir} && \ + ${LN} -fs ${VE} ${STAGEDIR}${inst_dir}/STA${VE}) +.for outil in ${tools} + ${LN} -fs ${LOCALBASE}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil} +.endfor .if !defined(WITHOUT_ASTK_CLI) - ${LN} -fs ${ASTKDIR}/bin/astk ${tools_dir}/ - ${LN} -fs ${ASTKDIR}/bin/bsf ${tools_dir}/ -.endif -.if !defined(WITHOUT_EFICAS) - ${LN} -fs ${LOCALBASE}/bin/eficas ${tools_dir}/ -. if exists(${LOCALBASE}/bin/qtEficas) - ${LN} -fs ${LOCALBASE}/bin/qtEficas ${tools_dir}/ -. endif -.endif -.if !defined(WITHOUT_GMSH) - ${LN} -fs ${LOCALBASE}/bin/gmsh ${tools_dir}/ -.endif -.if !defined(WITHOUT_GRACE) - ${LN} -fs ${LOCALBASE}/bin/gracebat ${tools_dir}/ - ${LN} -fs ${LOCALBASE}/bin/xmgrace ${tools_dir}/ +. for outil in astk bsf + ${LN} -fs ${ASTKDIR}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil} +. endfor .endif - @${ECHO_MSG} - @${CAT} ${PKGMESSAGE} - @${ECHO_MSG} .if defined(MAINTAINER_MODE) regression-test: install @${ECHO_MSG} "Note: homard must be installed to run some steps succesfully." - (cd ${inst_dir}; \ + ${CP} ${inst_dir}/${VE}/astout.export /tmp/ + (cd ${inst_dir}/${VE} && \ + ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run --list --all --vers=${VE} \ + --filter='"I" not in testlist' -o /tmp/list_seq ) + (cd /tmp && \ ${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run astout.export) || ${TRUE} @${ECHO_MSG} "Check /tmp/resu_test/*.erre" .endif Modified: head/french/aster/bsd.aster.mk ============================================================================== --- head/french/aster/bsd.aster.mk Tue May 13 21:45:49 2014 (r354002) +++ head/french/aster/bsd.aster.mk Tue May 13 21:48:27 2014 (r354003) @@ -19,10 +19,6 @@ TARNAME= ${PORTNAME:C|-edf||} TARNAME= ${PORTNAME} .endif -.if ${PORTNAME} == homard -DVSFX= .all -.endif - .if ${PORTNAME} != aster post-extract: (cd ${WRKDIR} && \ Added: head/french/aster/files/astout.export ============================================================================== --- /dev/null 00:00:00 1970 (empty, because file is newly added) +++ head/french/aster/files/astout.export Tue May 13 21:48:27 2014 (r354003) @@ -0,0 +1,16 @@ +# parameters +P actions astout +P version %%VER%% +P debug nodebug +P mode interactif +P ncpus 1 +P nbmaxnook 500 +P cpresok RESOK +P facmtps 3 +P tpsjob 300 + +# list of the test to run +F list /tmp/list_seq D 0 + +# results destination +R resu_test /tmp/resu_test R 0 Modified: head/french/aster/files/patch-as_setup.py ============================================================================== --- head/french/aster/files/patch-as_setup.py Tue May 13 21:45:49 2014 (r354002) +++ head/french/aster/files/patch-as_setup.py Tue May 13 21:48:27 2014 (r354003) @@ -1,5 +1,5 @@ ---- as_setup.py.orig 2014-01-06 14:30:14.000000000 +0100 -+++ as_setup.py 2014-01-17 23:16:39.000000000 +0100 +--- as_setup.py.orig 2014-03-05 09:41:19.000000000 +0100 ++++ as_setup.py 2014-05-12 19:32:12.000000000 +0200 @@ -45,6 +45,8 @@ import compileall import imp @@ -9,22 +9,18 @@ import distutils.sysconfig as SC from subprocess import Popen, PIPE -@@ -516,6 +518,42 @@ +@@ -516,6 +518,46 @@ if iextr_as: self.Clean(to_delete=path) + # Insert FreeBSD patches here + file2patch = os.path.join(self.workdir, self.content, 'bibc/wscript') -+ self._print('FreeBSD patch: no libdl + -O2 (GCC Bug 51267) => modify ' + file2patch) ++ self._print('FreeBSD patch: no libdl => modify ' + file2patch) + for ligne in fileinput.input(file2patch, inplace=1): + nl = 0 + nl = string.find(ligne, "uselib_store='SYS', lib='dl'") + 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) @@ -47,6 +43,14 @@ + if nl > 0: + ligne =ligne.replace("-O2", "-O0") + 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) ++ for ligne in fileinput.input(file2patch, inplace=1): ++ nl = 0 ++ nl = string.find(ligne, "/proc") ++ if nl > 0: ++ ligne =ligne.replace("/proc", "/compat/linux/proc") ++ sys.stdout.write(ligne) + # End of FreeBSD patches + #------------------------------------------------------------------------------- Modified: head/french/aster/files/pkg-message.in ============================================================================== --- head/french/aster/files/pkg-message.in Tue May 13 21:45:49 2014 (r354002) +++ head/french/aster/files/pkg-message.in Tue May 13 21:48:27 2014 (r354003) @@ -1,13 +1,13 @@ Pour lancer Code_Aster via ASTK, entrez : %%tools_dir%%/astk -Sur plate-forme i386, nous vous suggérons d'installer les ports french/gibi -et french/homard, deux outils de maillage additionnels. +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 -On i386 platform, we suggest you install the ports french/gibi and -french/homard, two additional meshing tools. +On i386 or amd64 platforms, we suggest you install the ports french/gibi +and french/homard, two additional meshing tools. Modified: head/french/aster/pkg-plist ============================================================================== --- head/french/aster/pkg-plist Tue May 13 21:45:49 2014 (r354002) +++ head/french/aster/pkg-plist Tue May 13 21:48:27 2014 (r354003) @@ -1,12436 +1,11723 @@ -%%ASTERDIR%%/LICENSE.TERMS -%%ASTERDIR%%/asteru -%%ASTERDIR%%/astest/adls102a.comm -%%ASTERDIR%%/astest/adls102a.datg -%%ASTERDIR%%/astest/adls102a.mail -%%ASTERDIR%%/astest/adls102a.para -%%ASTERDIR%%/astest/adlv100a.comm -%%ASTERDIR%%/astest/adlv100a.mail -%%ASTERDIR%%/astest/adlv100a.para -%%ASTERDIR%%/astest/adlv100b.comm -%%ASTERDIR%%/astest/adlv100b.msup -%%ASTERDIR%%/astest/adlv100b.para -%%ASTERDIR%%/astest/adlv100c.comm -%%ASTERDIR%%/astest/adlv100c.msup -%%ASTERDIR%%/astest/adlv100c.para -%%ASTERDIR%%/astest/adlv100d.comm -%%ASTERDIR%%/astest/adlv100d.msup -%%ASTERDIR%%/astest/adlv100d.para -%%ASTERDIR%%/astest/adlv100e.comm -%%ASTERDIR%%/astest/adlv100e.msup -%%ASTERDIR%%/astest/adlv100e.para -%%ASTERDIR%%/astest/adlv100f.comm -%%ASTERDIR%%/astest/adlv100f.msup -%%ASTERDIR%%/astest/adlv100f.para -%%ASTERDIR%%/astest/adlv100g.comm -%%ASTERDIR%%/astest/adlv100g.msup -%%ASTERDIR%%/astest/adlv100g.para -%%ASTERDIR%%/astest/adlv100h.comm -%%ASTERDIR%%/astest/adlv100h.msup -%%ASTERDIR%%/astest/adlv100h.para -%%ASTERDIR%%/astest/adlv100i.comm -%%ASTERDIR%%/astest/adlv100i.msup -%%ASTERDIR%%/astest/adlv100i.para -%%ASTERDIR%%/astest/adlv100j.comm -%%ASTERDIR%%/astest/adlv100j.msup -%%ASTERDIR%%/astest/adlv100j.para -%%ASTERDIR%%/astest/adlv100k.comm -%%ASTERDIR%%/astest/adlv100k.msup -%%ASTERDIR%%/astest/adlv100k.para -%%ASTERDIR%%/astest/adlv100l.comm -%%ASTERDIR%%/astest/adlv100l.msup -%%ASTERDIR%%/astest/adlv100l.para -%%ASTERDIR%%/astest/adlv100m.comm -%%ASTERDIR%%/astest/adlv100m.msup -%%ASTERDIR%%/astest/adlv100m.para -%%ASTERDIR%%/astest/adlv100n.comm -%%ASTERDIR%%/astest/adlv100n.msup -%%ASTERDIR%%/astest/adlv100n.para -%%ASTERDIR%%/astest/adlv101a.comm -%%ASTERDIR%%/astest/adlv101a.mail -%%ASTERDIR%%/astest/adlv101a.para -%%ASTERDIR%%/astest/adlv101b.comm -%%ASTERDIR%%/astest/adlv101b.mail -%%ASTERDIR%%/astest/adlv101b.para -%%ASTERDIR%%/astest/adlv101c.comm -%%ASTERDIR%%/astest/adlv101c.mail -%%ASTERDIR%%/astest/adlv101c.para -%%ASTERDIR%%/astest/adlv101d.comm -%%ASTERDIR%%/astest/adlv101d.mail -%%ASTERDIR%%/astest/adlv101d.para -%%ASTERDIR%%/astest/adlv101e.comm -%%ASTERDIR%%/astest/adlv101e.mail -%%ASTERDIR%%/astest/adlv101e.para -%%ASTERDIR%%/astest/adlv301a.comm -%%ASTERDIR%%/astest/adlv301a.mail -%%ASTERDIR%%/astest/adlv301a.msup -%%ASTERDIR%%/astest/adlv301a.para -%%ASTERDIR%%/astest/adlv312a.comm -%%ASTERDIR%%/astest/adlv312a.mail -%%ASTERDIR%%/astest/adlv312a.para -%%ASTERDIR%%/astest/ahlv100a.comm -%%ASTERDIR%%/astest/ahlv100a.mail -%%ASTERDIR%%/astest/ahlv100a.para -%%ASTERDIR%%/astest/ahlv100b.comm -%%ASTERDIR%%/astest/ahlv100b.mail -%%ASTERDIR%%/astest/ahlv100b.para -%%ASTERDIR%%/astest/ahlv100d.comm -%%ASTERDIR%%/astest/ahlv100d.msup -%%ASTERDIR%%/astest/ahlv100d.para -%%ASTERDIR%%/astest/ahlv100e.comm -%%ASTERDIR%%/astest/ahlv100e.msup -%%ASTERDIR%%/astest/ahlv100e.para -%%ASTERDIR%%/astest/ahlv100f.comm -%%ASTERDIR%%/astest/ahlv100f.msup -%%ASTERDIR%%/astest/ahlv100f.para -%%ASTERDIR%%/astest/ahlv100g.comm -%%ASTERDIR%%/astest/ahlv100g.msup -%%ASTERDIR%%/astest/ahlv100g.para -%%ASTERDIR%%/astest/ahlv100h.comm -%%ASTERDIR%%/astest/ahlv100h.msup -%%ASTERDIR%%/astest/ahlv100h.para -%%ASTERDIR%%/astest/ahlv100i.comm -%%ASTERDIR%%/astest/ahlv100i.msup -%%ASTERDIR%%/astest/ahlv100i.para -%%ASTERDIR%%/astest/ahlv100j.comm -%%ASTERDIR%%/astest/ahlv100j.msup -%%ASTERDIR%%/astest/ahlv100j.para -%%ASTERDIR%%/astest/ahlv100k.comm -%%ASTERDIR%%/astest/ahlv100k.msup -%%ASTERDIR%%/astest/ahlv100k.para -%%ASTERDIR%%/astest/ahlv100m.comm -%%ASTERDIR%%/astest/ahlv100m.mail -%%ASTERDIR%%/astest/ahlv100m.para -%%ASTERDIR%%/astest/ahlv100q.comm -%%ASTERDIR%%/astest/ahlv100q.msup -%%ASTERDIR%%/astest/ahlv100q.para -%%ASTERDIR%%/astest/ahlv100r.comm -%%ASTERDIR%%/astest/ahlv100r.msup -%%ASTERDIR%%/astest/ahlv100r.para -%%ASTERDIR%%/astest/ahlv100s.comm -%%ASTERDIR%%/astest/ahlv100s.msup -%%ASTERDIR%%/astest/ahlv100s.para -%%ASTERDIR%%/astest/ahlv101a.comm -%%ASTERDIR%%/astest/ahlv101a.mail -%%ASTERDIR%%/astest/ahlv101a.para -%%ASTERDIR%%/astest/ahlv101b.comm -%%ASTERDIR%%/astest/ahlv101b.msup -%%ASTERDIR%%/astest/ahlv101b.para -%%ASTERDIR%%/astest/ahlv101c.comm -%%ASTERDIR%%/astest/ahlv101c.msup -%%ASTERDIR%%/astest/ahlv101c.para -%%ASTERDIR%%/astest/ahlv302d.comm -%%ASTERDIR%%/astest/ahlv302d.msup -%%ASTERDIR%%/astest/ahlv302d.para -%%ASTERDIR%%/astest/ahlv302e.comm -%%ASTERDIR%%/astest/ahlv302e.msup -%%ASTERDIR%%/astest/ahlv302e.para -%%ASTERDIR%%/astest/ahlv302f.comm -%%ASTERDIR%%/astest/ahlv302f.msup -%%ASTERDIR%%/astest/ahlv302f.para -%%ASTERDIR%%/astest/aster@clpaster.cla.edfgdf -%%ASTERDIR%%/astest/comp001a.92 -%%ASTERDIR%%/astest/comp001a.comm -%%ASTERDIR%%/astest/comp001a.mail -%%ASTERDIR%%/astest/comp001a.para -%%ASTERDIR%%/astest/comp001b.comm -%%ASTERDIR%%/astest/comp001b.para -%%ASTERDIR%%/astest/comp001c.comm -%%ASTERDIR%%/astest/comp001c.para -%%ASTERDIR%%/astest/comp001d.comm -%%ASTERDIR%%/astest/comp001d.para -%%ASTERDIR%%/astest/comp001e.comm -%%ASTERDIR%%/astest/comp001e.para -%%ASTERDIR%%/astest/comp001f.comm -%%ASTERDIR%%/astest/comp001f.para -%%ASTERDIR%%/astest/comp001g.comm -%%ASTERDIR%%/astest/comp001g.para -%%ASTERDIR%%/astest/comp001h.comm -%%ASTERDIR%%/astest/comp001h.mail -%%ASTERDIR%%/astest/comp001h.para -%%ASTERDIR%%/astest/comp001i.comm -%%ASTERDIR%%/astest/comp001i.para -%%ASTERDIR%%/astest/comp002a.comm -%%ASTERDIR%%/astest/comp002a.mail -%%ASTERDIR%%/astest/comp002a.para -%%ASTERDIR%%/astest/comp002b.comm -%%ASTERDIR%%/astest/comp002b.para -%%ASTERDIR%%/astest/comp002c.comm -%%ASTERDIR%%/astest/comp002c.para -%%ASTERDIR%%/astest/comp002d.comm -%%ASTERDIR%%/astest/comp002d.para -%%ASTERDIR%%/astest/comp002e.comm -%%ASTERDIR%%/astest/comp002e.para -%%ASTERDIR%%/astest/comp002f.comm -%%ASTERDIR%%/astest/comp002f.para -%%ASTERDIR%%/astest/comp002g.comm -%%ASTERDIR%%/astest/comp002g.para -%%ASTERDIR%%/astest/comp002h.comm -%%ASTERDIR%%/astest/comp002h.para -%%ASTERDIR%%/astest/comp002i.92 -%%ASTERDIR%%/astest/comp002i.comm -%%ASTERDIR%%/astest/comp002i.para -%%ASTERDIR%%/astest/comp002j.91 -%%ASTERDIR%%/astest/comp002j.92 -%%ASTERDIR%%/astest/comp002j.93 -%%ASTERDIR%%/astest/comp002j.comm -%%ASTERDIR%%/astest/comp002j.mail -%%ASTERDIR%%/astest/comp002j.para -%%ASTERDIR%%/astest/comp005a.comm -%%ASTERDIR%%/astest/comp005a.mmed -%%ASTERDIR%%/astest/comp005a.para -%%ASTERDIR%%/astest/comp005b.comm -%%ASTERDIR%%/astest/comp005b.mail -%%ASTERDIR%%/astest/comp005b.para -%%ASTERDIR%%/astest/comp005c.comm -%%ASTERDIR%%/astest/comp005c.mail -%%ASTERDIR%%/astest/comp005c.para -%%ASTERDIR%%/astest/comp005d.comm -%%ASTERDIR%%/astest/comp005d.mmed -%%ASTERDIR%%/astest/comp005d.para -%%ASTERDIR%%/astest/comp007a.comm -%%ASTERDIR%%/astest/comp007a.para -%%ASTERDIR%%/astest/comp007b.comm -%%ASTERDIR%%/astest/comp007b.para -%%ASTERDIR%%/astest/comp007c.comm -%%ASTERDIR%%/astest/comp007c.para -%%ASTERDIR%%/astest/comp007d.comm -%%ASTERDIR%%/astest/comp007d.para -%%ASTERDIR%%/astest/comp008a.comm -%%ASTERDIR%%/astest/comp008a.para -%%ASTERDIR%%/astest/comp008b.comm -%%ASTERDIR%%/astest/comp008b.para -%%ASTERDIR%%/astest/comp008c.comm -%%ASTERDIR%%/astest/comp008c.para -%%ASTERDIR%%/astest/comp008d.comm -%%ASTERDIR%%/astest/comp008d.para -%%ASTERDIR%%/astest/comp008e.comm -%%ASTERDIR%%/astest/comp008e.para -%%ASTERDIR%%/astest/comp008f.comm -%%ASTERDIR%%/astest/comp008f.para -%%ASTERDIR%%/astest/comp008g.comm -%%ASTERDIR%%/astest/comp008g.para -%%ASTERDIR%%/astest/comp008h.comm -%%ASTERDIR%%/astest/comp008h.para -%%ASTERDIR%%/astest/comp008i.comm -%%ASTERDIR%%/astest/comp008i.para -%%ASTERDIR%%/astest/comp008j.comm -%%ASTERDIR%%/astest/comp008j.para -%%ASTERDIR%%/astest/comp008k.comm -%%ASTERDIR%%/astest/comp008k.para -%%ASTERDIR%%/astest/comp008l.comm -%%ASTERDIR%%/astest/comp008l.para -%%ASTERDIR%%/astest/comp008m.comm -%%ASTERDIR%%/astest/comp008m.para -%%ASTERDIR%%/astest/comp009a.comm -%%ASTERDIR%%/astest/comp009a.mail -%%ASTERDIR%%/astest/comp009a.para -%%ASTERDIR%%/astest/comp009b.comm -%%ASTERDIR%%/astest/comp009b.mail -%%ASTERDIR%%/astest/comp009b.para -%%ASTERDIR%%/astest/comp009c.comm -%%ASTERDIR%%/astest/comp009c.mail -%%ASTERDIR%%/astest/comp009c.para -%%ASTERDIR%%/astest/comp009d.comm -%%ASTERDIR%%/astest/comp009d.mail -%%ASTERDIR%%/astest/comp009d.para -%%ASTERDIR%%/astest/comp009f.comm -%%ASTERDIR%%/astest/comp009f.mail -%%ASTERDIR%%/astest/comp009f.para -%%ASTERDIR%%/astest/comp010c.comm -%%ASTERDIR%%/astest/comp010c.para -%%ASTERDIR%%/astest/comp010d.comm -%%ASTERDIR%%/astest/comp010d.para -%%ASTERDIR%%/astest/comp011a.comm -%%ASTERDIR%%/astest/comp011a.para -%%ASTERDIR%%/astest/comp011e.comm -%%ASTERDIR%%/astest/comp011e.para -%%ASTERDIR%%/astest/demo001a.17 -%%ASTERDIR%%/astest/demo001a.18 -%%ASTERDIR%%/astest/demo001a.52 -%%ASTERDIR%%/astest/demo001a.53 -%%ASTERDIR%%/astest/demo001a.54 -%%ASTERDIR%%/astest/demo001a.55 -%%ASTERDIR%%/astest/demo001a.comm -%%ASTERDIR%%/astest/demo001a.datg -%%ASTERDIR%%/astest/demo001a.geo -%%ASTERDIR%%/astest/demo001a.msh -%%ASTERDIR%%/astest/demo001a.para -%%ASTERDIR%%/astest/demo002a.comm -%%ASTERDIR%%/astest/demo002a.mail -%%ASTERDIR%%/astest/demo002a.para -%%ASTERDIR%%/astest/demo003a.comm -%%ASTERDIR%%/astest/demo003a.datg -%%ASTERDIR%%/astest/demo003a.mail -%%ASTERDIR%%/astest/demo003a.msh -%%ASTERDIR%%/astest/demo003a.para -%%ASTERDIR%%/astest/demo004a.comm -%%ASTERDIR%%/astest/demo004a.datg -%%ASTERDIR%%/astest/demo004a.msh -%%ASTERDIR%%/astest/demo004a.para -%%ASTERDIR%%/astest/demo004b.comm -%%ASTERDIR%%/astest/demo004b.datg -%%ASTERDIR%%/astest/demo004b.msh -%%ASTERDIR%%/astest/demo004b.para -%%ASTERDIR%%/astest/demo005a.38 -%%ASTERDIR%%/astest/demo005a.comm -%%ASTERDIR%%/astest/demo005a.datg -%%ASTERDIR%%/astest/demo005a.msh -%%ASTERDIR%%/astest/demo005a.para -%%ASTERDIR%%/astest/demo006a.38 -%%ASTERDIR%%/astest/demo006a.comm -%%ASTERDIR%%/astest/demo006a.msh -%%ASTERDIR%%/astest/demo006a.para -%%ASTERDIR%%/astest/distr01a.11 -%%ASTERDIR%%/astest/distr01a.50 -%%ASTERDIR%%/astest/distr01a.51 -%%ASTERDIR%%/astest/distr01a.com1 -%%ASTERDIR%%/astest/distr01a.comm -%%ASTERDIR%%/astest/distr01a.mmed -%%ASTERDIR%%/astest/distr01a.para -%%ASTERDIR%%/astest/efica02a.com1 -%%ASTERDIR%%/astest/efica02a.comm -%%ASTERDIR%%/astest/efica02a.mail -%%ASTERDIR%%/astest/efica02a.para -%%ASTERDIR%%/astest/epicu01a.comm -%%ASTERDIR%%/astest/epicu01a.datg -%%ASTERDIR%%/astest/epicu01a.mgib -%%ASTERDIR%%/astest/epicu01a.para -%%ASTERDIR%%/astest/epicu01b.comm -%%ASTERDIR%%/astest/epicu01b.datg -%%ASTERDIR%%/astest/epicu01b.mgib -%%ASTERDIR%%/astest/epicu01b.para -%%ASTERDIR%%/astest/erreu01a.comm -%%ASTERDIR%%/astest/erreu01a.mail -%%ASTERDIR%%/astest/erreu01a.para -%%ASTERDIR%%/astest/erreu02a.comm -%%ASTERDIR%%/astest/erreu02a.mail -%%ASTERDIR%%/astest/erreu02a.para -%%ASTERDIR%%/astest/erreu03a.comm -%%ASTERDIR%%/astest/erreu03a.datg -%%ASTERDIR%%/astest/erreu03a.mgib -%%ASTERDIR%%/astest/erreu03a.para -%%ASTERDIR%%/astest/erreu04a.comm -%%ASTERDIR%%/astest/erreu04a.mail -%%ASTERDIR%%/astest/erreu04a.para -%%ASTERDIR%%/astest/erreu05a.com1 -%%ASTERDIR%%/astest/erreu05a.comm -%%ASTERDIR%%/astest/erreu05a.mmed -%%ASTERDIR%%/astest/erreu05a.para -%%ASTERDIR%%/astest/erreu06a.comm -%%ASTERDIR%%/astest/erreu06a.para -%%ASTERDIR%%/astest/erreu07a.comm -%%ASTERDIR%%/astest/erreu07a.datg -%%ASTERDIR%%/astest/erreu07a.mgib -%%ASTERDIR%%/astest/erreu07a.para -%%ASTERDIR%%/astest/erreu08a.comm -%%ASTERDIR%%/astest/erreu08a.mmed -%%ASTERDIR%%/astest/erreu08a.para -%%ASTERDIR%%/astest/erreu09a.com1 -%%ASTERDIR%%/astest/erreu09a.comm -%%ASTERDIR%%/astest/erreu09a.mail -%%ASTERDIR%%/astest/erreu09a.para -%%ASTERDIR%%/astest/fdll200a.comm -%%ASTERDIR%%/astest/fdll200a.mail -%%ASTERDIR%%/astest/fdll200a.para -%%ASTERDIR%%/astest/fdlv100a.comm -%%ASTERDIR%%/astest/fdlv100a.mail -%%ASTERDIR%%/astest/fdlv100a.msup -%%ASTERDIR%%/astest/fdlv100a.para -%%ASTERDIR%%/astest/fdlv101a.comm -%%ASTERDIR%%/astest/fdlv101a.mail -%%ASTERDIR%%/astest/fdlv101a.msup -%%ASTERDIR%%/astest/fdlv101a.para -%%ASTERDIR%%/astest/fdlv102a.comm -%%ASTERDIR%%/astest/fdlv102a.mail -%%ASTERDIR%%/astest/fdlv102a.mgib -%%ASTERDIR%%/astest/fdlv102a.para -%%ASTERDIR%%/astest/fdlv102b.comm -%%ASTERDIR%%/astest/fdlv102b.datg -%%ASTERDIR%%/astest/fdlv102b.mail -%%ASTERDIR%%/astest/fdlv102b.mgib -%%ASTERDIR%%/astest/fdlv102b.para -%%ASTERDIR%%/astest/fdlv102c.21 -%%ASTERDIR%%/astest/fdlv102c.comm -%%ASTERDIR%%/astest/fdlv102c.mail -%%ASTERDIR%%/astest/fdlv102c.para -%%ASTERDIR%%/astest/fdlv103a.comm -%%ASTERDIR%%/astest/fdlv103a.msup -%%ASTERDIR%%/astest/fdlv103a.para -%%ASTERDIR%%/astest/fdlv105a.comm -%%ASTERDIR%%/astest/fdlv105a.mail -%%ASTERDIR%%/astest/fdlv105a.msup -%%ASTERDIR%%/astest/fdlv105a.para -%%ASTERDIR%%/astest/fdlv106a.21 -%%ASTERDIR%%/astest/fdlv106a.comm -%%ASTERDIR%%/astest/fdlv106a.mail -%%ASTERDIR%%/astest/fdlv106a.msup -%%ASTERDIR%%/astest/fdlv106a.para -%%ASTERDIR%%/astest/fdlv107a.20 -%%ASTERDIR%%/astest/fdlv107a.comm -%%ASTERDIR%%/astest/fdlv107a.msup -%%ASTERDIR%%/astest/fdlv107a.para -%%ASTERDIR%%/astest/fdlv108a.comm -%%ASTERDIR%%/astest/fdlv108a.msup -%%ASTERDIR%%/astest/fdlv108a.para -%%ASTERDIR%%/astest/fdlv109a.comm -%%ASTERDIR%%/astest/fdlv109a.msup -%%ASTERDIR%%/astest/fdlv109a.para -%%ASTERDIR%%/astest/fdlv111a.11 -%%ASTERDIR%%/astest/fdlv111a.comm -%%ASTERDIR%%/astest/fdlv111a.mail -%%ASTERDIR%%/astest/fdlv111a.para -%%ASTERDIR%%/astest/fdlv111b.11 -%%ASTERDIR%%/astest/fdlv111b.comm -%%ASTERDIR%%/astest/fdlv111b.mail -%%ASTERDIR%%/astest/fdlv111b.para -%%ASTERDIR%%/astest/fdlv112a.38 -%%ASTERDIR%%/astest/fdlv112a.comm -%%ASTERDIR%%/astest/fdlv112a.mail -%%ASTERDIR%%/astest/fdlv112a.para -%%ASTERDIR%%/astest/fdnv100a.comm -%%ASTERDIR%%/astest/fdnv100a.datg -%%ASTERDIR%%/astest/fdnv100a.mail -%%ASTERDIR%%/astest/fdnv100a.mgib -%%ASTERDIR%%/astest/fdnv100a.para -%%ASTERDIR%%/astest/feti001a.comm -%%ASTERDIR%%/astest/feti001a.mail -%%ASTERDIR%%/astest/feti001a.para -%%ASTERDIR%%/astest/feti001b.comm -%%ASTERDIR%%/astest/feti001b.mail -%%ASTERDIR%%/astest/feti001b.para -%%ASTERDIR%%/astest/feti002a.comm -%%ASTERDIR%%/astest/feti002a.mail -%%ASTERDIR%%/astest/feti002a.para -%%ASTERDIR%%/astest/feti002b.comm -%%ASTERDIR%%/astest/feti002b.mail -%%ASTERDIR%%/astest/feti002b.para -%%ASTERDIR%%/astest/feti003a.comm -%%ASTERDIR%%/astest/feti003a.mail -%%ASTERDIR%%/astest/feti003a.para -%%ASTERDIR%%/astest/feti003b.comm -%%ASTERDIR%%/astest/feti003b.mail -%%ASTERDIR%%/astest/feti003b.para -%%ASTERDIR%%/astest/feti003c.comm -%%ASTERDIR%%/astest/feti003c.mail -%%ASTERDIR%%/astest/feti003c.para -%%ASTERDIR%%/astest/feti003d.comm -%%ASTERDIR%%/astest/feti003d.mail -%%ASTERDIR%%/astest/feti003d.para -%%ASTERDIR%%/astest/feti004a.comm -%%ASTERDIR%%/astest/feti004a.mail -%%ASTERDIR%%/astest/feti004a.para -%%ASTERDIR%%/astest/feti004b.comm -%%ASTERDIR%%/astest/feti004b.mail -%%ASTERDIR%%/astest/feti004b.para -%%ASTERDIR%%/astest/feti005a.comm -%%ASTERDIR%%/astest/feti005a.mail -%%ASTERDIR%%/astest/feti005a.para -%%ASTERDIR%%/astest/feti005b.comm -%%ASTERDIR%%/astest/feti005b.mail -%%ASTERDIR%%/astest/feti005b.para -%%ASTERDIR%%/astest/feti006a.comm -%%ASTERDIR%%/astest/feti006a.mail -%%ASTERDIR%%/astest/feti006a.para -%%ASTERDIR%%/astest/feti008b.comm -%%ASTERDIR%%/astest/feti008b.mail -%%ASTERDIR%%/astest/feti008b.para -%%ASTERDIR%%/astest/forma01a.comm -%%ASTERDIR%%/astest/forma01a.datg -%%ASTERDIR%%/astest/forma01a.mmed -%%ASTERDIR%%/astest/forma01a.para -%%ASTERDIR%%/astest/forma01b.comm -%%ASTERDIR%%/astest/forma01b.mmed -%%ASTERDIR%%/astest/forma01b.para -%%ASTERDIR%%/astest/forma01c.21 -%%ASTERDIR%%/astest/forma01c.comm -%%ASTERDIR%%/astest/forma01c.datg -%%ASTERDIR%%/astest/forma01c.mmed -%%ASTERDIR%%/astest/forma01c.para -%%ASTERDIR%%/astest/forma02a.comm -%%ASTERDIR%%/astest/forma02a.datg -%%ASTERDIR%%/astest/forma02a.mmed -%%ASTERDIR%%/astest/forma02a.para -%%ASTERDIR%%/astest/forma02b.com1 -%%ASTERDIR%%/astest/forma02b.comm -%%ASTERDIR%%/astest/forma02b.datg -%%ASTERDIR%%/astest/forma02b.mmed -%%ASTERDIR%%/astest/forma02b.para -%%ASTERDIR%%/astest/forma02c.comm -%%ASTERDIR%%/astest/forma02c.datg -%%ASTERDIR%%/astest/forma02c.geo -%%ASTERDIR%%/astest/forma02c.mmed -%%ASTERDIR%%/astest/forma02c.msh -%%ASTERDIR%%/astest/forma02c.para -%%ASTERDIR%%/astest/forma02d.comm -%%ASTERDIR%%/astest/forma02d.datg -%%ASTERDIR%%/astest/forma02d.mmed -%%ASTERDIR%%/astest/forma02d.para -%%ASTERDIR%%/astest/forma03a.21 -%%ASTERDIR%%/astest/forma03a.comm -%%ASTERDIR%%/astest/forma03a.datg -%%ASTERDIR%%/astest/forma03a.mgib -%%ASTERDIR%%/astest/forma03a.mmed -%%ASTERDIR%%/astest/forma03a.para -%%ASTERDIR%%/astest/forma03b.21 -%%ASTERDIR%%/astest/forma03b.com1 -%%ASTERDIR%%/astest/forma03b.comm -%%ASTERDIR%%/astest/forma03b.datg -%%ASTERDIR%%/astest/forma03b.mgib -%%ASTERDIR%%/astest/forma03b.mmed -%%ASTERDIR%%/astest/forma03b.para -%%ASTERDIR%%/astest/forma03c.21 -%%ASTERDIR%%/astest/forma03c.3 -%%ASTERDIR%%/astest/forma03c.81 -%%ASTERDIR%%/astest/forma03c.84 -%%ASTERDIR%%/astest/forma03c.comm -%%ASTERDIR%%/astest/forma03c.datg -%%ASTERDIR%%/astest/forma03c.mmed -%%ASTERDIR%%/astest/forma03c.para -%%ASTERDIR%%/astest/forma03d.21 -%%ASTERDIR%%/astest/forma03d.3 -%%ASTERDIR%%/astest/forma03d.comm -%%ASTERDIR%%/astest/forma03d.datg -%%ASTERDIR%%/astest/forma03d.mmed -%%ASTERDIR%%/astest/forma03d.para -%%ASTERDIR%%/astest/forma04a.comm -%%ASTERDIR%%/astest/forma04a.datg -%%ASTERDIR%%/astest/forma04a.mmed -%%ASTERDIR%%/astest/forma04a.para -%%ASTERDIR%%/astest/forma04b.comm -%%ASTERDIR%%/astest/forma04b.datg -%%ASTERDIR%%/astest/forma04b.mmed -%%ASTERDIR%%/astest/forma04b.para -%%ASTERDIR%%/astest/forma04c.comm -%%ASTERDIR%%/astest/forma04c.datg -%%ASTERDIR%%/astest/forma04c.mmed -%%ASTERDIR%%/astest/forma04c.para -%%ASTERDIR%%/astest/forma05a.comm -%%ASTERDIR%%/astest/forma05a.mmed -%%ASTERDIR%%/astest/forma05a.para -%%ASTERDIR%%/astest/forma06a.comm -%%ASTERDIR%%/astest/forma06a.mmed -%%ASTERDIR%%/astest/forma06a.para -%%ASTERDIR%%/astest/forma07a.31 -%%ASTERDIR%%/astest/forma07a.comm -%%ASTERDIR%%/astest/forma07a.mmed -%%ASTERDIR%%/astest/forma07a.para -%%ASTERDIR%%/astest/forma07b.41 -%%ASTERDIR%%/astest/forma07b.com1 -%%ASTERDIR%%/astest/forma07b.com2 -%%ASTERDIR%%/astest/forma07b.comm -%%ASTERDIR%%/astest/forma07b.mmed -%%ASTERDIR%%/astest/forma07b.para -%%ASTERDIR%%/astest/forma08a.comm -%%ASTERDIR%%/astest/forma08a.datg -%%ASTERDIR%%/astest/forma08a.mmed -%%ASTERDIR%%/astest/forma08a.para -%%ASTERDIR%%/astest/forma08b.comm -%%ASTERDIR%%/astest/forma08b.datg -%%ASTERDIR%%/astest/forma08b.mmed -%%ASTERDIR%%/astest/forma08b.para -%%ASTERDIR%%/astest/forma10a.21 -%%ASTERDIR%%/astest/forma10a.22 -%%ASTERDIR%%/astest/forma10a.com1 -%%ASTERDIR%%/astest/forma10a.comm -%%ASTERDIR%%/astest/forma10a.mail -%%ASTERDIR%%/astest/forma10a.para -%%ASTERDIR%%/astest/forma10b.comm -%%ASTERDIR%%/astest/forma10b.mail -%%ASTERDIR%%/astest/forma10b.para -%%ASTERDIR%%/astest/forma11a.comm -%%ASTERDIR%%/astest/forma11a.mail -%%ASTERDIR%%/astest/forma11a.para -%%ASTERDIR%%/astest/forma11b.comm -%%ASTERDIR%%/astest/forma11b.mail -%%ASTERDIR%%/astest/forma11b.para -%%ASTERDIR%%/astest/forma11c.comm -%%ASTERDIR%%/astest/forma11c.mail -%%ASTERDIR%%/astest/forma11c.para -%%ASTERDIR%%/astest/forma11d.comm -%%ASTERDIR%%/astest/forma11d.mail -%%ASTERDIR%%/astest/forma11d.para -%%ASTERDIR%%/astest/forma12a.comm -%%ASTERDIR%%/astest/forma12a.mmed -%%ASTERDIR%%/astest/forma12a.para -%%ASTERDIR%%/astest/forma12b.comm -%%ASTERDIR%%/astest/forma12b.mmed -%%ASTERDIR%%/astest/forma12b.para -%%ASTERDIR%%/astest/forma12c.comm -%%ASTERDIR%%/astest/forma12c.mmed -%%ASTERDIR%%/astest/forma12c.para -%%ASTERDIR%%/astest/forma12d.comm -%%ASTERDIR%%/astest/forma12d.mmed -%%ASTERDIR%%/astest/forma12d.para -%%ASTERDIR%%/astest/forma12e.comm -%%ASTERDIR%%/astest/forma12e.mmed *** DIFF OUTPUT TRUNCATED AT 1000 LINES ***