CVS commit: pkgsrc/www/R-httpuv

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Jun  8 12:49:19 UTC 2026

Modified Files:
        pkgsrc/www/R-httpuv: Makefile distinfo
        pkgsrc/www/R-httpuv/patches: patch-src_Makevars

Log Message:
(www/R-httpuv) Fix build against R 4.6.0


To generate a diff of this commit:
cvs rdiff -u -r1.12 -r1.13 pkgsrc/www/R-httpuv/Makefile \
    pkgsrc/www/R-httpuv/distinfo
cvs rdiff -u -r1.5 -r1.6 pkgsrc/www/R-httpuv/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/www/R-httpuv/Makefile
diff -u pkgsrc/www/R-httpuv/Makefile:1.12 pkgsrc/www/R-httpuv/Makefile:1.13
--- pkgsrc/www/R-httpuv/Makefile:1.12   Sat Sep 27 09:57:39 2025
+++ pkgsrc/www/R-httpuv/Makefile        Mon Jun  8 12:49:19 2026
@@ -1,4 +1,4 @@
-# $NetBSD: Makefile,v 1.12 2025/09/27 09:57:39 wiz Exp $
+# $NetBSD: Makefile,v 1.13 2026/06/08 12:49:19 mef Exp $
 
 R_PKGNAME=     httpuv
 R_PKGVER=      1.6.11
@@ -20,6 +20,18 @@ TEST_DEPENDS+=       R-curl-[0-9]*:../../www/R
 USE_TOOLS+=    gmake
 USE_LANGUAGES= c c++
 
+.include "../../mk/bsd.prefs.mk"
+
+SUBST_CLASSES+=                pkglibs
+SUBST_STAGE.pkglibs=   pre-configure
+SUBST_FILES.pkglibs=   src/Makevars
+.if ${OPSYS} != SunOS
+SUBST_SED.pkglibs=     -e s,@@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 "../../devel/boost-headers/buildlink3.mk"
Index: pkgsrc/www/R-httpuv/distinfo
diff -u pkgsrc/www/R-httpuv/distinfo:1.12 pkgsrc/www/R-httpuv/distinfo:1.13
--- pkgsrc/www/R-httpuv/distinfo:1.12   Sun Jun 11 09:28:59 2023
+++ pkgsrc/www/R-httpuv/distinfo        Mon Jun  8 12:49:19 2026
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.12 2023/06/11 09:28:59 mef Exp $
+$NetBSD: distinfo,v 1.13 2026/06/08 12:49:19 mef Exp $
 
 BLAKE2s (R/httpuv_1.6.11.tar.gz) = a3c16b09909230a3e7314764fc1a52eb66570bb9ce2a2c4180e822c2c9561391
 SHA512 (R/httpuv_1.6.11.tar.gz) = a9274dc93ab2fcade39a8f63069da6624ce7d33d19fa36a29547ad513f369489685746555affb6c17fbc5ceb153428a2f94b48a98c69e592eb661c1c47bdb62d
 Size (R/httpuv_1.6.11.tar.gz) = 1874829 bytes
-SHA1 (patch-src_Makevars) = 4d09f61e9ae12e61a3e1808f0574df6023593d8a
+SHA1 (patch-src_Makevars) = f2293b8c1ec044b17d2d221e5b84e878a1099a59

Index: pkgsrc/www/R-httpuv/patches/patch-src_Makevars
diff -u pkgsrc/www/R-httpuv/patches/patch-src_Makevars:1.5 pkgsrc/www/R-httpuv/patches/patch-src_Makevars:1.6
--- pkgsrc/www/R-httpuv/patches/patch-src_Makevars:1.5  Sun Mar 12 07:20:54 2023
+++ pkgsrc/www/R-httpuv/patches/patch-src_Makevars      Mon Jun  8 12:49:19 2026
@@ -1,4 +1,4 @@
-$NetBSD: patch-src_Makevars,v 1.5 2023/03/12 07:20:54 mef Exp $
+$NetBSD: patch-src_Makevars,v 1.6 2026/06/08 12:49:19 mef Exp $
 
 date: 2019-12-18 21:44:39 +0900;  author: joerg;  state: Exp;  commitid: UcBUFje0SklPFbPB;
 Use external libuv.
@@ -9,7 +9,7 @@ Use external libuv.
  UNAME := $(shell uname)
  
 -PKG_LIBS = ./libuv/.libs/libuv.a ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
-+PKG_LIBS =                  -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread
++PKG_LIBS =                  -luv ./http-parser/http_parser.o ./sha1/sha1.o ./base64/base64.o -pthread @@PKG_LIBS@@
  
  ifeq ($(UNAME), Darwin)
  PKG_LIBS += -framework CoreServices