CVS commit: pkgsrc/math/R-units

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Sat Jul  4 23:17:06 UTC 2026

Modified Files:
        pkgsrc/math/R-units: Makefile distinfo
        pkgsrc/math/R-units/patches: patch-src_Makevars.in

Log Message:
(math/R-units) Fix build on Darwin,Linux, hopefully


To generate a diff of this commit:
cvs rdiff -u -r1.7 -r1.8 pkgsrc/math/R-units/Makefile
cvs rdiff -u -r1.9 -r1.10 pkgsrc/math/R-units/distinfo
cvs rdiff -u -r1.1 -r1.2 pkgsrc/math/R-units/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/math/R-units/Makefile
diff -u pkgsrc/math/R-units/Makefile:1.7 pkgsrc/math/R-units/Makefile:1.8
--- pkgsrc/math/R-units/Makefile:1.7    Mon May 25 21:45:20 2026
+++ pkgsrc/math/R-units/Makefile        Sat Jul  4 23:17:05 2026
@@ -1,7 +1,8 @@
-# $NetBSD: Makefile,v 1.7 2026/05/25 21:45:20 mef Exp $
+# $NetBSD: Makefile,v 1.8 2026/07/04 23:17:05 mef Exp $
 
 R_PKGNAME=     units
 R_PKGVER=      0.8-5
+PKGREVISION=   1
 
 MAINTAINER=    pkgsrc-users%NetBSD.org@localhost
 COMMENT=       Measurement Units for R Vectors
@@ -17,8 +18,18 @@ TEST_DEPENDS+=       R-testthat-[0-9]*:../../d
 TEST_DEPENDS+= R-xml2-[0-9]*:../../textproc/R-xml2
 
 USE_LANGUAGES+=        c c++
-# make patch more portable
-USE_TOOLS+=    gmake
+
+.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 && ${OPSYS} != Darwin
+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/math/R-units/distinfo
diff -u pkgsrc/math/R-units/distinfo:1.9 pkgsrc/math/R-units/distinfo:1.10
--- pkgsrc/math/R-units/distinfo:1.9    Mon May 25 21:45:20 2026
+++ pkgsrc/math/R-units/distinfo        Sat Jul  4 23:17:05 2026
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.9 2026/05/25 21:45:20 mef Exp $
+$NetBSD: distinfo,v 1.10 2026/07/04 23:17:05 mef Exp $
 
 BLAKE2s (R/units_0.8-5.tar.gz) = a9db38d95c94ec3b6ab53a0953b80329af1423a797ac7252bf6dad1f855a1328
 SHA512 (R/units_0.8-5.tar.gz) = d01ca8e92a5cdb9e3b742ea1d4cdac622ce985c3f719f5e7d11b583cdae2666b49cf86a5be6d85764ed7c7c0c48a853b794406666b8ab3df7f53b9a860e00e40
 Size (R/units_0.8-5.tar.gz) = 247974 bytes
 SHA1 (patch-configure) = f57f2b7187678ba9f0973e2c90dd08d1fe4e752f
 SHA1 (patch-configure.ac) = 6f6dab407646bda4fc25abca4af1c730146a79be
-SHA1 (patch-src_Makevars.in) = 312e04fd627a059424b940bf8ef72e2eb513ce7e
+SHA1 (patch-src_Makevars.in) = 56ac5c37a523101fff81762eff73896c2244ace4

Index: pkgsrc/math/R-units/patches/patch-src_Makevars.in
diff -u pkgsrc/math/R-units/patches/patch-src_Makevars.in:1.1 pkgsrc/math/R-units/patches/patch-src_Makevars.in:1.2
--- pkgsrc/math/R-units/patches/patch-src_Makevars.in:1.1       Mon May 25 21:45:21 2026
+++ pkgsrc/math/R-units/patches/patch-src_Makevars.in   Sat Jul  4 23:17:05 2026
@@ -1,20 +1,13 @@
-$NetBSD: patch-src_Makevars.in,v 1.1 2026/05/25 21:45:21 mef Exp $
+$NetBSD: patch-src_Makevars.in,v 1.2 2026/07/04 23:17:05 mef Exp $
 
  Undefined PLT symbol "backtrace_symbols"
 
  this symbol found at /usr/lib/libexecinfo for *BSD
 
 --- src/Makevars.in.orig       2023-09-07 03:40:05.000000000 +0900
-+++ src/Makevars.in    2026-05-26 06:42:12.633885738 +0900
-@@ -1,2 +1,11 @@
++++ src/Makevars.in    2026-07-05 08:10:34.026713533 +0900
+@@ -1,2 +1,4 @@
  PKG_CPPFLAGS = -DUDUNITS2_DIR=@UDUNITS2_DIR@ @UD_CPPFLAGS@
-+
-+UNAME := $(shell uname)
-+
  PKG_LIBS = @LIBS@
 +
-+ifneq ($(UNAME), Linux)
-+ifneq ($(UNAME), SunOS)
-+PKG_LIBS += -lexecinfo
-+endif
-+endif
++@@PKG_LIBS@@