Skip site navigation (1)Skip section navigation (2)
Date:      Wed, 7 Apr 2021 19:55:58 GMT
From:      Joseph Mingrone <jrm@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: cd39514f1ed2 - main - math/R: Incorporate formatting suggestions from portclippy/portfmt
Message-ID:  <202104071955.137Jtw84069082@gitrepo.freebsd.org>

next in thread | raw e-mail | index | archive | help
The branch main has been updated by jrm:

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

commit cd39514f1ed279ea561a5293bd0e3658abceaeae
Author:     Joseph Mingrone <jrm@FreeBSD.org>
AuthorDate: 2021-04-07 19:34:37 +0000
Commit:     Joseph Mingrone <jrm@FreeBSD.org>
CommitDate: 2021-04-07 19:52:10 +0000

    math/R: Incorporate formatting suggestions from portclippy/portfmt
---
 math/R/Makefile | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/math/R/Makefile b/math/R/Makefile
index 2df8d6e9b617..9e626b48eb43 100644
--- a/math/R/Makefile
+++ b/math/R/Makefile
@@ -16,7 +16,8 @@ ONLY_FOR_ARCHS=	aarch64 amd64 armv6 armv7 i386 powerpc64 powerpc64le
 BUILD_DEPENDS=	texi2any:print/texinfo
 LIB_DEPENDS=	libcurl.so:ftp/curl \
 		libpcre2-8.so:devel/pcre2
-RUN_DEPENDS=	gmake:devel/gmake # R packages may require GNU make
+# R packages may require GNU make
+RUN_DEPENDS=	gmake:devel/gmake
 
 # possible TODO
 # - Use --with-recommended-packages=no by default
@@ -35,7 +36,8 @@ CONFIGURE_ARGS=	--disable-java \
 		--with-readline \
 		rdocdir=${DOCSDIR}
 INSTALL_TARGET=	install-strip
-PLIST_SUB=	FULLVER=${DISTVERSION} MAJORVER=${_MAJORVER}
+PLIST_SUB=	FULLVER=${DISTVERSION} \
+		MAJORVER=${_MAJORVER}
 
 OPTIONS_DEFINE=		ICU INFO LDOUBLE LETTER MEMPROF NLS RPROF X11
 OPTIONS_DEFINE_amd64=	FLANG OPENMP
@@ -143,12 +145,12 @@ post-patch:
 		${WRKSRC}/src/extra/blas/Makefile.in \
 		${WRKSRC}/src/modules/lapack/Makefile.in
 
-post-install-RBLAS-off:
-	@${REINPLACE_CMD} -e "s| -lR| -lR ${BLASLIB}|" \
-		${STAGEDIR}${PREFIX}/libdata/pkgconfig/libR.pc
-
 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.mk>



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?202104071955.137Jtw84069082>