CVS commit: pkgsrc/lang/R-RcppTOML

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Tue Jul 14 12:55:59 UTC 2026

Modified Files:
        pkgsrc/lang/R-RcppTOML: Makefile distinfo
        pkgsrc/lang/R-RcppTOML/patches: patch-src_Makevars

Log Message:
(lang/R-RcppTOML) Fix build on Darwin and hopefully on Linux


To generate a diff of this commit:
cvs rdiff -u -r1.2 -r1.3 pkgsrc/lang/R-RcppTOML/Makefile \
    pkgsrc/lang/R-RcppTOML/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/lang/R-RcppTOML/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/lang/R-RcppTOML/Makefile
diff -u pkgsrc/lang/R-RcppTOML/Makefile:1.2 pkgsrc/lang/R-RcppTOML/Makefile:1.3
--- pkgsrc/lang/R-RcppTOML/Makefile:1.2 Tue May 26 21:40:13 2026
+++ pkgsrc/lang/R-RcppTOML/Makefile     Tue Jul 14 12:55:59 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.2 2026/05/26 21:40:13 mef Exp $
+# $NetBSD: Makefile,v 1.3 2026/07/14 12:55:59 mef Exp $
 
 R_PKGNAME=     RcppTOML
 R_PKGVER=      0.2.2
@@ -18,8 +18,17 @@ TEST_DEPENDS+=       tex-url-[0-9]*:../../prin
 TEST_DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval
 
 USE_LANGUAGES= c c++
-# only for ifne at patch-src_Makevars
-USE_TOOLS+=    gmake
+
+.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 && ${OPSYS} != Darwin
+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"
Index: pkgsrc/lang/R-RcppTOML/distinfo
diff -u pkgsrc/lang/R-RcppTOML/distinfo:1.2 pkgsrc/lang/R-RcppTOML/distinfo:1.3
--- pkgsrc/lang/R-RcppTOML/distinfo:1.2 Tue May 26 21:40:13 2026
+++ pkgsrc/lang/R-RcppTOML/distinfo     Tue Jul 14 12:55:59 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.2 2026/05/26 21:40:13 mef Exp $
+$NetBSD: distinfo,v 1.3 2026/07/14 12:55:59 mef Exp $
 
 BLAKE2s (R/RcppTOML_0.2.2.tar.gz) = 0777083706a2b65cf5aad48690a50459ec66d765e16872d5e737748c42f849fc
 SHA512 (R/RcppTOML_0.2.2.tar.gz) = bfd175993f7f105c5cdb50b3da6d487955a8372a7f4662f8a171752f0e952e810af41100e1be1241f6f26684286c41597f84ff4952c319774c3e0543ade80f47
 Size (R/RcppTOML_0.2.2.tar.gz) = 141195 bytes
-SHA1 (patch-src_Makevars) = edee77b14e7bfe9988dd63cb9e00b3298d7dfe73
+SHA1 (patch-src_Makevars) = 444ad40fad7b7b81f8893c4dacb86d5c400b1379

Index: pkgsrc/lang/R-RcppTOML/patches/patch-src_Makevars
diff -u pkgsrc/lang/R-RcppTOML/patches/patch-src_Makevars:1.1 pkgsrc/lang/R-RcppTOML/patches/patch-src_Makevars:1.2
--- pkgsrc/lang/R-RcppTOML/patches/patch-src_Makevars:1.1       Tue May 26 21:40:14 2026
+++ pkgsrc/lang/R-RcppTOML/patches/patch-src_Makevars   Tue Jul 14 12:55:59 2026
@@ -1,18 +1,11 @@
-$NetBSD: patch-src_Makevars,v 1.1 2026/05/26 21:40:14 mef Exp $
+$NetBSD: patch-src_Makevars,v 1.2 2026/07/14 12:55:59 mef Exp $
 
 symbol backtrace_symbols is defined in /usr/lib/libexecinfo
 
 --- src/Makevars.orig  2023-01-29 09:03:42.000000000 +0900
 +++ src/Makevars       2026-05-27 06:36:20.233827202 +0900
-@@ -2,3 +2,11 @@
+@@ -2,3 +2,4 @@
  CXX_STD = CXX17
  
  PKG_CPPFLAGS = -I../inst/include -DTOML_ENABLE_FLOAT16=0
-+
-+UNAME := $(shell uname)
-+
-+ifneq ($(UNAME), Linux)
-+ifneq ($(UNAME), SunOS)
-+PKG_LIBS += -lexecinfo
-+endif
-+endif
++@@PKG_LIBS@@