From cd479d6723bfdda01a8539f8a4220a71c329e8ad Mon Sep 17 00:00:00 2001 From: Oliver Lehmann Date: Mon, 18 Aug 2003 14:20:17 +0000 Subject: Fix build on 4-STABLE PR: ports/55671 Submitted by: Thierry Thomas --- french/aster/Makefile | 9 +++++---- french/aster/files/config.txt | 4 ++-- 2 files changed, 7 insertions(+), 6 deletions(-) (limited to 'french') diff --git a/french/aster/Makefile b/french/aster/Makefile index 5caac5a3a3c8..6ee8c5cf40d4 100644 --- a/french/aster/Makefile +++ b/french/aster/Makefile @@ -48,6 +48,7 @@ RUN_DEPENDS= ${PYTHON_SITELIBDIR}/Gnuplot:${PORTSDIR}/math/py-gnuplot \ EXTRACT_CMD= ${TAR} EXTRACT_BEFORE_ARGS= -xf EXTRACT_AFTER_ARGS= # empty +USE_GCC= 3.2 USE_PYTHON= yes USE_REINPLACE= yes REINPLACE_ARGS= -i "" @@ -60,10 +61,6 @@ PKGMESSAGE= ${PKGDIR}/pkg-message.sans-astk .include -.if ${OSVERSION} < 500000 -#BROKEN= Does not build on systems prior 5.x - work in progress... -.endif - .if defined(WITH_BLAS) LIB_DEPENDS= blas.1:${PORTSDIR}/math/blas .else @@ -106,7 +103,11 @@ PLIST_SUB+= HOMARD="@comment " HOMARDDIR="" RUN_DEPENDS+= ${PYNUMERIC} .endif +.if ${OSVERSION} < 500039 +F77= g77-${USE_GCC:C/\.//} +.else F77?= f77 +.endif FFLAGS?= -O2 TK_VER?= 8.3 diff --git a/french/aster/files/config.txt b/french/aster/files/config.txt index 471a5b6f9bbc..1641d7f3d990 100644 --- a/french/aster/files/config.txt +++ b/french/aster/files/config.txt @@ -31,13 +31,13 @@ BIBL | blas | ? | OPT_BLAS BIBL | tcl | 8.3 | OPT_TCL BIBL | tk | 8.3 | OPT_TK BIBL | X11 | ? | OPT_X11 -BIBL | sys | ? | -Xlinker -export-dynamic PTHREAD -lutil -lm -lz +BIBL | sys | ? | -Xlinker -export-dynamic PTHREAD -lutil -lm -lz -lg2c # INCL | python | 2.1 | -IHOME_PYTHON/include/pythonPYTHON_VERSION # PYTHON | python | 2.1 | HOME_PYTHON/bin/PYTHON_BIN # -LINK | link | ? | %%F77%% +LINK | link | ? | %%CC%% -v # OPTL | f90 | ? | -v # -- cgit v1.2.3