From 243305cde1010ebfdc47d1bfbf6ca605ade6fd4c Mon Sep 17 00:00:00 2001
From: Joseph Mingrone <jrm@FreeBSD.org>
Date: Thu, 26 Oct 2017 17:05:20 +0000
Subject: math/R: Use the new flang argument to USES=fortran and patch libR.pc
 to link the appropriate BLAS library.

PR:		220418
Submitted by:	yuri@rawbw.com
---
 math/R/Makefile | 21 +++++++++++----------
 1 file changed, 11 insertions(+), 10 deletions(-)

(limited to 'math/R')

diff --git a/math/R/Makefile b/math/R/Makefile
index 3103c6c93f4d..a3db8d180595 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -3,6 +3,7 @@
 
 PORTNAME=		R
 DISTVERSION=		3.4.2
+PORTREVISION=		1
 CATEGORIES=		math lang
 MASTER_SITES=		CRAN/src/base/R-${PORTVERSION:C|\..*||}
 
@@ -75,17 +76,9 @@ CAIROPANGO_IMPLIES=	X11
 CAIROPANGO_CONFIGURE_WITH=cairo
 CAIROPANGO_USES=	gettext jpeg pkgconfig
 CAIROPANGO_USE=		GNOME=pango,cairo
-FLANG_USE=		binutils
-#FLANG_USES=		fortran:flang
+FLANG_USES=		fortran:flang
 FLANG_PREVENTS=		ATLAS OPENBLAS NETLIB
-FLANG_BUILD_DEPENDS=	flang:devel/flang
-FLANG_RUN_DEPENDS=	flang:devel/flang
-FLANG_VARS=		F77=flang FC=flang
-FLANG_LDFLAGS=		-L${LOCALBASE}/flang/lib -lflang -lexecinfo
-FLANG_CONFIGURE_ENV=	F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
-FLANG_MAKE_ENV=		F77="${F77}" FC="${FC}" FFLAGS="${FFLAGS}"
-#GFORTRAN_USE=		gcc=yes
-GFORTRAN_USES=		fortran
+GFORTRAN_USES=		fortran:gcc
 GFORTRAN_RUN_DEPENDS=	wget:ftp/wget
 GHOSTSCRIPT_IMPLIES=	X11
 GHOSTSCRIPT_USES=	ghostscript
@@ -145,6 +138,14 @@ post-patch:
 		${WRKSRC}/src/extra/blas/Makefile.in \
 		${WRKSRC}/src/modules/lapack/Makefile.in
 
+post-install-RBLAS-on:
+	@${REINPLACE_CMD} -e "s| -lR| -lR -lRblas|" \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
+
+post-install-RBLAS-off:
+	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
+		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
+
 .include <bsd.port.pre.mk>
 .include "compiler.mk"
 .include <bsd.port.post.mk>
-- 
cgit v1.2.3