CVS commit: pkgsrc/geography/R-lwgeom

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Tue Jun 23 15:06:47 UTC 2026

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

Log Message:
(geography/R-lwgeom) Fix build against R-4.6.0, -lexecinfo related


To generate a diff of this commit:
cvs rdiff -u -r1.31 -r1.32 pkgsrc/geography/R-lwgeom/Makefile
cvs rdiff -u -r1.6 -r1.7 pkgsrc/geography/R-lwgeom/distinfo
cvs rdiff -u -r0 -r1.1 \
    pkgsrc/geography/R-lwgeom/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-lwgeom/Makefile
diff -u pkgsrc/geography/R-lwgeom/Makefile:1.31 pkgsrc/geography/R-lwgeom/Makefile:1.32
--- pkgsrc/geography/R-lwgeom/Makefile:1.31     Thu May 14 16:41:05 2026
+++ pkgsrc/geography/R-lwgeom/Makefile  Tue Jun 23 15:06:47 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.31 2026/05/14 16:41:05 ryoon Exp $
+# $NetBSD: Makefile,v 1.32 2026/06/23 15:06:47 mef Exp $
 
 R_PKGNAME=     lwgeom
 R_PKGVER=      0.2-14
@@ -25,6 +25,17 @@ TEST_DEPENDS+=       tex-xkeyval-[0-9]*:../../
 USE_TOOLS+=    pkg-config
 USE_LANGUAGES= c c++
 
+.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
+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"
 .include "../../geography/R-sf/buildlink3.mk"

Index: pkgsrc/geography/R-lwgeom/distinfo
diff -u pkgsrc/geography/R-lwgeom/distinfo:1.6 pkgsrc/geography/R-lwgeom/distinfo:1.7
--- pkgsrc/geography/R-lwgeom/distinfo:1.6      Thu Nov 28 12:37:55 2024
+++ pkgsrc/geography/R-lwgeom/distinfo  Tue Jun 23 15:06:47 2026
@@ -1,5 +1,6 @@
-$NetBSD: distinfo,v 1.6 2024/11/28 12:37:55 mef Exp $
+$NetBSD: distinfo,v 1.7 2026/06/23 15:06:47 mef Exp $
 
 BLAKE2s (R/lwgeom_0.2-14.tar.gz) = 0e42b625cda520f87d9778ca19de544d0552c3ba52b1c38168958f99131df2b5
 SHA512 (R/lwgeom_0.2-14.tar.gz) = 99150c2c31280da053a5c5d24dc3afe7a0da8019a633106919031279706c9ac8f5d4afe0b2d1541377f50b471098e935e3d92becc99086ae2e17d09a06f9c905
 Size (R/lwgeom_0.2-14.tar.gz) = 475042 bytes
+SHA1 (patch-src_Makevars.in) = c72981700eec335c50f25682f51d734444cf717f

Added files:

Index: pkgsrc/geography/R-lwgeom/patches/patch-src_Makevars.in
diff -u /dev/null pkgsrc/geography/R-lwgeom/patches/patch-src_Makevars.in:1.1
--- /dev/null   Tue Jun 23 15:06:47 2026
+++ pkgsrc/geography/R-lwgeom/patches/patch-src_Makevars.in     Tue Jun 23 15:06:47 2026
@@ -0,0 +1,14 @@
+$NetBSD: patch-src_Makevars.in,v 1.1 2026/06/23 15:06:47 mef Exp $
+
+-lexecinfo is required for *BSD, see SUBST at Makefile
+
+--- src/Makevars.in.orig       2026-06-23 23:58:02.138821654 +0900
++++ src/Makevars.in    2026-06-23 23:55:30.162698989 +0900
+@@ -1,6 +1,7 @@
+ PKG_CPPFLAGS=@PKG_CPPFLAGS@
+ PKG_LIBS=@PKG_LIBS@
+ CXX_STD = CXX
++@@PKG_LIBS@@
+ 
+ OBJECTS_LIBLWGEOM= \
+   liblwgeom/varint.o \