Steven Mestdagh [2017-11-04, 18:55:19]:
> long overdue update, and switch to gfortran. ok?
> working on ports that depend on it.
this should take care of dependent ports, and switches them to gfortran.
Index: math/arpack/Makefile
===================================================================
RCS file: /cvs/ports/math/arpack/Makefile,v
retrieving revision 1.15
diff -u -p -u -r1.15 Makefile
--- math/arpack/Makefile 16 Mar 2015 18:07:49 -0000 1.15
+++ math/arpack/Makefile 4 Nov 2017 21:54:46 -0000
@@ -4,7 +4,7 @@ COMMENT= solve large scale eigenvalue pr
DISTNAME= arpack96
PKGNAME= arpack-96
-REVISION= 4
+REVISION= 5
SHARED_LIBS= arpack 1.0
CATEGORIES= math
@@ -18,7 +18,7 @@ DISTFILES= ${DISTNAME}.tar.gz patch.tar.
DIST_SUBDIR= arpack
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS = math/lapack \
@@ -30,7 +30,7 @@ WRKSRC= ${WRKDIST}/SRC
MAKE_FILE= ${FILESDIR}/Makefile
MAKE_ENV= SHLIB_MAJOR=${LIBarpack_VERSION:R} \
SHLIB_MINOR=${LIBarpack_VERSION:E} \
- FC=${FC}
+ FC="${MODFORTRAN_COMPILER} -cpp"
FAKE_FLAGS= LIBDIR=${LOCALBASE}/lib DEBUGLIBS=no
post-extract:
Index: math/arpack/patches/patch-SRC_second_f
===================================================================
RCS file: math/arpack/patches/patch-SRC_second_f
diff -N math/arpack/patches/patch-SRC_second_f
--- /dev/null 1 Jan 1970 00:00:00 -0000
+++ math/arpack/patches/patch-SRC_second_f 4 Nov 2017 21:54:46 -0000
@@ -0,0 +1,14 @@
+$OpenBSD$
+
+Index: SRC/second.f
+--- SRC/second.f.orig
++++ SRC/second.f
+@@ -21,7 +21,7 @@
+ * ..
+ * .. External Functions ..
+ REAL ETIME
+- EXTERNAL ETIME
++* EXTERNAL ETIME
+ * ..
+ * .. Executable Statements ..
+ *
Index: math/octave/Makefile
===================================================================
RCS file: /cvs/ports/math/octave/Makefile,v
retrieving revision 1.98
diff -u -p -u -r1.98 Makefile
--- math/octave/Makefile 3 Nov 2017 12:28:53 -0000 1.98
+++ math/octave/Makefile 4 Nov 2017 21:54:46 -0000
@@ -4,6 +4,7 @@ COMMENT = high-level language for numeri
VERSION = 4.2.1
DISTNAME = octave-${VERSION}
+REVISION = 0
CATEGORIES = math
SHARED_LIBS += octave 8.0
@@ -44,6 +45,8 @@ BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPEN
textproc/gsed \
math/gnuplot
+MODFORTRAN_COMPILER = gfortran
+
# configure checks for desktop-file-install(1)
BUILD_DEPENDS +=devel/desktop-file-utils
@@ -78,8 +81,7 @@ CONFIGURE_ENV = CPPFLAGS="-I${LOCALBASE}
-I${LOCALBASE}/include/ereadline" \
LDFLAGS="-L${LOCALBASE}/lib -L${X11BASE}/lib" \
LRELEASE="${MODQT_LRELEASE}" \
- F77=${FC} CXXFLAGS="${CXXFLAGS} -std=gnu++11"
-
+ CXXFLAGS="${CXXFLAGS} -std=gnu++11"
# needed to build on amd64
GCC_ARCH = ${MACHINE_ARCH}-unknown-openbsd${OSREV}
Index: math/py-numpy/Makefile
===================================================================
RCS file: /cvs/ports/math/py-numpy/Makefile,v
retrieving revision 1.46
diff -u -p -u -r1.46 Makefile
--- math/py-numpy/Makefile 3 Jan 2017 19:23:48 -0000 1.46
+++ math/py-numpy/Makefile 4 Nov 2017 21:54:46 -0000
@@ -7,7 +7,7 @@ COMMENT= fast array and numeric program
MODPY_EGG_VERSION= 1.9.2
DISTNAME= numpy-${MODPY_EGG_VERSION}
PKGNAME= py-${DISTNAME}
-REVISION= 0
+REVISION= 1
CATEGORIES= math devel
@@ -33,7 +33,7 @@ MODPY_SETUP= setupegg.py
TEST_DEPENDS= devel/py-nose${MODPY_FLAVOR}
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
BUILD_DEPENDS = ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS= math/lapack \
Index: math/suitesparse/Makefile
===================================================================
RCS file: /cvs/ports/math/suitesparse/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- math/suitesparse/Makefile 27 Feb 2017 23:08:14 -0000 1.5
+++ math/suitesparse/Makefile 4 Nov 2017 21:54:46 -0000
@@ -6,6 +6,7 @@ COMMENT= suite of sparse matrix algorit
DISTNAME= SuiteSparse-4.4.6
PKGNAME= ${DISTNAME:L}
+REVISION= 0
CATEGORIES= math
@@ -28,6 +29,7 @@ WANTLIB += ${MODFORTRAN_WANTLIB} blas la
MASTER_SITES= http://faculty.cse.tamu.edu/davis/SuiteSparse/
MODULES= fortran
+MODFORTRAN_COMPILER= gfortran
BUILD_DEPENDS= ${MODFORTRAN_BUILD_DEPENDS}
LIB_DEPENDS= ${MODFORTRAN_LIB_DEPENDS} \
@@ -89,7 +91,7 @@ post-build:
libcolamd.so.${LIBcolamd_VERSION} \
libccolamd.so.${LIBccolamd_VERSION} \
libsuitesparseconfig.so.${LIBsuitesparseconfig_VERSION}
\
- -lm -L${LOCALBASE}/lib -lblas -lg2c -llapack
+ -lm -L${LOCALBASE}/lib -lblas -lgfortran -llapack
cd ${WRKSRC} && \
${CC} -shared -o libcsparse.so.${LIBcsparse_VERSION} \
@@ -115,13 +117,13 @@ post-build:
UMFPACK/Lib/*.o libamd.so.${LIBamd_VERSION} \
libcholmod.so.${LIBcholmod_VERSION} \
libsuitesparseconfig.so.${LIBsuitesparseconfig_VERSION}
\
- -lm -L${LOCALBASE}/lib -lblas -lg2c -llapack
+ -lm -L${LOCALBASE}/lib -lblas -lgfortran -llapack
cd ${WRKSRC} && \
${CC} -shared -o libspqr.so.${LIBspqr_VERSION} \
SPQR/Lib/*.o libcholmod.so.${LIBcholmod_VERSION} \
libsuitesparseconfig.so.${LIBsuitesparseconfig_VERSION}
\
- -lm -L${LOCALBASE}/lib -lblas -lg2c -llapack
+ -lm -L${LOCALBASE}/lib -lblas -lgfortran -llapack
cd ${WRKSRC} && \
${CC} -shared -o librbio.so.${LIBrbio_VERSION} \
Index: math/suitesparse/patches/patch-SuiteSparse_config_SuiteSparse_config_mk
===================================================================
RCS file:
/cvs/ports/math/suitesparse/patches/patch-SuiteSparse_config_SuiteSparse_config_mk,v
retrieving revision 1.1.1.1
diff -u -p -u -r1.1.1.1 patch-SuiteSparse_config_SuiteSparse_config_mk
--- math/suitesparse/patches/patch-SuiteSparse_config_SuiteSparse_config_mk
20 Jul 2015 23:10:35 -0000 1.1.1.1
+++ math/suitesparse/patches/patch-SuiteSparse_config_SuiteSparse_config_mk
4 Nov 2017 21:54:46 -0000
@@ -24,7 +24,7 @@ $OpenBSD: patch-SuiteSparse_config_Suite
# This is probably slow ... it might connect to the Standard Reference BLAS:
-# BLAS = -lblas -lgfortran
- LAPACK = -llapack
-+ BLAS = -L${LOCALBASE}/lib -lblas -lg2c
++ BLAS = -L${LOCALBASE}/lib -lblas -lgfortran
+ LAPACK = -L${LOCALBASE}/lib -llapack
# MKL
Index: audio/cmu-sphinxbase/Makefile
===================================================================
RCS file: /cvs/ports/audio/cmu-sphinxbase/Makefile,v
retrieving revision 1.13
diff -u -p -u -r1.13 Makefile
--- audio/cmu-sphinxbase/Makefile 13 Sep 2016 11:44:06 -0000 1.13
+++ audio/cmu-sphinxbase/Makefile 4 Nov 2017 21:54:46 -0000
@@ -19,7 +19,7 @@ MASTER_SITES= ${MASTER_SITE_SOURCEFORGE:
WANTLIB= blas c iconv lapack m pthread sndio ${MODFORTRAN_WANTLIB}
MODULES= fortran
-MODFORTRAN_COMPILER = g77
+MODFORTRAN_COMPILER = gfortran
LIB_DEPENDS= converters/libiconv \
@@ -30,7 +30,7 @@ CONFIGURE_STYLE= gnu
CONFIGURE_ARGS= --without-python
CONFIGURE_ENV= CPPFLAGS=-I${LOCALBASE}/include \
LDFLAGS=-L${LOCALBASE}/lib \
- LIBS="-lblas -lm -lg2c -lsndio" \
+ LIBS="-lblas -lm -lgfortran -lquadmath -lsndio" \
HAVE_DOXYGEN="no"
pre-build:
