From 321bf86660eacf262d4aada473921450198a93cd Mon Sep 17 00:00:00 2001
From: thierry <thierry@FreeBSD.org>
Date: Sun, 4 Feb 2007 10:02:38 +0000
Subject: Fix build after gfortran migration.

Reported by:	pointyhat via Kris
---
 french/aster/Makefile                | 26 +++++++++++++-------------
 french/aster/files/patch-products.py |  6 +++---
 2 files changed, 16 insertions(+), 16 deletions(-)

(limited to 'french/aster')

diff --git a/french/aster/Makefile b/french/aster/Makefile
index d30ef16475d4..095ab0b43556 100644
--- a/french/aster/Makefile
+++ b/french/aster/Makefile
@@ -78,13 +78,13 @@ BROKEN=	Does not compile on this version, and cannot be patched easily.
 #.endif
 
 .if exists(${LOCALBASE}/lib/libatlas_r.so) && !defined(WITH_BLAS)
-WITH_ATLAS=     yes
+WITH_ATLAS=	yes
 .endif
 .if defined(WITH_ATLAS)
-LIB_DEPENDS+=   atlas.2:${PORTSDIR}/math/atlas
+LIB_DEPENDS+=	atlas.2:${PORTSDIR}/math/atlas
 .else
-LIB_DEPENDS+=   blas.2:${PORTSDIR}/math/blas
-LIB_DEPENDS+=   lapack.4:${PORTSDIR}/math/lapack
+LIB_DEPENDS+=	blas.2:${PORTSDIR}/math/blas
+LIB_DEPENDS+=	lapack.4:${PORTSDIR}/math/lapack
 .endif
 
 .if !defined(WITHOUT_ASTK_CLI)
@@ -123,7 +123,6 @@ WITH_MUMPS=	yes
 .endif
 .if defined(WITH_MUMPS)
 WITH_MPI=	yes	# For the FETI solver
-DLIBF90!=	${DIRNAME} `${LDCONFIG} -r | ${GREP} gfortran | ${AWK} '{print $$3}'`
 . if exists(${LOCALBASE}/lib/libmpiseq.a)
 MUMPS_PORT=	mumps
 . else
@@ -141,9 +140,11 @@ HOME_MPI=	${LOCALBASE}/mpich2
 .endif
 
 WANT_FORTRAN=	yes #dummy but future use
-BUILD_DEPENDS+= gfortran42:${PORTSDIR}/lang/gcc42
+BUILD_DEPENDS+=	gfortran42:${PORTSDIR}/lang/gcc42
 FC=		gfortran42
 F77=		gfortran42
+FORTRANLIBDIR=	`${DIRNAME} \`gfortran42 -print-libgcc-file-name\``
+FORTRANLIBDIR2=	`${DIRNAME} \`gfortran42 -print-libgcc-file-name\``/../../../
 
 TK_VER?=	8.4
 SHORT_TK_VER=	${TK_VER:S/.//}
@@ -246,15 +247,11 @@ pre-configure:
 	# else libmpiseq.a used instead of libmpich, default is OK
 	${ECHO_CMD} "MUMPSLIB = '${MUMPSLIB}'"			>> ${WRKSRC}/setup.cfg
 . endif
-	${ECHO_CMD} "F90='${LOCALBASE}/bin/${FC}'"	>> ${WRKSRC}/setup.cfg
-	${ECHO_CMD} "SYSLIB='-Xlinker -export-dynamic ${PTHREAD_LIBS} -lutil -lm -lz -L${DLIBF90} -L${DLIBF90}/../../.. -lgfortranbegin  -lgfortran'"	\
-		>> ${WRKSRC}/setup.cfg
-.else
-	${ECHO_CMD} "F90='${LOCALBASE}/bin/${FC}'"	>> ${WRKSRC}/setup.cfg
-	${ECHO_CMD} "SYSLIB='-Xlinker -export-dynamic ${PTHREAD_LIBS} -lutil -lm -lz -L${DLIBF90} -L${DLIBF90}/../../.. -lgfortranbegin  -lgfortran'"	\
+.endif
+	${ECHO_CMD} "F90='${LOCALBASE}/bin/${FC}'"		>> ${WRKSRC}/setup.cfg
+	${ECHO_CMD} "SYSLIB='-Xlinker -export-dynamic ${PTHREAD_LIBS} -lutil -lm -lz -L${FORTRANLIBDIR} -L${FORTRANLIBDIR2} -lgfortranbegin  -lgfortran'"	\
 		>> ${WRKSRC}/setup.cfg
 
-.endif
 .if defined(WITH_MPI)
 	${ECHO_CMD} "HOME_MPI = '${HOME_MPI}'"			>> ${WRKSRC}/setup.cfg
 .else
@@ -289,6 +286,9 @@ pre-configure:
 do-configure:
 	(cd ${CONFIGURE_WRKSRC} && ${PYTHON_CMD} setup.pyo test		\
 		| tee ${CONFIGURE_LOG})
+	@${ECHO_MSG} "---------------- Debug ------------------"
+	${CAT} ${CONFIGURE_WRKSRC}/setup.log
+	@${ECHO_MSG} "------------ Fin debug ------------------"
 
 pre-build:
 	${MKDIR} ${WRKSRC}/instdir/ASTK/ASTK_SERV/conf ${WRKSRC}/instdir/outils
diff --git a/french/aster/files/patch-products.py b/french/aster/files/patch-products.py
index 75dbc996378b..04a4796528ba 100644
--- a/french/aster/files/patch-products.py
+++ b/french/aster/files/patch-products.py
@@ -1,5 +1,5 @@
---- products.py.orig	Wed Jan  3 01:13:15 2007
-+++ products.py	Wed Jan 17 15:14:05 2007
+--- products.py.orig	Tue Jan  2 17:13:15 2007
++++ products.py	Fri Feb  2 23:13:35 2007
 @@ -833,16 +833,18 @@
             'HOME_PYTHON', 'PYTHON_EXE', 'PYTHONLIB', 'PYMODULES_PREFIX',
             'HOME_MUMPS', 'HOME_ZMAT', 'HOME_MPI',
@@ -30,7 +30,7 @@
        zmat_platform='Linux'
        mpilibs.extend(['mpich'])
 +   elif cfg['IFDEF']=='FREEBSD':
-+      opt['MATH_LIST']  = [cfg['LAPACKLIB'], cfg['BLASLIB'], cfg['ATLASLIB'], 'gfortran']
++      opt['MATH_LIST']  = [cfg['LAPACKLIB'], cfg['BLASLIB'], 'gfortran']
 +      opt['SYSLIB']     = cfg['SYSLIB']
 +      opt['LDFLAGS']    = cfg['LDFLAGS']
 +      opt['CFLAGS_DBG'] = cfg['CFLAGS_DBG']
-- 
cgit