Hi,
Given that:
- lang/g77-old devel/libf2c-old are long dead
- lang/gfortran will go to the Attic in the same way
- to use the newer fortran (egfortran) from gcc 4.9, it's better
to use the MODGCC4_* macros (see math/R)
After all this reasoning, ports/infrastructure/mk/fortran.port.mk
has become a simple four-liner:
---8<---
MODFORTRAN_COMPILER ?= g77
MODFORTRAN_BUILD_DEPENDS += lang/g77 devel/libf2c
MODFORTRAN_LIB_DEPENDS += devel/libf2c
MODFORTRAN_WANTLIB += g2c
---8<---
So, why not just removing it completely?
Ciao!
David
Index: audio/cmu-sphinx3/Makefile
===================================================================
RCS file: /cvs/ports/audio/cmu-sphinx3/Makefile,v
retrieving revision 1.13
diff -u -p -u -p -r1.13 Makefile
--- audio/cmu-sphinx3/Makefile 27 Apr 2016 20:55:02 -0000 1.13
+++ audio/cmu-sphinx3/Makefile 22 Aug 2016 06:21:16 -0000
@@ -16,14 +16,13 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmusphinx/}
-WANTLIB= blas c lapack m pthread sndio ${MODFORTRAN_WANTLIB} \
+WANTLIB= blas c g2c lapack m pthread sndio \
sphinxad sphinxbase
-MODULES= converters/libiconv fortran
-MODFORTRAN_COMPILER = g77
+MODULES= converters/libiconv
LIB_DEPENDS= audio/cmu-sphinxbase \
- ${MODFORTRAN_LIB_DEPENDS}
+ devel/libf2c
CONFIGURE_STYLE=gnu
Index: audio/cmu-sphinxbase/Makefile
===================================================================
RCS file: /cvs/ports/audio/cmu-sphinxbase/Makefile,v
retrieving revision 1.11
diff -u -p -u -p -r1.11 Makefile
--- audio/cmu-sphinxbase/Makefile 27 Apr 2016 20:53:34 -0000 1.11
+++ audio/cmu-sphinxbase/Makefile 22 Aug 2016 06:21:16 -0000
@@ -17,13 +17,11 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=cmusphinx/}
-WANTLIB= blas c lapack m pthread sndio ${MODFORTRAN_WANTLIB}
-MODULES= converters/libiconv fortran
-MODFORTRAN_COMPILER = g77
-
+WANTLIB= blas c g2c lapack m pthread sndio
+MODULES= converters/libiconv
LIB_DEPENDS= math/lapack \
- ${MODFORTRAN_LIB_DEPENDS}
+ devel/libf2c
CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --without-python
Index: devel/lam/Makefile
===================================================================
RCS file: /cvs/ports/devel/lam/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- devel/lam/Makefile 16 Mar 2015 18:07:41 -0000 1.25
+++ devel/lam/Makefile 22 Aug 2016 06:21:21 -0000
@@ -28,8 +28,7 @@ CONFIGURE_STYLE= gnu
MODGNU_CONFIG_GUESS_DIRS= ${WRKSRC}/config ${WRKSRC}/mpi2c++
CONFIGURE_ARGS+= --with-rsh="ssh -x"
-MODULES= fortran
-MODFORTRAN_COMPILER = g77
-BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
+BUILD_DEPENDS= devel/libf2c \
+ lang/g77
.include <bsd.port.mk>
Index: devel/openmpi/Makefile
===================================================================
RCS file: /cvs/ports/devel/openmpi/Makefile,v
retrieving revision 1.17
diff -u -p -u -p -r1.17 Makefile
--- devel/openmpi/Makefile 27 Mar 2016 15:31:24 -0000 1.17
+++ devel/openmpi/Makefile 22 Aug 2016 06:21:22 -0000
@@ -19,9 +19,8 @@ CATEGORIES = devel
HOMEPAGE = http://www.open-mpi.org/
-MODULES = fortran
-MODFORTRAN_COMPILER = g77
-BUILD_DEPENDS += ${MODFORTRAN_BUILD_DEPENDS}
+BUILD_DEPENDS += devel/libf2c \
+ lang/g77
# BSD
PERMIT_PACKAGE_CDROM = Yes
Index: infrastructure/mk/fortran.port.mk
===================================================================
RCS file: infrastructure/mk/fortran.port.mk
diff -N infrastructure/mk/fortran.port.mk
--- infrastructure/mk/fortran.port.mk 20 Nov 2010 19:57:30 -0000 1.12
+++ /dev/null 1 Jan 1970 00:00:00 -0000
@@ -1,41 +0,0 @@
-# $OpenBSD: fortran.port.mk,v 1.12 2010/11/20 19:57:30 espie Exp $
-
-MODFORTRAN_COMPILER ?= g77
-
-.if empty(MODFORTRAN_COMPILER)
-ERRORS += "Fatal: need to specify MODFORTRAN_COMPILER"
-.endif
-
-.if ${MODFORTRAN_COMPILER:L} == "g77"
-. if ${COMPILER_VERSION:L:Mgcc[34]*}
-_MODFORTRAN_LIB_DEPENDS_G77 = devel/libf2c
-_MODFORTRAN_WANTLIB_G77 = g2c
-_MODFORTRAN_BUILD_DEPENDS_G77 = lang/g77 devel/libf2c
-. else
-_MODFORTRAN_LIB_DEPENDS_G77 = devel/libf2c-old
-_MODFORTRAN_WANTLIB_G77 += g2c
-_MODFORTRAN_BUILD_DEPENDS_G77 = lang/g77-old devel/libf2c-old
-. endif
-MODFORTRAN_LIB_DEPENDS += ${_MODFORTRAN_LIB_DEPENDS_G77}
-MODFORTRAN_WANTLIB += ${_MODFORTRAN_WANTLIB_G77}
-MODFORTRAN_BUILD_DEPENDS += ${_MODFORTRAN_BUILD_DEPENDS_G77}
-MODFORTRAN_post-patch = \
-if test -e /usr/bin/g77 -o -e /usr/bin/f77; then \
- echo "Error: remove old fortran compiler /usr/bin/f77 /usr/bin/g77"; \
- exit 1; \
-fi
-.elif ${MODFORTRAN_COMPILER:L} == "gfortran"
-. if ${COMPILER_VERSION:L:Mgcc4}
-_MODFORTRAN_LIB_DEPENDS_GFORTRAN = lang/gfortran,-lib
-_MODFORTRAN_WANTLIB_GFORTRAN = gfortran
-_MODFORTRAN_BUILD_DEPENDS_GFORTRAN = lang/gfortran
-. else
-MODULES += gcc4
-MODGCC4_LANGS += fortran
-. endif
-MODFORTRAN_LIB_DEPENDS += ${_MODFORTRAN_LIB_DEPENDS_GFORTRAN}
-MODFORTRAN_WANTLIB += ${_MODFORTRAN_WANTLIB_GFORTRAN}
-MODFORTRAN_BUILD_DEPENDS += ${_MODFORTRAN_BUILD_DEPENDS_GFORTRAN}
-.else
-ERRORS += "Fatal: MODFORTRAN_COMPILER must be one of: g77 gfortran"
-.endif
Index: math/arpack/Makefile
===================================================================
RCS file: /cvs/ports/math/arpack/Makefile,v
retrieving revision 1.15
diff -u -p -u -p -r1.15 Makefile
--- math/arpack/Makefile 16 Mar 2015 18:07:49 -0000 1.15
+++ math/arpack/Makefile 22 Aug 2016 06:21:32 -0000
@@ -17,9 +17,8 @@ MASTER_SITES= ${HOMEPAGE}SRC/
DISTFILES= ${DISTNAME}.tar.gz patch.tar.gz ug.ps.gz
DIST_SUBDIR= arpack
-MODULES= fortran
-MODFORTRAN_COMPILER = g77
-BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
+BUILD_DEPENDS= devel/libf2c \
+ lang/g77
LIB_DEPENDS = math/lapack \
math/blas
Index: math/blas/Makefile
===================================================================
RCS file: /cvs/ports/math/blas/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- math/blas/Makefile 3 Dec 2015 21:24:30 -0000 1.25
+++ math/blas/Makefile 22 Aug 2016 06:21:32 -0000
@@ -25,9 +25,8 @@ EXTRACT_SUFX= .tgz
DIST_SUBDIR= ${DISTNAME}-${VERSION}
WRKDIST= ${WRKDIR}/BLAS
-MODULES= fortran
-MODFORTRAN_COMPILER = g77
-BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
+BUILD_DEPENDS= devel/libf2c \
+ lang/g77
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBblas_VERSION:R} \
Index: math/cblas/Makefile
===================================================================
RCS file: /cvs/ports/math/cblas/Makefile,v
retrieving revision 1.16
diff -u -p -u -p -r1.16 Makefile
--- math/cblas/Makefile 16 Mar 2015 18:07:49 -0000 1.16
+++ math/cblas/Makefile 22 Aug 2016 06:21:32 -0000
@@ -23,10 +23,8 @@ DIST_SUBDIR= ${DISTNAME}-${VERSION}
WRKDIST= ${WRKDIR}/CBLAS
WRKSRC= ${WRKDIST}/src
-MODULES= fortran
-MODFORTRAN_COMPILER = g77
-
-BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
+BUILD_DEPENDS = devel/libf2c \
+ lang/g77
LIB_DEPENDS = math/blas
WANTLIB = blas>=1.0
Index: math/lapack/Makefile
===================================================================
RCS file: /cvs/ports/math/lapack/Makefile,v
retrieving revision 1.24
diff -u -p -u -p -r1.24 Makefile
--- math/lapack/Makefile 18 Jun 2015 07:19:25 -0000 1.24
+++ math/lapack/Makefile 22 Aug 2016 06:21:32 -0000
@@ -21,9 +21,8 @@ EXTRACT_SUFX= .tgz
LIB_DEPENDS = math/blas
WANTLIB = blas>=1
-MODULES= fortran
-MODFORTRAN_COMPILER = g77
-BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
+BUILD_DEPENDS= devel/libf2c \
+ lang/g77
MAKE_ENV= SHLIB_MAJOR=${LIBlapack_VERSION:R} \
SHLIB_MINOR=${LIBlapack_VERSION:E} \
Index: math/matio/Makefile
===================================================================
RCS file: /cvs/ports/math/matio/Makefile,v
retrieving revision 1.14
diff -u -p -u -p -r1.14 Makefile
--- math/matio/Makefile 11 Mar 2016 20:28:27 -0000 1.14
+++ math/matio/Makefile 22 Aug 2016 06:21:32 -0000
@@ -15,14 +15,13 @@ PERMIT_PACKAGE_CDROM= Yes
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=matio/}
EXTRACT_SUFX= .tar.bz2
-MODULES= fortran
-MODFORTRAN_COMPILER = g77
-WANTLIB= ${MODFORTRAN_WANTLIB} m
-BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
-LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS}
+WANTLIB= g2c m
+BUILD_DEPENDS= devel/libf2c \
+ lang/g77
+LIB_DEPENDS= devel/libf2c
CONFIGURE_STYLE=gnu
-CONFIGURE_ENV += FC=${MODFORTRAN_COMPILER}
+CONFIGURE_ENV += FC="${LOCALBASE}/bin/g77"
CONFIGURE_ARGS= --enable-fortran=no \
--enable-test=yes
Index: math/netcdf/Makefile
===================================================================
RCS file: /cvs/ports/math/netcdf/Makefile,v
retrieving revision 1.25
diff -u -p -u -p -r1.25 Makefile
--- math/netcdf/Makefile 10 Mar 2016 11:50:13 -0000 1.25
+++ math/netcdf/Makefile 22 Aug 2016 06:21:32 -0000
@@ -16,9 +16,9 @@ SHARED_LIBS= netcdf 4.0 \
HOMEPAGE= http://www.unidata.ucar.edu/packages/netcdf/
MAINTAINER= Tom Knienieder <t...@knienieder.com>
-MODULES = fortran
-MODFORTRAN_COMPILER = g77
-BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
+
+BUILD_DEPENDS = devel/libf2c \
+ lang/g77
# BSD-like
PERMIT_PACKAGE_CDROM= Yes
Index: math/octave/Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.88
diff -u -p -u -p -r1.88 Makefile
--- math/octave/Makefile 13 Jun 2016 17:42:36 -0000 1.88
+++ math/octave/Makefile 22 Aug 2016 06:21:32 -0000
@@ -21,14 +21,13 @@ MAINTAINER = Steven Mestdagh <steven@ope
# GPLv3
PERMIT_PACKAGE_CDROM = Yes
-WANTLIB += ${MODFORTRAN_WANTLIB}
WANTLIB += FLAC GL GLU GraphicsMagick GraphicsMagick++ ICE OSMesa QtGui
WANTLIB += QtNetwork QtOpenGL SM X11 X11-xcb Xau Xcursor Xdamage
WANTLIB += Xdmcp Xext Xfixes Xft Xi Xinerama Xmu Xrandr Xrender
WANTLIB += Xt Xxf86vm amd arpack blas bz2 c camd ccolamd cholmod
WANTLIB += colamd crypto curl cxsparse drm ereadline expat fftw3 fftw3_threads
WANTLIB += fftw3f fftw3f_threads fltk fltk_gl fontconfig freetype
-WANTLIB += gl2ps glapi glpk glut gmp hdf5 idn lapack lcms2
+WANTLIB += g2c gl2ps glapi glpk glut gmp hdf5 idn lapack lcms2
WANTLIB += ltdl lzma m ncurses nghttp2 ogg pcre png portaudio pthread
WANTLIB += pthread-stubs qhull qrupdate qscintilla2 sndfile sndio
WANTLIB += ssl stdc++ suitesparseconfig umfpack usbhid util vorbis
@@ -37,23 +36,23 @@ WANTLIB += vorbisenc xcb xcb-dri2 xcb-gl
MASTER_SITES = ${MASTER_SITE_GNU:=octave/}
MODULES = devel/gettext \
- fortran \
x11/qt4
-BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS} \
+BUILD_DEPENDS = devel/libf2c \
+ lang/g77 \
+ math/gnuplot \
print/texinfo \
- textproc/gsed \
- math/gnuplot
+ textproc/gsed
# configure checks for desktop-file-install(1)
BUILD_DEPENDS +=devel/desktop-file-utils
RUN_DEPENDS = devel/desktop-file-utils
-LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS} \
- audio/libsndfile \
+LIB_DEPENDS = audio/libsndfile \
audio/portaudio-svn \
devel/glpk \
+ devel/libf2c \
devel/pcre \
devel/readline \
editors/qscintilla \
Index: math/plplot/Makefile
===================================================================
RCS file: /cvs/ports/math/plplot/Makefile,v
retrieving revision 1.53
diff -u -p -u -p -r1.53 Makefile
--- math/plplot/Makefile 18 Mar 2016 23:12:18 -0000 1.53
+++ math/plplot/Makefile 22 Aug 2016 06:21:33 -0000
@@ -30,18 +30,15 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=plplot/}
-MODULES = devel/gettext \
- fortran
+MODULES = devel/cmake \
+ devel/gettext
-MODFORTRAN_COMPILER = g77
-
-BUILD_DEPENDS = print/ghostscript/gnu-fonts \
- ${MODFORTRAN_BUILD_DEPENDS}
+BUILD_DEPENDS = devel/libf2c \
+ lang/g77 \
+ print/ghostscript/gnu-fonts
myRUN_DEPENDS = print/ghostscript/gnu-fonts
-MODULES += devel/cmake
-
# Until such time as the cmake ninja generator supports fortran
USE_NINJA = No
@@ -69,7 +66,7 @@ myWANTLIB += png z ${MODGETTEXT_WANTLIB}
WANTLIB-main = ${myWANTLIB} c pthread
WANTLIB-c++ = ${myWANTLIB} csirocsa plplotd stdc++
-WANTLIB-f77 += ${myWANTLIB} csirocsa plplotd ${MODFORTRAN_WANTLIB}
+WANTLIB-f77 += ${myWANTLIB} csirocsa g2c plplotd
myLIB_DEPENDS = devel/glib2 \
devel/pango \
@@ -80,9 +77,9 @@ myLIB_DEPENDS = devel/glib2 \
LIB_DEPENDS-main = ${myLIB_DEPENDS}
LIB_DEPENDS-c++ = math/plplot,-main \
${myLIB_DEPENDS}
-LIB_DEPENDS-f77 = math/plplot,-main \
- ${myLIB_DEPENDS} \
- ${MODFORTRAN_LIB_DEPENDS}
+LIB_DEPENDS-f77 = devel/libf2c \
+ math/plplot,-main \
+ ${myLIB_DEPENDS}
RUN_DEPENDS-main = ${MODLIBICONV_RUN_DEPENDS} ${myRUN_DEPENDS}
RUN_DEPENDS-c++ =
Index: math/py-numpy/Makefile
===================================================================
RCS file: /cvs/ports/math/py-numpy/Makefile,v
retrieving revision 1.45
diff -u -p -u -p -r1.45 Makefile
--- math/py-numpy/Makefile 18 Mar 2016 13:26:10 -0000 1.45
+++ math/py-numpy/Makefile 22 Aug 2016 06:21:33 -0000
@@ -17,12 +17,11 @@ MAINTAINER= Daniel Dickman <daniel@open
# BSD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB= blas lapack m pthread ${MODFORTRAN_WANTLIB}
${MODPY_WANTLIB}
+WANTLIB= blas g2c lapack m pthread ${MODPY_WANTLIB}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=numpy/}
-MODULES= lang/python \
- fortran
+MODULES= lang/python
FLAVORS= python3
FLAVOR?=
@@ -32,11 +31,10 @@ MODPY_SETUP= setupegg.py
TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR}
-MODFORTRAN_COMPILER = g77
-
-BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
-LIB_DEPENDS= math/lapack \
- ${MODFORTRAN_LIB_DEPENDS}
+BUILD_DEPENDS= devel/libf2c \
+ lang/g77
+LIB_DEPENDS= devel/libf2c \
+ math/lapack
pre-build:
cp -f ${WRKSRC}/numpy/distutils/site.cfg ${WRKSRC}/site.cfg
Index: math/py-scipy/Makefile
===================================================================
RCS file: /cvs/ports/math/py-scipy/Makefile,v
retrieving revision 1.26
diff -u -p -u -p -r1.26 Makefile
--- math/py-scipy/Makefile 25 Apr 2016 08:33:23 -0000 1.26
+++ math/py-scipy/Makefile 22 Aug 2016 06:21:33 -0000
@@ -16,24 +16,24 @@ MAINTAINER= Daniel Dickman <daniel@open
# BSD
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += ${MODFORTRAN_WANTLIB} ${MODPY_WANTLIB}
-WANTLIB += blas lapack m pthread stdc++ util
+WANTLIB += blas g2c lapack m pthread stdc++ util
+WANTLIB += ${MODPY_WANTLIB}
MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:=scipy/}
HOMEPAGE= http://numeric.scipy.org/
-MODULES= lang/python fortran
+MODULES= lang/python
FLAVORS= python3
FLAVOR?=
-MODFORTRAN_COMPILER = g77
MODPY_SETUPTOOLS= Yes
MODPY_SETUP= setupegg.py
BUILD_DEPENDS= ${RUN_DEPENDS} \
- ${MODFORTRAN_BUILD_DEPENDS}
-LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS}
+ devel/libf2c \
+ lang/g77
+LIB_DEPENDS= devel/libf2c
RUN_DEPENDS= math/py-numpy${MODPY_FLAVOR}>=1.6.0 \
devel/swig
Index: math/qrupdate/Makefile
===================================================================
RCS file: /cvs/ports/math/qrupdate/Makefile,v
retrieving revision 1.9
diff -u -p -u -p -r1.9 Makefile
--- math/qrupdate/Makefile 16 Mar 2015 18:07:50 -0000 1.9
+++ math/qrupdate/Makefile 22 Aug 2016 06:21:33 -0000
@@ -16,13 +16,11 @@ PERMIT_PACKAGE_CDROM = Yes
MASTER_SITES = ${MASTER_SITE_SOURCEFORGE:=qrupdate/}
-MODULES = fortran
-MODFORTRAN_COMPILER = g77
+WANTLIB = g2c m
-WANTLIB = m ${MODFORTRAN_WANTLIB}
-
-BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
-LIB_DEPENDS = ${MODFORTRAN_LIB_DEPENDS}
+BUILD_DEPENDS = devel/libf2c \
+ lang/g77
+LIB_DEPENDS = devel/libf2c
ALL_TARGET = lib solib
MAKE_FLAGS = FC="${FC}" FFLAGS="${FFLAGS}" \
Index: math/suitesparse/Makefile
===================================================================
RCS file: /cvs/ports/math/suitesparse/Makefile,v
retrieving revision 1.4
diff -u -p -u -p -r1.4 Makefile
--- math/suitesparse/Makefile 11 Dec 2015 06:34:38 -0000 1.4
+++ math/suitesparse/Makefile 22 Aug 2016 06:21:33 -0000
@@ -23,14 +23,13 @@ SHARED_LIBS += ${_lib} ${SO_VERSION}
# GPLv2 - LGPLv2.1
PERMIT_PACKAGE_CDROM= Yes
-WANTLIB += ${MODFORTRAN_WANTLIB} blas lapack m
+WANTLIB += blas g2c lapack m
MASTER_SITES= http://faculty.cse.tamu.edu/davis/SuiteSparse/
-MODULES= fortran
-
-BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
-LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \
+BUILD_DEPENDS= devel/libf2c \
+ lang/g77
+LIB_DEPENDS= devel/libf2c \
math/lapack
ALL_TARGET= default
