CVS commit: pkgsrc/time/R-RcppCCTZ

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Thu Jul  2 16:01:49 UTC 2026

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

Log Message:
(time/R-RcppCCTZ) Fix build on Linux and on Darwin (hopefully)


To generate a diff of this commit:
cvs rdiff -u -r1.5 -r1.6 pkgsrc/time/R-RcppCCTZ/Makefile
cvs rdiff -u -r1.3 -r1.4 pkgsrc/time/R-RcppCCTZ/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/time/R-RcppCCTZ/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-RcppCCTZ/Makefile
diff -u pkgsrc/time/R-RcppCCTZ/Makefile:1.5 pkgsrc/time/R-RcppCCTZ/Makefile:1.6
--- pkgsrc/time/R-RcppCCTZ/Makefile:1.5 Tue May 26 21:19:47 2026
+++ pkgsrc/time/R-RcppCCTZ/Makefile     Thu Jul  2 16:01:48 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.5 2026/05/26 21:19:47 mef Exp $
+# $NetBSD: Makefile,v 1.6 2026/07/02 16:01:48 mef Exp $
 
 R_PKGNAME=     RcppCCTZ
 R_PKGVER=      0.2.14
@@ -22,6 +22,16 @@ 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
+
 # https://mail-index.netbsd.org/pkgsrc-users/2025/01/02/msg040775.html
 # See
 #   /usr/include/wchar.h

Index: pkgsrc/time/R-RcppCCTZ/distinfo
diff -u pkgsrc/time/R-RcppCCTZ/distinfo:1.3 pkgsrc/time/R-RcppCCTZ/distinfo:1.4
--- pkgsrc/time/R-RcppCCTZ/distinfo:1.3 Tue May 26 21:19:47 2026
+++ pkgsrc/time/R-RcppCCTZ/distinfo     Thu Jul  2 16:01:48 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.3 2026/05/26 21:19:47 mef Exp $
+$NetBSD: distinfo,v 1.4 2026/07/02 16:01:48 mef Exp $
 
 BLAKE2s (R/RcppCCTZ_0.2.14.tar.gz) = b8603ecfdd25031369ad9399bf00db27a82e8176e5a4018185ca8d6c599e1bc1
 SHA512 (R/RcppCCTZ_0.2.14.tar.gz) = 589382198f3c78ea3f1c033379ca9657ff3800e8656f88544b0599e763e31c10b5e44ff46461ae7e49c24455b5e9d2d2484e2539472a75bd20e953e7b7fbc556
 Size (R/RcppCCTZ_0.2.14.tar.gz) = 81513 bytes
-SHA1 (patch-src_Makevars) = bb715440131a674b2c5e2109989d3b26701717c0
+SHA1 (patch-src_Makevars) = 0e56f18fcbc3dcc7becb9c7e829261dcf27e178a

Index: pkgsrc/time/R-RcppCCTZ/patches/patch-src_Makevars
diff -u pkgsrc/time/R-RcppCCTZ/patches/patch-src_Makevars:1.1 pkgsrc/time/R-RcppCCTZ/patches/patch-src_Makevars:1.2
--- pkgsrc/time/R-RcppCCTZ/patches/patch-src_Makevars:1.1       Tue May 26 21:19:47 2026
+++ pkgsrc/time/R-RcppCCTZ/patches/patch-src_Makevars   Thu Jul  2 16:01:48 2026
@@ -1,18 +1,11 @@
-$NetBSD: patch-src_Makevars,v 1.1 2026/05/26 21:19:47 mef Exp $
+$NetBSD: patch-src_Makevars,v 1.2 2026/07/02 16:01:48 mef Exp $
 
 symbol backtrace_symbols is defined in /usr/lib/libexecinfo
 
 --- src/Makevars.orig  2025-12-30 08:54:49.000000000 +0900
-+++ src/Makevars       2026-05-27 06:13:20.451270591 +0900
-@@ -24,3 +24,11 @@ PKG_SOURCES = \
++++ src/Makevars       2026-07-03 00:57:07.911103911 +0900
+@@ -24,3 +24,4 @@ PKG_SOURCES = \
  PKG_OBJECTS = $(PKG_SOURECES:.cpp=.o)
  
  $(SHLIB): $(CCTZ_OBJECTS) $(PKG_OBJECTS)
-+
-+UNAME := $(shell uname)
-+
-+ifneq ($(UNAME), Linux)
-+ifneq ($(UNAME), SunOS)
-+PKG_LIBS += -lexecinfo
-+endif
-+endif
++@@PKG_LIBS@@