CVS commit: pkgsrc/math/R-plyr

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Jul  4 23:26:00 UTC 2026

Modified Files:
        pkgsrc/math/R-plyr: Makefile distinfo
        pkgsrc/math/R-plyr/patches: patch-src_Makevars

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


To generate a diff of this commit:
cvs rdiff -u -r1.14 -r1.15 pkgsrc/math/R-plyr/Makefile
cvs rdiff -u -r1.13 -r1.14 pkgsrc/math/R-plyr/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/R-plyr/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/math/R-plyr/Makefile
diff -u pkgsrc/math/R-plyr/Makefile:1.14 pkgsrc/math/R-plyr/Makefile:1.15
--- pkgsrc/math/R-plyr/Makefile:1.14    Mon May 25 15:02:10 2026
+++ pkgsrc/math/R-plyr/Makefile Sat Jul  4 23:26:00 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.14 2026/05/25 15:02:10 mef Exp $
+# $NetBSD: Makefile,v 1.15 2026/07/04 23:26:00 mef Exp $
 
 R_PKGNAME=     plyr
 R_PKGVER=      1.8.9
@@ -17,8 +17,18 @@ TEST_DEPENDS+=       R-itertools-[0-9]*:../../
 TEST_DEPENDS+= R-testthat-[0-9]*:../../devel/R-testthat
 
 USE_LANGUAGES+=        c c++
-# make the patch works more portable
-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/math/R-plyr/distinfo
diff -u pkgsrc/math/R-plyr/distinfo:1.13 pkgsrc/math/R-plyr/distinfo:1.14
--- pkgsrc/math/R-plyr/distinfo:1.13    Mon May 25 15:02:10 2026
+++ pkgsrc/math/R-plyr/distinfo Sat Jul  4 23:26:00 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.13 2026/05/25 15:02:10 mef Exp $
+$NetBSD: distinfo,v 1.14 2026/07/04 23:26:00 mef Exp $
 
 BLAKE2s (R/plyr_1.8.9.tar.gz) = ea5238e97aa35d54c1608ea7230f7da1cef4bc7326de9a82d735ade5c87969e0
 SHA512 (R/plyr_1.8.9.tar.gz) = ebd4e817df16a5847ddd8239ef99cf54b46dcb19cb51ade53e58c0d66a6d5ffd241daa258c167468fe5284f0168c13e1760abada60f7e7b22b7e0a32150ec596
 Size (R/plyr_1.8.9.tar.gz) = 401488 bytes
-SHA1 (patch-src_Makevars) = 8844b6a77926177feb35420349ab82a967fbbfa4
+SHA1 (patch-src_Makevars) = ef37b88173917376b4b0584e028653d8a81674af

Index: pkgsrc/math/R-plyr/patches/patch-src_Makevars
diff -u pkgsrc/math/R-plyr/patches/patch-src_Makevars:1.1 pkgsrc/math/R-plyr/patches/patch-src_Makevars:1.2
--- pkgsrc/math/R-plyr/patches/patch-src_Makevars:1.1   Mon May 25 15:02:10 2026
+++ pkgsrc/math/R-plyr/patches/patch-src_Makevars       Sat Jul  4 23:26:00 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makevars,v 1.1 2026/05/25 15:02:10 mef Exp $
+$NetBSD: patch-src_Makevars,v 1.2 2026/07/04 23:26:00 mef Exp $
 
 symbol backtrace_symbols is defined in /usr/lib/libexecinfo
 
@@ -12,17 +12,11 @@ Execution halted
 ERROR: loading failed
 ---------------------------------
 
---- /dev/null  2026-05-25 23:49:38.565140977 +0900
-+++ src/Makevars       2026-05-25 23:54:14.584419265 +0900
-@@ -0,0 +1,11 @@
+--- src/Makevars.orig  2026-07-05 08:20:00.751584080 +0900
++++ src/Makevars       2026-07-05 08:22:56.091779410 +0900
+@@ -0,0 +1,5 @@
 + #### Debugging flags ####
 + # Uncomment to enable thread assertions
 + # PKG_CPPFLAGS += -DDEBUG_THREAD -UNDEBUG
 +
-+UNAME := $(shell uname)
-+
-+ifneq ($(UNAME), Linux)
-+ifneq ($(UNAME), SunOS)
-+PKG_LIBS += -lexecinfo
-+endif
-+endif
++@@PKG_LIBS@@