From 16c89d12ec5c03f824e4925d18b8849c4ab1e86b Mon Sep 17 00:00:00 2001
From: Joseph Mingrone <jrm@FreeBSD.org>
Date: Sun, 3 Oct 2021 11:20:38 -0300
Subject: math/R: Fix build with clang/openmp 13

The mgcv package is one of the recommended packages to be installed with
R.  A problem with mgcv and clang/openmp 13 is that mgcv versions prior
to 1.8-37 place 'include <omp.h>' after 'include <R.h>'.  This causes a
conflict between '#define match' and an openmp pragma line, which uses
match().  This problem was fixed in mgcv 1.8-37, so replace mgcv 1.8-36
with this newer version.

While here, incorporate formatting changes suggested by portclippy and
portfmt.

PR:		258887
Approved by:	dim
Differential Revision:	https://reviews.freebsd.org/D32280
---
 math/R/Makefile | 18 ++++++++++++------
 1 file changed, 12 insertions(+), 6 deletions(-)

(limited to 'math/R/Makefile')

diff --git a/math/R/Makefile b/math/R/Makefile
index f11b5efacc03..b7fb5c45083c 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -2,9 +2,13 @@
 
 PORTNAME=	R
 DISTVERSION=	4.1.1
-PORTREVISION=	1
+PORTREVISION=	2
 CATEGORIES=	math lang
-MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||}
+MASTER_SITES=	CRAN/src/base/R-${PORTVERSION:C|\..*||} \
+		CRAN/src/contrib/:packages
+DISTFILES=	${DISTNAME}${EXTRACT_SUFX} \
+		mgcv_1.8-37${EXTRACT_SUFX}:packages
+EXTRACT_ONLY=	${DISTNAME}${EXTRACT_SUFX}
 
 MAINTAINER=	jrm@FreeBSD.org
 COMMENT=	Language for statistical computing and graphics
@@ -25,13 +29,12 @@ 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 gmake iconv libtool localbase pathfix \
+		perl5 readline
+CPE_VENDOR=	r-project
 USE_LDCONFIG=	${PREFIX}/lib/R/lib
 USE_PERL5=	build
 
-CPE_VENDOR=	r-project
-
 GNU_CONFIGURE=	yes
 CONFIGURE_ARGS=	--disable-java \
 		--enable-R-shlib \
@@ -141,6 +144,9 @@ USES+=		fortran
 .endif
 
 post-patch:
+	@${CP} ${DISTDIR}/mgcv_1.8-37${EXTRACT_SUFX} ${WRKSRC}/src/library/Recommended/
+	@${RM} ${WRKSRC}/src/library/Recommended/mgcv.tgz ${WRKSRC}/src/library/Recommended/mgcv_1.8-36.tar.gz
+	@${LN} -s ${WRKSRC}/src/library/Recommended/mgcv_1.8-37${EXTRACT_SUFX} ${WRKSRC}/src/library/Recommended/mgcv.tgz
 	@${REINPLACE_CMD} -e "s|/usr/local|${LOCALBASE}|g" ${WRKSRC}/configure
 	@${REINPLACE_CMD} \
 		-e "s|%%FULLVER%%|${DISTVERSION}|" \
-- 
cgit v1.2.3