Upgrade ASTK to 1.6.2-1.

8 files changed, 47 insertions, 66 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index b5c91eeb81fb..e475969cb437 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -7,7 +7,7 @@
 
 PORTNAME=	astk
 DISTVERSIONPREFIX=	full-src-
-DISTVERSION=	1.5.5-1
+DISTVERSION=	1.6.2-1
 DISTVERSIONSUFFIX=	.noarch
 CATEGORIES=	cad
 MASTER_SITES=	http://www.code-aster.org/V2/UPLOAD/DOC/Telechargement/
@@ -39,14 +39,14 @@ USE_PYTHON=	yes
 NO_BUILD=	yes
 REINPLACE_ARGS=	-i ""
 
-ASTER_DISTVERSION=	${ASTER_VER}-2
+ASTER_DISTVERSION=	${ASTER_VER}-1
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION:S/-/./:R}/SRC
 
 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/as_exec_special lib/sub_script
+S_SCRIPTS=	bin/as_run bin/as_serv lib/sub_script
 S_PYLIBS=	alamain.py as_config.py as_timer.py as_devtools.py user_filter.py
 C_SCRIPTS=	bin/astk bin/bsf
 tools_dir=	${aster_dir}/outils
@@ -59,8 +59,7 @@ WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV
 PATCHDIR=	${MASTERDIR}/files
 PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "		\
 		vaster=${vaster}
-PATCH2RM=	conf/config bin/as_exec bin/as_serv lib/as_config.py	\
-		lib/as_exec.py conf/aster_profile.sh lib/as_system.py
+PATCH2RM=	conf/config lib/as_config.py lib/as_exec.py conf/aster_profile.sh
 . if exists(${LOCALBASE}/sbin/pbs_server)
 WITH_PBS=	yes
 . endif
@@ -85,7 +84,7 @@ TCL_VER?=	${TK_VER}
 SHORT_TK_VER=	${TK_VER:S/.//}
 BWidget_VER=	1.7.0
 
-ASTER_VER=	9.2.0
+ASTER_VER=	9.3.0
 vaster=		STA${ASTER_VER:R}
 
 GIBI=		gibi2003
@@ -167,8 +166,9 @@ do-configure:
 	${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
+	${REINPLACE_CMD} -e 's#?PYTHON_EXE?#${PYTHON_CMD}#'		\
+		-e 's#?MAXCMDLEN?#16384#;s#?MULTITHREADING?#True#'	\
+			${WRKSRC}/bin/as_run
 . for scripts in ${S_SCRIPTS}
 	${REINPLACE_CMD} -e "s#?SHELL_EXECUTION?#${SHELL_INSTALL_ASTER}#"	\
 	-e "s#?ASTER_ROOT?#${PREFIX}/aster#;s#?HOME_ASTK?#${inst_dir}#"		\
diff --git a/cad/astk-serveur/distinfo b/cad/astk-serveur/distinfo
index 5c35c82565f5..21d735475674 100644
--- a/cad/astk-serveur/distinfo
+++ b/cad/astk-serveur/distinfo
@@ -1,3 +1,3 @@
-MD5 (aster-full-src-9.2.0-2.noarch.tar.gz) = b0e3de37a3ce0f2c843855c9a5eef7ca
-SHA256 (aster-full-src-9.2.0-2.noarch.tar.gz) = fc43b758681ffb0dd7cfdbe30e92f9b840f0394732c11b815b0170bd38d48ec6
-SIZE (aster-full-src-9.2.0-2.noarch.tar.gz) = 117727246
+MD5 (aster-full-src-9.3.0-1.noarch.tar.gz) = 9f2988ea950e528e2e02ead3d30280a2
+SHA256 (aster-full-src-9.3.0-1.noarch.tar.gz) = 015f8e9f07e788ec1a7be314c14808f3c9603dc22a1b5aed627d4adcf25b1274
+SIZE (aster-full-src-9.3.0-1.noarch.tar.gz) = 141387639
diff --git a/cad/astk-serveur/files/patch-bin::as_exec b/cad/astk-serveur/files/patch-bin::as_exec
deleted file mode 100644
index 89bbd34890be..000000000000
--- a/cad/astk-serveur/files/patch-bin::as_exec
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./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
deleted file mode 100644
index 336c5c4815bb..000000000000
--- a/cad/astk-serveur/files/patch-bin::as_serv
+++ /dev/null
@@ -1,8 +0,0 @@
---- 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 bba0276bfeb7..dd05ca62eb75 100644
--- a/cad/astk-serveur/files/patch-conf::config
+++ b/cad/astk-serveur/files/patch-conf::config
@@ -1,8 +1,8 @@
---- conf/config.orig	Tue Jan  2 13:36:39 2007
-+++ conf/config	Wed Jan 10 22:02:14 2007
-@@ -46,6 +46,10 @@
- # temporary directory for Aster executions
- rep_trav : /tmp
+--- conf/config.orig	2008-06-25 15:43:23.000000000 +0200
++++ conf/config	2008-07-06 18:16:37.000000000 +0200
+@@ -50,6 +50,10 @@
+ # (used by mpi executions). For example : /export/tmp, /home/tmp...
+ shared_tmp : /tmp
  
 +# directories for tests
 +rep_test : /tmp
@@ -11,7 +11,7 @@
  # choose True to create symbolic links instead of copying executable and catalogs
  symlink : True
  
-@@ -76,6 +80,7 @@
+@@ -80,6 +84,7 @@
  # for each version a config.VVV file must be created.
  # DO NOT EDIT FOLLOWING LINE !
  #?vers : VVV?
@@ -19,7 +19,7 @@
  
  #-------------------------------------------------------------------------------
  # ----- batch/interactive configuration
-@@ -114,12 +119,12 @@
+@@ -122,12 +127,12 @@
  # batch_job : to display information about jobs
  # batch_kil : to delete jobs
  # --- Sun Grid Engine example
@@ -38,7 +38,7 @@
  
  # --- LSF example
  #batch_nom : LSF
-@@ -130,19 +135,22 @@
+@@ -138,12 +143,12 @@
  #batch_kil : /usr/opt/lsf/4.2/alpha5/bin/bkill
  
  # --- PBS example
@@ -55,6 +55,8 @@
 +batch_kil : LOCALBASE/bin/qdel
  
  #-------------------------------------------------------------------------------
+ # ----- MPI commands and parameters
+@@ -168,8 +173,11 @@
  # ps commands : uncomment lines corresponding to your platform
  #ps_cpu : /bin/ps -e --width=512 -ocputime -ocommand
  #ps_pid : /bin/ps -e --width=512 -opid -ocommand
@@ -68,7 +70,7 @@
  
  #-------------------------------------------------------------------------------
  # debug command :
-@@ -154,7 +162,7 @@
+@@ -181,7 +189,7 @@
  #cmd_post : gdb -batch --command=@D @E @C
  #cmd_dbg : ddd --debugger gdb --command=@D --exec=@E --core=@C
  cmd_post : ?DEBUGGER_COMMAND_POST?
diff --git a/cad/astk-serveur/files/patch-conf_aster_profile.sh b/cad/astk-serveur/files/patch-conf_aster_profile.sh
index 05167d5e81b0..c9c5879bc86d 100644
--- a/cad/astk-serveur/files/patch-conf_aster_profile.sh
+++ b/cad/astk-serveur/files/patch-conf_aster_profile.sh
@@ -1,8 +1,8 @@
---- conf/aster_profile.sh.orig	Thu Oct 27 18:32:14 2005
-+++ conf/aster_profile.sh	Wed Jan 11 22:08:53 2006
-@@ -15,6 +15,13 @@
- # unlimit corefile size
- ulimit -c unlimited
+--- conf/aster_profile.sh.orig	2008-04-10 19:13:17.000000000 +0200
++++ conf/aster_profile.sh	2008-07-06 19:18:01.000000000 +0200
+@@ -18,4 +18,10 @@
+ #PYTHONHOME=?HOME_PYTHON?
+ #export PYTHONHOME
  
 +# Might be useful to fix errors on 64 bits platforms
 +# See <http://www.code-aster.org/forum/read.php?f=11&i=1603&t=1574>
@@ -10,7 +10,4 @@
 +export HOME_MED
 +HOME_HDF=?HOME_HDF?
 +export HOME_HDF
-+
- # optional settings
- # DO NOT EDIT FOLLOWING LINE !
- #?OPT_ENV?
+ 
diff --git a/cad/astk-serveur/files/patch-lib__as_system.py b/cad/astk-serveur/files/patch-lib__as_system.py
deleted file mode 100644
index 76ada1e2ec33..000000000000
--- a/cad/astk-serveur/files/patch-lib__as_system.py
+++ /dev/null
@@ -1,16 +0,0 @@
---- lib/as_system.py.orig	Tue Dec 19 16:55:44 2006
-+++ lib/as_system.py	Sat Feb 17 23:15:15 2007
-@@ -672,7 +672,12 @@
-       from socket import gethostname, gethostbyaddr
-       if host == None:
-          host = gethostname()
--      fqn, alias, ip = gethostbyaddr(host)
-+      """ Fix for package building on the FreeBSD cluster which has no hostname
-+      """
-+      try:
-+         fqn, alias, ip = gethostbyaddr(host)
-+      except:
-+         fqn='put-your-host-name.here'
-       if fqn.find('localhost')>-1:
-          alias = [a for a in alias if a.find('localhost')<0]
-          if len(alias)>0:
diff --git a/cad/astk-serveur/pkg-plist b/cad/astk-serveur/pkg-plist
index 48c1a1f88c3e..438b1eb825d3 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -178,8 +178,6 @@
 %%CLIENT%%%%BWidget_DIR%%/wizard.tcl
 %%CLIENT%%%%BWidget_DIR%%/xpm2image.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%%/conf/.mysql_connect_REX
@@ -205,15 +203,24 @@
 %%SERV%%%%ASTKDIR%%/lib/as_exec.py
 %%SERV%%%%ASTKDIR%%/lib/as_exec.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_exec.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_execution.py
+%%SERV%%%%ASTKDIR%%/lib/as_execution.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_execution.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_job.py
 %%SERV%%%%ASTKDIR%%/lib/as_job.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_job.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_list.py
 %%SERV%%%%ASTKDIR%%/lib/as_list.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_list.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_mail.py
+%%SERV%%%%ASTKDIR%%/lib/as_mail.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_mail.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_maintenance.py
 %%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_maintenance.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_mpi.py
+%%SERV%%%%ASTKDIR%%/lib/as_mpi.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_mpi.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_option.py
 %%SERV%%%%ASTKDIR%%/lib/as_option.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_option.pyo
@@ -227,9 +234,15 @@
 %%SERV%%%%ASTKDIR%%/lib/as_run.py
 %%SERV%%%%ASTKDIR%%/lib/as_run.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_run.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_serv.py
+%%SERV%%%%ASTKDIR%%/lib/as_serv.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_serv.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_system.py
 %%SERV%%%%ASTKDIR%%/lib/as_system.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_system.pyo
+%%SERV%%%%ASTKDIR%%/lib/as_thread.py
+%%SERV%%%%ASTKDIR%%/lib/as_thread.pyc
+%%SERV%%%%ASTKDIR%%/lib/as_thread.pyo
 %%SERV%%%%ASTKDIR%%/lib/as_timer.py
 %%SERV%%%%ASTKDIR%%/lib/as_timer.pyc
 %%SERV%%%%ASTKDIR%%/lib/as_timer.pyo
@@ -239,11 +252,15 @@
 %%SERV%%%%ASTKDIR%%/lib/astk_maintenance.py
 %%SERV%%%%ASTKDIR%%/lib/astk_maintenance.pyc
 %%SERV%%%%ASTKDIR%%/lib/astk_maintenance.pyo
+%%SERV%%%%ASTKDIR%%/lib/backward_compatibility.py
+%%SERV%%%%ASTKDIR%%/lib/backward_compatibility.pyc
+%%SERV%%%%ASTKDIR%%/lib/backward_compatibility.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/mpirun_template
 %%SERV%%%%ASTKDIR%%/lib/myconnect.py
 %%SERV%%%%ASTKDIR%%/lib/myconnect.pyc
 %%SERV%%%%ASTKDIR%%/lib/myconnect.pyo