Index: Mk/Uses/fortran.mk =================================================================== --- Mk/Uses/fortran.mk (revision 537119) +++ Mk/Uses/fortran.mk (working copy) @@ -27,10 +27,19 @@ .endif .elif ${fortran_ARGS} == gfortran _GCC_VER= ${GCC_DEFAULT:S/.//} -BUILD_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} -RUN_DEPENDS+= gfortran${_GCC_VER}:lang/gcc${_GCC_VER} -F77= gfortran${_GCC_VER} -FC= gfortran${_GCC_VER} +# TODO the next line is necessary but insufficient +_USE_GCC:= ${GCC_DEFAULT} +V:= ${_USE_GCC:S/.//} +. if ${V} == 10 +_GCC_PORT:= gcc${V}-devel +. else +_GCC_PORT:= gcc${V} +. endif +BUILD_DEPENDS+= gfortran${V}:lang/gcc${_GCC_PORT} +RUN_DEPENDS+= gfortran${V}:lang/gcc${_GCC_PORT} +F77= gfortran${V} +FC= gfortran${V} +.endif FFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} FCFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} LDFLAGS+= -Wl,-rpath=${LOCALBASE}/lib/gcc${_GCC_VER} \