3 files changed, 22 insertions, 9 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 9af2b17e7f5f..169f2bfe05c7 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	astk
 DISTVERSIONPREFIX=	full-src-
-DISTVERSION=	1.7.1-1
+DISTVERSION=	1.7.4-1
 DISTVERSIONSUFFIX=	.noarch
 CATEGORIES=	cad
 MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
@@ -48,7 +48,8 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 LINSTDIR=	aster/ASTK
 inst_dir=	${PREFIX}/${LINSTDIR}
 aster_dir=	${LOCALBASE}/aster/${vaster}
-S_SCRIPTS=	bin/as_run bin/as_serv bin/mpirun_template bin/sub_script
+S_SCRIPTS=	bin/as_run bin/as_serv bin/mpirun_template bin/sub_script		\
+		bin/tools/get_infos
 S_PYLIBS=	lib/alamain.py lib/as_config.py lib/as_timer.py lib/as_devtools.py	\
 		lib/as_repart.py lib/user_filter.py bin/main.py bin/parallel_cp
 C_SCRIPTS=	bin/astk bin/bsf
@@ -97,7 +98,7 @@ TCL_VER?=	${TK_VER}
 SHORT_TK_VER=	${TK_VER:S/.//}
 BWidget_VER=	1.7.0
 
-ASTER_VER=	9.4.0
+ASTER_VER=	10.0.3
 vaster=		STA${ASTER_VER:R}
 
 GIBI=		gibi2003
@@ -226,12 +227,12 @@ do-configure:
 		-e "s#?vaster?#${vaster}#"					\
 		-e "s#?TOOLS_DIR?#${tools_dir}#" ${conf_dir}/outils
 	${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#"			\
-		-e "s#?XTERM?#${LOCALBASE}/bin/xterm#"				\
+		-e "s#?TERMINAL?#${LOCALBASE}/bin/xterm#"				\
 		-e "s#?FULL_SERVER_NAME?#${SERVER_NAME}#"			\
 		-e "s#?SERVER_NAME?#${HOST_NAME}#"				\
 		-e "s#?ASTER_ROOT?#${PREFIX}/aster#"				\
 		-e "s#?EDITOR?#${WITH_ED}#" ${conf_dir}/config_serveurs
-	${REINPLACE_CMD} -e "s#?XTERM?#${LOCALBASE}/bin/xterm#"			\
+	${REINPLACE_CMD} -e "s#?TERMINAL?#${LOCALBASE}/bin/xterm#"			\
 		-e "s#?ASTER_VERSION?#${ASTER_VER}#"				\
 		-e "s#langue : ENG#langue : ${ASTK_LANG}#"			\
 		-e "s#?DOMAIN_NAME?#${DOMAIN_NAME}#"				\
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index e8345165e666..5d3f27ea2757 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,3 +1,3 @@
-MD5 (aster-full-src-9.4.0-2.noarch.tar.gz) = d28a1aee23413239166e77d4e934395a
-SHA256 (aster-full-src-9.4.0-2.noarch.tar.gz) = ab46cac1f1606c1cacda35befd0a8c7992bd2c4568e2f0b59f26676dd5fe38f3
-SIZE (aster-full-src-9.4.0-2.noarch.tar.gz) = 149933404
+MD5 (aster-full-src-10.0.3-2.noarch.tar.gz) = d2609b01a26e1166a58ebcb5a5b46a32
+SHA256 (aster-full-src-10.0.3-2.noarch.tar.gz) = a30a0d7c46168b1c7cbff22a290527753337d89883ec53afff6a2ca8a32c49a3
+SIZE (aster-full-src-10.0.3-2.noarch.tar.gz) = 149739925
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index a71a2666a4ff..9a98b974fa65 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -188,6 +188,7 @@
 %%SERV%%%%ASTKDIR%%/bin/mpirun_template
 %%SERV%%%%ASTKDIR%%/bin/parallel_cp
 %%SERV%%%%ASTKDIR%%/bin/sub_script
+%%SERV%%%%ASTKDIR%%/bin/tools/get_infos
 %%SERV%%%%ASTKDIR%%/conf/.mysql_connect_REX
 %%SERV%%%%ASTKDIR%%/conf/aster_profile.sh
 %%SERV%%%%ASTKDIR%%/conf/config
@@ -337,9 +338,18 @@
 %%SERV%%%%ASTKDIR%%/unittest/jobs/jobs.export.in
 %%SERV%%%%ASTKDIR%%/unittest/meshtool/Makefile
 %%SERV%%%%ASTKDIR%%/unittest/meshtool/meshtool.export.in
+%%SERV%%%%ASTKDIR%%/unittest/others/Makefile
+%%SERV%%%%ASTKDIR%%/unittest/others/agla.py
+%%SERV%%%%ASTKDIR%%/unittest/others/agla.pyc
+%%SERV%%%%ASTKDIR%%/unittest/others/agla.pyo
+%%SERV%%%%ASTKDIR%%/unittest/others/scroll.py
+%%SERV%%%%ASTKDIR%%/unittest/others/scroll.pyc
+%%SERV%%%%ASTKDIR%%/unittest/others/scroll.pyo
 %%SERV%%%%ASTKDIR%%/unittest/param/Makefile
-%%SERV%%%%ASTKDIR%%/unittest/param/param.distr
 %%SERV%%%%ASTKDIR%%/unittest/param/param.export.in
+%%SERV%%%%ASTKDIR%%/unittest/param/test_param.py
+%%SERV%%%%ASTKDIR%%/unittest/param/test_param.pyc
+%%SERV%%%%ASTKDIR%%/unittest/param/test_param.pyo
 %%SERV%%%%ASTKDIR%%/unittest/surcharge/Makefile
 %%SERV%%%%ASTKDIR%%/unittest/surcharge/surcharge.export.in
 %%SERV%%%%ASTKDIR%%/unittest/surcharge/surcharge_astout.export.in
@@ -360,6 +370,7 @@
 %%CLIENT%%@dirrm %%ASTKDIR%%/share
 %%SERV%%@dirrm %%ASTKDIR%%/unittest/surcharge
 %%SERV%%@dirrm %%ASTKDIR%%/unittest/param
+%%SERV%%@dirrm %%ASTKDIR%%/unittest/others
 %%SERV%%@dirrm %%ASTKDIR%%/unittest/meshtool
 %%SERV%%@dirrm %%ASTKDIR%%/unittest/jobs
 %%SERV%%@dirrm %%ASTKDIR%%/unittest/etude
@@ -370,6 +381,7 @@
 %%SERV%%@dirrm %%ASTKDIR%%/unittest
 %%SERV%%@dirrm %%ASTKDIR%%/lib
 %%SERV%%@dirrm %%ASTKDIR%%/conf
+%%SERV%%@dirrm %%ASTKDIR%%/bin/tools
 %%SERV%%@dirrm %%ASTKDIR%%/bin
 @dirrm %%ASTKDIR%%
 @dirrmtry aster/ASTK