Index: head/math/libRmath/Makefile
===================================================================
--- head/math/libRmath/Makefile	(revision 452961)
+++ head/math/libRmath/Makefile	(revision 452962)
@@ -1,45 +1,63 @@
 # Created by: Eric van Gyzen <vangyzen@stat.duke.edu>
 # $FreeBSD$
 
 PORTNAME=	libRmath
-PORTVERSION=	3.4.1
-PORTREVISION=	1
+PORTVERSION=	3.4.2
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
 DISTNAME=	R-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Standalone math library from R
 
 LICENSE=	GPLv2
 
+ONLY_FOR_ARCHS=		aarch64 amd64 i386
+
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre.so:devel/pcre
 
 BUILD_WRKSRC=	${WRKSRC}/src/nmath/standalone
 CONFIGURE_ARGS=	--disable-nls --with-ICU=no --with-cairo=no \
 		--with-jpeglib=no --with-libpng=no --with-libtiff=no \
 		--with-readline=no --with-tcltk=no --with-x=no \
 		--without-libintl-prefix
 CONFIGURE_ENV+=	ac_cv_header_iconv_h=no
 GNU_CONFIGURE=	yes
-RMATH_SOVERSION=3
-USES=		fortran localbase
+RMATH_SOVERSION=${PORTVERSION:R}
+USES=		localbase
 USE_LDCONFIG=	yes
 
 PLIST_SUB=	RMATH_SOVERSION="${RMATH_SOVERSION}"
+
+OPTIONS_SINGLE=		FORTRAN
+OPTIONS_SINGLE_FORTRAN=	${OPTIONS_SINGLE_FORTRAN_${MACHINE_ARCH}}
+OPTIONS_SINGLE_FORTRAN_amd64=	GFORTRAN FLANG
+OPTIONS_DEFAULT_amd64=	FLANG
+
+FLANG_DESC=		Build Fortran source with flang
+GFORTRAN_DESC=		Build Fortran source with gfortran
+
+GFORTRAN_USES=		fortran:gcc
+FLANG_USES=		fortran:flang
+
+.include <bsd.port.options.mk>
+
+.if ${ARCH} != amd64
+USES+=		fortran:gcc
+.endif
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g'\
 		${WRKSRC}/src/nmath/standalone/Makefile.in \
 		${WRKSRC}/src/unix/Makefile.in
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" \
 		${WRKSRC}/configure
 
 do-install:
 	${INSTALL_DATA} ${WRKSRC}/src/include/Rmath.h ${STAGEDIR}${PREFIX}/include
 	${INSTALL_DATA} ${BUILD_WRKSRC}/libRmath.a ${STAGEDIR}${PREFIX}/lib
 	${INSTALL_LIB} ${BUILD_WRKSRC}/libRmath.so ${STAGEDIR}${PREFIX}/lib/libRmath.so
 	(cd ${STAGEDIR}${PREFIX}/lib; ${LN} -sf libRmath.so libRmath.so.${RMATH_SOVERSION})
 
 .include <bsd.port.mk>
Index: head/math/libRmath/distinfo
===================================================================
--- head/math/libRmath/distinfo	(revision 452961)
+++ head/math/libRmath/distinfo	(revision 452962)
@@ -1,3 +1,3 @@
-TIMESTAMP = 1499255209
-SHA256 (R-3.4.1.tar.gz) = 02b1135d15ea969a3582caeb95594a05e830a6debcdb5b85ed2d5836a6a3fc78
-SIZE (R-3.4.1.tar.gz) = 30200109
+TIMESTAMP = 1506856491
+SHA256 (R-3.4.2.tar.gz) = 971e30c2436cf645f58552905105d75788bd9733bddbcb7c4fbff4c1a6d80c64
+SIZE (R-3.4.2.tar.gz) = 30255544