CVS commit: pkgsrc/time/R-nanotime

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Jun 22 21:53:51 UTC 2026

Modified Files:
        pkgsrc/time/R-nanotime: Makefile distinfo
        pkgsrc/time/R-nanotime/patches: patch-src_Makevars

Log Message:
(time/R-nanotime) fix  -lexecinfo active/disable logic (by SUBST)


To generate a diff of this commit:
cvs rdiff -u -r1.4 -r1.5 pkgsrc/time/R-nanotime/Makefile \
    pkgsrc/time/R-nanotime/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/R-nanotime/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/time/R-nanotime/Makefile
diff -u pkgsrc/time/R-nanotime/Makefile:1.4 pkgsrc/time/R-nanotime/Makefile:1.5
--- pkgsrc/time/R-nanotime/Makefile:1.4 Tue Jun  2 22:52:39 2026
+++ pkgsrc/time/R-nanotime/Makefile     Mon Jun 22 21:53:51 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.4 2026/06/02 22:52:39 mef Exp $
+# $NetBSD: Makefile,v 1.5 2026/06/22 21:53:51 mef Exp $
 
 R_PKGNAME=     nanotime
 R_PKGVER=      0.3.11
@@ -26,7 +26,17 @@ TEST_DEPENDS+=       tex-url-[0-9]*:../../prin
 TEST_DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval
 
 USE_LANGUAGES= c c++
-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
+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/time/R-nanotime/distinfo
diff -u pkgsrc/time/R-nanotime/distinfo:1.4 pkgsrc/time/R-nanotime/distinfo:1.5
--- pkgsrc/time/R-nanotime/distinfo:1.4 Tue Jun  2 22:52:39 2026
+++ pkgsrc/time/R-nanotime/distinfo     Mon Jun 22 21:53:51 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.4 2026/06/02 22:52:39 mef Exp $
+$NetBSD: distinfo,v 1.5 2026/06/22 21:53:51 mef Exp $
 
 BLAKE2s (R/nanotime_0.3.11.tar.gz) = d1aa2d7db24e0de8eea16419eee0a75e82b9c1c683cbee11655ba72c3cfe66a0
 SHA512 (R/nanotime_0.3.11.tar.gz) = 1391910042b2c1f6805f919ef1c8c71250637d82dbedbb9fa804b8ec8ec0edf7926ac81a4a876bd0b4c8417a26d4c14bedc8d78f2ea587e47dcd06b56724dfa0
 Size (R/nanotime_0.3.11.tar.gz) = 408523 bytes
-SHA1 (patch-src_Makevars) = 0cea60b310b305889163c973dbd2f5b75dffe1f5
+SHA1 (patch-src_Makevars) = 8c98a21b56fd31026f50259c7a877a6f58d51c7e

Index: pkgsrc/time/R-nanotime/patches/patch-src_Makevars
diff -u pkgsrc/time/R-nanotime/patches/patch-src_Makevars:1.1 pkgsrc/time/R-nanotime/patches/patch-src_Makevars:1.2
--- pkgsrc/time/R-nanotime/patches/patch-src_Makevars:1.1       Tue Jun  2 22:52:39 2026
+++ pkgsrc/time/R-nanotime/patches/patch-src_Makevars   Mon Jun 22 21:53:51 2026
@@ -1,17 +1,11 @@
-$NetBSD: patch-src_Makevars,v 1.1 2026/06/02 22:52:39 mef Exp $
+$NetBSD: patch-src_Makevars,v 1.2 2026/06/22 21:53:51 mef Exp $
 
 symbol backtrace_symbols is defined in /usr/lib/libexecinfo
 
 --- src/Makevars.orig  2024-06-17 19:54:52.000000000 +0900
-+++ src/Makevars       2026-06-03 07:48:22.110859722 +0900
-@@ -3,3 +3,10 @@ CXX_STD = CXX17
++++ src/Makevars       2026-06-23 06:50:33.955847020 +0900
+@@ -3,3 +3,4 @@ CXX_STD = CXX17
  
  ## We need headers from our package, the directory is not automatically included
  PKG_CXXFLAGS = -I../inst/include
-+
-+UNAME := $(shell uname)
-+
-+ifneq ($(UNAME), Linux)
-+PKG_LIBS += -lexecinfo
-+endif
-+
++@@PKG_LIBS@@