diff --git a/astro/wcslib/Makefile b/astro/wcslib/Makefile
index 9a69986dde2..eedf94174d6 100644
--- a/astro/wcslib/Makefile
+++ b/astro/wcslib/Makefile
@@ -1,28 +1,27 @@
-# $OpenBSD: Makefile,v 1.4 2015/05/22 11:31:10 ajacoutot Exp $
+# $OpenBSD: Makefile,v 1.5 2015/05/28 08:09:46 pascal Exp $
 
 COMMENT =	implementation of the FITS WCS standard
 CATEGORIES =	astro devel
 DISTNAME =	wcslib-4.17
 HOMEPAGE =	http://www.atnf.csiro.au/people/mcalabre/WCS/wcslib/
-REVISION =	1
+REVISION =	2
 
 SHARED_LIBS =	wcs		0.0
 
 # LGPLv3+
 PERMIT_PACKAGE_CDROM =	Yes
 
-WANTLIB =	${MODFORTRAN_WANTLIB} c cfitsio m
+WANTLIB =	c cfitsio m
 
 MASTER_SITES =	ftp://ftp.atnf.csiro.au/pub/software/wcslib/
 EXTRACT_SUFX =	.tar.bz2
 
-MODULES =		fortran
-MODFORTRAN_COMPILER =	gfortran
+MODULES =		gcc4
+MODGCC4_ARCHS =		*
+MODGCC4_LANGS =		fortran
 
-BUILD_DEPENDS =	${MODFORTRAN_BUILD_DEPENDS}
-TEST_DEPENDS =	${MODFORTRAN_BUILD_DEPENDS}
-LIB_DEPENDS =	${MODFORTRAN_LIB_DEPENDS} \
-		math/cfitsio
+LIB_DEPENDS =	math/cfitsio
+TEST_DEPENDS =	lang/gcc/${MODGCC4_VERSION},-f95
 
 USE_GMAKE =		Yes
 CONFIGURE_STYLE =	gnu autoconf
diff --git a/math/R/Makefile b/math/R/Makefile
index 83ff185f92f..351f26a08d5 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,10 +1,10 @@
-# $OpenBSD: Makefile,v 1.70 2015/05/02 09:10:04 zhuk Exp $
+# $OpenBSD: Makefile,v 1.71 2015/05/28 08:09:46 pascal Exp $
 
 SHARED_ONLY=	Yes
 
 COMMENT=	powerful math/statistics/graphics language
 DISTNAME=	R-3.2.0
-REVISION=	0
+REVISION=	1
 
 SHARED_LIBS=	R	3.1
 SHARED_LIBS+=	Rlapack	31.2 	# 31.2
@@ -15,7 +15,7 @@ HOMEPAGE=	http://www.r-project.org/
 
 MAINTAINER=	Ingo Feinerer <feinerer@logic.at>
 
-# GPL
+# GPLv2+
 PERMIT_PACKAGE_CDROM=	Yes
 
 WANTLIB=	ICE SM X11 Xext Xmu Xss Xt bz2 c crypto curl \
@@ -23,7 +23,7 @@ WANTLIB=	ICE SM X11 Xext Xmu Xss Xt bz2 c crypto curl \
 		gobject-2.0 icui18n icuuc idn jpeg lzma m \
 		ncurses pango-1.0 pangocairo-1.0 \
 		pangoft2-1.0 pcre png pthread ssl tiff z \
-		${MODFORTRAN_WANTLIB} ${MODTK_WANTLIB}
+		${MODTK_WANTLIB}
 
 MASTER_SITES=	http://cran.r-project.org/src/base/R-3/ \
 		ftp://cran.r-project.org/pub/R/src/base/R-3/ \
@@ -39,18 +39,17 @@ MASTER_SITES=	http://cran.r-project.org/src/base/R-3/ \
 		http://lib.stat.cmu.edu/R/CRAN/src/base/R-3/ \
 		http://probability.ca/cran/src/base/R-3/
 
-MODULES=	fortran \
+MODULES=	gcc4 \
 		devel/gettext \
 		x11/tk
 
-MODFORTRAN_COMPILER= gfortran
+MODGCC4_ARCHS=	*
+MODGCC4_LANGS=	fortran
 
-BUILD_DEPENDS=	${MODFORTRAN_BUILD_DEPENDS} \
-		archivers/gtar \
+BUILD_DEPENDS=	archivers/gtar \
 		archivers/unzip \
 		archivers/zip \
 		devel/xdg-utils
-
 LIB_DEPENDS=	${MODFORTRAN_LIB_DEPENDS} \
 		${MODTK_LIB_DEPENDS} \
 		archivers/bzip2 \
diff --git a/x11/kde4/cantor/Makefile b/x11/kde4/cantor/Makefile
index 7723ce05c8c..78f3db3bdd5 100644
--- a/x11/kde4/cantor/Makefile
+++ b/x11/kde4/cantor/Makefile
@@ -1,8 +1,8 @@
-# $OpenBSD: Makefile,v 1.9 2015/05/02 09:48:12 zhuk Exp $
+# $OpenBSD: Makefile,v 1.10 2015/05/28 08:09:46 pascal Exp $
 
 COMMENT =	KDE mathematical applications
 DISTNAME =	cantor-${MODKDE4_VERSION}
-REVISION =	1
+REVISION =	2
 
 # Bogus message about "backend /usr/local/bin/latex" at startup when no
 # backend is choosen on the command line.
@@ -18,16 +18,16 @@ WANTLIB += ${KDE4LIB}/kdeui ${KDE4LIB}/kio ${KDE4LIB}/knewstuff3
 WANTLIB += ${KDE4LIB}/kparts ${KDE4LIB}/kpty ${KDE4LIB}/ktexteditor
 WANTLIB += ${KDE4LIB}/nepomuk ${KDE4LIB}/nepomukutils
 WANTLIB += lib/R/lib/R lib/R/lib/Rblas lib/R/lib/Rlapack
-WANTLIB += cln gfortran glib-2.0 qalculate soprano spectre xml2
+WANTLIB += cln glib-2.0 qalculate soprano spectre xml2
 WANTLIB += luajit-${MODLUA_DEFAULT_VERSION}
 
 MODULES =	devel/gettext lang/lua lang/python
+MODGCC4_LANGS +=fortran
 
 RUN_DEPENDS =	devel/desktop-file-utils \
 		x11/gtk+3,-guic
 
 LIB_DEPENDS = 	databases/soprano \
-		lang/gfortran,-lib \
 		lang/luajit \
 		math/R>=2.15.1p4 \
 		math/libqalculate \