Upgrade - endly! - to Code_Aster 13.4.0-3.

Notes:

- I have (not yet) succeeded to enable MFront in this version;

- it uses math/mumps-edf, repocopied from math/mumps;

- cad/scotch is now taken out of the aster tarball;

- french/eficas is no more used: to be replaced by "aster-study" in Salome_Meca
	(the port cad/salome should be resurrected!)

19 files changed, 178 insertions, 313 deletions

diff --git a/cad/astk-serveur/Makefile b/cad/astk-serveur/Makefile
index 1ae08051c746..f62c37055347 100644
--- a/cad/astk-serveur/Makefile
+++ b/cad/astk-serveur/Makefile
@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	astk
-DISTVERSION=	1.13.8-2
+DISTVERSION=	1.13.10-1
 CATEGORIES=	cad
 .if !defined(CLIENT_SEUL)
 PKGNAMESUFFIX=	-serveur
@@ -25,13 +25,14 @@ LICENSE=	GPLv2
 #
 #-----------------------------------------------------------------------
 
-# 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.
+# There exists a "logical" RUN_DEPENDS towards french/aster for the
+# server part, but it is not set to avoid circular dependences.
 
 RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:shells/${SHIADEP}
 
 .if !defined(CLIENT_SEUL)
-USES+=		gettext python tk:build
+USES+=		gettext python shebangfix tk:build
+SHEBANG_FILES=	unittest/run_test.py
 .else
 USES+=		tk
 .endif
@@ -56,12 +57,6 @@ C_SCRIPTS=	bin/astk bin/bsf
 tools_dir=	${LOCALBASE}/aster/outils
 conf_dir=	${WRKSRC}/etc/astkrc
 
-.if defined(LANG) && ${LANG:Mfr*} != ""
-ASTK_LANG=	FR
-.else
-ASTK_LANG=	ENG
-.endif
-
 .include <bsd.port.pre.mk>
 
 WRKCONF=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/configuration
@@ -170,6 +165,12 @@ HOST_NAME=	this-hostname
 DOMAIN_NAME=	your.domain-name
 .endif
 
+.if defined(LANG) && ${LANG:Mfr*} != ""
+ASTK_LANG=	FR
+.else
+ASTK_LANG=	ENG
+.endif
+
 pre-configure:
 	${RM} ${PATCH2RM:C|^|${WRKSRC}/|:C|$|.orig|}
 
@@ -210,7 +211,7 @@ do-configure:
 	${REINPLACE_CMD} -e "s|/opt/aster/NEW9|${aster_dir}|"			\
 		 -e "s|/opt/aster/NEW10|${aster_dir}|"				\
 		-e "s|/opt/aster/ASTK|${inst_dir}|"				\
-		-e "s|/opt/aster/etc|${LOCALBASE}/aster/etc|"			\
+		-e "s|/opt/aster|${LOCALBASE}/aster|g"				\
 		-e "s|/usr/bin/editor|${WITH_ED}|"				\
 		-e "s|/usr/bin/nedit2|${WITH_ED}|"				\
 		-e "s|/usr/bin/nedit|${WITH_ED}|"				\
diff --git a/cad/astk-serveur/files.client/patch-bin_astk b/cad/astk-serveur/files.client/patch-bin_astk
index bb9215fe8d34..3acc4cc967f8 100644
--- a/cad/astk-serveur/files.client/patch-bin_astk
+++ b/cad/astk-serveur/files.client/patch-bin_astk
@@ -1,26 +1,26 @@
---- bin/astk.orig	2015-08-05 15:37:44 UTC
+--- bin/astk.orig	2017-07-13 07:40:52 UTC
 +++ bin/astk
 @@ -17,15 +17,9 @@
  #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
  # ==============================================================================
  
 -set_prefix() {
--    local this=`readlink -n -f $1`
--    local bin=`dirname $this`
--    prefix=`dirname $bin`
+-    local this=`readlink -n -f "$1"`
+-    local bin=`dirname "${this}"`
+-    prefix=`dirname "${bin}"`
 -}
 -
--set_prefix $0
+-set_prefix "$0"
 +prefix=%%inst_dir%%/ASTK_CLIENT
  
--ASTER_ROOT=$prefix
-+ASTER_ROOT=?ASTER_ROOT?
- ASTER_ETC=$ASTER_ROOT/etc
- if [ "$ASTER_ROOT" = "/usr" ]; then
-     ASTER_ETC=/etc
-@@ -43,4 +37,4 @@ if [ -z "$WISHEXECUTABLE" ]; then
+-ASTER_ROOT="${prefix}"
++ASTER_ROOT="?ASTER_ROOT?"
+ export ASTER_ROOT
+ 
+ if [ -z "${ASTER_ETC}" ]; then
+@@ -46,4 +40,4 @@ if [ -z "${WISHEXECUTABLE}" ]; then
     WISHEXECUTABLE=wish
  fi
  
--$WISHEXECUTABLE $ASTER_ROOT/lib/astk/astk.tcl -- $* &
-+$WISHEXECUTABLE $prefix/lib/astk.tcl -- $* &
+-"${WISHEXECUTABLE}" "${ASTER_ROOT}"/lib/astk/astk.tcl -- "${@}" &
++"${WISHEXECUTABLE}" $prefix/lib/astk.tcl -- "${@}" &
diff --git a/cad/astk-serveur/files.client/patch-bin_bsf b/cad/astk-serveur/files.client/patch-bin_bsf
index 1bf48ad060f0..298bc7a6a610 100644
--- a/cad/astk-serveur/files.client/patch-bin_bsf
+++ b/cad/astk-serveur/files.client/patch-bin_bsf
@@ -1,20 +1,26 @@
---- ./bin/bsf.orig	2011-12-20 13:33:00.000000000 +0100
-+++ ./bin/bsf	2012-01-02 22:28:16.000000000 +0100
-@@ -17,15 +17,9 @@
+--- bin/bsf.orig	2017-07-13 07:40:52 UTC
++++ bin/bsf
+@@ -17,15 +17,11 @@
  #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
  # ==============================================================================
  
 -set_prefix() {
--    local this=`readlink -n -f $1`
--    local bin=`dirname $this`
--    prefix=`dirname $bin`
+-    local this=`readlink -n -f "$1"`
+-    local bin=`dirname "${this}"`
+-    prefix=`dirname "${bin}"`
 -}
 +prefix=%%inst_dir%%/ASTK_CLIENT
  
--set_prefix $0
--
--ASTER_ROOT=$prefix
-+ASTER_ROOT=?ASTER_ROOT?
- ASTER_ETC=$ASTER_ROOT/etc
- if [ "$ASTER_ROOT" = "/usr" ]; then
-     ASTER_ETC=/etc
+ set_prefix "$0"
+ 
+-ASTER_ROOT="${prefix}"
++ASTER_ROOT="?ASTER_ROOT?"
+ export ASTER_ROOT
+ 
+ if [ -z "${ASTER_ETC}" ]; then
+@@ -46,4 +42,4 @@ if [ -z "${WISHEXECUTABLE}" ]; then
+    WISHEXECUTABLE=wish
+ fi
+ 
+-"${WISHEXECUTABLE}" "${ASTER_ROOT}"/lib/astk/bsf.tcl -- "${@}" &
++"${WISHEXECUTABLE}" $prefix/lib/bsf.tcl -- "${@}" &
diff --git a/cad/astk-serveur/files.client/patch-etc_astkrc_outils b/cad/astk-serveur/files.client/patch-etc_astkrc_outils
index 72508380af46..31bb6ec64955 100644
--- a/cad/astk-serveur/files.client/patch-etc_astkrc_outils
+++ b/cad/astk-serveur/files.client/patch-etc_astkrc_outils
@@ -1,18 +1,18 @@
---- ./etc/astkrc/outils.orig	2009-12-23 15:53:05.000000000 +0100
-+++ ./etc/astkrc/outils	2010-01-26 23:20:42.000000000 +0100
-@@ -8,6 +8,11 @@
- ext : comm com0 com1 com2
- dist : on
+--- etc/astkrc/outils.orig	2017-07-13 07:40:52 UTC
++++ etc/astkrc/outils
+@@ -3,11 +3,6 @@
  #
-+nom : qtEficas
-+cmde : ?TOOLS_DIR?/eficasQt (@F)
-+ext : comm com0 com1 com2
-+dist : on
-+#
+ astkrc_version : 1.1
+ #
+-nom : Eficas
+-cmde : ?TOOLS_DIR?/eficas (@F)
+-ext : comm com0 com1 com2
+-dist : on
+-#
  nom : Gmsh
  cmde : ?TOOLS_DIR?/gmsh (@F)
  ext : geo msh pos
-@@ -23,3 +28,8 @@
+@@ -23,3 +18,8 @@ cmde : ?TOOLS_DIR?/xmgrace (@F)
  ext : dat
  dist : on
  #
diff --git a/cad/astk-serveur/files.client/patch-lib_init.tcl b/cad/astk-serveur/files.client/patch-lib_init.tcl
index 77646fb3e8a7..ad2e2396537a 100644
--- a/cad/astk-serveur/files.client/patch-lib_init.tcl
+++ b/cad/astk-serveur/files.client/patch-lib_init.tcl
@@ -1,15 +1,15 @@
---- lib/init.tcl.orig	2011-12-20 13:33:00.000000000 +0100
-+++ lib/init.tcl	2012-05-08 12:55:11.000000000 +0200
-@@ -100,7 +100,7 @@
+--- lib/init.tcl.orig	2017-07-13 07:40:52 UTC
++++ lib/init.tcl
+@@ -103,7 +103,7 @@ proc init_gene { root } {
     if { $prefix == "/usr" } {
        set prefix "/"
     }
 -   set ashare::prefix $prefix
 +   set ashare::prefix [file join $prefix "ASTK_SERV"]
     set ashare::astkrc_ref [file join $ashare::prefix "etc" "codeaster" "astkrc"]
+    catch { set ashare::astkrc_ref [file join $env(ASTER_ETC) "codeaster" "astkrc"] }
  
-    #  numero de version de astk
-@@ -673,6 +673,7 @@
+@@ -683,6 +683,7 @@ proc init_pltf { } {
     set astk::ihm(pltf,WIN32) "Windows"
  
     set astk::ihm(pltf,P_LINUX) "Linux x86"
diff --git a/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl b/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl
index be4fc766aeb8..cc63a7db746e 100644
--- a/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl
+++ b/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl
@@ -1,6 +1,6 @@
---- ./lib/tkselecteur.tcl.orig	2010-07-07 18:18:08.000000000 +0200
-+++ ./lib/tkselecteur.tcl	2010-08-11 22:57:14.000000000 +0200
-@@ -1923,10 +1923,10 @@
+--- lib/tkselecteur.tcl.orig	2017-07-13 07:40:52 UTC
++++ lib/tkselecteur.tcl
+@@ -1944,10 +1944,10 @@ proc tkgetdir::ExecCmde { parent } {
     set ExecCmde_shell $ini
      radiobutton $fen.sh.sh   -font $astk::ihm(font,lab) -text /bin/sh   -value /bin/sh   -variable ExecCmde_shell
      radiobutton $fen.sh.csh  -font $astk::ihm(font,lab) -text /bin/csh  -value /bin/csh  -variable ExecCmde_shell
diff --git a/cad/astk-serveur/files/patch-asrun_common_sysutils.py b/cad/astk-serveur/files/patch-asrun_common_sysutils.py
index 5e5195bc6390..4ba329547d98 100644
--- a/cad/astk-serveur/files/patch-asrun_common_sysutils.py
+++ b/cad/astk-serveur/files/patch-asrun_common_sysutils.py
@@ -1,6 +1,6 @@
---- ./asrun/common/sysutils.py.orig	2010-07-07 18:18:08.000000000 +0200
-+++ ./asrun/common/sysutils.py	2010-08-13 19:24:59.000000000 +0200
-@@ -67,7 +67,7 @@
+--- asrun/common/sysutils.py.orig	2017-07-13 07:40:52 UTC
++++ asrun/common/sysutils.py
+@@ -83,7 +83,7 @@ def on_mac():
  
  def on_linux():
      """Tell if it's running on a linux platform"""
@@ -9,12 +9,12 @@
  
  def on_64bits():
      """Tell if it's running on a 64 bits platform"""
-@@ -125,7 +125,7 @@
+@@ -212,7 +212,7 @@ class FileName(object):
          and fill properties = user, passwd, mach, path
          """
          # windows : only work on local files
 -        if not on_linux():
 +        if on_windows():
              self.path = pathname
+             return
          # posix
-         if type(pathname) not in (str, unicode):
diff --git a/cad/astk-serveur/files/patch-asrun_config.py b/cad/astk-serveur/files/patch-asrun_config.py
index 29e59d95cc53..29824f3192ea 100644
--- a/cad/astk-serveur/files/patch-asrun_config.py
+++ b/cad/astk-serveur/files/patch-asrun_config.py
@@ -1,6 +1,6 @@
---- asrun/config.py.orig	2013-01-08 09:55:52.000000000 +0100
-+++ asrun/config.py	2013-03-17 17:38:29.000000000 +0100
-@@ -44,8 +44,8 @@
+--- asrun/config.py.orig	2017-07-13 07:40:52 UTC
++++ asrun/config.py
+@@ -44,8 +44,8 @@ DEFAULTS = {
      'SRCHIST'         : ['histor'],
      # name of "binaries" (as results of a make)
      'MAKE'            : ['debug nodebug'],
diff --git a/cad/astk-serveur/files/patch-asrun_installation.py b/cad/astk-serveur/files/patch-asrun_installation.py
deleted file mode 100644
index 94bf30981899..000000000000
--- a/cad/astk-serveur/files/patch-asrun_installation.py
+++ /dev/null
@@ -1,11 +0,0 @@
---- ./asrun/installation.py.orig	2011-12-20 13:33:00.000000000 +0100
-+++ ./asrun/installation.py	2012-01-02 21:53:51.000000000 +0100
-@@ -21,7 +21,7 @@
- prefix = aster_root
- if aster_root == '/usr':
-     prefix = '/'
--confdir = osp.join(prefix, 'etc', 'codeaster')
-+confdir = osp.join(aster_root, 'etc', 'codeaster')
- 
- # confdir contains plugins directory
- if confdir not in sys.path:
diff --git a/cad/astk-serveur/files/patch-asrun_system.py b/cad/astk-serveur/files/patch-asrun_system.py
index ed7f01ce09f3..91c7c3463889 100644
--- a/cad/astk-serveur/files/patch-asrun_system.py
+++ b/cad/astk-serveur/files/patch-asrun_system.py
@@ -1,7 +1,7 @@
---- ./asrun/system.py.orig	2010-07-07 18:18:08.000000000 +0200
-+++ ./asrun/system.py	2010-08-16 20:51:28.000000000 +0200
-@@ -137,10 +137,10 @@
-     var = os.environ.get("TMPDIR") or os.environ.get('TEMP') or os.environ.get('TMP')
+--- asrun/system.py.orig	2017-07-13 07:40:52 UTC
++++ asrun/system.py
+@@ -133,10 +133,10 @@ def get_system_tmpdir():
+        or os.environ.get('TEMP') or os.environ.get('TMP')
      if var:
          return var
 -    if on_linux():
@@ -14,7 +14,7 @@
  
  
  def split_path(path):
-@@ -818,6 +818,8 @@
+@@ -854,6 +854,8 @@ class AsterSystem:
                      num = max([int(i) for i in l_ids]) + 1
              elif on_windows():
                  num = 1
diff --git a/cad/astk-serveur/files/patch-asrun_system_command.py b/cad/astk-serveur/files/patch-asrun_system__command.py
index 0b83e8ca9924..fe16f223ef3c 100644
--- a/cad/astk-serveur/files/patch-asrun_system_command.py
+++ b/cad/astk-serveur/files/patch-asrun_system__command.py
@@ -1,5 +1,5 @@
---- ./asrun/system_command.py.orig	2010-07-07 18:18:08.000000000 +0200
-+++ ./asrun/system_command.py	2010-08-16 21:09:31.000000000 +0200
+--- asrun/system_command.py.orig	2017-07-13 07:40:52 UTC
++++ asrun/system_command.py
 @@ -21,9 +21,9 @@
  This module defines syntaxes to run command lines.
  """
@@ -10,9 +10,9 @@
 -if on_linux():
 +if not on_windows():
      COMMAND = {
-         'background' : '( %(cmd)s ) > %(output)s 2>&1 &',
-         'follow_with_stderr' : '( %(cmd)s ; echo %(var)s=$? ) 2>&1 | tee %(output)s',
-@@ -32,7 +32,7 @@
+         'foreground' : '( %(cmd)s ) > /dev/null 2>&1',
+         'background' : '( %(cmd)s ) > /dev/null 2>&1 &',
+@@ -33,7 +33,7 @@ if on_linux():
          'not_follow_separ_stderr' : '( %(cmd)s ) > %(output)s 2> %(error)s',
          'rm_file' : '\\rm -f %(args)s',
          'rm_dirs' : '\\rm -rf %(args)s',
@@ -20,4 +20,4 @@
 +        'copy' : 'cp -L -R %(args)s',
          'ping' : 'ping -c 1 -W %(timeout)s %(host)s',
          'shell_cmd' : "bash -c",
-     }
+         'file' : "file %(args)s",
diff --git a/cad/astk-serveur/files/patch-bin_as_run b/cad/astk-serveur/files/patch-bin_as_run
deleted file mode 100644
index 300356cf7915..000000000000
--- a/cad/astk-serveur/files/patch-bin_as_run
+++ /dev/null
@@ -1,17 +0,0 @@
---- bin/as_run.orig	2011-12-20 13:33:00.000000000 +0100
-+++ bin/as_run	2012-01-02 21:56:27.000000000 +0100
-@@ -17,13 +17,7 @@
- #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
- # ==============================================================================
- 
--set_prefix() {
--    local this=`readlink -n -f $1`
--    local bin=`dirname $this`
--    prefix=`dirname $bin`
--}
--
--set_prefix $0
-+prefix=?ASTER_ROOT?
- 
- ASTER_ROOT=$prefix
- ASTER_ETC=$ASTER_ROOT/etc
diff --git a/cad/astk-serveur/files/patch-bin_parallel_cp b/cad/astk-serveur/files/patch-bin_parallel_cp
deleted file mode 100644
index cf472a8fd718..000000000000
--- a/cad/astk-serveur/files/patch-bin_parallel_cp
+++ /dev/null
@@ -1,17 +0,0 @@
---- bin/parallel_cp.orig	2011-12-20 13:33:00.000000000 +0100
-+++ bin/parallel_cp	2012-01-02 22:01:50.000000000 +0100
-@@ -17,13 +17,7 @@
- #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
- # ==============================================================================
- 
--set_prefix() {
--    local this=`readlink -n -f $1`
--    local bin=`dirname $this`
--    prefix=`dirname $bin`
--}
--
--set_prefix $0
-+prefix=?ASTER_ROOT?
- 
- ASTER_ROOT=$prefix
- ASTER_ETC=$ASTER_ROOT/etc
diff --git a/cad/astk-serveur/files/patch-etc_asrun b/cad/astk-serveur/files/patch-etc_asrun
deleted file mode 100644
index dc56e101bcfc..000000000000
--- a/cad/astk-serveur/files/patch-etc_asrun
+++ /dev/null
@@ -1,64 +0,0 @@
---- etc/asrun.orig	2014-03-05 09:28:59.000000000 +0100
-+++ etc/asrun	2014-03-17 15:46:25.000000000 +0100
-@@ -110,6 +110,10 @@
- # shared folders = for which remote copy is never necessary (comma separated)
- shared_folders :
- 
-+# directories for tests
-+rep_test : /tmp
-+resu_test : /tmp
-+
- # choose True to create symbolic links instead of copying executable and catalogs
- symlink : True
- 
-@@ -195,28 +199,28 @@
- #batch_kil : /usr/share/lsf/6.2/linux2.6-glibc2.3-ia64/bin/bkill
- 
- # --- PBS example
--#batch_nom : PBS
-+batch_nom : PBS
- #batch_ini :
--#batch_sub : /usr/bin/qsub
--#batch_jid : PBS_JOBID
--#batch_job : /usr/bin/qstat
--#batch_kil : /usr/bin/qdel
-+batch_sub : LOCALBASE/bin/qsub
-+batch_jid : PBS_JOBID
-+batch_job : LOCALBASE/bin/qstat
-+batch_kil : LOCALBASE/bin/qdel
- 
- #-------------------------------------------------------------------------------
- # ----- MPI commands and parameters
- # mpirun
- #    available arguments are : mpi_hostfile, mpi_nbnoeud, mpi_nbcpu
- #    (use Python string formatting style)
--mpirun_cmd : ?MPIRUN? -np %(mpi_nbcpu)s --hostfile %(mpi_hostfile)s %(program)s
-+mpirun_cmd : ?MPIRUN? -np %(mpi_nbcpu)s %(program)s
- 
- # file which contains list of hosts (REQUIRED even if it is not used in mpirun_cmd)
- mpi_hostfile : $ASTER_ETC/codeaster/mpi_hostfile
- 
- # command called to initialize MPI environment (for example for mpich2)
--#mpi_ini : mpdboot --totalnum=%(mpi_nbnoeud)s --file=%(mpi_hostfile)s ; sleep 10
-+mpi_ini : mpdboot --totalnum=%(mpi_nbnoeud)s --file=%(mpi_hostfile)s ; sleep 10
- 
- # command called to close the MPI session (for example for mpich2)
--#mpi_end : mpdallexit
-+mpi_end : mpdallexit
- 
- # shell command to get processor id
- # LAM/MPI : echo $LAMRANK
-@@ -245,8 +249,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
--ps_cpu : ?PS_COMMAND_CPU?
--ps_pid : ?PS_COMMAND_PID?
-+#ps_cpu : ?PS_COMMAND_CPU?
-+#ps_pid : ?PS_COMMAND_PID?
-+# FREEBSD :
-+ps_cpu : /bin/ps -e -ocpu,command
-+ps_pid : /bin/ps -e -opid,command
- 
- #-------------------------------------------------------------------------------
- # debug command :
diff --git a/cad/astk-serveur/files/patch-etc_profile.sh b/cad/astk-serveur/files/patch-etc_profile.sh
deleted file mode 100644
index 93970272f83a..000000000000
--- a/cad/astk-serveur/files/patch-etc_profile.sh
+++ /dev/null
@@ -1,16 +0,0 @@
---- etc/profile.sh.orig	2010-07-07 18:18:08.000000000 +0200
-+++ etc/profile.sh	2010-08-11 19:07:22.000000000 +0200
-@@ -37,6 +37,13 @@
- # this should not be usefull...
- #export PYTHONHOME=?HOME_PYTHON?
- 
-+# 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>
-+HOME_MED=?HOME_MED?
-+export HOME_MED
-+HOME_HDF=?HOME_HDF?
-+export HOME_HDF
-+
- export WISHEXECUTABLE=?WISH_EXE?
- 
- 
diff --git a/cad/astk-serveur/files/pkg-message.in b/cad/astk-serveur/files/pkg-message.in
index e2be2f50f80c..99890d7847dc 100644
--- a/cad/astk-serveur/files/pkg-message.in
+++ b/cad/astk-serveur/files/pkg-message.in
@@ -1,11 +1,5 @@
-Des fichiers de configuration standards ont été préparés :
-%%ETCDIR%%/
-Veuillez les vérifier, et n'oubliez pas d'installer la partie cliente sur vos
-stations.
+N'oubliez pas d'installer la partie cliente sur vos stations.
 
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
+=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=
 
-Standard configuration files have been initialized:
-%%ETCDIR%%/
-Please check them, and do not forget to install the client side on your
-stations.
+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 5e3fb8de4897..0937461121db 100644
--- a/cad/astk-serveur/pkg-plist
+++ b/cad/astk-serveur/pkg-plist
@@ -216,9 +216,6 @@
 %%CLIENT%%%%BWidget_DIR%%/widget.tcl
 %%CLIENT%%%%BWidget_DIR%%/wizard.tcl
 %%CLIENT%%%%BWidget_DIR%%/xpm2image.tcl
-%%SERV%%%%ASTKDIR%%/asrun/N__F.py
-%%SERV%%%%ASTKDIR%%/asrun/N__F.pyc
-%%SERV%%%%ASTKDIR%%/asrun/N__F.pyo
 %%SERV%%%%ASTKDIR%%/asrun/__init__.py
 %%SERV%%%%ASTKDIR%%/asrun/__init__.pyc
 %%SERV%%%%ASTKDIR%%/asrun/__init__.pyo
@@ -252,6 +249,9 @@
 %%SERV%%%%ASTKDIR%%/asrun/client/config.py
 %%SERV%%%%ASTKDIR%%/asrun/client/config.pyc
 %%SERV%%%%ASTKDIR%%/asrun/client/config.pyo
+%%SERV%%%%ASTKDIR%%/asrun/common_func.py
+%%SERV%%%%ASTKDIR%%/asrun/common_func.pyc
+%%SERV%%%%ASTKDIR%%/asrun/common_func.pyo
 %%SERV%%%%ASTKDIR%%/asrun/common/__init__.py
 %%SERV%%%%ASTKDIR%%/asrun/common/__init__.pyc
 %%SERV%%%%ASTKDIR%%/asrun/common/__init__.pyo
@@ -270,30 +270,27 @@
 %%SERV%%%%ASTKDIR%%/asrun/common/utils.py
 %%SERV%%%%ASTKDIR%%/asrun/common/utils.pyc
 %%SERV%%%%ASTKDIR%%/asrun/common/utils.pyo
-%%SERV%%%%ASTKDIR%%/asrun/common_func.py
-%%SERV%%%%ASTKDIR%%/asrun/common_func.pyc
-%%SERV%%%%ASTKDIR%%/asrun/common_func.pyo
 %%SERV%%%%ASTKDIR%%/asrun/config.py
 %%SERV%%%%ASTKDIR%%/asrun/config.pyc
 %%SERV%%%%ASTKDIR%%/asrun/config.pyo
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.py
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.pyc
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.pyo
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.py
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.pyc
-%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.pyo
-%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.py
-%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.pyc
-%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.pyo
 %%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.py
 %%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.pyc
 %%SERV%%%%ASTKDIR%%/asrun/contrib/__init__.pyo
 %%SERV%%%%ASTKDIR%%/asrun/contrib/copy_version.py
 %%SERV%%%%ASTKDIR%%/asrun/contrib/copy_version.pyc
 %%SERV%%%%ASTKDIR%%/asrun/contrib/copy_version.pyo
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.py
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Fichier.pyo
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.py
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/Ligne.pyo
 %%SERV%%%%ASTKDIR%%/asrun/contrib/log_usage.py
 %%SERV%%%%ASTKDIR%%/asrun/contrib/log_usage.pyc
 %%SERV%%%%ASTKDIR%%/asrun/contrib/log_usage.pyo
+%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.py
+%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.pyc
+%%SERV%%%%ASTKDIR%%/asrun/contrib/OutputParser.pyo
 %%SERV%%%%ASTKDIR%%/asrun/core/__init__.py
 %%SERV%%%%ASTKDIR%%/asrun/core/__init__.pyc
 %%SERV%%%%ASTKDIR%%/asrun/core/__init__.pyo
@@ -354,6 +351,9 @@
 %%SERV%%%%ASTKDIR%%/asrun/mystring.py
 %%SERV%%%%ASTKDIR%%/asrun/mystring.pyc
 %%SERV%%%%ASTKDIR%%/asrun/mystring.pyo
+%%SERV%%%%ASTKDIR%%/asrun/N__F.py
+%%SERV%%%%ASTKDIR%%/asrun/N__F.pyc
+%%SERV%%%%ASTKDIR%%/asrun/N__F.pyo
 %%SERV%%%%ASTKDIR%%/asrun/parallel_cp.py
 %%SERV%%%%ASTKDIR%%/asrun/parallel_cp.pyc
 %%SERV%%%%ASTKDIR%%/asrun/parallel_cp.pyo
@@ -417,12 +417,12 @@
 %%SERV%%%%ASTKDIR%%/asrun/status.py
 %%SERV%%%%ASTKDIR%%/asrun/status.pyc
 %%SERV%%%%ASTKDIR%%/asrun/status.pyo
-%%SERV%%%%ASTKDIR%%/asrun/system.py
-%%SERV%%%%ASTKDIR%%/asrun/system.pyc
-%%SERV%%%%ASTKDIR%%/asrun/system.pyo
 %%SERV%%%%ASTKDIR%%/asrun/system_command.py
 %%SERV%%%%ASTKDIR%%/asrun/system_command.pyc
 %%SERV%%%%ASTKDIR%%/asrun/system_command.pyo
+%%SERV%%%%ASTKDIR%%/asrun/system.py
+%%SERV%%%%ASTKDIR%%/asrun/system.pyc
+%%SERV%%%%ASTKDIR%%/asrun/system.pyo
 %%SERV%%%%ASTKDIR%%/asrun/testlist.py
 %%SERV%%%%ASTKDIR%%/asrun/testlist.pyc
 %%SERV%%%%ASTKDIR%%/asrun/testlist.pyo
@@ -460,6 +460,12 @@
 %%SERV%%%%ASTKDIR%%/etc/plugins/athosdev.py
 %%SERV%%%%ASTKDIR%%/etc/plugins/athosdev.pyc
 %%SERV%%%%ASTKDIR%%/etc/plugins/athosdev.pyo
+%%SERV%%%%ASTKDIR%%/etc/plugins/distribution.py
+%%SERV%%%%ASTKDIR%%/etc/plugins/distribution.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/distribution.pyo
+%%SERV%%%%ASTKDIR%%/etc/plugins/eole.py
+%%SERV%%%%ASTKDIR%%/etc/plugins/eole.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/eole.pyo
 %%SERV%%%%ASTKDIR%%/etc/plugins/ivanoe.py
 %%SERV%%%%ASTKDIR%%/etc/plugins/ivanoe.pyc
 %%SERV%%%%ASTKDIR%%/etc/plugins/ivanoe.pyo
@@ -470,12 +476,11 @@
 %%SERV%%%%ASTKDIR%%/etc/plugins/tail_slurm.pyc
 %%SERV%%%%ASTKDIR%%/etc/plugins/tail_slurm.pyo
 %%SERV%%%%ASTKDIR%%/etc/profile.sh
-%%SERV%%%%ASTKDIR%%/i18n/Makefile
 %%SERV%%%%ASTKDIR%%/i18n/asrun.fr.mo
 %%SERV%%%%ASTKDIR%%/i18n/asrun.fr.po
 %%SERV%%%%ASTKDIR%%/i18n/locale/fr/LC_MESSAGES/asrun.mo
+%%SERV%%%%ASTKDIR%%/i18n/Makefile
 %%SERV%%%%ASTKDIR%%/i18n/messages.pot
-%%SERV%%%%ASTKDIR%%/share/codeaster/GPL.txt
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/as_rex_prof
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/convbase.comm
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/data/meshtool.comm
@@ -493,6 +498,7 @@
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/user_filter.py
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/user_filter.pyc
 %%SERV%%%%ASTKDIR%%/share/codeaster/asrun/examples/user_filter.pyo
+%%SERV%%%%ASTKDIR%%/share/codeaster/GPL.txt
 %%SERV%%%%ASTKDIR%%/unittest/010_misc.py
 %%SERV%%%%ASTKDIR%%/unittest/010_misc.pyc
 %%SERV%%%%ASTKDIR%%/unittest/010_misc.pyo
@@ -559,8 +565,8 @@
 %%SERV%%%%ASTKDIR%%/unittest/data.py
 %%SERV%%%%ASTKDIR%%/unittest/data.pyc
 %%SERV%%%%ASTKDIR%%/unittest/data.pyo
-%%SERV%%%%ASTKDIR%%/unittest/datafiles/astout.list
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/astout_dvp.list
+%%SERV%%%%ASTKDIR%%/unittest/datafiles/astout.list
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/chg_capy.comm
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/config_serveurs
 %%SERV%%%%ASTKDIR%%/unittest/datafiles/forma01a.mmed
@@ -580,7 +586,6 @@
 %%SERV%%%%ASTKDIR%%/unittest/test_relocate.py
 %%SERV%%%%ASTKDIR%%/unittest/test_relocate.pyc
 %%SERV%%%%ASTKDIR%%/unittest/test_relocate.pyo
-%%SERV%%%%MPI%%aster/aster-mpihosts
 %%SERV%%%%ETCDIR%%/asrun
 %%SERV%%%%ETCDIR%%/aster
 %%SERV%%%%ETCDIR%%/config_nodename
@@ -596,6 +601,12 @@
 %%SERV%%%%ETCDIR%%/plugins/athosdev.py
 %%SERV%%%%ETCDIR%%/plugins/athosdev.pyc
 %%SERV%%%%ETCDIR%%/plugins/athosdev.pyo
+%%SERV%%%%ETCDIR%%/plugins/distribution.py
+%%SERV%%%%ETCDIR%%/plugins/distribution.pyc
+%%SERV%%%%ETCDIR%%/plugins/distribution.pyo
+%%SERV%%%%ETCDIR%%/plugins/eole.py
+%%SERV%%%%ETCDIR%%/plugins/eole.pyc
+%%SERV%%%%ETCDIR%%/plugins/eole.pyo
 %%SERV%%%%ETCDIR%%/plugins/ivanoe.py
 %%SERV%%%%ETCDIR%%/plugins/ivanoe.pyc
 %%SERV%%%%ETCDIR%%/plugins/ivanoe.pyo
@@ -606,3 +617,4 @@
 %%SERV%%%%ETCDIR%%/plugins/tail_slurm.pyc
 %%SERV%%%%ETCDIR%%/plugins/tail_slurm.pyo
 %%SERV%%%%ETCDIR%%/profile_astk.sh
+%%SERV%%%%MPI%%aster/aster-mpihosts
diff --git a/cad/scotch/Makefile b/cad/scotch/Makefile
index 889fc9b5b457..c561e706c1d6 100644
--- a/cad/scotch/Makefile
+++ b/cad/scotch/Makefile
@@ -2,11 +2,8 @@
 # $FreeBSD$
 
 PORTNAME=	scotch
-DISTVERSION=	5.1.12b_esmumps
-PORTREVISION=	8
+DISTVERSION=	6.0.4-aster5
 CATEGORIES=	cad science
-MASTER_SITES=	https://gforge.inria.fr/frs/download.php/28978/
-DISTNAME=	${PORTNAME}_${DISTVERSION}
 
 MAINTAINER=	thierry@FreeBSD.org
 COMMENT=	Package for graph and mesh partitioning and sparse matrix ordering
@@ -18,43 +15,31 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-sell auto-accept
 
 CONFLICTS=	gbase-0.* gmap-2015.*
 
-USES=		gmake
+USES=		bison gmake localbase
 
 MAKE_JOBS_UNSAFE=yes
 
 OPTIONS_DEFINE=	DOCS EXAMPLES
 
-.if defined(MAINTAINER_MODE)
-USES+=		fortran
-.endif
-
-WRKSRC=		${WRKDIR}/${DISTNAME:C/b_/_/}
+WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}
 BUILD_WRKSRC=	${WRKSRC}/src
-ALL_TARGET=	scotch
-
-CFLAGS+=	-I${LOCALBASE}/include
+INSTALL_WRKSRC=	${BUILD_WRKSRC}
+TEST_WRKSRC=	${BUILD_WRKSRC}
+ALL_TARGET=	esmumps
+TEST_TARGET=	check
+MAKE_ENV=	prefix=${STAGEDIR}${PREFIX} mandir=${STAGEDIR}${MANDIRS}	\
+		-DSCOTCH_PTHREAD_NUMBER=2
 
-VER=		${PORTVERSION:R}
-BINS=		acpl amk_ccc amk_fft2 amk_grf amk_hy amk_m2 amk_p2 atst	\
-		gbase gcv gmap gmk_hy gmk_m2 gmk_m3 gmk_msh gmk_ub2	\
-		gmtst gord gotst gout gpart gscat gtst mcv mmk_m2 mmk_m3\
-		mord mtst
-INCS=		esmumps.h scotch.h scotchf.h
-LIBS=		libesmumps.a libscotch.a libscotcherr.a libscotcherrexit.a libscotchmetis.a
-DOCVER=		${PORTVERSION:R:R:R}
-PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf
-EXAMPLES=	scotch_example_1.f scotch_example_2.f90
+DOCVER=		${PORTVERSION:R:R}
+PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf scotch_example.f
+EXAMPLES=	scotch_example.f
 
 .if !defined(WITHOUT_MPI)
 LIB_DEPENDS+=	libmpich.so:net/mpich2
 
-ALL_TARGET+=	ptscotch
+ALL_TARGET+=	ptesmumps
 MAKE_ENV+=	PATH=${PATH}:${LOCALBASE}/mpich2/bin
-
-INCS+=		ptscotch.h ptscotchf.h
-LIBS+=		libptesmumps.a libptscotch.a libptscotcherr.a libptscotcherrexit.a	\
-		libptscotchparmetis.a
-BINS+=		dggath dgmap dgord dgpart dgscat dgtst
+TEST_TARGET+=	ptcheck
 
 PLIST_SUB+=	MPI=""
 .else
@@ -85,32 +70,32 @@ pre-configure:
 	${REINPLACE_CMD} -E -e 's|cd (.*) ; * \$$\(MAKE\)|\$$(MAKE) -C \1|'	\
 		-e 's|\&\& \$$\(MAKE\)||' ${WRKSRC}/src/Makefile
 
-do-install:
-	${INSTALL_PROGRAM} ${BINS:S|^|${WRKSRC}/bin/|} ${STAGEDIR}${PREFIX}/bin
-	${INSTALL_DATA} ${INCS:S|^|${WRKSRC}/include/|} ${STAGEDIR}${PREFIX}/include
-	${INSTALL_DATA} ${LIBS:S|^|${WRKSRC}/lib/|} ${STAGEDIR}${PREFIX}/lib
-	${INSTALL_MAN} ${WRKSRC}/man/man1/* ${STAGEDIR}${MANPREFIX}/man/man1
+post-stage:
+	${STRIP_CMD} ${STAGEDIR}${PREFIX}/bin/*
+
 do-install-DOCS-on:
 	${MKDIR} ${STAGEDIR}${DOCSDIR}
 	${INSTALL_DATA} ${PORTDOCS:S|^|${WRKSRC}/doc/|} ${STAGEDIR}${DOCSDIR}
+
 do-install-EXAMPLES-on:
 	${MKDIR} ${STAGEDIR}${EXAMPLESDIR}/grf ${STAGEDIR}${EXAMPLESDIR}/tgt
-	${INSTALL_DATA} ${EXAMPLES:S|^|${WRKSRC}/examples/|} ${STAGEDIR}${EXAMPLESDIR}
 	${INSTALL_DATA} ${WRKSRC}/grf/* ${STAGEDIR}${EXAMPLESDIR}/grf
 	${INSTALL_DATA} ${WRKSRC}/tgt/* ${STAGEDIR}${EXAMPLESDIR}/tgt
 
-.if defined(MAINTAINER_MODE)
-regression-test:	install
-	(amk_ccc 3 | acpl - ${WRKDIR}/ccc3.tgt &&	\
-	${GUNZIP_CMD} -c ${EXAMPLESDIR}/grf/bump.grf.gz |	\
-	gmap - ${WRKDIR}/ccc3.tgt ${WRKDIR}/brol.map)
-	(cd ${WRKSRC}/examples &&	\
-	${FC} -o scotch_test scotch_example_1.f ${FCFLAGS}	\
-		-I${PREFIX}/include ${LDFLAGS} -L${PREFIX}/lib -lscotch -lscotcherr -lm	\
-	&& ./scotch_test)
-. if !defined(WITHOUT_MPI)
-	(${GUNZIP_CMD} -c ${EXAMPLESDIR}/grf/bump.grf.gz | dgtst)
+.if !defined(WITHOUT_MPI)
+pre-test:
+. if !exists(${HOME}/.mpd.conf)
+	@${ECHO_CMD} "MPD_SECRETWORD=change_on_install" > ${HOME}/.mpd.conf
+	${CHMOD} go-r ${HOME}/.mpd.conf
+	@${ECHO_MSG} "${HOME}/.mpd.conf has been generated - please change the secret word!"
 . endif
+	${LOCALBASE}/bin/mpd &
+.endif
+
+.if !defined(WITHOUT_MPI)
+post-test:
+	${LOCALBASE}/bin/mpdallexit
 .endif
 
+.include "${.CURDIR}/../../french/aster/bsd.aster.mk"
 .include <bsd.port.mk>
diff --git a/cad/scotch/pkg-plist b/cad/scotch/pkg-plist
index 48e305e917e2..61d0ee18b058 100644
--- a/cad/scotch/pkg-plist
+++ b/cad/scotch/pkg-plist
@@ -32,7 +32,6 @@ bin/mmk_m2
 bin/mmk_m3
 bin/mord
 bin/mtst
-include/esmumps.h
 %%MPI%%include/ptscotch.h
 %%MPI%%include/ptscotchf.h
 include/scotch.h
@@ -47,6 +46,34 @@ lib/libscotch.a
 lib/libscotcherr.a
 lib/libscotcherrexit.a
 lib/libscotchmetis.a
+man/man1/amk_ccc.1.gz
+man/man1/amk_fft2.1.gz
+man/man1/amk_hy.1.gz
+man/man1/amk_m2.1.gz
+man/man1/amk_p2.1.gz
+man/man1/atst.1.gz
+man/man1/dgmap.1.gz
+man/man1/dgord.1.gz
+man/man1/dgpart.1.gz
+man/man1/dgscat.1.gz
+man/man1/dgtst.1.gz
+man/man1/gcv.1.gz
+man/man1/gmap.1.gz
+man/man1/gmk_hy.1.gz
+man/man1/gmk_m2.1.gz
+man/man1/gmk_m3.1.gz
+man/man1/gmk_msh.1.gz
+man/man1/gmk_ub2.1.gz
+man/man1/gmtst.1.gz
+man/man1/gord.1.gz
+man/man1/gotst.1.gz
+man/man1/gout.1.gz
+man/man1/gpart.1.gz
+man/man1/gtst.1.gz
+man/man1/mmk_m2.1.gz
+man/man1/mmk_m3.1.gz
+man/man1/mord.1.gz
+man/man1/mtst.1.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/3elt.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt.grf.gz
@@ -55,8 +82,6 @@ lib/libscotchmetis.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/4elt2.xyz.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.grf.gz
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/grf/bump.xyz.gz
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scotch_example_1.f
-%%PORTEXAMPLES%%%%EXAMPLESDIR%%/scotch_example_2.f90
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/SP2_16.txt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/T3D_64.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/h1.tgt
@@ -126,36 +151,3 @@ lib/libscotchmetis.a
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vcmplt.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/vhcub.tgt
 %%PORTEXAMPLES%%%%EXAMPLESDIR%%/tgt/void.tgt
-man/man1/acpl.1.gz
-man/man1/amk_ccc.1.gz
-man/man1/amk_fft2.1.gz
-man/man1/amk_grf.1.gz
-man/man1/amk_hy.1.gz
-man/man1/amk_m2.1.gz
-man/man1/amk_p2.1.gz
-man/man1/atst.1.gz
-man/man1/dggath.1.gz
-man/man1/dgmap.1.gz
-man/man1/dgord.1.gz
-man/man1/dgpart.1.gz
-man/man1/dgscat.1.gz
-man/man1/dgtst.1.gz
-man/man1/gbase.1.gz
-man/man1/gcv.1.gz
-man/man1/gmap.1.gz
-man/man1/gmk_hy.1.gz
-man/man1/gmk_m2.1.gz
-man/man1/gmk_m3.1.gz
-man/man1/gmk_msh.1.gz
-man/man1/gmk_ub2.1.gz
-man/man1/gmtst.1.gz
-man/man1/gord.1.gz
-man/man1/gotst.1.gz
-man/man1/gout.1.gz
-man/man1/gpart.1.gz
-man/man1/gtst.1.gz
-man/man1/mcv.1.gz
-man/man1/mmk_m2.1.gz
-man/man1/mmk_m3.1.gz
-man/man1/mord.1.gz
-man/man1/mtst.1.gz