svn commit: r454187 - in head: . cad/astk-serveur cad/astk-serveur/files cad/astk-serveur/files.client cad/scotch french french/aster french/aster/files french/eficas french/homard french/med frenc...

Thierry Thomas thierry at FreeBSD.org
Tue Nov 14 18:29:25 UTC 2017 

Author: thierry
Date: Tue Nov 14 18:29:22 2017
New Revision: 454187
URL: https://svnweb.freebsd.org/changeset/ports/454187

Log:
  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!)

Added:
  head/cad/astk-serveur/files/patch-asrun_system__command.py   (contents, props changed)
  head/french/aster/files/patch-products__data.py   (contents, props changed)
  head/math/metis-edf/files/patch-libmetis__CMakeLists.txt   (contents, props changed)
  head/math/mumps-edf/
     - copied from r447196, head/math/mumps/
  head/math/mumps-edf/files/patch-Make.inc_Makefile.FREEBSD10.PAR   (contents, props changed)
  head/math/mumps-edf/files/patch-Make.inc_Makefile.FREEBSD10.SEQ   (contents, props changed)
  head/math/mumps-edf/files/patch-examples_Makefile   (contents, props changed)
Deleted:
  head/cad/astk-serveur/files/patch-asrun_installation.py
  head/cad/astk-serveur/files/patch-asrun_system_command.py
  head/cad/astk-serveur/files/patch-bin_as_run
  head/cad/astk-serveur/files/patch-bin_parallel_cp
  head/cad/astk-serveur/files/patch-etc_asrun
  head/cad/astk-serveur/files/patch-etc_profile.sh
  head/french/aster/files/patch-setup.cfg
  head/french/aster/files/patch-setup.py
  head/french/eficas/
  head/french/med/files/patch-src_2.3.6_ci_MEDequivInfo.c
  head/math/metis-edf/files/patch-Lib_Makefile
  head/math/metis-edf/files/patch-Makefile
  head/math/metis-edf/files/patch-Makefile.in
  head/math/mumps-edf/files/patch-Make.inc_Makefile.inc.generic
  head/math/mumps-edf/files/patch-Make.inc_Makefile.inc.generic.SEQ
Modified:
  head/MOVED
  head/cad/astk-serveur/Makefile
  head/cad/astk-serveur/files.client/patch-bin_astk
  head/cad/astk-serveur/files.client/patch-bin_bsf
  head/cad/astk-serveur/files.client/patch-etc_astkrc_outils
  head/cad/astk-serveur/files.client/patch-lib_init.tcl
  head/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl
  head/cad/astk-serveur/files/patch-asrun_common_sysutils.py
  head/cad/astk-serveur/files/patch-asrun_config.py
  head/cad/astk-serveur/files/patch-asrun_system.py
  head/cad/astk-serveur/files/pkg-message.in
  head/cad/astk-serveur/pkg-plist
  head/cad/scotch/Makefile
  head/cad/scotch/pkg-plist
  head/french/Makefile
  head/french/aster/Makefile
  head/french/aster/bsd.aster.mk
  head/french/aster/distinfo
  head/french/aster/files/patch-as_setup.py
  head/french/aster/files/patch-check_compilers.py
  head/french/aster/files/patch-check_compilers_src.py
  head/french/aster/files/patch-products.py
  head/french/aster/pkg-plist
  head/french/homard/Makefile
  head/french/med/Makefile
  head/french/med/files/patch-configure
  head/french/med/pkg-plist
  head/math/Makefile
  head/math/metis-edf/Makefile
  head/math/metis-edf/pkg-plist
  head/math/mumps-edf/Makefile
  head/math/mumps-edf/files/patch-Makefile
  head/math/mumps-edf/files/patch-PORD_lib_Makefile
  head/math/mumps-edf/files/patch-libseq_Makefile
  head/math/mumps-edf/files/patch-src_Makefile
  head/math/mumps-edf/pkg-plist
  head/math/mumps/Makefile

Modified: head/MOVED
==============================================================================
--- head/MOVED	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/MOVED	Tue Nov 14 18:29:22 2017	(r454187)
@@ -9629,3 +9629,4 @@ graphics/geos35|graphics/geos|2017-11-12|Has expired: 
 astro/gmapcatcher||2017-11-12|Has expired: Unfetchable for more than six months (google code has gone away)
 audio/smasher||2017-11-12|Has expired: Does not build with modern csound
 audio/csound|audio/csound6|2017-11-12|Has expired: Not supported upstream anymore, use csound6
+french/eficas||2017-11-14|Removed with Code_Aster 13.4.0, should be replaced by aster-study in cad/salome

Modified: head/cad/astk-serveur/Makefile
==============================================================================
--- head/cad/astk-serveur/Makefile	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/Makefile	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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}|"				\

Modified: head/cad/astk-serveur/files.client/patch-bin_astk
==============================================================================
--- head/cad/astk-serveur/files.client/patch-bin_astk	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/files.client/patch-bin_astk	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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 -- "${@}" &

Modified: head/cad/astk-serveur/files.client/patch-bin_bsf
==============================================================================
--- head/cad/astk-serveur/files.client/patch-bin_bsf	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/files.client/patch-bin_bsf	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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 -- "${@}" &

Modified: head/cad/astk-serveur/files.client/patch-etc_astkrc_outils
==============================================================================
--- head/cad/astk-serveur/files.client/patch-etc_astkrc_outils	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/files.client/patch-etc_astkrc_outils	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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
  #

Modified: head/cad/astk-serveur/files.client/patch-lib_init.tcl
==============================================================================
--- head/cad/astk-serveur/files.client/patch-lib_init.tcl	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/files.client/patch-lib_init.tcl	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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"

Modified: head/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl
==============================================================================
--- head/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/files.client/patch-lib_tkselecteur.tcl	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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

Modified: head/cad/astk-serveur/files/patch-asrun_common_sysutils.py
==============================================================================
--- head/cad/astk-serveur/files/patch-asrun_common_sysutils.py	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/files/patch-asrun_common_sysutils.py	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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):

Modified: head/cad/astk-serveur/files/patch-asrun_config.py
==============================================================================
--- head/cad/astk-serveur/files/patch-asrun_config.py	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/files/patch-asrun_config.py	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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'],

Modified: head/cad/astk-serveur/files/patch-asrun_system.py
==============================================================================
--- head/cad/astk-serveur/files/patch-asrun_system.py	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/files/patch-asrun_system.py	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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

Added: head/cad/astk-serveur/files/patch-asrun_system__command.py
==============================================================================
--- /dev/null	00:00:00 1970	(empty, because file is newly added)
+++ head/cad/astk-serveur/files/patch-asrun_system__command.py	Tue Nov 14 18:29:22 2017	(r454187)
@@ -0,0 +1,23 @@
+--- 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.
+ """
+ 
+-from asrun.common.sysutils import on_linux
++from asrun.common.sysutils import on_windows
+ 
+-if on_linux():
++if not on_windows():
+     COMMAND = {
+         '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',
+-        'copy' : 'cp -L -r %(args)s',
++        'copy' : 'cp -L -R %(args)s',
+         'ping' : 'ping -c 1 -W %(timeout)s %(host)s',
+         'shell_cmd' : "bash -c",
+         'file' : "file %(args)s",

Modified: head/cad/astk-serveur/files/pkg-message.in
==============================================================================
--- head/cad/astk-serveur/files/pkg-message.in	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/files/pkg-message.in	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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.

Modified: head/cad/astk-serveur/pkg-plist
==============================================================================
--- head/cad/astk-serveur/pkg-plist	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/astk-serveur/pkg-plist	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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

Modified: head/cad/scotch/Makefile
==============================================================================
--- head/cad/scotch/Makefile	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/scotch/Makefile	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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 at FreeBSD.org
 COMMENT=	Package for graph and mesh partitioning and sparse matrix ordering
@@ -18,44 +15,32 @@ LICENSE_PERMS=	dist-mirror dist-sell pkg-mirror pkg-se
 
 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
+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
 
-CFLAGS+=	-I${LOCALBASE}/include
+DOCVER=		${PORTVERSION:R:R}
+PORTDOCS=	ptscotch_user${DOCVER}.pdf scotch_user${DOCVER}.pdf scotch_example.f
+EXAMPLES=	scotch_example.f
 
-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
-
 .if !defined(WITHOUT_MPI)
 LIB_DEPENDS+=	libmpich.so:net/mpich2
 
-ALL_TARGET+=	ptscotch
+ALL_TARGET+=	ptesmumps
 MAKE_ENV+=	PATH=${PATH}:${LOCALBASE}/mpich2/bin
+TEST_TARGET+=	ptcheck
 
-INCS+=		ptscotch.h ptscotchf.h
-LIBS+=		libptesmumps.a libptscotch.a libptscotcherr.a libptscotcherrexit.a	\
-		libptscotchparmetis.a
-BINS+=		dggath dgmap dgord dgpart dgscat dgtst
-
 PLIST_SUB+=	MPI=""
 .else
 PLIST_SUB+=	MPI="@comment "
@@ -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>

Modified: head/cad/scotch/pkg-plist
==============================================================================
--- head/cad/scotch/pkg-plist	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/cad/scotch/pkg-plist	Tue Nov 14 18:29:22 2017	(r454187)
@@ -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

Modified: head/french/Makefile
==============================================================================
--- head/french/Makefile	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/french/Makefile	Tue Nov 14 18:29:22 2017	(r454187)
@@ -5,7 +5,6 @@
 
     SUBDIR += aspell
     SUBDIR += aster
-    SUBDIR += eficas
     SUBDIR += eric6
     SUBDIR += fortune-mod-zarathoustra
     SUBDIR += geonext

Modified: head/french/aster/Makefile
==============================================================================
--- head/french/aster/Makefile	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/french/aster/Makefile	Tue Nov 14 18:29:22 2017	(r454187)
@@ -3,7 +3,6 @@
 
 PORTNAME=	aster
 DISTVERSION=	${ASTER_DISTVERSION}
-PORTREVISION=	5
 CATEGORIES=	french cad
 CATEGORIES=	french cad
 
@@ -35,14 +34,19 @@ LICENSE=	GPLv2
 BUILD_DEPENDS+=	astk-serveur>0:cad/astk-serveur	\
 		${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
 		${LOCALBASE}/lib/libscotch.a:cad/scotch		\
+		${LOCALBASE}/lib/libGKlib.a:math/metis-edf	\
+		pylupdate4:textproc/py-qt4-xml			\
+		gnproc:sysutils/coreutils			\
 		python:lang/python				\
+		bash:shells/bash				\
 		${PYNUMPY}
 LIB_DEPENDS+=	libhdf5-18.so:science/hdf5-18			\
-		libmed.so:french/med				\
-		libmetis.so.0:math/metis-edf			\
-		libAsterInterface.so:science/tfel
+		libmetis.so.2:math/metis-edf			\
+		libomp.so:devel/openmp				\
+		libmed.so:french/med
+#		libAsterInterface.so:science/mfront
+#		libAsterInterface.so:science/tfel
 RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot\
-		${LOCALBASE}/bin/onmetis:math/metis-edf		\
 		${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
 		astk-serveur>0:cad/astk-serveur
 
@@ -50,6 +54,7 @@ BROKEN_FreeBSD_12=	does not build (sed: ${STAGEDIR}${i
 
 USES=		bison fortran gettext python:2 tk
 USE_BINUTILS=	yes
+USE_QT4=	linguisttools_build
 
 .if defined(WITH_ATLAS)
 USES+=		blaslapack:atlas
@@ -58,7 +63,10 @@ USES+=		blaslapack:netlib
 .endif
 
 HAS_CONFIGURE=	yes
-MAKE_ENV=	INCLUDES="${LOCALBASE}/include/hdf5-18 ${LOCALBASE}/include ${LOCALBASE}/include/metis"
+MAKE_ENV=	INCLUDES="${LOCALBASE}/include/hdf5-18 ${LOCALBASE}/include"	\
+		INCLUDEDIR="${LOCALBASE}/include/hdf5-18 ${LOCALBASE}/include"	\
+		LD_PRELOAD="${LOCALBASE}/lib/gcc${_GCC_VER}/libgcc_s.so.1"	\
+		LINKFLAGS="${LDFLAGS}" LD_LIBRARY_PATH="${LOCALBASE}/lib/gcc${_GCC_VER}"
 REINPLACE_ARGS=	-i ""
 
 VER=		${PORTVERSION:R}
@@ -90,12 +98,6 @@ PLIST_SUB+=	ASTK_CLIENT=""  ASTKDIR=${ASTKDIR}
 .else
 PLIST_SUB+=	ASTK_CLIENT="@comment " ASTKDIR=""
 .endif
-.if !defined(WITHOUT_EFICAS)
-RUN_DEPENDS+=	fr-eficas>0:french/eficas
-PLIST_SUB+=	EFICAS=""
-.else
-PLIST_SUB+=	EFICAS="@comment "
-.endif
 .if !defined(WITHOUT_GMSH)
 RUN_DEPENDS+=	${LOCALBASE}/bin/gmsh:cad/gmsh
 PLIST_SUB+=	GMSH=""
@@ -113,14 +115,15 @@ RUN_DEPENDS+=	${PYNUMPY}
 .endif
 
 .if !defined(WITH_MPI)
-MUMPS_PORT=	mumps
+MPISEQ=		-lmpiseq
+MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord ${MPISEQ}
+LIB_DEPENDS+=	libmpiseq.so.5:math/mumps-edf
 .else
 BUILD_DEPENDS+=	${LOCALBASE}/lib/libblacs.a:math/blacs	\
 		${LOCALBASE}/lib/libscalapack.a:math/scalapack
-MUMPS_PORT=	mumps-mpich
-MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich -lmpl
+MUMPSLIB=	-L${LOCALBASE}/lib -ldmumps -lzmumps -lsmumps -lcmumps -lmumps_common -lpord -lscalapack -lblacs -lblacsc -lblacs -L${LOCALBASE}/lib -lmpich -lmpl
+LIB_DEPENDS+=	libcmumps.so.5:math/mumps-edf
 .endif
-BUILD_DEPENDS+=	${LOCALBASE}/lib/libcmumps.a:math/${MUMPS_PORT}
 
 .if defined(WITH_MPI)
 LIB_DEPENDS+=	libmpich.so:net/mpich2
@@ -174,10 +177,7 @@ PFX2FIX=	bin/as_run ${VE}/include/aster/asterc_config.
 		${VE}/share/aster/CTestTestfile.cmake ${VE}/share/aster/config.txt
 inst_dir=	${PREFIX}/${PORTNAME}
 tools_dir=	${PREFIX}/${PORTNAME}/outils
-tools=		kmetis onmetis pmetis gnuplot
-.if !defined(WITHOUT_EFICAS)
-tools+=		eficas eficasQt
-.endif
+tools=		cmpfillin gpmetis graphchk m2gmetis mpmetis ndmetis gnuplot
 .if !defined(WITHOUT_GMSH)
 tools+=		gmsh
 .endif
@@ -209,7 +209,7 @@ pre-configure:
 		${WRKSRC}/products.py
 	${REINPLACE_CMD} -e "s|'gfortran'|'${FC}'|g;s|'gcc'|'${CC}'|g"	\
 		-e "s|'g++'|'${CXX}'|g" ${WRKSRC}/check_compilers.py
-	${REINPLACE_CMD} -e 's|%%FILESDIR%%|${FILESDIR}|' ${WRKSRC}/as_setup.py
+	${REINPLACE_CMD} -e "s|%%LOCALBASE%%|${LOCALBASE}|" ${WRKSRC}/as_setup.py
 .for sh in ${BASH2RC}
 	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
 .endfor
@@ -233,6 +233,7 @@ pre-configure:
 	${ECHO_CMD} "_install_astk = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_astk_serv = False"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_metis = False"			>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "_install_mfront = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_mumps = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORB = False"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "_install_omniORBpy = False"		>> ${WRKSRC}/setup.cfg
@@ -243,13 +244,18 @@ pre-configure:
 	${ECHO_CMD} "OPT_ENV = 'verbose=True'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_SCOTCH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_METIS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "HOME_GMSH = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "HOME_GIBI = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "HOME_HOMARD = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "INCLUDEDIR = ['${LOCALBASE}/include/hdf5-18', '${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\
 			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_MUMPS = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
-	${ECHO_CMD} "HOME_MFRONT = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
-.if ${MUMPS_PORT} == "mumps-mpich"
+# Disable MFront at the moment (compilation error)
+#	${ECHO_CMD} "HOME_MFRONT = '${LOCALBASE}'"		>> ${WRKSRC}/setup.cfg
+#	${ECHO_CMD} "TFELHOME = '${LOCALBASE}'"			>> ${WRKSRC}/setup.cfg
+	${REINPLACE_CMD} -e "s|waf configure|waf configure --disable-mfront|"	\
+		${WRKSRC}/products.py
 	${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'"			>> ${WRKSRC}/setup.cfg
-.endif
 	${ECHO_CMD} "CC='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "gcc='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXX='${CXX}'"				>> ${WRKSRC}/setup.cfg
@@ -257,7 +263,7 @@ pre-configure:
 	${ECHO_CMD} "F90='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'"		\
 		>> ${WRKSRC}/setup.cfg
-	${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic -lutil -lpthread -lz'"	\
+	${ECHO_CMD} "OTHERLIB='-Xlinker -export-dynamic ${MPISEQ} -lexecinfo -lutil -lpthread -lz'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "SYSLIB='-lpthread -lz'"			>> ${WRKSRC}/setup.cfg
 .if defined(WITH_MPI)
@@ -313,7 +319,7 @@ pre-configure:
 
 do-configure:
 	(cd ${CONFIGURE_WRKSRC}	\
-	&& TMPDIR=${WRKDIR} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS}	\
+	&& TMPDIR=${WRKDIR} ${MAKE_ENV} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS}	\
 		--prefix=${STAGEDIR}${inst_dir} test | tee ${CONFIGURE_LOG})
 	@${ECHO_MSG} "---------------- Debug ------------------"
 	${CAT} ${CONFIGURE_WRKSRC}/setup.log
@@ -365,6 +371,7 @@ post-install:
 	(cd ${STAGEDIR} && ${LN} -fs ${inst_dir}/${VE}/share/aster/${conf}	\
 		${STAGEDIR}${inst_dir}/STA${VE}/${conf})
 .endfor
+	${MKDIR} ${STAGEDIR}${tools_dir}
 .for outil in ${tools}
 	${LN} -fs ${LOCALBASE}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 .endfor
@@ -390,10 +397,10 @@ regression-test:	install
 	@${ECHO_MSG} "Note: homard must be installed to run some steps succesfully."
 	${CP} ${inst_dir}/${VE}/astout.export /tmp/
 	(cd ${inst_dir}/${VE} &&	\
-	${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run --list --all --vers=${VE}	\
+	${LOCALBASE}/aster/bin/as_run --list --all --vers=${VE}	\
 		--filter='"I" not in testlist' -o /tmp/list_seq )
 	(cd /tmp &&	\
-	${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run astout.export) || ${TRUE}
+	${LOCALBASE}/aster/bin/as_run astout.export) || ${TRUE}
 	@${ECHO_MSG} "Check /tmp/resu_test/NOOK"
 .endif
 

Modified: head/french/aster/bsd.aster.mk
==============================================================================
--- head/french/aster/bsd.aster.mk	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/french/aster/bsd.aster.mk	Tue Nov 14 18:29:22 2017	(r454187)
@@ -10,11 +10,11 @@ MASTER_SITES=	http://www.code-aster.org/FICHIERS/	\
 DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
 DISTINFO_FILE=	${.CURDIR}/../../french/aster/distinfo
 
-ASTER_VER=	12.6.0
-ASTER_DISTVERSION=	${ASTER_VER}-4
+ASTER_VER=	13.4.0
+ASTER_DISTVERSION=	${ASTER_VER}-3
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
 
-.if ${PORTNAME} == metis-edf
+.if ${PORTNAME} == metis-edf || ${PORTNAME} == mumps-edf
 TARNAME=	${PORTNAME:C|-edf||}
 .else
 TARNAME=	${PORTNAME}

Modified: head/french/aster/distinfo
==============================================================================
--- head/french/aster/distinfo	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/french/aster/distinfo	Tue Nov 14 18:29:22 2017	(r454187)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1473583156
-SHA256 (aster-full-src-12.6.0-4.noarch.tar.gz) = 8bf9eafed2b4cd28469eb18fc1e305d8708479f5beefe3f241bc259d07db7f8e
-SIZE (aster-full-src-12.6.0-4.noarch.tar.gz) = 286459637
+TIMESTAMP = 1509193793
+SHA256 (aster-full-src-13.4.0-3.noarch.tar.gz) = d32f7ef79ffeedd5ceb6bdda87350300402f6179678aeb8b145804927543cbf8
+SIZE (aster-full-src-13.4.0-3.noarch.tar.gz) = 265793726

Modified: head/french/aster/files/patch-as_setup.py
==============================================================================
--- head/french/aster/files/patch-as_setup.py	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/french/aster/files/patch-as_setup.py	Tue Nov 14 18:29:22 2017	(r454187)
@@ -1,4 +1,4 @@
---- as_setup.py.orig	2016-09-07 08:44:22 UTC
+--- as_setup.py.orig	2017-08-26 13:56:41 UTC
 +++ as_setup.py
 @@ -45,6 +45,8 @@ import tarfile
  import compileall
@@ -17,7 +17,7 @@
        self._print(self._fmt_title % _('Extraction'))
        if kargs.get('external')<>None:
           self._call_external(**kargs)
-@@ -518,6 +521,60 @@ class SETUP:
+@@ -518,6 +521,76 @@ class SETUP:
        if iextr_as:
           self.Clean(to_delete=path)
  
@@ -72,6 +72,22 @@
 +         nl = string.find(ligne, "opts.hdf5_libs = 'hdf5'")
 +         if nl > 0:
 +            ligne =ligne.replace("'hdf5'", "'hdf5-18'")
++         sys.stdout.write(ligne)
++      file2patch = os.path.join(self.workdir, self.content, 'waf')
++      self._print('FreeBSD patch: /bin/bash => modify ' + file2patch)
++      for ligne in fileinput.input(file2patch, inplace=1):
++         nl = 0
++         nl = string.find(ligne, "/bin/bash")
++         if nl > 0:
++            ligne =ligne.replace("/bin/bash", " %%LOCALBASE%%/bin/bash")
++         sys.stdout.write(ligne)
++      file2patch = os.path.join(self.workdir, self.content, 'waftools/mathematics.py')
++      self._print('FreeBSD patch: nproc => gnproc ' + file2patch)
++      for ligne in fileinput.input(file2patch, inplace=1):
++         nl = 0
++         nl = string.find(ligne, "'nproc'")
++         if nl > 0:
++            ligne =ligne.replace("'nproc'", "'gnproc'")
 +         sys.stdout.write(ligne)
 +      # End of FreeBSD patches
 +

Modified: head/french/aster/files/patch-check_compilers.py
==============================================================================
--- head/french/aster/files/patch-check_compilers.py	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/french/aster/files/patch-check_compilers.py	Tue Nov 14 18:29:22 2017	(r454187)
@@ -1,4 +1,4 @@
---- check_compilers.py.orig	2016-09-07 08:44:22 UTC
+--- check_compilers.py.orig	2017-08-26 13:56:41 UTC
 +++ check_compilers.py
 @@ -420,8 +420,7 @@ class GNU_COMPILER(CONFIGURE_COMPILER):
     def after_compilers(self):

Modified: head/french/aster/files/patch-check_compilers_src.py
==============================================================================
--- head/french/aster/files/patch-check_compilers_src.py	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/french/aster/files/patch-check_compilers_src.py	Tue Nov 14 18:29:22 2017	(r454187)
@@ -1,4 +1,4 @@
---- check_compilers_src.py.orig	2016-09-07 08:44:22 UTC
+--- check_compilers_src.py.orig	2017-08-26 13:56:41 UTC
 +++ check_compilers_src.py
 @@ -109,6 +109,9 @@ Code_Aster will be compiled without erro
  You must choose another compiler or change the optimization level.

Modified: head/french/aster/files/patch-products.py
==============================================================================
--- head/french/aster/files/patch-products.py	Tue Nov 14 18:09:35 2017	(r454186)
+++ head/french/aster/files/patch-products.py	Tue Nov 14 18:29:22 2017	(r454187)
@@ -1,6 +1,6 @@
---- products.py.orig	2016-09-07 08:44:22 UTC
+--- products.py.orig	2017-08-26 13:56:41 UTC
 +++ products.py
-@@ -117,8 +117,8 @@ def setup_hdf5(dep, summary, **kargs):
+@@ -118,8 +118,8 @@ def setup_hdf5(dep, summary, **kargs):
  
        actions=(
           ('IsInstalled', { 'filename' :
@@ -11,19 +11,17 @@
           } ),
           ('Extract'  , {}),
           # gcc>=4.9 not supported by configure, should not use -ansi
-@@ -842,8 +842,9 @@ def setup_aster(dep, summary, **kargs):
-       req=['ASTER_ROOT', 'ASTER_VERSION',
-            'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB',
+@@ -723,7 +723,8 @@ def setup_aster(dep, summary, **kargs):
             'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS',
--           'HOME_MED', 'HOME_HDF', # 'HOME_MFRONT', because of v11 branch
+            'HOME_MED', 'HOME_HDF', 'HOME_MFRONT',
+            #'HOME_GMSH', 'HOME_GIBI', 'HOME_HOMARD', optional
 -           'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ],
-+           'HOME_MED', 'HOME_HDF', 'HOME_MFRONT',
 +           'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', 'CFLAGS', 'LDFLAGS',
 +           'CFLAGS_DBG', 'FFLAGS', 'FFLAGS_DBG','F90FLAGS', 'F90FLAGS_DBG', 'CXXLIB', ],
        reqobj=['file:?ASTER_ROOT?/bin/as_run',
                'file:?ASTER_ROOT?/etc/codeaster/profile.sh'],
     )
-@@ -885,7 +886,8 @@ def setup_aster(dep, summary, **kargs):

*** DIFF OUTPUT TRUNCATED AT 1000 LINES ***

More information about the svn-ports-all mailing list