Upgrade to 1.5.0-1.

4 files changed, 69 insertions, 60 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 45eb90a6b68b..d020a0cbb0a3 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,7 +6,7 @@
 #
 
 PORTNAME=	astk
-DISTVERSION=	1.3.3-1
+DISTVERSION=	1.5.0-1
 CATEGORIES=	cad
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 .if !defined(CLIENT_SEUL)
@@ -44,7 +44,7 @@ PKGMESSAGE=	${WRKDIR}/pkg-message
 LINSTDIR=	aster/ASTK
 inst_dir=	${PREFIX}/${LINSTDIR}
 aster_dir=	${LOCALBASE}/aster/${vaster}
-S_SCRIPTS=	bin/as_exec bin/as_run bin/as_serv bin/tool_stanley lib/sub_script
+S_SCRIPTS=	bin/as_exec bin/as_run bin/as_serv bin/as_exec_special lib/sub_script
 S_PYLIBS=	alamain.py as_timer.py
 C_SCRIPTS=	bin/astk bin/bsf
 tools_dir=	${aster_dir}/outils
@@ -74,7 +74,7 @@ TCL_VER?=	${TK_VER}
 SHORT_TK_VER=	${TK_VER:S/.//}
 BWidget_VER=	1.7.0
 
-ASTER_VER=	8.3.0
+ASTER_VER=	9.0.0
 vaster=		STA${ASTER_VER:R}
 
 GIBI=		gibi2003
@@ -159,7 +159,8 @@ do-configure:
 		-e 's#?MAXCMDLEN?#16384#' ${WRKSRC}/bin/as_run
 . for scripts in ${S_SCRIPTS}
 	@${REINPLACE_CMD} -e "s#?SHELL_EXECUTION?#${SHELL_INSTALL_ASTER}#"	\
-	-e "s#?HOME_ASTK?#${inst_dir}#" ${WRKSRC}/${scripts}
+	-e "s#?ASTER_ROOT?#${PREFIX}/aster#;s#?HOME_ASTK?#${inst_dir}#"		\
+		${WRKSRC}/${scripts}
 . endfor
 	@${REINPLACE_CMD} -e "s#?IFDEF?#${v_ifdef}#g"				\
 	-e "s#?ASTER_ROOT?#${LOCALBASE}/aster#g"				\
@@ -188,8 +189,7 @@ do-configure:
 	-e "s#?HOME_ASTK?#${inst_dir}#"						\
 	-e "s#?WISH_EXE?#wish${TK_VER}#" ${WRKSRC}/${scripts}
 . endfor
-	@${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#"			\
-		-e "s#GIBI#${GIBI}#"						\
+	@${REINPLACE_CMD} -e "s#GIBI#${GIBI}#"					\
 		-e "s#?vaster?#${vaster}#"					\
 		-e "s#?TOOLS_DIR?#${tools_dir}#" ${conf_dir}/outils
 	@${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#"			\
@@ -206,6 +206,7 @@ do-configure:
 		${WRKSRC}/share/tkselecteur.tcl
 	@${REINPLACE_CMD} -e "s#%%unamesm%%#${unamesm}#"			\
 		${WRKSRC}/lib/ASTK/init.tcl
+	@${REINPLACE_CMD} -e 's|?ASTER_ROOT?|${PREFIX}/aster|' ${WRKSRC}/bin/astk
 .endif
 
 do-install:
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index d18a1b0035f9..fe05f540c6f9 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,3 +1,3 @@
-MD5 (astk-1.3.3-1.noarch.tar.gz) = 468ff9c130d9dfbce18d7b18f8c778cf
-SHA256 (astk-1.3.3-1.noarch.tar.gz) = 829b18ad7e7d3b1e8779ff4f7f943d7cdefcc93704adfa51e77694eead5cd1e4
-SIZE (astk-1.3.3-1.noarch.tar.gz) = 378106
+MD5 (astk-1.5.0-1.noarch.tar.gz) = bc4a313531493fe5f62866dfbd701efa
+SHA256 (astk-1.5.0-1.noarch.tar.gz) = ed038adce4ab0212c1ef18b451cb9cde13e1c2fe9e482812d6bf49445efde8d5
+SIZE (astk-1.5.0-1.noarch.tar.gz) = 405067
diff --git a/cad/astk-serveur/files/patch-lib::as_config.py b/cad/astk-serveur/files/patch-lib::as_config.py
index f5de7cb1aff7..40d3d12a94b4 100644
--- a/cad/astk-serveur/files/patch-lib::as_config.py
+++ b/cad/astk-serveur/files/patch-lib::as_config.py
@@ -1,9 +1,9 @@
---- lib/as_config.py.orig	Mon Feb 14 09:23:49 2005
-+++ lib/as_config.py	Thu Mar 24 10:08:09 2005
-@@ -66,8 +66,8 @@
-          'SRCMAT'          : ['materiau'],
+--- lib/as_config.py.orig	Tue Dec 19 14:31:52 2006
++++ lib/as_config.py	Sat Dec 23 22:07:31 2006
+@@ -75,8 +75,8 @@
           'SRCHIST'         : ['histor'],
           # name of "binaries" (as results of a make)
+          'MAKE'            : ['debug nodebug'],
 -         'BIN_NODBG'       : ['asteru.exe'],
 -         'BIN_DBG'         : ['asterd.exe'],
 +         'BIN_NODBG'       : ['asteru'],
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 51e830b0d7c9..8b58004f8d78 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -26,14 +26,13 @@
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/FR/item_190.txt
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/FR/item_323.txt
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/RELNOTES
-%%CLIENT%%%%ASTKDIR%%/lib/ASTK/TODO
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/aide.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/astk.tcl
-%%CLIENT%%%%ASTKDIR%%/lib/ASTK/astk2run_aster.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/astkrc/ASTKRC_INFO.txt
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/astkrc/config_serveurs
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/astkrc/outils
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/astkrc/prefs
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/convbase.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/fichier.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/i_serv.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_agla.tcl
@@ -52,10 +51,55 @@
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/init_agla.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/init_env.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/lance_calcul.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/meshtool.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/options.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/tools.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/ASTK/unites_logiques.tcl
 %%CLIENT%%%%ASTKDIR%%/lib/BSF/bsf.tcl
+%%CLIENT%%%%ASTKDIR%%/share/appli.tcl
+%%CLIENT%%%%ASTKDIR%%/share/config.tcl
+%%CLIENT%%%%ASTKDIR%%/share/file_funct.tcl
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_1downarrow.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_1uparrow.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_button_cancel.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_edit.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_empty.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_filenew.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_fileopen.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_folder.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_folder_open.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_help.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_openterm.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_reload.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_salome.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_up.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/crystalsvg_22_view_text.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_compS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_deleteS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_dirS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_downarrow.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_editS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_fileS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_helpS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_newS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_openRS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_openS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_printS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_refreshS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_salome.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_sans_helpB.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_upS.gif
+%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_uparrow.gif
+%%CLIENT%%%%ASTKDIR%%/share/ihm_tools.tcl
+%%CLIENT%%%%ASTKDIR%%/share/init_share.tcl
+%%CLIENT%%%%ASTKDIR%%/share/lire_mcles.tcl
+%%CLIENT%%%%ASTKDIR%%/share/locales.txt
+%%CLIENT%%%%ASTKDIR%%/share/messages.tcl
+%%CLIENT%%%%ASTKDIR%%/share/outils.tcl
+%%CLIENT%%%%ASTKDIR%%/share/preferences.tcl
+%%CLIENT%%%%ASTKDIR%%/share/print.tcl
+%%CLIENT%%%%ASTKDIR%%/share/remote_tools.tcl
+%%CLIENT%%%%ASTKDIR%%/share/tkselecteur.tcl
 %%CLIENT%%%%BWidget_DIR%%/CHANGES.txt
 %%CLIENT%%%%BWidget_DIR%%/ChangeLog
 %%CLIENT%%%%BWidget_DIR%%/LICENSE.txt
@@ -133,54 +177,11 @@
 %%CLIENT%%%%BWidget_DIR%%/widget.tcl
 %%CLIENT%%%%BWidget_DIR%%/wizard.tcl
 %%CLIENT%%%%BWidget_DIR%%/xpm2image.tcl
-%%CLIENT%%%%ASTKDIR%%/share/appli.tcl
-%%CLIENT%%%%ASTKDIR%%/share/config.tcl
-%%CLIENT%%%%ASTKDIR%%/share/file_funct.tcl
-%%CLIENT%%%%ASTKDIR%%/share/icons/sans_helpB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_browseB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_browseS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_comp1.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_compB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_compS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_configB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_deleteB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_deleteS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_dirS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_edit.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_editS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_fileB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_fileS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_helpB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_helpS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_newB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_newS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_openB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_openRB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_openRS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_openS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_printB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_printS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_refreshB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_refreshS.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_salome.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_save.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_upB.gif
-%%CLIENT%%%%ASTKDIR%%/share/icons/vaio_upS.gif
-%%CLIENT%%%%ASTKDIR%%/share/ihm_tools.tcl
-%%CLIENT%%%%ASTKDIR%%/share/init_share.tcl
-%%CLIENT%%%%ASTKDIR%%/share/lire_mcles.tcl
-%%CLIENT%%%%ASTKDIR%%/share/locales.txt
-%%CLIENT%%%%ASTKDIR%%/share/messages.tcl
-%%CLIENT%%%%ASTKDIR%%/share/outils.tcl
-%%CLIENT%%%%ASTKDIR%%/share/preferences.tcl
-%%CLIENT%%%%ASTKDIR%%/share/print.tcl
-%%CLIENT%%%%ASTKDIR%%/share/remote_tools.tcl
-%%CLIENT%%%%ASTKDIR%%/share/tkselecteur.tcl
 %%SERV%%%%ASTKDIR%%/GPL.txt
 %%SERV%%%%ASTKDIR%%/bin/as_exec
+%%SERV%%%%ASTKDIR%%/bin/as_exec_special
 %%SERV%%%%ASTKDIR%%/bin/as_run
 %%SERV%%%%ASTKDIR%%/bin/as_serv
-%%SERV%%%%ASTKDIR%%/bin/tool_stanley
 %%SERV%%%%ASTKDIR%%/conf/.mysql_connect_REX
 %%SERV%%%%ASTKDIR%%/conf/aster_profile.sh
 %%SERV%%%%ASTKDIR%%/conf/config
@@ -222,10 +223,14 @@
 %%SERV%%%%ASTKDIR%%/lib/as_timer.py
 %%SERV%%%%ASTKDIR%%/lib/as_timer.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_timer.pyo
-%%SERV%%%%ASTKDIR%%/lib/astk2run_aster.tcl
+%%SERV%%%%ASTKDIR%%/lib/astk_maintenance.py
+%%SERV%%%%ASTKDIR%%/lib/astk_maintenance.pyc
+%%SERV%%%%ASTKDIR%%/lib/astk_maintenance.pyo
+%%SERV%%%%ASTKDIR%%/lib/convbase.comm
 %%SERV%%%%ASTKDIR%%/lib/histor.py
 %%SERV%%%%ASTKDIR%%/lib/histor.pyc
 %%SERV%%%%ASTKDIR%%/lib/histor.pyo
+%%SERV%%%%ASTKDIR%%/lib/meshtool.comm
 %%SERV%%%%ASTKDIR%%/lib/myconnect.py
 %%SERV%%%%ASTKDIR%%/lib/myconnect.pyc
 %%SERV%%%%ASTKDIR%%/lib/myconnect.pyo
@@ -238,6 +243,9 @@
 %%SERV%%%%ASTKDIR%%/lib/stanley_post.comm
 %%SERV%%%%ASTKDIR%%/lib/sub_script
 %%SERV%%%%ASTKDIR%%/lib/sum_tps.awk
+%%SERV%%%%ASTKDIR%%/lib/utils.py
+%%SERV%%%%ASTKDIR%%/lib/utils.pyc
+%%SERV%%%%ASTKDIR%%/lib/utils.pyo
 %%CLIENT%%@dirrm %%ASTKDIR%%/bin
 %%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASJOB
 %%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASTK/DOC