From owner-dev-commits-ports-main@freebsd.org Wed Apr 7 19:55:58 2021 Return-Path: Delivered-To: dev-commits-ports-main@mailman.nyi.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.nyi.freebsd.org (Postfix) with ESMTP id 73A6B5C2F90; Wed, 7 Apr 2021 19:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256 client-signature RSA-PSS (4096 bits) client-digest SHA256) (Client CN "mxrelay.nyi.freebsd.org", Issuer "R3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id 4FFwB62vDDz4h7g; Wed, 7 Apr 2021 19:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org (gitrepo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:5]) (using TLSv1.3 with cipher TLS_AES_256_GCM_SHA384 (256/256 bits) key-exchange X25519 server-signature RSA-PSS (4096 bits) server-digest SHA256) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id 5292425230; Wed, 7 Apr 2021 19:55:58 +0000 (UTC) (envelope-from git@FreeBSD.org) Received: from gitrepo.freebsd.org ([127.0.1.44]) by gitrepo.freebsd.org (8.16.1/8.16.1) with ESMTP id 137JtwXd069083; Wed, 7 Apr 2021 19:55:58 GMT (envelope-from git@gitrepo.freebsd.org) Received: (from git@localhost) by gitrepo.freebsd.org (8.16.1/8.16.1/Submit) id 137Jtw84069082; Wed, 7 Apr 2021 19:55:58 GMT (envelope-from git) Date: Wed, 7 Apr 2021 19:55:58 GMT Message-Id: <202104071955.137Jtw84069082@gitrepo.freebsd.org> To: ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org From: Joseph Mingrone Subject: git: cd39514f1ed2 - main - math/R: Incorporate formatting suggestions from portclippy/portfmt MIME-Version: 1.0 Content-Type: text/plain; charset=utf-8 Content-Transfer-Encoding: 8bit X-Git-Committer: jrm X-Git-Repository: ports X-Git-Refname: refs/heads/main X-Git-Reftype: branch X-Git-Commit: cd39514f1ed279ea561a5293bd0e3658abceaeae Auto-Submitted: auto-generated X-BeenThere: dev-commits-ports-main@freebsd.org X-Mailman-Version: 2.1.34 Precedence: list List-Id: Commits to the main branch of the FreeBSD ports repository List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Wed, 07 Apr 2021 19:55:58 -0000 The branch main has been updated by jrm: URL: https://cgit.FreeBSD.org/ports/commit/?id=cd39514f1ed279ea561a5293bd0e3658abceaeae commit cd39514f1ed279ea561a5293bd0e3658abceaeae Author: Joseph Mingrone AuthorDate: 2021-04-07 19:34:37 +0000 Commit: Joseph Mingrone 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