Skip site navigation (1)Skip section navigation (2)
Date:      Fri, 9 Jun 2023 18:44:24 GMT
From:      Piotr Kubaj <pkubaj@FreeBSD.org>
To:        ports-committers@FreeBSD.org, dev-commits-ports-all@FreeBSD.org, dev-commits-ports-main@FreeBSD.org
Subject:   git: 1b2f76ac985f - main - graphics/R-cran-s2: regenerate patch
Message-ID:  <202306091844.359IiOWx056216@gitrepo.freebsd.org>

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

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

commit 1b2f76ac985f5b0825058918a479e859fc3701d6
Author:     Piotr Kubaj <pkubaj@FreeBSD.org>
AuthorDate: 2023-06-09 17:26:11 +0000
Commit:     Piotr Kubaj <pkubaj@FreeBSD.org>
CommitDate: 2023-06-09 18:44:22 +0000

    graphics/R-cran-s2: regenerate patch
    
    ===>  Applying extra patch /usr/ports/graphics/R-cran-s2/files/extra-patch-src_Makevars.in
    1 out of 1 hunks failed--saving rejects to src/Makevars.in.rej
    ===>  FAILED Applying extra patch /usr/ports/graphics/R-cran-s2/files/extra-patch-src_Makevars.in
    *** Error code 1
---
 graphics/R-cran-s2/files/extra-patch-src_Makevars.in | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/graphics/R-cran-s2/files/extra-patch-src_Makevars.in b/graphics/R-cran-s2/files/extra-patch-src_Makevars.in
index bfbd3bb57d12..c017fdb15481 100644
--- a/graphics/R-cran-s2/files/extra-patch-src_Makevars.in
+++ b/graphics/R-cran-s2/files/extra-patch-src_Makevars.in
@@ -1,10 +1,10 @@
---- src/Makevars.in.orig	2021-07-06 12:09:16 UTC
+--- src/Makevars.in.orig	2023-05-13 20:29:12 UTC
 +++ src/Makevars.in
 @@ -1,6 +1,6 @@
- PKG_CPPFLAGS = -I../inst/include -DSTRICT_R_HEADERS
+ PKG_CPPFLAGS = -I../src -DSTRICT_R_HEADERS
  PKG_LIBS = @libs@
 -PKG_CXXFLAGS = @cflags@ -pthread
 +PKG_CXXFLAGS = @cflags@ -pthread -mcpu=power7
+ 
  CXX_STD = CXX11
  
- OBJECTS = cpp-compat.o \



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