CVS commit: pkgsrc/geography/R-s2

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Tue May 26 12:28:05 UTC 2026

Modified Files:
        pkgsrc/geography/R-s2: Makefile distinfo
Added Files:
        pkgsrc/geography/R-s2/patches: patch-src_Makevars.in

Log Message:
(geography/R-s2) Fix build for R 4.6.0 (Re: execinfo)


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/geography/R-s2/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/R-s2/distinfo
cvs rdiff -u -r0 -r1.1 pkgsrc/geography/R-s2/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/geography/R-s2/Makefile
diff -u pkgsrc/geography/R-s2/Makefile:1.7 pkgsrc/geography/R-s2/Makefile:1.8
--- pkgsrc/geography/R-s2/Makefile:1.7  Sat Jan  4 05:30:57 2025
+++ pkgsrc/geography/R-s2/Makefile      Tue May 26 12:28:05 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.7 2025/01/04 05:30:57 mef Exp $
+# $NetBSD: Makefile,v 1.8 2026/05/26 12:28:05 mef Exp $
 
 R_PKGNAME=     s2
 R_PKGVER=      1.1.7
@@ -19,6 +19,8 @@ TEST_DEPENDS+=        tex-url-[0-9]*:../../prin
 TEST_DEPENDS+= tex-xkeyval-[0-9]*:../../print/tex-xkeyval
 
 USE_LANGUAGES=         c c++
+# make patch to be portable
+USE_TOOLS+=            gmake
 .include "../../mk/bsd.prefs.mk"
 
 # https://mail-index.netbsd.org/pkgsrc-users/2025/01/02/msg040775.html

Index: pkgsrc/geography/R-s2/distinfo
diff -u pkgsrc/geography/R-s2/distinfo:1.6 pkgsrc/geography/R-s2/distinfo:1.7
--- pkgsrc/geography/R-s2/distinfo:1.6  Mon Apr 20 06:06:38 2026
+++ pkgsrc/geography/R-s2/distinfo      Tue May 26 12:28:05 2026
@@ -1,6 +1,7 @@
-$NetBSD: distinfo,v 1.6 2026/04/20 06:06:38 wiz Exp $
+$NetBSD: distinfo,v 1.7 2026/05/26 12:28:05 mef Exp $
 
 BLAKE2s (R/s2_1.1.7.tar.gz) = ac2d079302b55e2ed7df820b597ff9056f859822b8f18297f8db17b9d92bb775
 SHA512 (R/s2_1.1.7.tar.gz) = 3c2b6b83a11b8979781cfc56c58fd6d788fda62cdc8a7d635b84219f4cf530eea06068b5418a07e3e04ed3455ec2d7b3e1d7a8d91b133514e94d31dab2be477a
 Size (R/s2_1.1.7.tar.gz) = 2381288 bytes
+SHA1 (patch-src_Makevars.in) = f1011a77c3fdf016f1592955d1f4374f68efad73
 SHA1 (patch-src_absl_debugging_internal_elf__mem__image.cc) = 03d9a93c21aa4c0c9acd328ddc4b5b7aacb2a54a

Added files:

Index: pkgsrc/geography/R-s2/patches/patch-src_Makevars.in
diff -u /dev/null pkgsrc/geography/R-s2/patches/patch-src_Makevars.in:1.1
--- /dev/null   Tue May 26 12:28:05 2026
+++ pkgsrc/geography/R-s2/patches/patch-src_Makevars.in Tue May 26 12:28:05 2026
@@ -0,0 +1,22 @@
+$NetBSD: patch-src_Makevars.in,v 1.1 2026/05/26 12:28:05 mef Exp $
+
+Add /usr/lib/libexecinfo for "backtrace_symbols"
+
+--- src/Makevars.in.orig       2024-07-17 15:45:33.000000000 +0900
++++ src/Makevars.in    2026-05-26 07:14:17.232134083 +0900
+@@ -1,7 +1,15 @@
++UNAME := $(shell uname)
++
+ PKG_CPPFLAGS = -I../src -DSTRICT_R_HEADERS
+ PKG_LIBS = @libs@
+ PKG_CXXFLAGS = @cflags@ -pthread
+ 
++ifneq ($(UNAME), Linux)
++ifneq ($(UNAME), SunOS)
++PKG_LIBS += -lexecinfo
++endif
++endif
++
+ CXX_STD = CXX14
+ 
+ ABSL_LIBS = absl/base/internal/cycleclock.o \