CVS commit: pkgsrc/geography/R-s2

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Fri Jun 12 17:11:55 UTC 2026

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

Log Message:
(geography/R-s2) Staying version 1.1.7, fix build against R-4.6.0


To generate a diff of this commit:
cvs rdiff -u -r1.10 -r1.11 pkgsrc/geography/R-s2/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/geography/R-s2/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/geography/R-s2/patches/patch-src_Makevars.in
cvs rdiff -u -r0 -r1.3 \
    pkgsrc/geography/R-s2/patches/patch-src_absl_debugging_internal_elf__mem__image.cc

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.10 pkgsrc/geography/R-s2/Makefile:1.11
--- pkgsrc/geography/R-s2/Makefile:1.10 Fri Jun 12 16:58:19 2026
+++ pkgsrc/geography/R-s2/Makefile      Fri Jun 12 17:11:55 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.10 2026/06/12 16:58:19 mef Exp $
+# $NetBSD: Makefile,v 1.11 2026/06/12 17:11:55 mef Exp $
 
 R_PKGNAME=     s2
 R_PKGVER=      1.1.7
@@ -28,6 +28,16 @@ CWRAPPERS_APPEND.cxx=        -D_NETBSD_SOURCE
 .  endif
 .endif
 
+SUBST_CLASSES+=                pkglibs
+SUBST_STAGE.pkglibs=   pre-configure
+SUBST_FILES.pkglibs=   src/Makevars.in
+.if ${OPSYS} != SunOS && ${OPSYS} != Linux
+SUBST_SED.pkglibs=     -e s,@@PKG_LIBS@@,PKG_LIBS+=-lexecinfo,
+.else
+SUBST_SED.pkglibs=     -e s,@@PKG_LIBS@@,,
+.endif
+SUBST_MESSAGE.pkglibs= Add -lexecinfo for *BSD
+
 .include "../../math/R/Makefile.extension"
 .include "../../devel/R-Rcpp/buildlink3.mk"
 .include "../../geography/R-wk/buildlink3.mk"

Index: pkgsrc/geography/R-s2/distinfo
diff -u pkgsrc/geography/R-s2/distinfo:1.9 pkgsrc/geography/R-s2/distinfo:1.10
--- pkgsrc/geography/R-s2/distinfo:1.9  Fri Jun 12 16:58:19 2026
+++ pkgsrc/geography/R-s2/distinfo      Fri Jun 12 17:11:55 2026
@@ -1,7 +1,7 @@
-$NetBSD: distinfo,v 1.9 2026/06/12 16:58:19 mef Exp $
+$NetBSD: distinfo,v 1.10 2026/06/12 17:11:55 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_Makevars.in) = 57fea66e11e438615f87865ae0d7fb1fbae233c1
 SHA1 (patch-src_absl_debugging_internal_elf__mem__image.cc) = 03d9a93c21aa4c0c9acd328ddc4b5b7aacb2a54a

Index: pkgsrc/geography/R-s2/patches/patch-src_Makevars.in
diff -u pkgsrc/geography/R-s2/patches/patch-src_Makevars.in:1.1 pkgsrc/geography/R-s2/patches/patch-src_Makevars.in:1.2
--- pkgsrc/geography/R-s2/patches/patch-src_Makevars.in:1.1     Tue May 26 12:28:05 2026
+++ pkgsrc/geography/R-s2/patches/patch-src_Makevars.in Fri Jun 12 17:11:55 2026
@@ -1,22 +1,14 @@
-$NetBSD: patch-src_Makevars.in,v 1.1 2026/05/26 12:28:05 mef Exp $
+$NetBSD: patch-src_Makevars.in,v 1.2 2026/06/12 17:11:55 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@
++++ src/Makevars.in    2026-06-13 02:01:34.613646791 +0900
+@@ -3,6 +3,7 @@ PKG_LIBS = @libs@
  PKG_CXXFLAGS = @cflags@ -pthread
  
-+ifneq ($(UNAME), Linux)
-+ifneq ($(UNAME), SunOS)
-+PKG_LIBS += -lexecinfo
-+endif
-+endif
-+
  CXX_STD = CXX14
++@@PKG_LIBS@@
  
  ABSL_LIBS = absl/base/internal/cycleclock.o \
+     absl/base/internal/low_level_alloc.o \

Added files:

Index: pkgsrc/geography/R-s2/patches/patch-src_absl_debugging_internal_elf__mem__image.cc
diff -u /dev/null pkgsrc/geography/R-s2/patches/patch-src_absl_debugging_internal_elf__mem__image.cc:1.3
--- /dev/null   Fri Jun 12 17:11:55 2026
+++ pkgsrc/geography/R-s2/patches/patch-src_absl_debugging_internal_elf__mem__image.cc  Fri Jun 12 17:11:55 2026
@@ -0,0 +1,15 @@
+$NetBSD: patch-src_absl_debugging_internal_elf__mem__image.cc,v 1.3 2026/06/12 17:11:55 mef Exp $
+
+Fix for ELF header updates in NetBSD 11.
+
+--- src/absl/debugging/internal/elf_mem_image.cc.orig  2023-11-25 15:31:07.000000000 +0000
++++ src/absl/debugging/internal/elf_mem_image.cc
+@@ -351,7 +351,7 @@ void ElfMemImage::SymbolIterator::Update(int increment
+   const ElfW(Versym) *version_symbol = image->GetVersym(index_);
+   ABSL_RAW_CHECK(symbol && version_symbol, "");
+   const char *const symbol_name = image->GetDynstr(symbol->st_name);
+-#if defined(__NetBSD__)
++#if defined(__NetBSD__) && (_SYS_EXEC_ELF_H_ + 0) < 2
+   const int version_index = version_symbol->vs_vers & VERSYM_VERSION;
+ #else
+   const ElfW(Versym) version_index = version_symbol[0] & VERSYM_VERSION;