Provide WANTLIB, LIB_DEPENDS and BUILD_DEPENDS variables for fortran, analogous to c++. Makes an upcoming fortan.port.mk diff a lot less ugly.
Index: 4.9/gcc4.port.mk =================================================================== RCS file: /cvs/ports/lang/gcc/4.9/gcc4.port.mk,v retrieving revision 1.10 diff -u -p -r1.10 gcc4.port.mk --- 4.9/gcc4.port.mk 5 Nov 2017 09:11:32 -0000 1.10 +++ 4.9/gcc4.port.mk 4 Jan 2019 16:54:47 -0000 @@ -34,6 +34,10 @@ MODGCC4_CPPDEP = lang/gcc/4.9,-c++>=4 MODGCC4_CPPWANTLIB = estdc++>=17 MODGCC4_ATOMICWANTLIB = atomic +MODGCC4_FORTRANLIBDEP = lang/gcc/4.9,-libs>=4.9,<4.10 +MODGCC4_FORTRANDEP = lang/gcc/4.9,-f95>=4.9,<4.10 +MODGCC4_FORTRANWANTLIB = gfortran>=3 + .if ${_MODGCC4_ARCH_USES:L} == "yes" . if ${MODGCC4_LANGS:L:Mc} @@ -55,13 +59,13 @@ COMPILER_LINKS += c++ ${LOCALBASE}/bin/e . endif . if ${MODGCC4_LANGS:L:Mfortran} -BUILD_DEPENDS += lang/gcc/4.9,-f95>=4.9,<4.10 -WANTLIB += gfortran>=3 +BUILD_DEPENDS += ${MODGCC4_FORTRANDEP} +WANTLIB += ${MODGCC4_FORTRANWANTLIB} # XXX sync with Makefile .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" WANTLIB += quadmath .endif -LIB_DEPENDS += lang/gcc/4.9,-libs>=4.9,<4.10 +LIB_DEPENDS += ${MODGCC4_FORTRANLIBDEP} COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran . endif Index: 8/gcc4.port.mk =================================================================== RCS file: /cvs/ports/lang/gcc/8/gcc4.port.mk,v retrieving revision 1.1.1.1 diff -u -p -r1.1.1.1 gcc4.port.mk --- 8/gcc4.port.mk 4 Jan 2019 15:50:38 -0000 1.1.1.1 +++ 8/gcc4.port.mk 4 Jan 2019 16:54:51 -0000 @@ -1,4 +1,4 @@ -# $OpenBSD: gcc4.port.mk,v 1.1.1.1 2019/01/04 15:50:38 pascal Exp $ +# $OpenBSD: gcc4.port.mk,v 1.4 2018/11/05 11:52:55 sthen Exp $ MODGCC4_ARCHS ?= ${GCC49_ARCHS} MODGCC4_LANGS ?= @@ -31,6 +31,10 @@ MODGCC4_CPPDEP = lang/gcc/8,-c++>=8,< MODGCC4_CPPWANTLIB = estdc++>=19 MODGCC4_ATOMICWANTLIB = atomic +MODGCC4_FORTRANDEP = lang/gcc/8,-f95>=8,<9 +MODGCC4_FORTRANLIBDEP = lang/gcc/8,-libs>=8,<9 +MODGCC4_FORTRANWANTLIB = gfortran>=8 + .if ${_MODGCC4_ARCH_USES:L} == "yes" . if ${MODGCC4_LANGS:L:Mc} @@ -52,13 +56,13 @@ COMPILER_LINKS += c++ ${LOCALBASE}/bin/e . endif . if ${MODGCC4_LANGS:L:Mfortran} -BUILD_DEPENDS += lang/gcc/8,-f95>=8,<9 -WANTLIB += gfortran>=8 +BUILD_DEPENDS += ${MODGCC4_FORTRANDEP} +WANTLIB += ${MODGCC4_FORTRANWANTLIB} # XXX sync with Makefile .if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386" WANTLIB += quadmath .endif -LIB_DEPENDS += lang/gcc/8,-libs>=8,<9 +LIB_DEPENDS += ${MODGCC4_FORTRANLIBDEP} COMPILER_LINKS += gfortran ${LOCALBASE}/bin/egfortran . endif