CVS commit: pkgsrc/textproc/R-readr

["Joerg Sonnenberger" <joerg%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   joerg
Date:           Wed Dec 18 12:42:05 UTC 2019

Modified Files:
        pkgsrc/textproc/R-readr: Makefile distinfo
Added Files:
        pkgsrc/textproc/R-readr/patches: patch-src_Makevars

Log Message:
Fix rpath in DSO, don't test on runtime due to $DESTDIR.


To generate a diff of this commit:
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/R-readr/Makefile
cvs rdiff -u -r1.1 -r1.2 pkgsrc/textproc/R-readr/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/R-readr/patches/patch-src_Makevars

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

Modified files:

Index: pkgsrc/textproc/R-readr/Makefile
diff -u pkgsrc/textproc/R-readr/Makefile:1.3 pkgsrc/textproc/R-readr/Makefile:1.4
--- pkgsrc/textproc/R-readr/Makefile:1.3        Wed Sep 25 17:35:51 2019
+++ pkgsrc/textproc/R-readr/Makefile    Wed Dec 18 12:42:04 2019
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.3 2019/09/25 17:35:51 brook Exp $
+# $NetBSD: Makefile,v 1.4 2019/12/18 12:42:04 joerg Exp $
 
 R_PKGNAME=     readr
 R_PKGVER=      1.3.1
+PKGREVISION=   1
 CATEGORIES=    textproc
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -30,6 +31,10 @@ post-install:
 .endif
 
 .include "../../math/R/Makefile.extension"
+
+# Can't find librcon.so during test.
+R_PKG_INSTALL_ARGS+=   --no-test-load
+
 .include "../../devel/R-Rcpp/buildlink3.mk"
 .include "../../devel/boost-headers/buildlink3.mk"
 .include "../../mk/bsd.pkg.mk"

Index: pkgsrc/textproc/R-readr/distinfo
diff -u pkgsrc/textproc/R-readr/distinfo:1.1 pkgsrc/textproc/R-readr/distinfo:1.2
--- pkgsrc/textproc/R-readr/distinfo:1.1        Wed Jul 31 13:52:15 2019
+++ pkgsrc/textproc/R-readr/distinfo    Wed Dec 18 12:42:04 2019
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.1 2019/07/31 13:52:15 brook Exp $
+$NetBSD: distinfo,v 1.2 2019/12/18 12:42:04 joerg Exp $
 
 SHA1 (R/readr_1.3.1.tar.gz) = 82b92ca252d6079778c32ed634fe1e3fc4cb109e
 RMD160 (R/readr_1.3.1.tar.gz) = d513393cf41e234fa907d55e2902252bdbb30353
 SHA512 (R/readr_1.3.1.tar.gz) = 343079275436fedf6a6c539692cdf23a7b877c2f62c439ab030fb72aa145bd39bf8d2574aaf095e1c6baadba1be3ae44789e209386bd27cfe1c8d1512d14b9fd
 Size (R/readr_1.3.1.tar.gz) = 268853 bytes
+SHA1 (patch-src_Makevars) = 8f0f388c32b19e82bf4899a3c3bd4da42b8860dd

Added files:

Index: pkgsrc/textproc/R-readr/patches/patch-src_Makevars
diff -u /dev/null pkgsrc/textproc/R-readr/patches/patch-src_Makevars:1.1
--- /dev/null   Wed Dec 18 12:42:05 2019
+++ pkgsrc/textproc/R-readr/patches/patch-src_Makevars  Wed Dec 18 12:42:04 2019
@@ -0,0 +1,13 @@
+$NetBSD: patch-src_Makevars,v 1.1 2019/12/18 12:42:04 joerg Exp $
+
+--- src/Makevars.orig  2019-12-10 22:19:51.276819189 +0000
++++ src/Makevars
+@@ -6,7 +6,7 @@ else
+ RPATH = '../../rcon$(R_ARCH)'
+ endif
+ 
+-PKG_LIBS = -L. -lrcon -L$(RCON_DIR) -Wl,-rpath,'$$ORIGIN/$(RPATH)'
++PKG_LIBS = -L. -lrcon -L$(RCON_DIR) -Wl,-rpath,${PREFIX}/lib/R/library/readr/rcon
+ PKG_CXXFLAGS = -I. -Ircon
+ 
+ LIBRCON = ../inst/rcon$(R_ARCH)/librcon.so