- Upgrade to 1.15.0-1;

- Install qtEficas.

4 files changed, 100 insertions, 24 deletions

diff --git a/french/eficas/Makefile b/french/eficas/Makefile
index 2c18fd2314fc..171780a2caf8 100644
--- a/french/eficas/Makefile
+++ b/french/eficas/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	eficas
 DISTVERSIONPREFIX=	full-src-
-DISTVERSION=	1.14.0-1
+DISTVERSION=	1.15.0-1
 DISTVERSIONSUFFIX=	.noarch
 CATEGORIES=	french cad
 MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
@@ -21,8 +21,8 @@ RUN_DEPENDS=	${PYTHON_SITELIBDIR}/Pmw:${PORTSDIR}/x11-toolkits/py-Pmw		\
 		${PYNUMERIC}							\
 		${PYTHON_SITELIBDIR}/_tkinter.so:${PORTSDIR}/x11-toolkits/py-tkinter
 
-ASTER_VER=	9.3.0
-ASTER_DISTVERSION=	${ASTER_VER}-2
+ASTER_VER=	9.4.0
+ASTER_DISTVERSION=	${ASTER_VER}-1
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
 
 USE_PYTHON=	yes
@@ -43,8 +43,16 @@ EF_LANG=	fr
 EF_LANG=	ang
 .endif
 
-ENV2PYTHON=	Misc/Cyclops.py Aster/eficas_aster.py convert/Parserv5/Translate.py
-FIXSH=		bureau.py cataediteur.py panels.py
+.if !defined(WITHOUT_QT)
+RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/qt.so:${PORTSDIR}/x11-toolkits/py-qt
+SUB_FILES+=	qtEficas
+.endif
+
+ENV2PYTHON=	Misc/Cyclops.py Aster/eficas_aster.py convert/Parserv5/Translate.py	\
+		Traducteur/traduitV8V9.py Traducteur/traduitV7V8.py Aster/test_eficas.py\
+		Aster/qtEficas_aster.py
+FIXSHTK=	bureau.py cataediteur.py panels.py
+FIXSHQT=	qtCommun.py
 
 post-extract:
 	(cd ${WRKDIR} &&	\
@@ -58,8 +66,10 @@ pre-configure:
 	${REINPLACE_CMD} -e "s|^#!*./usr/bin/env python|#!${PYTHON_CMD}|"	\
 		-e "s|^#!*./bin/env python|#!${PYTHON_CMD}|" ${WRKSRC}/${FILE}
 .endfor
-.for FILE in ${FIXSH}
-	${REINPLACE_CMD} -e "s|/usr/bin/sh|/bin/sh|" ${WRKSRC}/InterfaceTK/${FILE}
+.for tk in TK QT
+. for FILE in ${FIXSH${tk}}
+	${REINPLACE_CMD} -e "s|/usr/bin/sh|/bin/sh|" ${WRKSRC}/Interface${tk}/${FILE}
+. endfor
 .endfor
 	${REINPLACE_CMD} -e "s#lang='fr'#lang='${EF_LANG}'#"			\
 		${WRKSRC}/Aster/prefs.py
@@ -73,6 +83,9 @@ do-install:
 	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${EFICASDIR}
 	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${EFICASDIR}
 	@${INSTALL_SCRIPT} ${WRKDIR}/eficas ${PREFIX}/bin
+.if !defined(WITHOUT_QT)
+	@${INSTALL_SCRIPT} ${WRKDIR}/qtEficas ${PREFIX}/bin
+.endif
 .if !defined(NOPORTDOCS)
 	@${MKDIR} ${DOCSDIR}
 	@${CP} ${WRKDIR}/Doc/* ${DOCSDIR}
diff --git a/french/eficas/distinfo b/french/eficas/distinfo
index 8330bc57b081..0296de5d6e4c 100644
--- a/french/eficas/distinfo
+++ b/french/eficas/distinfo
@@ -1,3 +1,3 @@
-MD5 (aster-full-src-9.3.0-2.noarch.tar.gz) = ad4e5476fb4a1d3f02fcbaeebc54356c
-SHA256 (aster-full-src-9.3.0-2.noarch.tar.gz) = 53c5ea87cd21549b6bb7d2a5a51e79b082a3df2daaeb0fd2774d0a5696ca9d2d
-SIZE (aster-full-src-9.3.0-2.noarch.tar.gz) = 141387488
+MD5 (aster-full-src-9.4.0-1.noarch.tar.gz) = b6dbe112250aac2cf569da9ebf30b18b
+SHA256 (aster-full-src-9.4.0-1.noarch.tar.gz) = c475bca33c12ed0e1dcf7ff82f424aac87bf6968c820b5789d90842b1de5b107
+SIZE (aster-full-src-9.4.0-1.noarch.tar.gz) = 149931937
diff --git a/french/eficas/files/qtEficas.in b/french/eficas/files/qtEficas.in
new file mode 100644
index 000000000000..1ba4c9d1755a
--- /dev/null
+++ b/french/eficas/files/qtEficas.in
@@ -0,0 +1,11 @@
+#!/bin/sh
+#
+# $FreeBSD$
+#
+# $1 = comm
+# $2 = com0
+# $3 = com1
+# $4 = com2
+
+cd %%EFICASDIR%%/Aster
+exec %%PYTHON_CMD%% qtEficas_aster.pyo $1 $2 $3 $4
diff --git a/french/eficas/pkg-plist b/french/eficas/pkg-plist
index 51cba3fdcc5f..7be482a206be 100644
--- a/french/eficas/pkg-plist
+++ b/french/eficas/pkg-plist
@@ -1,3 +1,5 @@
+bin/eficas
+bin/qtEficas
 %%EFICASDIR%%/AIDE/__init__.py
 %%EFICASDIR%%/AIDE/__init__.pyc
 %%EFICASDIR%%/AIDE/__init__.pyo
@@ -247,6 +249,9 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA8/Macro/__init__.py
 %%EFICASDIR%%/Aster/Cata/cataSTA8/Macro/__init__.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA8/Macro/__init__.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA8/Macro/ajout_quad_gmsh.py
+%%EFICASDIR%%/Aster/Cata/cataSTA8/Macro/ajout_quad_gmsh.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA8/Macro/ajout_quad_gmsh.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA8/Macro/calc_fonction_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA8/Macro/calc_fonction_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA8/Macro/calc_fonction_ops.pyo
@@ -423,12 +428,24 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/__init__.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/__init__.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/__init__.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_essai_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_essai_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_essai_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_europlexus_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_europlexus_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_europlexus_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_fonction_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_fonction_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_fonction_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_modal_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_modal_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_modal_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_precont_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_precont_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_precont_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_spec_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_spec_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_spec_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_table_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_table_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/calc_table_ops.pyo
@@ -540,9 +557,6 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/macro_proj_base_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/macro_proj_base_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/macro_proj_base_ops.pyo
-%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/macro_visu_meidee_ops.py
-%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/macro_visu_meidee_ops.pyc
-%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/macro_visu_meidee_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/observation_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/observation_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/observation_ops.pyo
@@ -558,6 +572,9 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/post_k_trans_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/post_k_trans_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/post_k_trans_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/propa_fiss_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/propa_fiss_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/propa_fiss_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/reca_algo.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/reca_algo.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/reca_algo.pyo
@@ -591,6 +608,9 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/test_fichier_ops.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/test_fichier_ops.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/test_fichier_ops.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/test_temps_ops.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/test_temps_ops.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/Macro/test_temps_ops.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/__init__.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/__init__.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/__init__.pyo
@@ -795,6 +815,9 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_compor.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_compor.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_compor.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_compor1.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_compor1.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_compor1.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_courbe.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_courbe.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_courbe.pyo
@@ -807,12 +830,18 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_feti.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_feti.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_feti.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_fiss_xfem.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_fiss_xfem.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_fiss_xfem.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_fonction.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_fonction.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_fonction.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_fond_fiss.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_fond_fiss.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_fond_fiss.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_formule.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_formule.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_formule.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_gfibre.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_gfibre.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_gfibre.pyo
@@ -900,6 +929,9 @@
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_nume_equa.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_nume_equa.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_nume_equa.pyo
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_obstacle.py
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_obstacle.pyc
+%%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_obstacle.pyo
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_para_sensi.py
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_para_sensi.pyc
 %%EFICASDIR%%/Aster/Cata/cataSTA9/SD/sd_para_sensi.pyo
@@ -1007,6 +1039,9 @@
 %%EFICASDIR%%/Aster/aster.py
 %%EFICASDIR%%/Aster/aster.pyc
 %%EFICASDIR%%/Aster/aster.pyo
+%%EFICASDIR%%/Aster/configuration.py
+%%EFICASDIR%%/Aster/configuration.pyc
+%%EFICASDIR%%/Aster/configuration.pyo
 %%EFICASDIR%%/Aster/editeur.ini
 %%EFICASDIR%%/Aster/editeur_salome.ini
 %%EFICASDIR%%/Aster/eficas_aster.py
@@ -1018,6 +1053,9 @@
 %%EFICASDIR%%/Aster/properties.py
 %%EFICASDIR%%/Aster/properties.pyc
 %%EFICASDIR%%/Aster/properties.pyo
+%%EFICASDIR%%/Aster/qtEficas_aster.py
+%%EFICASDIR%%/Aster/qtEficas_aster.pyc
+%%EFICASDIR%%/Aster/qtEficas_aster.pyo
 %%EFICASDIR%%/Aster/style.py
 %%EFICASDIR%%/Aster/style.pyc
 %%EFICASDIR%%/Aster/style.pyo
@@ -1049,13 +1087,19 @@
 %%EFICASDIR%%/Editeur/autre_analyse_cata.py
 %%EFICASDIR%%/Editeur/autre_analyse_cata.pyc
 %%EFICASDIR%%/Editeur/autre_analyse_cata.pyo
+%%EFICASDIR%%/Editeur/basestyle.py
+%%EFICASDIR%%/Editeur/basestyle.pyc
+%%EFICASDIR%%/Editeur/basestyle.pyo
 %%EFICASDIR%%/Editeur/comploader.py
 %%EFICASDIR%%/Editeur/comploader.pyc
 %%EFICASDIR%%/Editeur/comploader.pyo
-%%EFICASDIR%%/Editeur/configuration.py
-%%EFICASDIR%%/Editeur/configuration.pyc
-%%EFICASDIR%%/Editeur/configuration.pyo
+%%EFICASDIR%%/Editeur/comploaderqt4.py
+%%EFICASDIR%%/Editeur/comploaderqt4.pyc
+%%EFICASDIR%%/Editeur/comploaderqt4.pyo
 %%EFICASDIR%%/Editeur/faqs.txt
+%%EFICASDIR%%/Editeur/fontes.py
+%%EFICASDIR%%/Editeur/fontes.pyc
+%%EFICASDIR%%/Editeur/fontes.pyo
 %%EFICASDIR%%/Editeur/icons/About24.gif
 %%EFICASDIR%%/Editeur/icons/Copy24.gif
 %%EFICASDIR%%/Editeur/icons/Cut24.gif
@@ -1104,6 +1148,9 @@
 %%EFICASDIR%%/Editeur/session.py
 %%EFICASDIR%%/Editeur/session.pyc
 %%EFICASDIR%%/Editeur/session.pyo
+%%EFICASDIR%%/Editeur/styles.py
+%%EFICASDIR%%/Editeur/styles.pyc
+%%EFICASDIR%%/Editeur/styles.pyo
 %%EFICASDIR%%/Editeur/uiinfo.py
 %%EFICASDIR%%/Editeur/uiinfo.pyc
 %%EFICASDIR%%/Editeur/uiinfo.pyo
@@ -1291,9 +1338,6 @@
 %%EFICASDIR%%/InterfaceQT/editor.py
 %%EFICASDIR%%/InterfaceQT/editor.pyc
 %%EFICASDIR%%/InterfaceQT/editor.pyo
-%%EFICASDIR%%/InterfaceQT/eficas.py
-%%EFICASDIR%%/InterfaceQT/eficas.pyc
-%%EFICASDIR%%/InterfaceQT/eficas.pyo
 %%EFICASDIR%%/InterfaceQT/eficas_go.py
 %%EFICASDIR%%/InterfaceQT/eficas_go.pyc
 %%EFICASDIR%%/InterfaceQT/eficas_go.pyo
@@ -2006,9 +2050,12 @@
 %%EFICASDIR%%/convert/convert_ini.py
 %%EFICASDIR%%/convert/convert_ini.pyc
 %%EFICASDIR%%/convert/convert_ini.pyo
-%%EFICASDIR%%/convert/convert_openturns.py
-%%EFICASDIR%%/convert/convert_openturns.pyc
-%%EFICASDIR%%/convert/convert_openturns.pyo
+%%EFICASDIR%%/convert/convert_openturns_study.py
+%%EFICASDIR%%/convert/convert_openturns_study.pyc
+%%EFICASDIR%%/convert/convert_openturns_study.pyo
+%%EFICASDIR%%/convert/convert_openturns_wrapper.py
+%%EFICASDIR%%/convert/convert_openturns_wrapper.pyc
+%%EFICASDIR%%/convert/convert_openturns_wrapper.pyo
 %%EFICASDIR%%/convert/convert_pyth.py
 %%EFICASDIR%%/convert/convert_pyth.pyc
 %%EFICASDIR%%/convert/convert_pyth.pyo
@@ -2054,6 +2101,12 @@
 %%EFICASDIR%%/generator/generator_openturns.py
 %%EFICASDIR%%/generator/generator_openturns.pyc
 %%EFICASDIR%%/generator/generator_openturns.pyo
+%%EFICASDIR%%/generator/generator_openturns_study.py
+%%EFICASDIR%%/generator/generator_openturns_study.pyc
+%%EFICASDIR%%/generator/generator_openturns_study.pyo
+%%EFICASDIR%%/generator/generator_openturns_wrapper.py
+%%EFICASDIR%%/generator/generator_openturns_wrapper.pyc
+%%EFICASDIR%%/generator/generator_openturns_wrapper.pyo
 %%EFICASDIR%%/generator/generator_pyth.py
 %%EFICASDIR%%/generator/generator_pyth.pyc
 %%EFICASDIR%%/generator/generator_pyth.pyo
@@ -2066,7 +2119,6 @@
 %%EFICASDIR%%/generator/generator_vers3DSalome.py
 %%EFICASDIR%%/generator/generator_vers3DSalome.pyc
 %%EFICASDIR%%/generator/generator_vers3DSalome.pyo
-bin/eficas
 %%PORTDOCS%%%%DOCSDIR%%/U40201i.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U40301e.pdf
 %%PORTDOCS%%%%DOCSDIR%%/U40301f.pdf
@@ -2369,8 +2421,8 @@ bin/eficas
 @dirrm %%EFICASDIR%%/Tools
 @dirrm %%EFICASDIR%%/Noyau
 @dirrm %%EFICASDIR%%/Misc
-@dirrm %%EFICASDIR%%/InterfaceQT
 @dirrm %%EFICASDIR%%/InterfaceTK
+@dirrm %%EFICASDIR%%/InterfaceQT
 @dirrm %%EFICASDIR%%/Ihm
 @dirrm %%EFICASDIR%%/Extensions
 @dirrm %%EFICASDIR%%/Editeur/icons