Upgrade Code_Aster to 12.0.6-4.

This brings french/eficas to 2016.0.1,
	cad/astk-serveur and astk-client to 1.13.8.2,
	french/med to 3.2.0 (built against hdf5-18),
	bump PORTREVSION to math/metis-edf and fix soname,
	and french/homard to 11.7-1.

cad/astk-serveur/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	astk
-DISTVERSION=	1.13.5-1
+DISTVERSION=	1.13.8-2
 CATEGORIES=	cad
 .if !defined(CLIENT_SEUL)
 PKGNAMESUFFIX=	-serveur
@@ -40,6 +40,7 @@ REINPLACE_ARGS=	-i ""
 
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION:S/-/./:R}/SRC
 
+NO_ARCH=	yes
 SUB_FILES=	pkg-message
 SUB_LIST=	inst_dir=${inst_dir} tools_dir=${tools_dir}
 PKGMESSAGE=	${WRKDIR}/pkg-message
@@ -47,8 +48,7 @@ LINSTDIR=	aster/ASTK
 inst_dir=	${PREFIX}/${LINSTDIR}
 aster_dir=	${LOCALBASE}/aster/${vaster}
 S_SCRIPTS=	bin/as_run bin/parallel_cp asrun/installation.py	\
-		share/codeaster/asrun/data/mpirun_template		\
-		etc/profile.csh
+		share/codeaster/asrun/data/mpirun_template
 S_PYLIBS=	share/codeaster/asrun/examples/alamain.py		\
 		unittest/datafiles/config_serveurs unittest/010_misc.py	\
 		unittest/015_package.py unittest/run_test.py
@@ -58,12 +58,13 @@ conf_dir=	${WRKSRC}/etc/astkrc
 
 .include <bsd.port.pre.mk>
 
+WRKCONF=	${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/configuration
 .if !defined(CLIENT_SEUL)
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION:R}/ASTK_SERV
 PATCHDIR=	${MASTERDIR}/files
-PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "		\
+PLIST_SUB=	ASTKDIR=${LINSTDIR}/ASTK_SERV SERV="" CLIENT="@comment "\
 		vaster=${vaster}
-PATCH2RM=	bin/as_run bin/parallel_cp etc/asrun etc/profile.csh etc/profile.sh	\
+PATCH2RM=	bin/as_run bin/parallel_cp etc/asrun etc/profile.sh	\
 		asrun/config.py asrun/installation.py asrun/system.py	\
 		asrun/common/sysutils.py asrun/system_command.py
 . if exists(${LOCALBASE}/sbin/pbs_server)
@@ -121,6 +122,9 @@ SHIA=		zsh
 .endif
 SHIADEP=	${SHIA}
 BASH2RC=	asrun/calcul.py share/codeaster/asrun/data/mpirun_template
+BASH2RC2=	lib/tkselecteur.tcl
+BASH2RC3=	deprecated_outils.sh extract_info.py deprecated_client.sh	\
+		deprecated_server.sh
 
 .if !defined(WITH_ED)
 . if exists(${LOCALBASE}/bin/nedit)
@@ -132,9 +136,6 @@ RUN_DEPENDS+=	${LOCALBASE}/bin/gvim:editors/vim
 . elif exists(${LOCALBASE}/bin/emacs)
 WITH_ED=	emacs
 RUN_DEPENDS+=	${LOCALBASE}/bin/emacs:editors/emacs
-. elif exists(${LOCALBASE}/bin/xemacs)
-WITH_ED=	xemacs
-RUN_DEPENDS+=	${LOCALBASE}/bin/xemacs:editors/xemacs
 . elif exists(${LOCALBASE}/bin/gedit)
 WITH_ED=	gedit
 RUN_DEPENDS+=	${LOCALBASE}/bin/gedit:editors/gedit
@@ -197,7 +198,6 @@ do-configure:
 		-e "s|LOCALBASE|${LOCALBASE}|"					\
 		${WRKSRC}/etc/${sc}
 . endfor
-. for sh in sh csh
 	${REINPLACE_CMD} -e "s|?ASTER_ROOT?|${LOCALBASE}/aster|"		\
 		-e 's|?HOME_PYTHON?|${PYTHONBASE}|'				\
 		-e 's|?ASRUN_SITE_PKG?|${PREFIX}/${LINSTDIR}/ASTK_SERV|'	\
@@ -205,8 +205,7 @@ do-configure:
 		-e 's|?HOME_MED?|${LOCALBASE}|'					\
 		-e 's|?HOME_HDF?|${LOCALBASE}|'					\
 		-e "s|?WISH_EXE?|${WISH}|"					\
-		${WRKSRC}/etc/profile.${sh}
-. endfor
+		${WRKSRC}/etc/profile.sh
 . for libs in ${S_PYLIBS}
 	${REINPLACE_CMD} -e "s|/opt/aster/NEW9|${aster_dir}|"			\
 		 -e "s|/opt/aster/NEW10|${aster_dir}|"				\
@@ -262,7 +261,13 @@ do-configure:
 		${WRKSRC}/lib/tkselecteur.tcl
 	${REINPLACE_CMD} -e "s|%%unamesm%%|${unamesm}|"				\
 		${WRKSRC}/lib/init.tcl
+. for sh in ${BASH2RC2}
+	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKSRC}/${sh}
+. endfor
 .endif
+.for sh in ${BASH2RC3}
+	${REINPLACE_CMD} -e 's|/bin/bash|${SHELL_INSTALL_ASTER}|' ${WRKCONF}/${sh}
+.endfor
 
 do-install:
 	${MKDIR} ${STAGEDIR}${inst_dir}
@@ -278,6 +283,7 @@ do-install:
 	(cd ${STAGEDIR}${PREFIX} \
 		 && ${PYTHON_CMD} -O ${PYTHON_LIBDIR}/compileall.py \
 		 -d ${PREFIX} -f aster)
+	${MV} ${STAGEDIR}${ETCDIR}/profile.sh ${STAGEDIR}${ETCDIR}/profile_astk.sh
 . if defined(WITH_MPI)
 	${ECHO_CMD} "localhost" > ${STAGEDIR}${PREFIX}/aster/aster-mpihosts
 . endif

cad/astk-serveur/files.client/patch-bin_astk

@@ -1,5 +1,5 @@
---- bin/astk.orig	2011-12-20 13:33:00.000000000 +0100
-+++ bin/astk	2012-05-08 12:31:09.000000000 +0200
+--- bin/astk.orig	2015-08-05 15:37:44 UTC
++++ bin/astk
 @@ -17,15 +17,9 @@
  #    1 AVENUE DU GENERAL DE GAULLE, 92141 CLAMART CEDEX, FRANCE.
  # ==============================================================================
@@ -9,19 +9,18 @@
 -    local bin=`dirname $this`
 -    prefix=`dirname $bin`
 -}
+-
+-set_prefix $0
 +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
-@@ -43,5 +37,5 @@
+@@ -43,4 +37,4 @@ if [ -z "$WISHEXECUTABLE" ]; then
     WISHEXECUTABLE=wish
  fi
  
 -$WISHEXECUTABLE $ASTER_ROOT/lib/astk/astk.tcl -- $* &
 +$WISHEXECUTABLE $prefix/lib/astk.tcl -- $* &
- 

cad/astk-serveur/files/patch-etc_profile.csh

@@ -1,14 +0,0 @@
---- ./etc/profile.csh.orig	2009-12-23 15:53:06.000000000 +0100
-+++ ./etc/profile.csh	2010-01-10 21:45:50.000000000 +0100
-@@ -38,6 +38,11 @@
- # this should not be usefull...
- #setenv 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>
-+setenv HOME_MED ?HOME_MED?
-+setenv HOME_HDF ?HOME_HDF?
-+
- setenv WISHEXECUTABLE ?WISH_EXE?
- 
- 

cad/astk-serveur/pkg-plist

@@ -372,6 +372,9 @@
 %%SERV%%%%ASTKDIR%%/asrun/plugins/default.py
 %%SERV%%%%ASTKDIR%%/asrun/plugins/default.pyc
 %%SERV%%%%ASTKDIR%%/asrun/plugins/default.pyo
+%%SERV%%%%ASTKDIR%%/asrun/plugins/generic_func.py
+%%SERV%%%%ASTKDIR%%/asrun/plugins/generic_func.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/generic_func.pyo
 %%SERV%%%%ASTKDIR%%/asrun/plugins/rsh_server.py
 %%SERV%%%%ASTKDIR%%/asrun/plugins/rsh_server.pyc
 %%SERV%%%%ASTKDIR%%/asrun/plugins/rsh_server.pyo
@@ -381,6 +384,9 @@
 %%SERV%%%%ASTKDIR%%/asrun/plugins/sftp_server.py
 %%SERV%%%%ASTKDIR%%/asrun/plugins/sftp_server.pyc
 %%SERV%%%%ASTKDIR%%/asrun/plugins/sftp_server.pyo
+%%SERV%%%%ASTKDIR%%/asrun/plugins/webdav_server.py
+%%SERV%%%%ASTKDIR%%/asrun/plugins/webdav_server.pyc
+%%SERV%%%%ASTKDIR%%/asrun/plugins/webdav_server.pyo
 %%SERV%%%%ASTKDIR%%/asrun/profil.py
 %%SERV%%%%ASTKDIR%%/asrun/profil.pyc
 %%SERV%%%%ASTKDIR%%/asrun/profil.pyo
@@ -399,6 +405,9 @@
 %%SERV%%%%ASTKDIR%%/asrun/run.py
 %%SERV%%%%ASTKDIR%%/asrun/run.pyc
 %%SERV%%%%ASTKDIR%%/asrun/run.pyo
+%%SERV%%%%ASTKDIR%%/asrun/runner.py
+%%SERV%%%%ASTKDIR%%/asrun/runner.pyc
+%%SERV%%%%ASTKDIR%%/asrun/runner.pyo
 %%SERV%%%%ASTKDIR%%/asrun/schema.py
 %%SERV%%%%ASTKDIR%%/asrun/schema.pyc
 %%SERV%%%%ASTKDIR%%/asrun/schema.pyo
@@ -448,13 +457,18 @@
 %%SERV%%%%ASTKDIR%%/etc/plugins/aster5.py
 %%SERV%%%%ASTKDIR%%/etc/plugins/aster5.pyc
 %%SERV%%%%ASTKDIR%%/etc/plugins/aster5.pyo
+%%SERV%%%%ASTKDIR%%/etc/plugins/athosdev.py
+%%SERV%%%%ASTKDIR%%/etc/plugins/athosdev.pyc
+%%SERV%%%%ASTKDIR%%/etc/plugins/athosdev.pyo
 %%SERV%%%%ASTKDIR%%/etc/plugins/ivanoe.py
 %%SERV%%%%ASTKDIR%%/etc/plugins/ivanoe.pyc
 %%SERV%%%%ASTKDIR%%/etc/plugins/ivanoe.pyo
 %%SERV%%%%ASTKDIR%%/etc/plugins/sge_pe.py
 %%SERV%%%%ASTKDIR%%/etc/plugins/sge_pe.pyc
 %%SERV%%%%ASTKDIR%%/etc/plugins/sge_pe.pyo
-%%SERV%%%%ASTKDIR%%/etc/profile.csh
+%%SERV%%%%ASTKDIR%%/etc/plugins/tail_slurm.py
+%%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
@@ -579,11 +593,16 @@
 %%SERV%%%%ETCDIR%%/plugins/aster5.py
 %%SERV%%%%ETCDIR%%/plugins/aster5.pyc
 %%SERV%%%%ETCDIR%%/plugins/aster5.pyo
+%%SERV%%%%ETCDIR%%/plugins/athosdev.py
+%%SERV%%%%ETCDIR%%/plugins/athosdev.pyc
+%%SERV%%%%ETCDIR%%/plugins/athosdev.pyo
 %%SERV%%%%ETCDIR%%/plugins/ivanoe.py
 %%SERV%%%%ETCDIR%%/plugins/ivanoe.pyc
 %%SERV%%%%ETCDIR%%/plugins/ivanoe.pyo
 %%SERV%%%%ETCDIR%%/plugins/sge_pe.py
 %%SERV%%%%ETCDIR%%/plugins/sge_pe.pyc
 %%SERV%%%%ETCDIR%%/plugins/sge_pe.pyo
-%%SERV%%%%ETCDIR%%/profile.csh
-%%SERV%%%%ETCDIR%%/profile.sh
+%%SERV%%%%ETCDIR%%/plugins/tail_slurm.py
+%%SERV%%%%ETCDIR%%/plugins/tail_slurm.pyc
+%%SERV%%%%ETCDIR%%/plugins/tail_slurm.pyo
+%%SERV%%%%ETCDIR%%/profile_astk.sh

french/aster/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	aster
 DISTVERSION=	${ASTER_DISTVERSION}
-PORTREVISION=	2
+CATEGORIES=	french cad
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -36,15 +36,16 @@ BUILD_DEPENDS+=	astk-serveur>0:cad/astk-serveur	\
 		${LOCALBASE}/lib/libscotch.a:cad/scotch		\
 		python:lang/python				\
 		${PYNUMPY}
-LIB_DEPENDS+=	libhdf5.so:science/hdf5				\
+LIB_DEPENDS+=	libhdf5-18.so:science/hdf5-18			\
 		libmed.so:french/med				\
-		libmetis.so.0:math/metis-edf
-RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gnuplot>0:math/py-gnuplot	\
+		libmetis.so.0:math/metis-edf			\
+		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
 
-USES=		bison fortran tk python:2
+USES=		bison fortran gettext python:2 tk
 USE_BINUTILS=	yes
 
 .if defined(WITH_ATLAS)
@@ -54,7 +55,7 @@ USES+=		blaslapack:netlib
 .endif
 
 HAS_CONFIGURE=	yes
-MAKE_ENV=	INCLUDES="${LOCALBASE}/include ${LOCALBASE}/include/metis"
+MAKE_ENV=	INCLUDES="${LOCALBASE}/include/hdf5-18 ${LOCALBASE}/include ${LOCALBASE}/include/metis"
 REINPLACE_ARGS=	-i ""
 
 VER=		${PORTVERSION:R}
@@ -163,12 +164,11 @@ WITH_ED=	vi
 
 INST_DAT=	elements
 INST_SH=	as_run parallel_cp
-PFX2FIX=	bin/as_run ${VE}/include/aster/asterc_config.h ${VE}/config.txt	\
-		${VE}/include/aster/asterf_config.h ${VE}/profile.sh		\
-		${VE}/lib/aster/aster_pkginfo.py
-V_HOMARD=	V11_2
-V_HOMARD0=	V10_6
-V_H2FIX=	${VE}/lib/aster/Cata/cata.py ${VE}/tests/zzzz121a.comm
+PFX2FIX=	bin/as_run ${VE}/include/aster/asterc_config.h			\
+		${VE}/include/aster/asterf_config.h ${VE}/share/aster/profile.sh\
+		etc/codeaster/profile.sh etc/codeaster/aster			\
+		${VE}/lib/aster/aster_pkginfo.py ${VE}/aster.conf		\
+		${VE}/share/aster/CTestTestfile.cmake ${VE}/share/aster/config.txt
 inst_dir=	${PREFIX}/${PORTNAME}
 tools_dir=	${PREFIX}/${PORTNAME}/outils
 tools=		kmetis onmetis pmetis gnuplot
@@ -240,9 +240,10 @@ 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} "INCLUDEDIR = ['${LOCALBASE}/include', '${LOCALBASE}/include/metis', ]"\
+	${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"
 	${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'"			>> ${WRKSRC}/setup.cfg
 .endif
@@ -276,7 +277,7 @@ pre-configure:
 	${ECHO_CMD} "SHELL_EXECUTION='${SHELL_INSTALL_ASTER}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "TERMINAL='xterm'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "EDITOR='${WITH_ED}'"			>> ${WRKSRC}/setup.cfg
-	${ECHO_CMD} "LDFLAGS='-v ${LDFLAGS}'"			>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "LDFLAGS='${LDFLAGS}'"			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS='-c ${FFLAGS} -fno-tree-dse ${FLAGARCH}'"	\
 		>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "FFLAGS_DBG='-c -g ${FFLAGS:C|O2|O0|} -fno-tree-dse ${FLAGARCH}'"	\
@@ -309,8 +310,8 @@ pre-configure:
 
 do-configure:
 	(cd ${CONFIGURE_WRKSRC}	\
-	&& TMPDIR=${WRKDIR} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS} test	\
-		--prefix=${STAGEDIR}${inst_dir}	| tee ${CONFIGURE_LOG})
+	&& TMPDIR=${WRKDIR} ${PYTHON_CMD} setup.pyo ${DEBUG_FLAGS}	\
+		--prefix=${STAGEDIR}${inst_dir} test | tee ${CONFIGURE_LOG})
 	@${ECHO_MSG} "---------------- Debug ------------------"
 	${CAT} ${CONFIGURE_WRKSRC}/setup.log
 	@${ECHO_MSG} "------------ Fin debug ------------------"
@@ -325,6 +326,8 @@ post-configure:
 		${STAGEDIR}${inst_dir}
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|'	\
 		${STAGEDIR}${inst_dir}/bin/as_run
+	${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/profile_astk.sh	\
+		${STAGEDIR}${inst_dir}/etc/codeaster/profile.sh
 .for sf in etc/codeaster/profile.sh asrun/installation.py
 	${REINPLACE_CMD} -e 's|${LOCALBASE}/aster/ASTK/ASTK_SERV|${STAGEDIR}${inst_dir}|g'	\
 		-e 's|${LOCALBASE}/aster|${STAGEDIR}${inst_dir}|g'	\
@@ -341,15 +344,6 @@ do-install:
 	@${DO_NADA}
 
 post-install:
-	${RM} -r ${STAGEDIR}${inst_dir}/etc	# Installed by cad/astk-serveur
-	${MV} ${STAGEDIR}${inst_dir}/${VE}/share/aster/tests	\
-		${STAGEDIR}${inst_dir}/${VE}/
-	${MV} ${STAGEDIR}${inst_dir}/${VE}/share/aster/*	\
-		${STAGEDIR}${inst_dir}/${VE}/
-	${RM} -r ${STAGEDIR}${inst_dir}/${VE}/share
-.for f in ${V_H2FIX}
-	${REINPLACE_CMD} -e 's|${V_HOMARD0}|${V_HOMARD}|' ${STAGEDIR}${inst_dir}/${f}
-.endfor
 .for f in ${PFX2FIX}
 	${REINPLACE_CMD} -e 's|${STAGEDIR}||g' ${STAGEDIR}${inst_dir}/${f}
 .endfor
@@ -364,6 +358,10 @@ post-install:
 		> ${STAGEDIR}${inst_dir}/${VE}/astout.export
 	(cd ${STAGEDIR}${inst_dir} &&	\
 		${LN} -fs ${VE} ${STAGEDIR}${inst_dir}/STA${VE})
+.for conf in config.txt profile.sh
+	(cd ${STAGEDIR} && ${LN} -fs ${inst_dir}/${VE}/share/aster/${conf}	\
+		${STAGEDIR}${inst_dir}/STA${VE}/${conf})
+.endfor
 .for outil in ${tools}
 	${LN} -fs ${LOCALBASE}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 .endfor
@@ -375,6 +373,14 @@ post-install:
 	${LN} -fs ${ASTKDIR}/bin/${outil} ${STAGEDIR}${tools_dir}/${outil}
 . endfor
 .endif
+	${MKDIR} ${WRKDIR}/AvoidConflictWithASTK
+.for f in aster.install_${VE} profile.sh
+	${MV} ${STAGEDIR}${inst_dir}/etc/codeaster/${f} ${WRKDIR}/AvoidConflictWithASTK/
+.endfor
+	${RM} -r ${STAGEDIR}${inst_dir}/etc/codeaster/*
+.for f in aster.install_${VE} profile.sh
+	${MV} ${WRKDIR}/AvoidConflictWithASTK/${f} ${STAGEDIR}${inst_dir}/etc/codeaster/
+.endfor
 
 .if defined(MAINTAINER_MODE)
 regression-test:	install

french/aster/bsd.aster.mk

@@ -10,8 +10,8 @@ MASTER_SITES=	http://www.code-aster.org/FICHIERS/	\
 DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
 DISTINFO_FILE=	${.CURDIR}/../../french/aster/distinfo
 
-ASTER_VER=	11.7.0
-ASTER_DISTVERSION=	${ASTER_VER}-1
+ASTER_VER=	12.6.0
+ASTER_DISTVERSION=	${ASTER_VER}-4
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
 
 .if ${PORTNAME} == metis-edf

french/aster/distinfo

@@ -1,2 +1,3 @@
-SHA256 (aster-full-src-11.7.0-1.noarch.tar.gz) = 94632f3801249d7464be0031f9aeaa4760f0a3ebde575cb0bdfe64f0fcdd316c
-SIZE (aster-full-src-11.7.0-1.noarch.tar.gz) = 186807735
+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

french/aster/files/bibc_utilitai_mempid.c.diff

@@ -1,79 +0,0 @@
---- bibc/utilitai/mempid.c.orig	2013-12-16 09:25:29.000000000 +0100
-+++ bibc/utilitai/mempid.c	2014-05-20 22:28:25.000000000 +0200
-@@ -19,7 +19,14 @@
- #include "aster.h"
- 
- #ifdef _POSIX
--#include <fcntl.h>
-+# ifdef __FreeBSD__
-+#  include <kvm.h>
-+#  include <sys/param.h>
-+#  include <sys/sysctl.h>
-+#  include <sys/user.h>
-+#  include <err.h>
-+# endif
-+# include <fcntl.h>
- #endif
- 
- /*
-@@ -40,9 +47,48 @@
-     pid_t numpro;
- #ifdef _POSIX
-     pid_t getpid(void);
--    
-+
-     numpro = getpid();
- 
-+# ifdef __FreeBSD__
-+/*
-+** FreeBSD and some others without /proc ?
-+*/
-+
-+
-+#define B2K(x) ((x) >> 10) /* bytes to kbytes */
-+#define P2K(x) ((x) << (PAGE_SHIFT - 10)) /* pages to kbytes */
-+
-+    char errbuf[_POSIX2_LINE_MAX];
-+    struct kinfo_proc *kp;
-+    kvm_t *kd;
-+    int count;
-+    kd = kvm_openfiles(NULL, "/dev/null", NULL, O_RDONLY, errbuf);
-+    if (kd == NULL)
-+        errx(1, "kvm_openfiles: %s", errbuf);
-+
-+    kp = kvm_getprocs(kd, KERN_PROC_PID, numpro, &count);
-+    if (kp == NULL) {
-+        (void)fprintf(stderr, "kvm_getprocs: %s", kvm_geterr(kd));
-+        kvm_close(kd);
-+        return -1;
-+    }
-+
-+    kvm_close(kd);
-+
-+    /* VmData */
-+    val[0] = P2K((uintmax_t)kp->ki_dsize);
-+    /* VmSize */
-+    val[1] = B2K((uintmax_t)kp->ki_size);
-+    /* VmPeak - not defined in /compat/linux/proc/pid/status */
-+    val[2] = -1;
-+    /* VmRSS */
-+    val[3] = P2K((uintmax_t)kp->ki_rssize);
-+    /* VmStk */
-+    lmem = P2K((uintmax_t)kp->ki_ssize);
-+
-+# else /* Linux */
-+
-     sprintf(filename, "/proc/%ld/status", (long)numpro);
-     fd = open(filename, O_RDONLY, 0);
-     if (fd==-1) return -1;
-@@ -68,7 +114,10 @@
-       
-     S=strstr(sbuf,"VmStk:")+7;
-     lmem = atoi(S);
-+# endif
-+
-     return lmem ;
-+
- #else
- /* 
- ** Pour retourner des valeurs sous Windows

french/aster/files/patch-as_setup.py

@@ -1,6 +1,6 @@
---- as_setup.py.orig	2014-03-05 09:41:19.000000000 +0100
-+++ as_setup.py	2014-05-24 15:16:48.000000000 +0200
-@@ -45,6 +45,8 @@
+--- as_setup.py.orig	2016-09-07 08:44:22 UTC
++++ as_setup.py
+@@ -45,6 +45,8 @@ import tarfile
  import compileall
  import imp
  import pprint
@@ -9,7 +9,7 @@
  import distutils.sysconfig as SC
  from subprocess import Popen, PIPE
  
-@@ -408,6 +410,7 @@
+@@ -410,6 +412,7 @@ class SETUP:
              archive filename !),
           extract_as : rename content.
        """
@@ -17,7 +17,7 @@
        self._print(self._fmt_title % _('Extraction'))
        if kargs.get('external')<>None:
           self._call_external(**kargs)
-@@ -516,6 +519,47 @@
+@@ -518,6 +521,52 @@ class SETUP:
        if iextr_as:
           self.Clean(to_delete=path)
  
@@ -55,11 +55,16 @@
 +            if nl > 0:
 +               ligne =ligne.replace("malloc.h", "stdlib.h")
 +         sys.stdout.write(ligne)
-+      file2patch = os.path.join(self.workdir, self.content, 'bibc/utilitai/mempid.c')
-+      self._print('FreeBSD patch: VmData VmSize and VmPeak in /proc/%pid%/status ' + file2patch)
 +      system=SYSTEM({ 'verbose' : True, 'debug' : False },
 +         **{'maxcmdlen' : 2**31, 'log' : self})
-+      iret, out = system.local_shell('cd ' + os.path.join(self.workdir, self.content) + '&& /usr/bin/patch -p0 < ' + '%%FILESDIR%%' + '/bibc_utilitai_mempid.c.diff')
++      file2patch = os.path.join(self.workdir, self.content, 'waftools/med.py')
++      self._print('FreeBSD patch: only hdf5-18 is supported ' + file2patch)
++      for ligne in fileinput.input(file2patch, inplace=1):
++         nl = 0
++         nl = string.find(ligne, "opts.hdf5_libs = 'hdf5'")
++         if nl > 0:
++            ligne =ligne.replace("'hdf5'", "'hdf5-18'")
++         sys.stdout.write(ligne)
 +      # End of FreeBSD patches
 +
  #-------------------------------------------------------------------------------

french/aster/files/patch-check_compilers.py

@@ -1,6 +1,6 @@
---- check_compilers.py.orig	2014-07-07 21:31:29.000000000 +0200
-+++ check_compilers.py	2014-08-17 17:54:05.000000000 +0200
-@@ -420,8 +420,7 @@
+--- check_compilers.py.orig	2016-09-07 08:44:22 UTC
++++ check_compilers.py
+@@ -420,8 +420,7 @@ class GNU_COMPILER(CONFIGURE_COMPILER):
     def after_compilers(self):
        """Define libs to search."""
        # prefer always libstdc++.so to the static one

french/aster/files/patch-check_compilers_src.py

@@ -1,6 +1,6 @@
---- check_compilers_src.py.orig	2013-12-19 15:44:50.000000000 +0100
-+++ check_compilers_src.py	2013-12-28 15:09:39.000000000 +0100
-@@ -109,6 +109,9 @@
+--- check_compilers_src.py.orig	2016-09-07 08:44:22 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.
  You can cancel now or make the changes later in the config.txt file of
  Code_Aster and rebuild it.

french/aster/files/patch-products.py

@@ -1,16 +1,29 @@
---- products.py.orig	2014-12-19 10:21:30.000000000 +0100
-+++ products.py	2015-02-15 19:39:55.000000000 +0100
-@@ -777,7 +777,8 @@
+--- products.py.orig	2016-09-07 08:44:22 UTC
++++ products.py
+@@ -117,8 +117,8 @@ def setup_hdf5(dep, summary, **kargs):
+ 
+       actions=(
+          ('IsInstalled', { 'filename' :
+-             [osp.join('__setup.installdir__', 'lib', 'libhdf5.a'),
+-              osp.join('__setup.installdir__', 'include', 'hdf5.h')]
++             [osp.join('__setup.installdir__', 'lib', 'libhdf5-18.a'),
++              osp.join('__setup.installdir__', 'include/hdf5-18', 'hdf5.h')]
+          } ),
+          ('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',
             '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', because of v11 branch
 -           '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'],
     )
-@@ -817,7 +818,8 @@
+@@ -885,7 +886,8 @@ def setup_aster(dep, summary, **kargs):
              'capturestderr' : False,
           }),
           ('Make'  , {

french/aster/files/patch-setup.cfg

@@ -1,6 +1,6 @@
---- setup.cfg.orig	2012-01-11 16:29:00.000000000 +0100
-+++ setup.cfg	2012-04-30 18:11:37.000000000 +0200
-@@ -66,7 +66,7 @@
+--- setup.cfg.orig	2016-09-07 08:44:22 UTC
++++ setup.cfg
+@@ -69,7 +69,7 @@ PREFER_COMPILER = 'GNU'
  # If a file or library is not found in these directories, you may try
  # using 'locate' command. Default is not to use locate because it usually
  # causes failure with inconsistent versions.
@@ -9,7 +9,7 @@
  USE_LOCATE = False
  
  #-------------------------------------------------------------------------------
-@@ -111,7 +111,7 @@
+@@ -109,7 +109,7 @@ USE_LOCATE = False
  #INCLUDEDIR=['/myprefix/include', ]
  
  # To search for shared libraries first

french/aster/files/patch-setup.py

@@ -1,16 +1,15 @@
---- setup.py.orig	2013-07-29 11:39:57.000000000 +0200
-+++ setup.py	2013-08-15 17:14:57.000000000 +0200
-@@ -330,7 +330,8 @@
-    log._print(_separ, """Installation on :
- %s""" % sident, _separ)
- 
--   common_libs = ['pthread', 'z']
-+   # FreeBSD patch: no -lpthread, but PTHREAD_LIBS already added
+--- setup.py.orig	2016-09-07 08:44:22 UTC
++++ setup.py
+@@ -357,7 +357,7 @@ def main():
+       else:
+          cfg['IFDEF'] = 'DARWIN'
+    elif plt.startswith('freebsd'):
+-      common_libs = []
 +      common_libs = ['z']
-    if plt.startswith('linux'):
-        plt = 'linux'
-    if plt == 'win32':
-@@ -502,7 +503,10 @@
+       cfg['IFDEF']='FREEBSD'
+       cfg['ARCH'] = 'x86'
+       if machine.endswith('64'):
+@@ -513,7 +513,10 @@ def main():
     # 1.4.1g. ----- check for system dependent libraries (and only used by Code_Aster)
     cfg['SYSLIB'] = cfg.get('SYSLIB', '')
     aster_sys_lib = []

french/aster/files/pkg-message.in

@@ -1,11 +1,3 @@
-Pour lancer Code_Aster via ASTK, entrez :
-%%tools_dir%%/astk
-
-Sur plates-formes i386 ou amd64, nous vous suggérons d'installer les ports
-french/gibi et french/homard, deux outils de maillage additionnels.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
 To run Code_Aster through ASTK, type:
 %%tools_dir%%/astk
 

french/aster/files/pkg-message.sans-astk.in

@@ -1,12 +1,3 @@
-Après avoir installé Code_Aster, vous devriez installer ASTK
-[cad/astk-serveur et cad/astk-client].
-ASTK est une interface graphique qui lance Code_Aster.
-
-Sur plate-forme i386, nous vous suggérons d'installer les ports french/gibi
-et french/homard, deux outils de maillage additionnels.
-
-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
-
 After Code_Aster installation you could install ASTK
 [cad/astk-serveur and cad/astk-client].
 ASTK is a graphic interface to run Code_Aster.

french/eficas/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	eficas
-DISTVERSION=	7.5.0-1
+DISTVERSION=	2016.0-1
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -15,8 +15,8 @@ RUN_DEPENDS=	${PYTHON_PKGNAMEPREFIX}Pmw>0:x11-toolkits/py-Pmw	\
 		bash:shells/bash					\
 		${PYNUMPY}
 
-USES=		shebangfix python
-USE_GCC=	yes # To be removed - Needed as a work-around for numpy, see PR ports/188114
+USES=		python shebangfix
+#USE_GCC=	yes # To be removed - Needed as a work-around for numpy, see PR ports/188114
 SHEBANG_FILES=	eficas eficasQt
 REINPLACE_ARGS=	-i ""
 NO_BUILD=	yes
@@ -37,9 +37,7 @@ EF_LANG=	ang
 RUN_DEPENDS+=	${PYTHON_SITELIBDIR}/PyQt4/QtGui.so:x11-toolkits/py-qt4-gui	\
 		xdg-open:devel/xdg-utils
 
-FIXUBIN=	Openturns_Study/prefs_OPENTURNS_STUDY.py	\
-		Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py	\
-		Aster/prefs_ASTER.py
+FIXUBIN=	Aster/prefs_ASTER.py
 
 pre-configure:
 	${REINPLACE_CMD} -e "s#lang='fr'#lang='${EF_LANG}'#"		\

french/eficas/files/patch-eficasQt

@@ -1,5 +1,5 @@
---- eficasQt.orig	2014-04-17 22:44:45.000000000 +0200
-+++ eficasQt	2014-04-17 22:49:47.000000000 +0200
+--- eficasQt.orig	2015-08-22 20:27:05 UTC
++++ eficasQt
 @@ -18,21 +18,19 @@
  # ==============================================================================
  
@@ -30,10 +30,9 @@
  fi
  
  # start Python interpreter
-@@ -44,5 +42,5 @@
+@@ -44,4 +42,4 @@ PYTHONPATH=$PYTHONPATH:$EFICAS_ROOT
  PYTHONPATH=$PYTHONPATH:$EFICAS_ROOT/UiQT4
  PYTHONPATH=$PYTHONPATH:$EFICAS_ROOT/Editeur
  
 -$PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.py $*
 +LD_LIBRARY_PATH=$FIXNUMPY $PYTHONEXECUTABLE $eficasdir/Aster/qtEficas_aster.pyo $*
- 

french/eficas/pkg-message

@@ -1,9 +1,2 @@
 Warning: if py27-Pmw and py27-tkinter are built against different
 versions of Tk, eficas won't run!
-
-When upgrading, don't forget to remove the line
-catalogues      = (('ASTER', ...
-from your $HOME/.Eficas_install/editeur.ini .
-
-The documentation is available as a separate package.
-Please see the port french/eficas_doc.

french/eficas/pkg-plist

@@ -115,6 +115,7 @@
 %%EFICASDIR%%/Aide/fichiers_OPENTURNS_STUDY/EficasGui.txt
 %%EFICASDIR%%/Aide/fichiers_OPENTURNS_STUDY/UncertaintyStudy.txt
 %%EFICASDIR%%/Aide/fichiers_OPENTURNS_STUDY/index.html
+%%EFICASDIR%%/Aster/Doc/clefs_docu_oldstable
 %%EFICASDIR%%/Aster/Doc/clefs_docu_stable
 %%EFICASDIR%%/Aster/Doc/clefs_docu_testing
 %%EFICASDIR%%/Aster/configuration_ASTER.py
@@ -355,6 +356,9 @@
 %%EFICASDIR%%/Ihm/I_EXCLUS.py
 %%EFICASDIR%%/Ihm/I_EXCLUS.pyc
 %%EFICASDIR%%/Ihm/I_EXCLUS.pyo
+%%EFICASDIR%%/Ihm/I_FICHIER.py
+%%EFICASDIR%%/Ihm/I_FICHIER.pyc
+%%EFICASDIR%%/Ihm/I_FICHIER.pyo
 %%EFICASDIR%%/Ihm/I_FONCTION.py
 %%EFICASDIR%%/Ihm/I_FONCTION.pyc
 %%EFICASDIR%%/Ihm/I_FONCTION.pyo
@@ -754,39 +758,12 @@
 %%EFICASDIR%%/Noyau/strfunc.py
 %%EFICASDIR%%/Noyau/strfunc.pyc
 %%EFICASDIR%%/Noyau/strfunc.pyo
-%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V8.py
-%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V8.pyc
-%%EFICASDIR%%/Openturns_Study/OpenTURNS_Cata_Study_V8.pyo
-%%EFICASDIR%%/Openturns_Study/configuration_OPENTURNS_STUDY.py
-%%EFICASDIR%%/Openturns_Study/configuration_OPENTURNS_STUDY.pyc
-%%EFICASDIR%%/Openturns_Study/configuration_OPENTURNS_STUDY.pyo
-%%EFICASDIR%%/Openturns_Study/opsOT.py
-%%EFICASDIR%%/Openturns_Study/opsOT.pyc
-%%EFICASDIR%%/Openturns_Study/opsOT.pyo
-%%EFICASDIR%%/Openturns_Study/prefs.py
-%%EFICASDIR%%/Openturns_Study/prefs.pyc
-%%EFICASDIR%%/Openturns_Study/prefs.pyo
-%%EFICASDIR%%/Openturns_Study/prefs_OPENTURNS_STUDY.py
-%%EFICASDIR%%/Openturns_Study/prefs_OPENTURNS_STUDY.pyc
-%%EFICASDIR%%/Openturns_Study/prefs_OPENTURNS_STUDY.pyo
-%%EFICASDIR%%/Openturns_Study/qtEficas_openturns_study.py
-%%EFICASDIR%%/Openturns_Study/qtEficas_openturns_study.pyc
-%%EFICASDIR%%/Openturns_Study/qtEficas_openturns_study.pyo
-%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.py
-%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.pyc
-%%EFICASDIR%%/Openturns_Wrapper/OpenTURNS_Cata_Wrapper_V4.pyo
-%%EFICASDIR%%/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.py
-%%EFICASDIR%%/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.pyc
-%%EFICASDIR%%/Openturns_Wrapper/configuration_OPENTURNS_WRAPPER.pyo
-%%EFICASDIR%%/Openturns_Wrapper/prefs.py
-%%EFICASDIR%%/Openturns_Wrapper/prefs.pyc
-%%EFICASDIR%%/Openturns_Wrapper/prefs.pyo
-%%EFICASDIR%%/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.py
-%%EFICASDIR%%/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.pyc
-%%EFICASDIR%%/Openturns_Wrapper/prefs_OPENTURNS_WRAPPER.pyo
-%%EFICASDIR%%/Openturns_Wrapper/qtEficas_openturns_wrapper.py
-%%EFICASDIR%%/Openturns_Wrapper/qtEficas_openturns_wrapper.pyc
-%%EFICASDIR%%/Openturns_Wrapper/qtEficas_openturns_wrapper.pyo
+%%EFICASDIR%%/Traducteur/__init__.py
+%%EFICASDIR%%/Traducteur/__init__.pyc
+%%EFICASDIR%%/Traducteur/__init__.pyo
+%%EFICASDIR%%/Traducteur/calcG.py
+%%EFICASDIR%%/Traducteur/calcG.pyc
+%%EFICASDIR%%/Traducteur/calcG.pyo
 %%EFICASDIR%%/Traducteur/changeValeur.py
 %%EFICASDIR%%/Traducteur/changeValeur.pyc
 %%EFICASDIR%%/Traducteur/changeValeur.pyo
@@ -796,6 +773,12 @@
 %%EFICASDIR%%/Traducteur/inseremocle.py
 %%EFICASDIR%%/Traducteur/inseremocle.pyc
 %%EFICASDIR%%/Traducteur/inseremocle.pyo
+%%EFICASDIR%%/Traducteur/load.py
+%%EFICASDIR%%/Traducteur/load.pyc
+%%EFICASDIR%%/Traducteur/load.pyo
+%%EFICASDIR%%/Traducteur/log.py
+%%EFICASDIR%%/Traducteur/log.pyc
+%%EFICASDIR%%/Traducteur/log.pyo
 %%EFICASDIR%%/Traducteur/mocles.py
 %%EFICASDIR%%/Traducteur/mocles.pyc
 %%EFICASDIR%%/Traducteur/mocles.pyo
@@ -817,6 +800,18 @@
 %%EFICASDIR%%/Traducteur/traduitV10V11.py
 %%EFICASDIR%%/Traducteur/traduitV10V11.pyc
 %%EFICASDIR%%/Traducteur/traduitV10V11.pyo
+%%EFICASDIR%%/Traducteur/traduitV11V12.py
+%%EFICASDIR%%/Traducteur/traduitV11V12.pyc
+%%EFICASDIR%%/Traducteur/traduitV11V12.pyo
+%%EFICASDIR%%/Traducteur/traduitV9V10.py
+%%EFICASDIR%%/Traducteur/traduitV9V10.pyc
+%%EFICASDIR%%/Traducteur/traduitV9V10.pyo
+%%EFICASDIR%%/Traducteur/utils.py
+%%EFICASDIR%%/Traducteur/utils.pyc
+%%EFICASDIR%%/Traducteur/utils.pyo
+%%EFICASDIR%%/Traducteur/visiteur.py
+%%EFICASDIR%%/Traducteur/visiteur.pyc
+%%EFICASDIR%%/Traducteur/visiteur.pyo
 %%EFICASDIR%%/UiQT4/OptionsCuve.py
 %%EFICASDIR%%/UiQT4/OptionsCuve.pyc
 %%EFICASDIR%%/UiQT4/OptionsCuve.pyo
@@ -990,24 +985,6 @@
 %%EFICASDIR%%/Validation/__init__.py
 %%EFICASDIR%%/Validation/__init__.pyc
 %%EFICASDIR%%/Validation/__init__.pyo
-%%EFICASDIR%%/ZCracks/configuration_ZCRACKS.py
-%%EFICASDIR%%/ZCracks/configuration_ZCRACKS.pyc
-%%EFICASDIR%%/ZCracks/configuration_ZCRACKS.pyo
-%%EFICASDIR%%/ZCracks/monCode_Cata.py
-%%EFICASDIR%%/ZCracks/monCode_Cata.pyc
-%%EFICASDIR%%/ZCracks/monCode_Cata.pyo
-%%EFICASDIR%%/ZCracks/prefs.py
-%%EFICASDIR%%/ZCracks/prefs.pyc
-%%EFICASDIR%%/ZCracks/prefs.pyo
-%%EFICASDIR%%/ZCracks/prefs_ZCRACKS.py
-%%EFICASDIR%%/ZCracks/prefs_ZCRACKS.pyc
-%%EFICASDIR%%/ZCracks/prefs_ZCRACKS.pyo
-%%EFICASDIR%%/ZCracks/properties.py
-%%EFICASDIR%%/ZCracks/properties.pyc
-%%EFICASDIR%%/ZCracks/properties.pyo
-%%EFICASDIR%%/ZCracks/qtEficas_ZCracks.py
-%%EFICASDIR%%/ZCracks/qtEficas_ZCracks.pyc
-%%EFICASDIR%%/ZCracks/qtEficas_ZCracks.pyo
 %%EFICASDIR%%/convert/Parserv5/README
 %%EFICASDIR%%/convert/Parserv5/Translate.py
 %%EFICASDIR%%/convert/Parserv5/Translate.pyc
@@ -1054,33 +1031,15 @@
 %%EFICASDIR%%/generator/Formatage.py
 %%EFICASDIR%%/generator/Formatage.pyc
 %%EFICASDIR%%/generator/Formatage.pyo
-%%EFICASDIR%%/generator/OpenturnsBase.py
-%%EFICASDIR%%/generator/OpenturnsBase.pyc
-%%EFICASDIR%%/generator/OpenturnsBase.pyo
-%%EFICASDIR%%/generator/OpenturnsSTD.py
-%%EFICASDIR%%/generator/OpenturnsSTD.pyc
-%%EFICASDIR%%/generator/OpenturnsSTD.pyo
-%%EFICASDIR%%/generator/OpenturnsXML.py
-%%EFICASDIR%%/generator/OpenturnsXML.pyc
-%%EFICASDIR%%/generator/OpenturnsXML.pyo
 %%EFICASDIR%%/generator/__init__.py
 %%EFICASDIR%%/generator/__init__.pyc
 %%EFICASDIR%%/generator/__init__.pyo
-%%EFICASDIR%%/generator/generator_CARMEL3D_frequentiel.py
-%%EFICASDIR%%/generator/generator_CARMEL3D_frequentiel.pyc
-%%EFICASDIR%%/generator/generator_CARMEL3D_frequentiel.pyo
-%%EFICASDIR%%/generator/generator_CARMELCND.py
-%%EFICASDIR%%/generator/generator_CARMELCND.pyc
-%%EFICASDIR%%/generator/generator_CARMELCND.pyo
 %%EFICASDIR%%/generator/generator_GroupMA.py
 %%EFICASDIR%%/generator/generator_GroupMA.pyc
 %%EFICASDIR%%/generator/generator_GroupMA.pyo
 %%EFICASDIR%%/generator/generator_SEP.py
 %%EFICASDIR%%/generator/generator_SEP.pyc
 %%EFICASDIR%%/generator/generator_SEP.pyo
-%%EFICASDIR%%/generator/generator_ZCracks.py
-%%EFICASDIR%%/generator/generator_ZCracks.pyc
-%%EFICASDIR%%/generator/generator_ZCracks.pyo
 %%EFICASDIR%%/generator/generator_aplat.py
 %%EFICASDIR%%/generator/generator_aplat.pyc
 %%EFICASDIR%%/generator/generator_aplat.pyo
@@ -1090,15 +1049,6 @@
 %%EFICASDIR%%/generator/generator_map.py
 %%EFICASDIR%%/generator/generator_map.pyc
 %%EFICASDIR%%/generator/generator_map.pyo
-%%EFICASDIR%%/generator/generator_openturns.py
-%%EFICASDIR%%/generator/generator_openturns.pyc
-%%EFICASDIR%%/generator/generator_openturns.pyo
-%%EFICASDIR%%/generator/generator_openturns_study.py
-%%EFICASDIR%%/generator/generator_openturns_study.pyc
-%%EFICASDIR%%/generator/generator_openturns_study.pyo
-%%EFICASDIR%%/generator/generator_openturns_wrapper.py
-%%EFICASDIR%%/generator/generator_openturns_wrapper.pyc
-%%EFICASDIR%%/generator/generator_openturns_wrapper.pyo
 %%EFICASDIR%%/generator/generator_python.py
 %%EFICASDIR%%/generator/generator_python.pyc
 %%EFICASDIR%%/generator/generator_python.pyo

french/homard/Makefile

@@ -2,7 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	homard
-DISTVERSION=	11.2-1
+DISTVERSION=	11.7-1
 CATEGORIES=	french cad linux
 
 MAINTAINER=	thierry@FreeBSD.org

french/homard/pkg-message

@@ -1,11 +1,11 @@
 Avertissement
 =============
 
-Toute personne chargeant le logiciel HOMARD s'engage à ne l'utiliser qu'en
+Toute personne chargeant le logiciel HOMARD s'engage à ne l'utiliser qu'en
 couplage avec le logiciel Code_ASTER. Pour tout autre usage, un droit de
-licence est nécessaire.
+licence est nécessaire.
 
-Contacter les administrateurs de HOMARD à l'adresse : <homard@edf.fr>.
+Contacter les administrateurs de HOMARD à l'adresse : <homard@edf.fr>.
 
 =-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-=-
 

french/med/Makefile

@@ -2,8 +2,7 @@
 # $FreeBSD$
 
 PORTNAME=	med
-DISTVERSION=	3.0.8
-PORTREVISION=	2
+DISTVERSION=	3.2.0
 CATEGORIES=	french science
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -11,7 +10,7 @@ COMMENT=	Modelisation et Echanges de Donnees
 
 LICENSE=	GPLv3
 
-LIB_DEPENDS=	libhdf5.so:science/hdf5
+LIB_DEPENDS=	libhdf5-18.so:science/hdf5-18
 
 WRKSRC=		${WRKDIR}/${PORTNAME}-${PORTVERSION}
 
@@ -19,7 +18,7 @@ OPTIONS_DEFINE=	DOCS EXAMPLES
 
 USES=		fortran gmake libtool tk
 CONFIGURE_ARGS=	--disable-python --with-hdf5=${LOCALBASE}
-CONFIGURE_ENV=	WISH=${WISH}
+CONFIGURE_ENV=	WISH=${WISH} H5DUMP=h5dump-18
 GNU_CONFIGURE=	yes
 USE_LDCONFIG=	yes
 
@@ -53,6 +52,8 @@ pre-configure:
 			-e 's|unittestsdir = $$(bindir)/unit|unittestsdir = ${EXAMPLESDIR}/unit|' \
 			-e 's|usescasesdir = $$(bindir)/uses|usescasesdir = ${EXAMPLESDIR}/uses|'
 .endfor
+	# ATM MED is only compatible with hdf5-18
+	${REINPLACE_CMD} -e 's|-lhdf5|-lhdf5-18|'  ${WRKSRC}/${CONFIGURE_SCRIPT}
 
 post-install:
 	(cd ${STAGEDIR}${PREFIX}/bin && ${LN} -sf mdump3 mdump	\

french/med/files/patch-configure

@@ -0,0 +1,47 @@
+--- configure.orig	2016-01-21 16:50:07 UTC
++++ configure
+@@ -3692,7 +3692,7 @@ $as_echo "$as_me: WARNING: Can't compile
+ 
+ 
+ 
+-if test "x`sed -n '/^#define *H5_HAVE_PARALLEL *1\{0,1\}/{s/.*/MED_CATCH_H5_HAVE_PARALLEL/p;}' ${hdf5home}/include/H5pubconf.h`" = "xMED_CATCH_H5_HAVE_PARALLEL"
++if test "x`sed -n '/^#define *H5_HAVE_PARALLEL *1\{0,1\}/{s/.*/MED_CATCH_H5_HAVE_PARALLEL/p;}' ${hdf5home}/include/hdf5-18/H5pubconf.h`" = "xMED_CATCH_H5_HAVE_PARALLEL"
+ then
+  mpi_wanted_test="yes"
+ else
+@@ -6793,7 +6793,7 @@ done
+       CPPFLAGS_save="$CPPFLAGS"
+ 
+       LDFLAGS="-L$hdf5home/lib $LDFLAGS"
+-      CPPFLAGS="-I$hdf5home/include $CPPFLAGS "
++      CPPFLAGS="-I$hdf5home/include/hdf5-18 $CPPFLAGS "
+ 
+         { $as_echo "$as_me:${as_lineno-$LINENO}: checking absolute name of <H5public.h>" >&5
+ $as_echo_n "checking absolute name of <H5public.h>... " >&6; }
+@@ -6932,7 +6932,7 @@ fi
+ 
+ 
+       # Extract the first word of "h5dump", so it can be a program name with args.
+-set dummy h5dump; ac_word=$2
++set dummy h5dump-18; ac_word=$2
+ { $as_echo "$as_me:${as_lineno-$LINENO}: checking for $ac_word" >&5
+ $as_echo_n "checking for $ac_word... " >&6; }
+ if ${ac_cv_path_H5DUMP+:} false; then :
+@@ -6973,7 +6973,7 @@ fi
+ 
+ 
+       if test "X$H5DUMP" = "Xno"; then
+-         as_fn_error $? "Can't find h5dump, please verify your env. var. PATH" "$LINENO" 5
++         as_fn_error $? "Can't find h5dump-18, please verify your env. var. PATH" "$LINENO" 5
+       fi
+ 
+ 
+@@ -6983,7 +6983,7 @@ fi
+ 
+ 
+ 
+-      HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I$hdf5home/include"
++      HDF5_CPPFLAGS="$HDF5_CPPFLAGS -I$hdf5home/include/hdf5-18"
+       HDF5_LDFLAGS="-L$hdf5home/lib"
+       LDFLAGS="$LDFLAGS_save"
+       CPPFLAGS="$CPPFLAGS_save"

french/med/pkg-plist

@@ -46,13 +46,13 @@ include/medsubdomain.h
 lib/libmed.a
 lib/libmed.so
 lib/libmed.so.1
-lib/libmed.so.1.5.0
+lib/libmed.so.1.7.0
 lib/libmed3.settings
 lib/libmedC.a
 lib/libmedC.so
 lib/libmedC.so.1
-lib/libmedC.so.1.5.0
+lib/libmedC.so.1.7.0
 lib/libmedimport.a
 lib/libmedimport.so
 lib/libmedimport.so.0
-lib/libmedimport.so.0.2.0
+lib/libmedimport.so.0.2.2

math/metis-edf/Makefile

@@ -3,7 +3,7 @@
 
 PORTNAME=	metis-edf
 DISTVERSION=	4.0.3-1
-PORTREVISION=	2
+PORTREVISION=	3
 PORTEPOCH=	1
 CATEGORIES=	math
 
@@ -16,6 +16,7 @@ ALL_TARGET=	default
 MAKE_ENV=	PICFLAG="${PICFLAG}" prefix="${PREFIX}" OPTFLAGS="${CFLAGS}"
 
 PICFLAG?=	-fPIC
+LDFLAGS+=	-Wl,-soname,libmetis.so.0
 
 WRKSRC=		${WRKDIR}/${PORTNAME:C|-edf||}-${PORTVERSION:R}