Upgrade to 1.2.0.

9 files changed, 364 insertions, 287 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 7f693d8de88e..69ea4b294008 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -6,15 +6,15 @@
 #
 
 PORTNAME=	astk
-PORTVERSION=	1.1.1
-CATEGORIES=	cad tk84
+PORTVERSION=	1.2.0
+CATEGORIES=	cad
 MASTER_SITES=	http://www.code-aster.org/FICHIERS/
 .if !defined(CLIENT_SEUL)
 PKGNAMESUFFIX=	-serveur
 .else
 PKGNAMESUFFIX=	-client
 .endif
-DISTNAME=	aster-src-${ASTER_VER}-8
+DISTNAME=	aster-full-src-${ASTER_VER}-3
 EXTRACT_SUFX=	.tar
 
 MAINTAINER=	ports@FreeBSD.org
@@ -30,34 +30,44 @@ COMMENT?=	Graphical interface for Code_Aster (server side)
 #
 #-----------------------------------------------------------------------
 
-.include <bsd.port.pre.mk>
-
 # There exists a "logical" RUN_DEPENDS towards french/aster and french/eficas
 # for the server part, but it is not set to avoid circular dependences.
-RUN_DEPENDS=	wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}	\
-		${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}
+RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:${PORTSDIR}/shells/${SHIADEP}
 .if defined(WITH_PBS) && !defined(CLIENT_SEUL)
-RUN_DEPENDS+=	${LOCALBASE}bin/pbs_tclsh:misc/pbs
+RUN_DEPENDS+=	${LOCALBASE}bin/pbs_tclsh:${PORTSDIR}/misc/pbs
 .endif
 
-EXTRACT_CMD=	${TAR}
-EXTRACT_BEFORE_ARGS=	-xf
-EXTRACT_AFTER_ARGS=	# empty
+USE_PYTHON=	yes
 NO_BUILD=	yes
 USE_REINPLACE=	yes
 REINPLACE_ARGS=	-i ""
 
-EXTDIR=		${WRKDIR}/aster-src-${ASTER_VER}
+EXTDIR=		${WRKDIR}/aster-src-${ASTER_VER}/SRC
 PKGMESSAGE=	${WRKDIR}/pkg-message
+LINSTDIR=	aster/ASTK
+inst_dir=	${PREFIX}/${LINSTDIR}
+aster_dir=	${LOCALBASE}/aster/${vaster}
+S_SCRIPTS=	bin/as_actu bin/as_del bin/as_edit bin/as_exec bin/as_info	\
+		bin/as_serv bin/as_tail bin/tool_stanley lib/sub_script
+S_PYLIBS=	as_config.py as_system.py
+C_SCRIPTS=	bin/astk bin/bsf
+tools_dir=	${LOCALBASE}/aster/outils
+conf_dir=	${WRKSRC}/lib/ASTK/astkrc
+
+.include <bsd.port.pre.mk>
+
 .if !defined(CLIENT_SEUL)
-WRKSRC=		${EXTDIR}/ASTK_SERV
+WRKSRC=		${EXTDIR}/astk-${PORTVERSION}/ASTK_SERV
 PATCHDIR=	${MASTERDIR}/files
-PLIST_SUB=	SERV="" CLIENT="@comment " vaster=${vaster}
+PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "		\
+		vaster=${vaster}
 .else
-WRKSRC=		${EXTDIR}/ASTK_CLIENT
+RUN_DEPENDS+=	xterm:${X_CLIENTS_PORT}	\
+		wish${TK_VER}:${PORTSDIR}/x11-toolkits/tk${SHORT_TK_VER}
+WRKSRC=		${EXTDIR}/astk-${PORTVERSION}/ASTK_CLIENT
 PATCHDIR=	${MASTERDIR}/files.client
-PLIST_SUB=	SERV="@comment " CLIENT="" vaster=""		\
-		BWidget_DIR=ASTK/ASTK_CLIENT/share/BWidget-${BWidget_VER}
+PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_CLIENT SERV="@comment " CLIENT="" vaster=""	\
+		BWidget_DIR=${LINSTDIR}/ASTK_CLIENT/share/BWidget-${BWidget_VER}
 .endif
 FILESDIR=	${PATCHDIR}
 
@@ -68,7 +78,7 @@ TCL_VER?=	${TK_VER}
 SHORT_TK_VER=	${TK_VER:S/.//}
 BWidget_VER=	1.7.0
 
-ASTER_VER=	7.3.0
+ASTER_VER=	7.4.0
 vaster=		STA${ASTER_VER:S/.0//}
 
 GIBI=		gibi2000
@@ -95,28 +105,37 @@ SHIADEP=	${SHIA}
 .endif
 
 .if !defined(WITH_ED)
-.if exists(${X11BASE}/bin/nedit)
+. if exists(${X11BASE}/bin/nedit)
 WITH_ED=	nedit
 RUN_DEPENDS+=	${X11BASE}/bin/nedit:${PORTSDIR}/editors/nedit
-.else
-WITH_ED=	gvim
+. elif exists(${LOCALBASE}/bin/gvim)
+WITH_ED=	gvim${WRKSRC}/bin/as_exec.orig
 RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:${PORTSDIR}/editors/vim
-.endif
+. elif exists(${LOCALBASE}/bin/emacs)
+WITH_ED=	emacs
+RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:${PORTSDIR}/editors/emacs
+. elif exists(${LOCALBASE}/bin/xemacs)
+WITH_ED=	xemacs
+RUN_DEPENDS+=	${LOCALBASE}/bin/xemacs:${PORTSDIR}/editors/xemacs
+. else
+WITH_ED=	xedit
+RUN_DEPENDS+=	${X11BASE}/bin/xedit:${X_CLIENTS_PORT}
+. endif
 .endif
 
-inst_dir?=	${PREFIX}/ASTK
-aster_dir=	${LOCALBASE}/aster/${vaster}
-S_SCRIPTS=	bin/as_actu bin/as_del bin/as_edit bin/as_exec bin/as_info	\
-		bin/as_serv bin/as_tail bin/tool_stanley lib/sub_script
-C_SCRIPTS=	bin/astk bin/asjob bin/bsf
-tools_dir=	${aster_dir}/outils
-conf_dir=	${WRKSRC}/lib/ASTK/astkrc
-SERVER_NAME!=	${UNAME} -n
-unames!=	${UNAME} -s
-unamesm!=	${UNAME} -sm
-v_ifdef=	${unames:U}
+unamesm=	${OPSYS} ${ARCH}
+v_ifdef=	${OPSYS:U}
 SHELL_INSTALL_ASTER=	${LOCALBASE}/bin/${SHIA}
-gzip!=		${DIRNAME} `${WHICH} ${GZIP_CMD}`
+
+.if !defined(PACKAGE_BUILDING)
+SERVER_NAME!=	${UNAME} -n
+HOST_NAME!=	/bin/hostname -s
+DOMAIN_NAME=	${SERVER_NAME:S|${HOST_NAME}.||}
+.else
+SERVER_NAME=	put.your.fdqn
+HOST_NAME=	this-hostname
+DOMAIN_NAME=	your.domain-name
+.endif
 
 .if defined(LANG) && ${LANG:Mfr*} != ""
 ASTK_LANG=	FR
@@ -126,89 +145,84 @@ ASTK_LANG=	ENG
 
 post-extract:
 	@(cd ${EXTDIR} && \
-	${TAR} xfz ${EXTDIR}/astk.tar.gz)
+	${TAR} xfz ${EXTDIR}/astk-${PORTVERSION}-1.noarch.tar.gz)
+
+post-patch:
 .if !defined(CLIENT_SEUL)
-	@(cd ${EXTDIR} && \
-	${TAR} xf ASTK_SERV.tar)
+	@${RM} ${WRKSRC}/conf/config.orig ${WRKSRC}/bin/as_exec.orig			\
+		${WRKSRC}/bin/as_serv.orig
 .else
-	@(cd ${EXTDIR} && \
-	${TAR} xf ASTK_CLIENT.tar)
+	@${RM} ${WRKSRC}/lib/ASTK/init.tcl.orig	${WRKSRC}/lib/ASTK/astkrc/outils.orig	\
+		${WRKSRC}/share/tkselecteur.tcl.orig ${WRKSRC}/lib/ASTK/tools.tcl.orig
 .endif
 
-post-patch:
+do-configure:
 .if !defined(CLIENT_SEUL)
-.for scripts in ${S_SCRIPTS}
-	@${REINPLACE_CMD} -e "s#SHELL_EXECUTION#${SHELL_INSTALL_ASTER}#"	\
-	-e "s#HOME_ASTK#${inst_dir}#"						\
-	-e "s#HOME_TCL_TK#${LOCALBASE}#"					\
-	-e "s#TCLSH_BIN#tclsh${TCL_VER}#" ${WRKSRC}/${scripts}
-.endfor
-	@${REINPLACE_CMD} -e "s#IFDEF#${v_ifdef}#g"				\
-	-e "s#/aster#${aster_dir}#g"						\
-	-e "s#EDITOR#${WITH_ED}#g"						\
-	-e "s#/bin/sh#${SHELL_INSTALL_ASTER}#g"					\
-	-e "s#NODE#${SERVER_NAME}#"						\
-	-e "s#%%vaster%%#${vaster}#"						\
+. if ${SHIA} == "zsh"
+	@${REINPLACE_CMD} -e 's|#set -o SH_WORD_SPLIT|set -o SH_WORD_SPLIT|'	\
+		${WRKSRC}/bin/as_serv
+. endif
+	@${REINPLACE_CMD} -e 's#?PYTHON_EXE?#${PYTHON_CMD}#'			\
+		-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}
+. endfor
+	@${REINPLACE_CMD} -e "s#?IFDEF?#${v_ifdef}#g"				\
+	-e "s#?ASTER_ROOT?#${LOCALBASE}/aster#g"				\
+	-e "s#?EDITOR?#${WITH_ED}#g"						\
+	-e "s#?NODE?#${HOST_NAME}#"						\
+	-e "s#?ASTER_VERSION?#${ASTER_VER}#"					\
+	-e "s#?vaster?#${vaster}#"						\
 	-e "s#LOCALBASE#${LOCALBASE}#"						\
-	-e "s|#%%v_ifdef%%|${v_ifdef}|" ${WRKSRC}/conf/config
-	@${RM} ${WRKSRC}/conf/config.orig
-	@${CP} ${WRKSRC}/conf/config.version ${WRKSRC}/conf/config.${vaster}
-	@${REINPLACE_CMD} -e "s#/aster#${aster_dir}#"				\
-	-e "s#/NEW7##"								\
-	-e "s#ans debug binairies#and debug binaries#"				\
-		${WRKSRC}/conf/config.${vaster}
-.if defined(WITH_PBS)
+	-e "s#%%v_ifdef%%#${v_ifdef}#" ${WRKSRC}/conf/config
+.for libs in ${S_PYLIBS}
+	@${REINPLACE_CMD} -e "s#/opt/aster/NEW7#${aster_dir}#" ${WRKSRC}/lib/${libs}
+. endfor
+. if defined(WITH_PBS)
 	@${REINPLACE_CMD} -e "s|batch : non|batch : oui|"			\
-	-e "s|^batch_nom|#batch_nom|"						\
-	-e "s|^batch_ini|#batch_ini|"						\
-	-e "s|^batch_sub|#batch_sub|"						\
-	-e "s|^batch_jid|#batch_jid|"						\
-	-e "s|^batch_job|#batch_job|"						\
-	-e "s|^batch_kil|#batch_kil|"						\
-	-e "s|#batch_nom : PBS|batch_nom : PBS|"				\
-	-e "s|#batch_sub : /local/openpbs-2.3.16/bin/qsub|batch_sub : ${LOCALBASE}/bin/qsub|" \
-	-e "s|#batch_jid : PBS_JOBID|batch_jid : PBS_JOBID|"			\
-	-e "s|#batch_job : /local/openpbs-2.3.16/bin/qstat|batch_job : ${LOCALBASE}/bin/qstat" \
-	-e "s|#batch_kil : /local/openpbs-2.3.16/bin/qdel|batch_kil : ${LOCALBASE}/bin/qdel"
 		${WRKSRC}/conf/config
-.endif
+. endif
+	@${REINPLACE_CMD} -e 's|?HOME_PYTHON?|${PYTHONBASE}|'			\
+		-e 's|?ASTER_ROOT?|${aster_dir}|'				\
+		-e 's|?HOME_MED?|${LOCALBASE}|'					\
+		-e 's|?HOME_HDF?|${LOCALBASE}|' ${WRKSRC}/conf/aster_profile.sh
 .else
 # CLIENT_SEUL
-.for scripts in ${C_SCRIPTS}
-	@${REINPLACE_CMD} -e "s#SHELL_EXECUTION#${SHELL_INSTALL_ASTER}#"	\
-	-e "s#HOME_ASTK#${inst_dir}#"						\
-	-e "s#HOME_TCL_TK#${LOCALBASE}#"					\
-	-e "s#WISH_BIN#wish${TK_VER}#" ${WRKSRC}/${scripts}
-.endfor
-	@${REINPLACE_CMD} -e "s#HOME_ASTK#${inst_dir}#"				\
-		-e "s#GIBI#${GIBI}#"		\
-		-e "s#TOOLS_DIR#${tools_dir}#" ${conf_dir}/outils
-	@${REINPLACE_CMD} -e "s#HOME_ASTK#${inst_dir}#"				\
-		-e "s#HOME_XTERM#${X11BASE}/bin#"				\
-		-e "s#FULL_SERVER_NAME#${SERVER_NAME}#"				\
-		-e "s#SERVER_NAME#${SERVER_NAME}#"				\
-		-e "s#EDITOR#${WITH_ED}#" ${conf_dir}/config_serveurs
-	@${REINPLACE_CMD} -e "s#HOME_XTERM#${X11BASE}/bin#"			\
-		-e "s#VVV#${vaster}#"						\
+. for scripts in ${C_SCRIPTS}
+	@${REINPLACE_CMD} -e "s#?SHELL_EXECUTION?#${SHELL_INSTALL_ASTER}#"	\
+	-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}#"						\
+		-e "s#?vaster?#${vaster}#"					\
+		-e "s#?TOOLS_DIR?#${tools_dir}#" ${conf_dir}/outils
+	@${REINPLACE_CMD} -e "s#?HOME_ASTK?#${inst_dir}#"			\
+		-e "s#?XTERM?#${X11BASE}/bin/xterm#"				\
+		-e "s#?FULL_SERVER_NAME?#${SERVER_NAME}#"			\
+		-e "s#?SERVER_NAME?#${HOST_NAME}#"				\
+		-e "s#?EDITOR?#${WITH_ED}#" ${conf_dir}/config_serveurs
+	@${REINPLACE_CMD} -e "s#?XTERM?#${X11BASE}/bin/xterm#"			\
+		-e "s#?ASTER_VERSION?#${ASTER_VER}#"				\
 		-e "s#langue : ENG#langue : ${ASTK_LANG}#"			\
-		-e "s#EDITOR#${WITH_ED}#" ${conf_dir}/prefs
+		-e "s#?DOMAIN_NAME?#${DOMAIN_NAME}#"				\
+		-e "s#?EDITOR?#${WITH_ED}#" ${conf_dir}/prefs
 	@${REINPLACE_CMD} -e "s#%%LOCALBASE%%#${LOCALBASE}#g"			\
 		${WRKSRC}/share/tkselecteur.tcl
 	@${REINPLACE_CMD} -e "s#%%unamesm%%#${unamesm}#"			\
 		${WRKSRC}/lib/ASTK/init.tcl
-	@${RM} ${WRKSRC}/lib/ASTK/init.tcl.orig
-	@${RM} ${WRKSRC}/share/tkselecteur.tcl.orig
-	@${RM} ${WRKSRC}/lib/ASTK/astkrc/outils.orig
 .endif
 
 do-install:
 	${MKDIR} ${inst_dir}
 	${CP} -R ${WRKSRC} ${inst_dir}
+	@${PYTHON_CMD} ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/lib
+	@${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py ${inst_dir}/ASTK_SERV/lib
 
 post-install:
 	@${ECHO_MSG}
 	@${SED} -e "s#%%inst_dir%%#${inst_dir}#;s#%%tools_dir%%#${tools_dir}#"	\
-		-e "s#%%ASTER_VER%%#${vaster}#"					\
 		${FILESDIR}/pkg-message.in > ${PKGMESSAGE}
 	@${CAT} ${PKGMESSAGE}
 	@${ECHO_MSG}
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index 9ad950016892..36bb0aadc2e4 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,2 +1,2 @@
-MD5 (aster-src-7.3.0-8.tar) = 7e23ef1a94bf6f93c155454b5feb5ef6
-SIZE (aster-src-7.3.0-8.tar) = 18841600
+MD5 (aster-full-src-7.4.0-3.tar) = 0d756794a176f2e1b92412382373a629
+SIZE (aster-full-src-7.4.0-3.tar) = 87232678
diff --git a/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils b/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
index 3c0fa02454c6..4f4955b3ea00 100644
--- a/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
+++ b/cad/astk-serveur/files.client/patch-lib::ASTK::astkrc::outils
@@ -1,21 +1,21 @@
---- ./lib/ASTK/astkrc/outils.orig	Fri Nov 28 11:21:00 2003
-+++ ./lib/ASTK/astkrc/outils	Thu May 20 23:17:34 2004
+--- ./lib/ASTK/astkrc/outils.orig	Mon Dec 13 14:34:29 2004
++++ ./lib/ASTK/astkrc/outils	Sun Jan  9 23:33:55 2005
 @@ -19,7 +19,7 @@
  dist : on
  #
  nom : Gibi
--cmde : TOOLS_DIR/gibi.x (@F)
-+cmde : TOOLS_DIR/GIBI (@F)
+-cmde : ?TOOLS_DIR?/gibi.x (@F)
++cmde : ?TOOLS_DIR?/GIBI (@F)
  ext : datg dgibi
  dist : on
  #
 @@ -27,4 +27,9 @@
- cmde : TOOLS_DIR/xmgrace (@F)
+ cmde : ?TOOLS_DIR?/xmgrace (@F)
  ext : dat
  dist : on
 +#
 +nom : Stanley
-+cmde : TOOLS_DIR/../bibpyt/Stanley/stanley.py
++cmde : ?TOOLS_DIR?/../?vaster?/bibpyt/Stanley/stanley.py
 +ext : _VIDE
 +dist : off
  #
diff --git a/cad/astk-serveur/files.client/patch-lib::ASTK::tools.tcl b/cad/astk-serveur/files.client/patch-lib::ASTK::tools.tcl
new file mode 100644
index 000000000000..b208c310f061
--- /dev/null
+++ b/cad/astk-serveur/files.client/patch-lib::ASTK::tools.tcl
@@ -0,0 +1,18 @@
+--- ./lib/ASTK/tools.tcl.orig	Mon Dec  6 09:48:47 2004
++++ ./lib/ASTK/tools.tcl	Sun Jan 16 00:43:35 2005
+@@ -51,12 +51,12 @@
+    if { $sortie } {
+ # vérifie que les commandes distantes fonctionnent
+       init_config
+-      if { $config(-1,remote_shell_protocol) == "" || $config(-1,remote_shell_protocol) == "RSH" } {
++      if { $astk::config(-1,remote_shell_protocol) == "" || $astk::config(-1,remote_shell_protocol) == "RSH" } {
+          set cmd "rsh -n -l $astk::config(-1,login) $astk::config(-1,nom_complet) echo hello"
+-      } elseif { $config(-1,remote_shell_protocol) == "SSH" } {
++      } elseif { $astk::config(-1,remote_shell_protocol) == "SSH" } {
+          set cmd "ssh -n -l $astk::config(-1,login) $astk::config(-1,nom_complet) echo hello"
+       } else {
+-         ashare::mess erreur 49 $config(-1,remote_shell_protocol)
++         ashare::mess erreur 49 $astk::config(-1,remote_shell_protocol)
+          # le premier appel à rexec_cmd échouera
+          cmd="echo ERROR"
+       }
diff --git a/cad/astk-serveur/files/patch-bin::as_exec b/cad/astk-serveur/files/patch-bin::as_exec
new file mode 100644
index 000000000000..89bbd34890be
--- /dev/null
+++ b/cad/astk-serveur/files/patch-bin::as_exec
@@ -0,0 +1,11 @@
+--- ./bin/as_exec.orig	Mon Jan  3 18:31:30 2005
++++ ./bin/as_exec	Sun Jan 16 21:56:08 2005
+@@ -73,7 +73,7 @@
+ if [ `echo $fich | grep -c '@'` -ne 0 ]; then
+    $RCP_CMD $fich $pr_astk > /dev/null 2>&1
+ else
+-   \cp $fich $pr_astk > /dev/null 2>&1
++   cp $fich $pr_astk > /dev/null 2>&1
+ fi
+ if [ ! -f $pr_astk ]; then
+    echo "Profile copy failed"
diff --git a/cad/astk-serveur/files/patch-bin::as_serv b/cad/astk-serveur/files/patch-bin::as_serv
new file mode 100644
index 000000000000..336c5c4815bb
--- /dev/null
+++ b/cad/astk-serveur/files/patch-bin::as_serv
@@ -0,0 +1,8 @@
+--- bin/as_serv.orig	Mon Dec 13 14:34:29 2004
++++ bin/as_serv	Mon Jan 17 21:00:14 2005
+@@ -1,4 +1,5 @@
+ #!?SHELL_EXECUTION?
++#set -o SH_WORD_SPLIT
+ 
+ #########################################################################
+ # COPYRIGHT (C) 2003         EDF R&D              WWW.CODE-ASTER.ORG    #
diff --git a/cad/astk-serveur/files/patch-conf::config b/cad/astk-serveur/files/patch-conf::config
index 0099bceb5313..3fcd2244afff 100644
--- a/cad/astk-serveur/files/patch-conf::config
+++ b/cad/astk-serveur/files/patch-conf::config
@@ -1,64 +1,64 @@
---- conf/config.orig	Fri Sep  5 16:48:15 2003
-+++ conf/config	Fri Nov 14 22:08:22 2003
-@@ -60,39 +60,43 @@
+--- conf/config.orig	Fri Jan  7 09:10:16 2005
++++ conf/config	Sun Jan  9 22:15:57 2005
+@@ -68,6 +68,7 @@
  # for each version a config.VVV file must be created.
  # DO NOT EDIT FOLLOWING LINE !
- #vers : VVV
-+vers : %%vaster%%
+ #?vers : VVV?
++vers : ?vaster?
  
- #################################################################
- # batch commands
--batch_nom : LSF
-+#batch_nom : LSF
- # initialisation (shell script, sh/ksh syntax)
--batch_ini : /usr/opt/lsf/conf/profile.lsf
-+#batch_ini : /usr/opt/lsf/conf/profile.lsf
- # submission
--batch_sub : /usr/opt/lsf/4.2/alpha5/bin/bsub
-+#batch_sub : /usr/opt/lsf/4.2/alpha5/bin/bsub
- # variable of the job number
--batch_jid : LSB_JOBID
-+#batch_jid : LSB_JOBID
- # to display information about jobs
--batch_job : /usr/opt/lsf/4.2/alpha5/bin/bjobs
-+#batch_job : /usr/opt/lsf/4.2/alpha5/bin/bjobs
- # to delete jobs
--batch_kil : /usr/opt/lsf/4.2/alpha5/bin/bkill
-+#batch_kil : /usr/opt/lsf/4.2/alpha5/bin/bkill
+ #-------------------------------------------------------------------------------
+ # ----- batch/interactive configuration
+@@ -106,12 +107,12 @@
+ # batch_job : to display information about jobs
+ # batch_kil : to delete jobs
+ # --- Sun Grid Engine example
+-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
  
- # PBS example (experimental)
+ # --- LSF example
+ #batch_nom : LSF
+@@ -122,18 +123,21 @@
+ #batch_kil : /usr/opt/lsf/4.2/alpha5/bin/bkill
+ 
+ # --- PBS example
 -#batch_nom : PBS
 +batch_nom : PBS
- # initialisation
  #batch_ini : 
- # submission
 -#batch_sub : /local/openpbs-2.3.16/bin/qsub
-+#batch_sub : LOCALBASE/bin/qsub
- # variable of the job number
- #batch_jid : PBS_JOBID
- # to display information about jobs
+-#batch_jid : PBS_JOBID
 -#batch_job : /local/openpbs-2.3.16/bin/qstat
-+#batch_job : LOCALBASE/bin/qstat
- # to delete jobs
 -#batch_kil : /local/openpbs-2.3.16/bin/qdel
-+#batch_kil : LOCALBASE/bin/qdel
++batch_sub : LOCALBASE/bin/qsub
++batch_jid : PBS_JOBID
++batch_job : LOCALBASE/bin/qstat
++batch_kil : LOCALBASE/bin/qdel
  
- #################################################################
+ #-------------------------------------------------------------------------------
  # ps commands : uncomment lines corresponding to your platform
  # LINUX :
- #P_LINUXps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
- #P_LINUXps_pid : /bin/ps -e --width=512 -opid -ocommand
+ #?P_LINUX?ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
+ #?P_LINUX?ps_pid : /bin/ps -e --width=512 -opid -ocommand
 +# FREEBSD :
-+#%%v_ifdef%%ps_cpu : /bin/ps -e -ocpu,command
-+#%%v_ifdef%%ps_pid : /bin/ps -e -opid,command
++ps_cpu : /bin/ps -e -ocpu,command
++ps_pid : /bin/ps -e -opid,command
  # TRU64 :
- #TRU64ps_cpu : /bin/ps -e -ocputime -ocommand
- #TRU64ps_pid : /bin/ps -e -opid -ocommand
-@@ -116,6 +120,7 @@
+ #?TRU64?ps_cpu : /bin/ps -e -ocputime -ocommand
+ #?TRU64?ps_pid : /bin/ps -e -opid -ocommand
+@@ -157,6 +161,7 @@
  # GDB :
- #P_LINUXcmd_post : gdb --dbx --command=@D @E @C
- #P_LINUXcmd_dbg : ddd --debugger gdb --command=@D @E @C
-+#%%v_ifdef%%cmd_dbg : gdb --dbx --command=@D @E @C
+ #?P_LINUX?cmd_post : gdb -batch --command=@D @E @C
+ #?P_LINUX?cmd_dbg : ddd --debugger gdb --command=@D @E @C
++cmd_dbg : gdb --dbx --command=@D @E @C
  # DBX -c + filename :
- #TRU64cmd_post : dbx -c @D @E @C
- #TRU64cmd_dbg : dbx -c @D @E @C
+ #?TRU64?cmd_post : dbx -c @D @E @C
+ #?TRU64?cmd_dbg : dbx -c @D @E @C
diff --git a/cad/astk-serveur/files/pkg-message.in b/cad/astk-serveur/files/pkg-message.in
index 8f6746fa1833..9965ef588c61 100644
--- a/cad/astk-serveur/files/pkg-message.in
+++ b/cad/astk-serveur/files/pkg-message.in
@@ -1,13 +1,11 @@
 Des fichiers de configuration standards ont été préparés :
-%%inst_dir%%/ASTK_SERV/conf/config
-%%inst_dir%%/ASTK_SERV/conf/config.%%ASTER_VER%%
+%%inst_dir%%/ASTK_SERV/conf/
 Veuillez les vérifier, et n'oubliez pas d'installer la partie cliente sur vos
 stations.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 
 Standard configuration files have been initialized:
-%%inst_dir%%/ASTK_SERV/conf/config
-%%inst_dir%%/ASTK_SERV/conf/config.%%ASTER_VER%%
+%%inst_dir%%/ASTK_SERV/conf/
 Please check them, and do not forget to install the client side on your
 stations.
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 0388fcbc5378..010a86b679b3 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -1,62 +1,61 @@
-%%CLIENT%%ASTK/ASTK_CLIENT/GPL.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/bin/asjob
-%%CLIENT%%ASTK/ASTK_CLIENT/bin/astk
-%%CLIENT%%ASTK/ASTK_CLIENT/bin/bsf
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASJOB/asjob.info
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASJOB/asjob.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASJOB/asjob_main.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASJOB/init_asjob.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASJOB/listej.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_UL.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_agla.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_config.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_ihm.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_inv.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_mots.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_msg.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_outils.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_print.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_profil.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_rex.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/DOC/sdd_sel.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/ENG/item_110.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/ENG/item_111.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/ENG/item_190.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/ENG/item_323.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/FR/item_110.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/FR/item_111.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/FR/item_190.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/HELP/FR/item_323.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/RELNOTES
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/TODO
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/aide.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/astk.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/astk2run_aster.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/astkrc/ASTKRC_INFO.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/astkrc/config_serveurs
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/astkrc/outils
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/astkrc/prefs
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/fichier.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/i_serv.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_agla.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_commun.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_etude.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_execution.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_liste.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_main.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_menu.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_outils.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_rex.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_satellite.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/ihm_status.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/init.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/init_agla.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/init_env.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/lance_calcul.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/options.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/tools.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/ASTK/unites_logiques.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/lib/BSF/bsf.tcl
+%%CLIENT%%%%ASTKDIR%%/GPL.txt
+%%CLIENT%%%%ASTKDIR%%/bin/astk
+%%CLIENT%%%%ASTKDIR%%/bin/bsf
+%%CLIENT%%%%ASTKDIR%%/lib/ASJOB/asjob.info
+%%CLIENT%%%%ASTKDIR%%/lib/ASJOB/asjob.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASJOB/asjob_main.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASJOB/init_asjob.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASJOB/listej.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_UL.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_agla.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_config.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_ihm.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_inv.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_mots.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_msg.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_outils.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_print.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_profil.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_rex.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/DOC/sdd_sel.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/ENG/item_110.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/ENG/item_111.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/ENG/item_190.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/ENG/item_323.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/FR/item_110.txt
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/HELP/FR/item_111.txt
+%%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/fichier.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/i_serv.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_agla.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_commun.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_etude.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_execution.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_liste.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_main.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_menu.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_outils.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_rex.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_satellite.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/ihm_status.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/init.tcl
+%%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/options.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/tools.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/ASTK/unites_logiques.tcl
+%%CLIENT%%%%ASTKDIR%%/lib/BSF/bsf.tcl
 %%CLIENT%%%%BWidget_DIR%%/CHANGES.txt
 %%CLIENT%%%%BWidget_DIR%%/ChangeLog
 %%CLIENT%%%%BWidget_DIR%%/LICENSE.txt
@@ -134,82 +133,111 @@
 %%CLIENT%%%%BWidget_DIR%%/widget.tcl
 %%CLIENT%%%%BWidget_DIR%%/wizard.tcl
 %%CLIENT%%%%BWidget_DIR%%/xpm2image.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/appli.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/config.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/file_funct.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/sans_helpB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_browseB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_browseS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_comp1.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_compB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_compS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_configB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_deleteB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_deleteS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_dirS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_edit.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_editS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_fileB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_fileS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_helpB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_helpS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_newB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_newS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_openB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_openRB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_openRS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_openS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_printB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_printS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_refreshB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_refreshS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_save.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_upB.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/icons/vaio_upS.gif
-%%CLIENT%%ASTK/ASTK_CLIENT/share/ihm_tools.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/init_share.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/lire_mcles.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/locales.txt
-%%CLIENT%%ASTK/ASTK_CLIENT/share/messages.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/outils.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/preferences.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/print.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/remote_tools.tcl
-%%CLIENT%%ASTK/ASTK_CLIENT/share/tkselecteur.tcl
-%%SERV%%ASTK/ASTK_SERV/GPL.txt
-%%SERV%%ASTK/ASTK_SERV/bin/as_actu
-%%SERV%%ASTK/ASTK_SERV/bin/as_del
-%%SERV%%ASTK/ASTK_SERV/bin/as_edit
-%%SERV%%ASTK/ASTK_SERV/bin/as_exec
-%%SERV%%ASTK/ASTK_SERV/bin/as_info
-%%SERV%%ASTK/ASTK_SERV/bin/as_serv
-%%SERV%%ASTK/ASTK_SERV/bin/as_tail
-%%SERV%%ASTK/ASTK_SERV/bin/tool_stanley
-%%SERV%%ASTK/ASTK_SERV/conf/config
-%%SERV%%ASTK/ASTK_SERV/conf/config.%%vaster%%
-%%SERV%%ASTK/ASTK_SERV/conf/config.version
-%%SERV%%ASTK/ASTK_SERV/lib/astk2run_aster.tcl
-%%SERV%%ASTK/ASTK_SERV/lib/stanley_post.comm
-%%SERV%%ASTK/ASTK_SERV/lib/sub_script
-%%SERV%%ASTK/ASTK_SERV/lib/sum_tps.awk
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/bin
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib/ASJOB
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib/ASTK/DOC
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib/ASTK/HELP/ENG
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib/ASTK/HELP/FR
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib/ASTK/HELP
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib/ASTK/astkrc
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib/ASTK
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib/BSF
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/lib
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/share/icons
+%%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_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_actu
+%%SERV%%%%ASTKDIR%%/bin/as_del
+%%SERV%%%%ASTKDIR%%/bin/as_edit
+%%SERV%%%%ASTKDIR%%/bin/as_exec
+%%SERV%%%%ASTKDIR%%/bin/as_info
+%%SERV%%%%ASTKDIR%%/bin/as_run
+%%SERV%%%%ASTKDIR%%/bin/as_serv
+%%SERV%%%%ASTKDIR%%/bin/as_tail
+%%SERV%%%%ASTKDIR%%/bin/tool_stanley
+%%SERV%%%%ASTKDIR%%/conf/aster_profile.sh
+%%SERV%%%%ASTKDIR%%/conf/config
+%%SERV%%%%ASTKDIR%%/conf/config_nodename
+%%SERV%%%%ASTKDIR%%/lib/HELP_as_run.txt
+%%SERV%%%%ASTKDIR%%/lib/as_build.py
+%%SERV%%%%ASTKDIR%%/lib/as_build.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_build.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_config.py
+%%SERV%%%%ASTKDIR%%/lib/as_config.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_config.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_exec.py
+%%SERV%%%%ASTKDIR%%/lib/as_exec.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_exec.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_maintenance.py
+%%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_option.py
+%%SERV%%%%ASTKDIR%%/lib/as_option.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_option.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_profil.py
+%%SERV%%%%ASTKDIR%%/lib/as_profil.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_profil.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_run.py
+%%SERV%%%%ASTKDIR%%/lib/as_run.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_run.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_system.py
+%%SERV%%%%ASTKDIR%%/lib/as_system.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_system.pyo
+%%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/stanley_post.comm
+%%SERV%%%%ASTKDIR%%/lib/sub_script
+%%SERV%%%%ASTKDIR%%/lib/sum_tps.awk
+%%CLIENT%%@dirrm %%ASTKDIR%%/bin
+%%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASJOB
+%%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASTK/DOC
+%%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASTK/HELP/ENG
+%%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASTK/HELP/FR
+%%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASTK/HELP
+%%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASTK/astkrc
+%%CLIENT%%@dirrm %%ASTKDIR%%/lib/ASTK
+%%CLIENT%%@dirrm %%ASTKDIR%%/lib/BSF
+%%CLIENT%%@dirrm %%ASTKDIR%%/lib
+%%CLIENT%%@dirrm %%ASTKDIR%%/share/icons
 %%CLIENT%%@dirrm %%BWidget_DIR%%/images
 %%CLIENT%%@dirrm %%BWidget_DIR%%/lang
 %%CLIENT%%@dirrm %%BWidget_DIR%%
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT/share
-%%CLIENT%%@dirrm ASTK/ASTK_CLIENT
-%%SERV%%@dirrm ASTK/ASTK_SERV/bin
-%%SERV%%@dirrm ASTK/ASTK_SERV/conf
-%%SERV%%@dirrm ASTK/ASTK_SERV/lib
-%%SERV%%@dirrm ASTK/ASTK_SERV
-@unexec rmdir %D/ASTK 2>/dev/null || true
+%%CLIENT%%@dirrm %%ASTKDIR%%/share
+%%SERV%%@dirrm %%ASTKDIR%%/bin
+%%SERV%%@dirrm %%ASTKDIR%%/conf
+%%SERV%%@dirrm %%ASTKDIR%%/lib
+@dirrm %%ASTKDIR%%
+@unexec rmdir %D/aster/ASTK 2>/dev/null || true
+@unexec rmdir %D/aster 2>/dev/null || true