Index: Makefile
===================================================================
RCS file: /home/cvs/ports/math/py-scipy/Makefile,v
retrieving revision 1.21
diff -u -p -u -p -r1.21 Makefile
--- Makefile	3 Oct 2013 16:37:17 -0000	1.21
+++ Makefile	2 Dec 2014 02:35:17 -0000
@@ -9,6 +9,7 @@ COMMENT=		maths, science and engineering
 MODPY_EGG_VERSION=	0.10.0
 DISTNAME=		scipy-${MODPY_EGG_VERSION}
 PKGNAME=		py-${DISTNAME}
+REVISION=		0
 CATEGORIES=		math devel
 
 MAINTAINER=		Eric Faurot <eric@openbsd.org>
@@ -16,27 +17,29 @@ MAINTAINER=		Eric Faurot <eric@openbsd.o
 # BSD
 PERMIT_PACKAGE_CDROM=	Yes
 
-WANTLIB += amd arpack blas stdc++ lapack m umfpack util
-WANTLIB += ${MODPY_WANTLIB} ${MODFORTRAN_WANTLIB}
+WANTLIB += amd arpack blas stdc++ lapack m pthread umfpack util
+WANTLIB += ${MODPY_WANTLIB}
+.if ${MACHINE_ARCH} == "amd64" || ${MACHINE_ARCH} == "i386"
+WANTLIB += quadmath
+.endif
 
 MASTER_SITES=		${MASTER_SITE_SOURCEFORGE:=scipy/}
 HOMEPAGE=		http://numeric.scipy.org/
 
-MODULES=		lang/python fortran
-MODFORTRAN_COMPILER =	g77
+MODULES=		lang/python gcc4
+MODGCC4_LANGS=		fortran
+MODGCC4_ARCHS=		*
 MODPY_SETUPTOOLS=       Yes
 MODPY_SETUP=            setupegg.py
 
-BUILD_DEPENDS=		${RUN_DEPENDS} \
-			${MODFORTRAN_BUILD_DEPENDS}
+BUILD_DEPENDS=		${RUN_DEPENDS}
 LIB_DEPENDS=		math/umfpack \
 			math/arpack \
-			math/amd \
-			${MODFORTRAN_LIB_DEPENDS}
+			math/amd
 RUN_DEPENDS=		math/py-numpy>=1.6.0 \
 			devel/swig
 
-TEST_DEPENDS=	devel/py-nose
+TEST_DEPENDS=		devel/py-nose
 
 MAKE_ENV+=		CPPFLAGS="-I${LOCALBASE}/include/amd -I${LOCALBASE}/include"
 MAKE_ENV+=		LDFLAGS="-shared -L${LOCALBASE}/lib -pthread -lutil"