Update Code_Aster to 11.7.0-1, with its different tools.

5 files changed, 31 insertions, 9 deletions

diff --git a/french/aster/Makefile b/french/aster/Makefile
index d974905bee97..02ecf9e313de 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -3,7 +3,6 @@
 
 PORTNAME=	aster
 DISTVERSION=	${ASTER_DISTVERSION}
-PORTREVISION=	4
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -45,6 +44,7 @@ RUN_DEPENDS+=	${PYTHON_PKGNAMEPREFIX}gnuplot>0:${PORTSDIR}/math/py-gnuplot	\
 		astk-serveur>0:${PORTSDIR}/cad/astk-serveur
 
 USES=		bison fortran tk python:2
+USE_BINUTILS=	yes
 
 .if defined(WITH_ATLAS)
 USES+=		blaslapack:atlas
@@ -165,6 +165,9 @@ 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
 inst_dir=	${PREFIX}/${PORTNAME}
 tools_dir=	${PREFIX}/${PORTNAME}/outils
 tools=		kmetis onmetis pmetis gnuplot
@@ -343,6 +346,9 @@ post-install:
 	${MV} ${STAGEDIR}${inst_dir}/${VE}/share/aster/*	\
 		${STAGEDIR}${inst_dir}/${VE}/
 	${RM} -rf ${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
@@ -378,7 +384,7 @@ regression-test:	install
 		--filter='"I" not in testlist' -o /tmp/list_seq )
 	(cd /tmp &&	\
 	${LOCALBASE}/aster/ASTK/ASTK_SERV/bin/as_run astout.export) || ${TRUE}
-	@${ECHO_MSG} "Check /tmp/resu_test/*.erre"
+	@${ECHO_MSG} "Check /tmp/resu_test/NOOK"
 .endif
 
 .include <bsd.port.post.mk>
diff --git a/french/aster/bsd.aster.mk b/french/aster/bsd.aster.mk
index abd51156b641..fbbde54ca3c8 100644
--- a/french/aster/bsd.aster.mk
+++ b/french/aster/bsd.aster.mk
@@ -11,7 +11,7 @@ MASTER_SITE_SUBDIR=	thierry
 DISTNAME=	aster-${DISTVERSIONPREFIX}${ASTER_DISTVERSION}${DISTVERSIONSUFFIX}
 DISTINFO_FILE=	${.CURDIR}/../../french/aster/distinfo
 
-ASTER_VER=	11.6.0
+ASTER_VER=	11.7.0
 ASTER_DISTVERSION=	${ASTER_VER}-1
 EXTRACT_WRKSRC=	${WRKDIR}/aster-${DISTVERSIONPREFIX}${ASTER_VER}/SRC
 
diff --git a/french/aster/distinfo b/french/aster/distinfo
index 1b5eda32a5b4..57b76f9a8793 100644
--- a/french/aster/distinfo
+++ b/french/aster/distinfo
@@ -1,2 +1,2 @@
-SHA256 (aster-full-src-11.6.0-1.noarch.tar.gz) = c6a18eaf382c2ba407388c6d33d5e09cca34ac9357bb2f59b1034a2c01f5d261
-SIZE (aster-full-src-11.6.0-1.noarch.tar.gz) = 185592825
+SHA256 (aster-full-src-11.7.0-1.noarch.tar.gz) = 94632f3801249d7464be0031f9aeaa4760f0a3ebde575cb0bdfe64f0fcdd316c
+SIZE (aster-full-src-11.7.0-1.noarch.tar.gz) = 186807735
diff --git a/french/aster/files/patch-products.py b/french/aster/files/patch-products.py
index 7c0e9052efc7..d301d34396ca 100644
--- a/french/aster/files/patch-products.py
+++ b/french/aster/files/patch-products.py
@@ -1,12 +1,22 @@
---- products.py.orig	2014-03-05 09:41:19.000000000 +0100
-+++ products.py	2014-03-17 18:39:24.000000000 +0100
-@@ -701,7 +701,8 @@
+--- 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 @@
             'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB',
             'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI', 'INCLUDE_MUMPS', 'HOME_METIS',
-            'HOME_MED', 'HOME_HDF',
+            'HOME_MED', 'HOME_HDF', # 'HOME_MFRONT', because of v11 branch
 -           'LD', 'CC', 'F90', 'CXXLIB', 'OTHERLIB', 'SYSLIB', ],
 +           '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 @@
+             'capturestderr' : False,
+          }),
+          ('Make'  , {
+-            'command'   : './waf build',
++            # Work-around on FreeBSD: MAKE_JOBS_UNSAFE + -vvv to get full logs in setup.dbg
++            'command'   : './waf build -vvv --jobs=1',
+             'capturestderr' : False,
+          }),
+          ('Install'  , {
diff --git a/french/aster/pkg-plist b/french/aster/pkg-plist
index 0465e049086c..eca1529cb556 100644
--- a/french/aster/pkg-plist
+++ b/french/aster/pkg-plist
@@ -2572,6 +2572,8 @@ aster/%%VE%%/tests/erreu09a.mail
 aster/%%VE%%/tests/erreu09b.comm
 aster/%%VE%%/tests/erreu09b.export
 aster/%%VE%%/tests/erreu09b.mmed
+aster/%%VE%%/tests/erreu09c.comm
+aster/%%VE%%/tests/erreu09c.export
 aster/%%VE%%/tests/erreu10a.comm
 aster/%%VE%%/tests/erreu10a.datg
 aster/%%VE%%/tests/erreu10a.export
@@ -6249,6 +6251,7 @@ aster/%%VE%%/tests/sslv134h.comm
 aster/%%VE%%/tests/sslv134h.datg
 aster/%%VE%%/tests/sslv134h.export
 aster/%%VE%%/tests/sslv134h.mmed
+aster/%%VE%%/tests/sslv134i.com1
 aster/%%VE%%/tests/sslv134i.comm
 aster/%%VE%%/tests/sslv134i.export
 aster/%%VE%%/tests/sslv134i.mmed
@@ -11636,6 +11639,9 @@ aster/asrun/plugins/rsh_server.pyo
 aster/asrun/plugins/server.py
 aster/asrun/plugins/server.pyc
 aster/asrun/plugins/server.pyo
+aster/asrun/plugins/sftp_server.py
+aster/asrun/plugins/sftp_server.pyc
+aster/asrun/plugins/sftp_server.pyo
 aster/asrun/profil.py
 aster/asrun/profil.pyc
 aster/asrun/profil.pyo