CVS commit: pkgsrc/textproc/R-readxl

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Wed Jun 10 13:17:48 UTC 2026

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

Log Message:
(textproc/R-readxl) fix build against R-4.6.0


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/textproc/R-readxl/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/textproc/R-readxl/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/textproc/R-readxl/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-readxl/Makefile
diff -u pkgsrc/textproc/R-readxl/Makefile:1.2 pkgsrc/textproc/R-readxl/Makefile:1.3
--- pkgsrc/textproc/R-readxl/Makefile:1.2       Thu Aug  8 19:53:57 2019
+++ pkgsrc/textproc/R-readxl/Makefile   Wed Jun 10 13:17:47 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2019/08/08 19:53:57 brook Exp $
+# $NetBSD: Makefile,v 1.3 2026/06/10 13:17:47 mef Exp $
 
 R_PKGNAME=     readxl
 R_PKGVER=      1.3.1
@@ -13,6 +13,18 @@ DEPENDS+=    R-cellranger>=1.1.0:../../text
 
 USE_LANGUAGES+=        c c++
 
+.include "../../mk/bsd.prefs.mk"
+
+SUBST_CLASSES+=                pkglibs
+SUBST_STAGE.pkglibs=   pre-configure
+SUBST_FILES.pkglibs=   src/Makevars
+SUBST_MESSAGE.pkglibs= Add -lexecinfo for *BSD
+.if ${OPSYS} != SunOS && ${OPSYS} != Linux
+SUBST_SED.pkglibs=     -e s,@@PKG_LIBS@@,PKG_LIBS+=-lexecinfo,
+.else
+SUBST_SED.pkglibs=     -e s,@@PKG_LIBS@@,,
+.endif
+
 .include "../../math/R/Makefile.extension"
 .include "../../devel/R-Rcpp/buildlink3.mk"
 .include "../../sysutils/R-progress/buildlink3.mk"

Index: pkgsrc/textproc/R-readxl/distinfo
diff -u pkgsrc/textproc/R-readxl/distinfo:1.3 pkgsrc/textproc/R-readxl/distinfo:1.4
--- pkgsrc/textproc/R-readxl/distinfo:1.3       Tue Oct 26 11:21:31 2021
+++ pkgsrc/textproc/R-readxl/distinfo   Wed Jun 10 13:17:47 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.3 2021/10/26 11:21:31 nia Exp $
+$NetBSD: distinfo,v 1.4 2026/06/10 13:17:47 mef Exp $
 
 BLAKE2s (R/readxl_1.3.1.tar.gz) = 697a490da2cf6df09c6adeb062859fbf0f6116b1404cc5ba5a5115f0daa9fa2e
 SHA512 (R/readxl_1.3.1.tar.gz) = befeb57b4b5eeb934e08927aca0c0026591d264c34a029f2d77509b60d466c7f8e5df7d11bd38865ab1010042eb30f93363bf0c6fce608ae724f1ccb0b402ac2
 Size (R/readxl_1.3.1.tar.gz) = 2056165 bytes
+SHA1 (patch-src_Makevars) = 45f469bf6e2342f5e64cd74fce8b6c58a10c99d2

Added files:

Index: pkgsrc/textproc/R-readxl/patches/patch-src_Makevars
diff -u /dev/null pkgsrc/textproc/R-readxl/patches/patch-src_Makevars:1.1
--- /dev/null   Wed Jun 10 13:17:48 2026
+++ pkgsrc/textproc/R-readxl/patches/patch-src_Makevars Wed Jun 10 13:17:47 2026
@@ -0,0 +1,23 @@
+$NetBSD: patch-src_Makevars,v 1.1 2026/06/10 13:17:47 mef Exp $
+
+- The Problem is:
+  RcppEigen.so: Undefined PLT symbol "backtrace_symbols" (symnum = 108)
+
+- The symbol "backtrace_symbols" is defined in /usr/lib/libexecinfo
+  at *BSD OS
+
+- R package does not honor LIBS+= parameter, due to real build is done
+  at (pkgsrc) install stage
+
+- Neither bmake (.if eq ... .endif) nor gmake ( ifneq .. endif) does work
+  in src/Makevars
+
+- So the condition branch will be done at SUBST mechanism
+
+--- src/Makevars.orig  2019-03-14 01:01:23.000000000 +0900
++++ src/Makevars       2026-06-10 21:56:52.450346394 +0900
+@@ -1,3 +1,4 @@
+ PKG_CPPFLAGS = -Iunix -I. -DRCPP_DEFAULT_INCLUDE_CALL=false
+ PKG_CFLAGS = $(C_VISIBILITY)
+ PKG_CXXFLAGS = $(CXX_VISIBILITY)
++@@PKG_LIBS@@