CVS commit: pkgsrc/math/R-RcppArmadillo

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Sun Jul  5 13:26:16 UTC 2026

Modified Files:
        pkgsrc/math/R-RcppArmadillo: Makefile distinfo
        pkgsrc/math/R-RcppArmadillo/patches: patch-src_Makevars.in

Log Message:
(math/R-RcppArmadillo) Fix build on Darwin,Linux, hopefully


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/math/R-RcppArmadillo/Makefile \
    pkgsrc/math/R-RcppArmadillo/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/math/R-RcppArmadillo/patches/patch-src_Makevars.in

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

Modified files:

Index: pkgsrc/math/R-RcppArmadillo/Makefile
diff -u pkgsrc/math/R-RcppArmadillo/Makefile:1.11 pkgsrc/math/R-RcppArmadillo/Makefile:1.12
--- pkgsrc/math/R-RcppArmadillo/Makefile:1.11   Tue May 26 13:10:41 2026
+++ pkgsrc/math/R-RcppArmadillo/Makefile        Sun Jul  5 13:26:16 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.11 2026/05/26 13:10:41 mef Exp $
+# $NetBSD: Makefile,v 1.12 2026/07/05 13:26:16 mef Exp $
 
 R_PKGNAME=     RcppArmadillo
 R_PKGVER=      15.2.6-1
@@ -14,11 +14,20 @@ TEST_DEPENDS+=      R-slam-[0-9]*:../../math/
 
 USE_LANGUAGES=         c++ fortran
 USE_CXX_FEATURES+=     c++11
-# for patch portablility (ifne)
-USE_TOOLS+=            gmake
 # configure claims 7.5 is too old
 GCC_REQD+=             8
 
+.include "../../mk/bsd.prefs.mk"
+SUBST_CLASSES+=                pkglibs
+SUBST_STAGE.pkglibs=   pre-configure
+SUBST_FILES.pkglibs=   src/Makevars.in
+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"
 .include "../../mk/bsd.pkg.mk"
Index: pkgsrc/math/R-RcppArmadillo/distinfo
diff -u pkgsrc/math/R-RcppArmadillo/distinfo:1.11 pkgsrc/math/R-RcppArmadillo/distinfo:1.12
--- pkgsrc/math/R-RcppArmadillo/distinfo:1.11   Tue May 26 13:10:41 2026
+++ pkgsrc/math/R-RcppArmadillo/distinfo        Sun Jul  5 13:26:16 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.11 2026/05/26 13:10:41 mef Exp $
+$NetBSD: distinfo,v 1.12 2026/07/05 13:26:16 mef Exp $
 
 BLAKE2s (R/RcppArmadillo_15.2.6-1.tar.gz) = 7188d5d2b5b2947391466690c3ae2681c86efd6efa791ca7b0f9e4382e9c3af7
 SHA512 (R/RcppArmadillo_15.2.6-1.tar.gz) = c2a175b56208806d3ade97c02f428eeb6f6552ce191ea38c6d25c10398045c0b8d4c738d5a9e1db3d7fe2e58ecdc0ff93206f64ff10e8efdf225e6d6ab3caffe
 Size (R/RcppArmadillo_15.2.6-1.tar.gz) = 1090108 bytes
-SHA1 (patch-src_Makevars.in) = ebe08fd565cc823834e3d9f9ac7f116e67565722
+SHA1 (patch-src_Makevars.in) = c740959ce97d7e4efedc8c8e1caff4b349cfebf6

Index: pkgsrc/math/R-RcppArmadillo/patches/patch-src_Makevars.in
diff -u pkgsrc/math/R-RcppArmadillo/patches/patch-src_Makevars.in:1.1 pkgsrc/math/R-RcppArmadillo/patches/patch-src_Makevars.in:1.2
--- pkgsrc/math/R-RcppArmadillo/patches/patch-src_Makevars.in:1.1       Tue May 26 13:10:41 2026
+++ pkgsrc/math/R-RcppArmadillo/patches/patch-src_Makevars.in   Sun Jul  5 13:26:16 2026
@@ -1,18 +1,12 @@
-$NetBSD: patch-src_Makevars.in,v 1.1 2026/05/26 13:10:41 mef Exp $
+$NetBSD: patch-src_Makevars.in,v 1.2 2026/07/05 13:26:16 mef Exp $
 
 Add /usr/lib/libexecinfo for "backtrace_symbols"
 
 --- src/Makevars.in.orig       2025-11-22 04:39:39.000000000 +0900
 +++ src/Makevars.in    2026-05-26 21:48:27.504953850 +0900
-@@ -2,3 +2,11 @@
+@@ -2,3 +2,5 @@
  PKG_CPPFLAGS = -I../inst/include -DARMA_USE_CURRENT
  PKG_CXXFLAGS = @PKG_CXXFLAGS@ @OPENMP_FLAG@
  PKG_LIBS= @PKG_LIBS@ @OPENMP_FLAG@ $(LAPACK_LIBS) $(BLAS_LIBS) $(FLIBS)
 +
-+UNAME := $(shell uname)
-+
-+ifneq ($(UNAME), Linux)
-+ifneq ($(UNAME), SunOS)
-+PKG_LIBS += -lexecinfo
-+endif
-+endif
++@@PKG_LIBS@@