git: c943a5c42e03 - main - math/R: Update to 4.2.2; remove FLANG option

The branch main has been updated by jrm:

URL: https://cgit.FreeBSD.org/ports/commit/?id=c943a5c42e03201411b8e9598b99a87da33c18c6

commit c943a5c42e03201411b8e9598b99a87da33c18c6
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2022-10-31 16:58:18 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2022-11-02 11:49:57 +0000

    math/R: Update to 4.2.2; remove FLANG option
    
    https://hypatia.math.ethz.ch/pipermail/r-announce/2022/000686.html
    
    Remove the FLANG option since lang/flang was removed from the tree on
    2022-09-30.  In the future, the option can be re-added to use flang that
    is part of devel/llvm13+.
    
    Sponsored by:   The FreeBSD Foundation
---
 math/R/Makefile | 34 ++++++++--------------------------
 math/R/distinfo |  6 +++---
 2 files changed, 11 insertions(+), 29 deletions(-)

diff --git a/math/R/Makefile b/math/R/Makefile
index f320d47df220..e39f9caf161d 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -1,6 +1,5 @@
 PORTNAME=	R
-DISTVERSION=	4.2.1
-PORTREVISION=	1
+DISTVERSION=	4.2.2
 CATEGORIES=	math lang
 MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
@@ -16,8 +15,8 @@ BUILD_DEPENDS=	texi2any:print/texinfo
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre2-8.so:devel/pcre2
 # R packages may require GNU make or cmake to build
-RUN_DEPENDS=	gmake:devel/gmake \
-		cmake:devel/cmake-core
+RUN_DEPENDS=	cmake:devel/cmake-core \
+		gmake:devel/gmake
 
 # possible TODO
 # - Use --with-recommended-packages=no by default
@@ -25,8 +24,8 @@ RUN_DEPENDS=	gmake:devel/gmake \
 # - Create ports for each of the recommended packages
 # - Create a meta-port for the recommended packages
 
-USES=		compiler:c++11-lang cpe gmake iconv libtool localbase pathfix \
-		perl5 readline
+USES=		compiler:c++11-lang cpe fortran gmake iconv libtool localbase \
+		pathfix perl5 readline
 CPE_VENDOR=	r-project
 USE_LDCONFIG=	${PREFIX}/lib/R/lib
 USE_PERL5=	build
@@ -40,17 +39,9 @@ INSTALL_TARGET=	install-strip
 PLIST_SUB=	FULLVER=${DISTVERSION} \
 		MAJORVER=${_MAJORVER}
 
-OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER MEMPROF NLS RPROF X11
-OPTIONS_DEFINE_amd64=	FLANG OPENMP
-OPTIONS_DEFINE_i386=	OPENMP
-OPTIONS_DEFINE_powerpc64=	OPENMP
-OPTIONS_DEFINE_powerpc64le=	OPENMP
-OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE PNG RBLAS \
-			RPROF TCLTK TIFF X11
-OPTIONS_DEFAULT_amd64=	OPENMP
-OPTIONS_DEFAULT_i386=	OPENMP
-OPTIONS_DEFAULT_powerpc64=	OPENMP
-OPTIONS_DEFAULT_powerpc64le=	OPENMP
+OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER MEMPROF NLS OPENMP RPROF X11
+OPTIONS_DEFAULT=	CAIROPANGO GHOSTSCRIPT ICU INFO JPEG LDOUBLE OPENMP PNG \
+			RBLAS RPROF TCLTK TIFF X11
 OPTIONS_GROUP=		NEEDX11
 OPTIONS_GROUP_NEEDX11=	CAIROPANGO GHOSTSCRIPT JPEG PNG TCLTK TEXDOCS TIFF
 OPTIONS_SINGLE=		BLAS
@@ -59,7 +50,6 @@ OPTIONS_SINGLE_BLAS=	ATLAS NETLIB OPENBLAS RBLAS
 OPTIONS_SUB=	YES
 
 CAIROPANGO_DESC=	Cairo graphics device and Pango multi-language text
-FLANG_DESC=		Use experimental flang Fortran compiler
 GHOSTSCRIPT_DESC=	Graphics device for bitmap files via Ghostscript
 JPEG_DESC=		JPEG graphics device
 LDOUBLE_DESC=		Long double data type
@@ -80,9 +70,6 @@ CAIROPANGO_LIB_DEPENDS=		libharfbuzz.so:print/harfbuzz
 CAIROPANGO_USES=		gettext gnome jpeg pkgconfig
 CAIROPANGO_USE=			GNOME=cairo,pango
 CAIROPANGO_CONFIGURE_WITH=	cairo
-FLANG_PREVENTS=			ATLAS NETLIB OPENBLAS
-FLANG_LIB_DEPENDS=		libpgmath.so:math/libpgmath
-FLANG_USES=			fortran:flang
 GHOSTSCRIPT_IMPLIES=		X11
 GHOSTSCRIPT_USES=		ghostscript
 ICU_LIB_DEPENDS=		libicui18n.so:devel/icu
@@ -135,11 +122,6 @@ _MAJORVER=	${DISTVERSION:R:R}
 
 .include <bsd.port.options.mk>
 
-## Cannot use FLANG_USES_OFF=fortran because the FLANG option is only for amd64
-.if ! ${PORT_OPTIONS:MFLANG}
-USES+=		fortran
-.endif
-
 post-patch:
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} \
diff --git a/math/R/distinfo b/math/R/distinfo
index b9433988c5e4..090457509eb4 100644
--- a/math/R/distinfo
+++ b/math/R/distinfo
@@ -1,3 +1,3 @@
-TIMESTAMP = 1656121127
-SHA256 (R-4.2.1.tar.gz) = 4d52db486d27848e54613d4ee977ad952ec08ce17807e1b525b10cd4436c643f
-SIZE (R-4.2.1.tar.gz) = 37601544
+TIMESTAMP = 1667234600
+SHA256 (R-4.2.2.tar.gz) = 0ff62b42ec51afa5713caee7c4fde7a0c45940ba39bef8c5c9487fef0c953df5
+SIZE (R-4.2.2.tar.gz) = 33987014