From 89c2cde9ae8db60e832867ebbc15d8f54fa4a2d7 Mon Sep 17 00:00:00 2001
From: Thierry Thomas <thierry@FreeBSD.org>
Date: Sun, 24 Jan 2021 11:19:08 +0000
Subject: [PATCH] - Chase gfortran10 and do not force Gcc any more;

- Mark french/aster BROKEN untill a solution is found for PR 252916.

PR:		252916
---
 french/aster/Makefile     | 13 +++++++------
 science/tfel-edf/Makefile |  3 +--
 2 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/french/aster/Makefile b/french/aster/Makefile
index ca4bf173bebb..c8218a165be3 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	aster
 DISTVERSION=	${ASTER_DISTVERSION}
-PORTREVISION=	2
+PORTREVISION=	3
 CATEGORIES=	french cad
 
 MAINTAINER=	thierry@FreeBSD.org
@@ -13,6 +13,7 @@ LICENSE=	GPLv2
 
 NOT_FOR_ARCHS=		armv6 armv7 i386 mips powerpc
 NOT_FOR_ARCHS_REASON=	ARG_MAX is too small for Code_Aster on 32 bits systems
+BROKEN=	${PYTHON_CMD}-config should honor --embed
 
 #-----------------------------------------------------------------------
 # You may define these options:
@@ -38,7 +39,8 @@ BUILD_DEPENDS+=	astk-serveur>0:cad/astk-serveur	\
 		bash:shells/bash				\
 		getopt>0:misc/getopt				\
 		xterm:x11/xterm					\
-		${PYNUMPY}
+		${PYNUMPY}	\
+		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 #		pylupdate5:textproc/py-qt5-xml
 LIB_DEPENDS+=	libhdf5.so:science/hdf5				\
 		libscotch.so:cad/scotch				\
@@ -48,12 +50,10 @@ LIB_DEPENDS+=	libhdf5.so:science/hdf5				\
 RUN_DEPENDS+=	${SHELL_INSTALL_ASTER}:shells/${SHIADEP}	\
 		astk-serveur>0:cad/astk-serveur			\
 		xterm:x11/xterm					\
+		${PYNUMPY}	\
 		${PYTHON_PKGNAMEPREFIX}sympy>0:math/py-sympy@${PY_FLAVOR}
 
 USES=		bison fortran gettext python:3.6+ qt:5 tk
-# Note 1: compile fine with clang but segfault when sharing args between C and Fortran
-# Note 2: tfel/mfront must be compiled with the same compiler, else it does not link
-USE_GCC=	yes
 USE_BINUTILS=	yes
 USE_QT=		linguisttools_build
 
@@ -268,6 +268,7 @@ pre-configure:
 			>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "PYTHON_INCLUDE = '${PYTHON_INCLUDEDIR}'"	>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "HOME_PYTHON = '${PYTHONBASE}'"		>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "PYTHON_EXE = '${PYTHON_CMD}'"		>> ${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
@@ -281,7 +282,7 @@ pre-configure:
 	${ECHO_CMD} "CC='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "gcc='${CC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "CXX='${CXX}'"				>> ${WRKSRC}/setup.cfg
-	${ECHO_CMD} "LD='${LD}'"				>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "LD='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "F90='${FC}'"				>> ${WRKSRC}/setup.cfg
 	${ECHO_CMD} "MATHLIB='${lib_math} ${LDFLAGS} -lgfortran -lm -lkvm'"		\
 		>> ${WRKSRC}/setup.cfg
diff --git a/science/tfel-edf/Makefile b/science/tfel-edf/Makefile
index 17ed78171e3d..74454a9126d6 100644
--- a/science/tfel-edf/Makefile
+++ b/science/tfel-edf/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=	tfel
 DISTVERSION=	3.2.1-1
+PORTREVISION=	1
 CATEGORIES=	science
 PKGNAMESUFFIX=	-mfront-edf
 
@@ -19,8 +20,6 @@ RUN_DEPENDS=	gnuplot:math/gnuplot	\
 		${PYNUMPY}
 
 USES=		cmake compiler:c++0x fortran localbase python
-# OK with clang, but does not link with Code_Aster compiled with Gcc
-USE_GCC=	yes
 
 CONFLICTS=	tfel-mfront-3.*