CVS commit: pkgsrc/sysutils/R-later

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

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

Modified Files:
        pkgsrc/sysutils/R-later: Makefile distinfo
        pkgsrc/sysutils/R-later/patches: patch-src_Makevars.in

Log Message:
(sysutils/R-later) Fix build on Darwin,Linux, hopefully


To generate a diff of this commit:
cvs rdiff -u -r1.11 -r1.12 pkgsrc/sysutils/R-later/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/sysutils/R-later/distinfo
cvs rdiff -u -r1.1 -r1.2 \
    pkgsrc/sysutils/R-later/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/sysutils/R-later/Makefile
diff -u pkgsrc/sysutils/R-later/Makefile:1.11 pkgsrc/sysutils/R-later/Makefile:1.12
--- pkgsrc/sysutils/R-later/Makefile:1.11       Thu May 21 13:13:45 2026
+++ pkgsrc/sysutils/R-later/Makefile    Sat Jul  4 23:32:31 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.11 2026/05/21 13:13:45 mef Exp $
+# $NetBSD: Makefile,v 1.12 2026/07/04 23:32:31 mef Exp $
 
 R_PKGNAME=     later
 R_PKGVER=      1.4.8
+PKGREVISION=   1
 CATEGORIES=    sysutils
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
@@ -19,8 +20,17 @@ TEST_DEPENDS+=       R-testthat-[0-9]*:../../d
 MAKE_ENV+=     -DEXTRA_PKG_LIBS=-lexecinfo
 USE_LANGUAGES= c c++
 
-# to make patches/patch-src_Makefile.in more portable
-USE_TOOLS+=    gmake
+.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 "../../mk/bsd.prefs.mk"
 

Index: pkgsrc/sysutils/R-later/distinfo
diff -u pkgsrc/sysutils/R-later/distinfo:1.9 pkgsrc/sysutils/R-later/distinfo:1.10
--- pkgsrc/sysutils/R-later/distinfo:1.9        Thu May 21 13:13:45 2026
+++ pkgsrc/sysutils/R-later/distinfo    Sat Jul  4 23:32:31 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.9 2026/05/21 13:13:45 mef Exp $
+$NetBSD: distinfo,v 1.10 2026/07/04 23:32:31 mef Exp $
 
 BLAKE2s (R/later_1.4.8.tar.gz) = 51fc0d3e9ec3f2c551191001e45de1db1d1424c8326acf53afecd4dc5298c4ed
 SHA512 (R/later_1.4.8.tar.gz) = eda0e97017d188f26528c559d2150e326865c3896d696f92c585cbd829388c0ef5eccde75b485b88a46234bf62bca2d6d5d0eea5e8c3875b1c69f956e8721a8c
 Size (R/later_1.4.8.tar.gz) = 70250 bytes
-SHA1 (patch-src_Makevars.in) = 808a94a079bce08ead8100ab0da94572a822aca8
+SHA1 (patch-src_Makevars.in) = 340608957b36c210adc011865c61f8199a711101

Index: pkgsrc/sysutils/R-later/patches/patch-src_Makevars.in
diff -u pkgsrc/sysutils/R-later/patches/patch-src_Makevars.in:1.1 pkgsrc/sysutils/R-later/patches/patch-src_Makevars.in:1.2
--- pkgsrc/sysutils/R-later/patches/patch-src_Makevars.in:1.1   Thu May 21 13:13:45 2026
+++ pkgsrc/sysutils/R-later/patches/patch-src_Makevars.in       Sat Jul  4 23:32:32 2026
@@ -1,19 +1,13 @@
-$NetBSD: patch-src_Makevars.in,v 1.1 2026/05/21 13:13:45 mef Exp $
+$NetBSD: patch-src_Makevars.in,v 1.2 2026/07/04 23:32:32 mef Exp $
 
 the function backtrace_symbols which may be found at
 /usr/lib/libexecinfo.* ( in *BSD OS, I assume)
 
 --- src/Makevars.in.orig       2025-10-20 02:02:36.000000000 +0900
 +++ src/Makevars.in    2026-05-21 21:58:07.950515018 +0900
-@@ -4,3 +4,11 @@ PKG_LIBS = -pthread @extra_pkg_libs@
+@@ -4,3 +4,5 @@ PKG_LIBS = -pthread @extra_pkg_libs@
  #### 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@@