2 files changed, 13 insertions, 29 deletions

diff --git a/math/R/Makefile b/math/R/Makefile
index e666dc8685bd..f04bd84eefab 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=		R
 DISTVERSION=		3.4.2
-PORTREVISION=		2
+PORTREVISION=		3
 CATEGORIES=		math lang
 MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
@@ -29,23 +29,20 @@ USES=			gmake iconv libtool localbase \
 USE_PERL5=		build
 USE_LDCONFIG=		${PREFIX}/lib/R/lib
 
-OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS OPENMP RPROF X11
+OPTIONS_DEFINE=		FLANG ICU INFO LDOUBLE LETTER LIBR MEMPROF NLS OPENMP RPROF X11
+OPTIONS_EXCLUDE_aarch64=FLANG	# define+exclude for *_OFF option helpers
+OPTIONS_EXCLUDE_i386=	FLANG
 OPTIONS_GROUP=		NEEDX11
 OPTIONS_GROUP_NEEDX11=	GHOSTSCRIPT JPEG CAIROPANGO PNG TCLTK TEXDOCS TIFF
-OPTIONS_SINGLE=		BLAS FORTRAN
+OPTIONS_SINGLE=		BLAS
 OPTIONS_SINGLE_BLAS=	ATLAS OPENBLAS NETLIB RBLAS
-OPTIONS_SINGLE_FORTRAN=	${OPTIONS_SINGLE_FORTRAN_${MACHINE_ARCH}}
-OPTIONS_SINGLE_FORTRAN_i386=	GFORTRAN
-OPTIONS_SINGLE_FORTRAN_aarch64=	GFORTRAN
-OPTIONS_SINGLE_FORTRAN_amd64=	GFORTRAN FLANG
 
 OPTIONS_SUB=		YES
 
 ATLAS_DESC=		ATLAS BLAS implementation
-FLANG_DESC=		Build Fortran source with flang
+FLANG_DESC=		Use flang instead of the default Fortran compiler
 GHOSTSCRIPT_DESC=	Graphics device for bitmap files via Ghostscript
 CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
-GFORTRAN_DESC=		Build Fortran source with gfortran
 INFO_DESC=		GNU info manuals
 JPEG_DESC=		JPEG graphics device
 LDOUBLE_DESC=		Long double data type
@@ -64,9 +61,6 @@ X11_DESC=		X11 graphics device
 
 OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE LIBR PNG \
 			RBLAS RPROF TCLTK TIFF X11
-OPTIONS_DEFAULT_aarch64=GFORTRAN
-OPTIONS_DEFAULT_amd64=	FLANG
-OPTIONS_DEFAULT_i386=	GFORTRAN
 
 ATLAS_USES=		blaslapack:atlas
 ATLAS_CONFIGURE_ON=	--disable-BLAS-shlib
@@ -77,9 +71,8 @@ CAIROPANGO_CONFIGURE_WITH=cairo
 CAIROPANGO_USES=	gettext jpeg pkgconfig
 CAIROPANGO_USE=		GNOME=pango,cairo
 FLANG_USES=		fortran:flang
+FLANG_USES_OFF=		fortran
 FLANG_PREVENTS=		ATLAS OPENBLAS NETLIB
-GFORTRAN_USES=		fortran:gcc
-GFORTRAN_RUN_DEPENDS=	wget:ftp/wget
 GHOSTSCRIPT_IMPLIES=	X11
 GHOSTSCRIPT_USES=	ghostscript
 ICU_CONFIGURE_WITH=	ICU
diff --git a/math/libRmath/Makefile b/math/libRmath/Makefile
index dff4fb796d32..913fddfa9340 100644
--- a/math/libRmath/Makefile
+++ b/math/libRmath/Makefile
@@ -3,7 +3,7 @@
 
 PORTNAME=	libRmath
 DISTVERSION=	3.4.2
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
 DISTNAME=	R-${DISTVERSIONPREFIX}${DISTVERSION}${DISTVERSIONSUFFIX}
@@ -31,22 +31,13 @@ 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
+OPTIONS_DEFINE=		FLANG
+OPTIONS_EXCLUDE_aarch64=FLANG
+OPTIONS_EXCLUDE_i386=	FLANG
 
-FLANG_DESC=		Build Fortran source with flang
-GFORTRAN_DESC=		Build Fortran source with gfortran
-
-GFORTRAN_USES=		fortran:gcc
+FLANG_DESC=		Use flang instead of the default Fortran compiler
 FLANG_USES=		fortran:flang
-
-.include <bsd.port.options.mk>
-
-.if ${ARCH} != amd64
-USES+=		fortran:gcc
-.endif
+FLANG_USES_OFF=		fortran
 
 post-patch:
 	@${REINPLACE_CMD} -e 's|(libdir)/pkgconfig|(prefix)/libdata/pkgconfig|g'\