From be6d5063067c930f49d00cb899bfbb1e444f0bac Mon Sep 17 00:00:00 2001
From: mef <mef@pkgsrc.org>
Date: Sun, 12 Mar 2023 07:20:54 +0000
Subject: [PATCH] (www/R-httpuv) Updated 1.6.5 to 1.6.9

# httpuv 1.6.9

* Fixed #354: The incorrect method was called to clear a `vector`. (#355)

* The `src/Makevars` file no longer sets `CXX_STD=CXX11`, and the
  `DESCRIPTION` file no longer lists `SystemRequirements: C++11`,
  because newer R versions always support C++11. (#356, #357)


# httpuv 1.6.8

* Fixed #351: A race condition could cause httpuv to crash when
  starting the background thread for I/O. (#352)


# httpuv 1.6.7

* Fixed rstudio/shiny#3741: The `TZ` environment variable could get
  unset in some cases. (#346)

* Closed #302: Fixed potential thread-safety issues with `timegm2`
  implementation. (#346)


# httpuv 1.6.6

* Update docs for CRAN (#343)

* Updated to libuv 1.43.0. (#328)

* Fixed #336: `encodeURI()` and `encodeURIComponent()` printed a space
  instead of a leading zero, as in `"% A"` instead of `"%0A"`. (#337)
---
 www/R-httpuv/Makefile                   |  4 ++--
 www/R-httpuv/distinfo                   | 10 +++++-----
 www/R-httpuv/patches/patch-src_Makevars | 15 +++++++--------
 3 files changed, 14 insertions(+), 15 deletions(-)

diff --git a/www/R-httpuv/Makefile b/www/R-httpuv/Makefile
index 1701fa1cdb7c..e15ac606e08c 100644
--- a/www/R-httpuv/Makefile
+++ b/www/R-httpuv/Makefile
@@ -1,7 +1,7 @@
-# $NetBSD: Makefile,v 1.9 2022/04/30 01:16:18 mef Exp $
+# $NetBSD: Makefile,v 1.10 2023/03/12 07:20:54 mef Exp $
 
 R_PKGNAME=	httpuv
-R_PKGVER=	1.6.5
+R_PKGVER=	1.6.9
 CATEGORIES=	www
 
 MAINTAINER=	pkgsrc-users@NetBSD.org
diff --git a/www/R-httpuv/distinfo b/www/R-httpuv/distinfo
index 3952469c0e7b..14fe224a1960 100644
--- a/www/R-httpuv/distinfo
+++ b/www/R-httpuv/distinfo
@@ -1,6 +1,6 @@
-$NetBSD: distinfo,v 1.10 2022/04/30 01:16:18 mef Exp $
+$NetBSD: distinfo,v 1.11 2023/03/12 07:20:54 mef Exp $
 
-BLAKE2s (R/httpuv_1.6.5.tar.gz) = cc5a77f9207e5847d5d0a38c5da3857196d40b85ba8de21c845508090a9a5571
-SHA512 (R/httpuv_1.6.5.tar.gz) = aaa3d6551d37b955b68072dc8e61a23d8c1c0b288dc5249aa46ab242682aef278e9f3a42e84809c68b4b6136f846171d8e4134eeb6b08749ed3758ef3752b79e
-Size (R/httpuv_1.6.5.tar.gz) = 1815063 bytes
-SHA1 (patch-src_Makevars) = 64eb03f7bcec11e0e46ab2749dde13b1d7053dbe
+BLAKE2s (R/httpuv_1.6.9.tar.gz) = 626442c4a0093a821afde3d012522be8df3ee186fcc961681c32abd3b3f5ff9f
+SHA512 (R/httpuv_1.6.9.tar.gz) = 435f637c942d47c42a7f75d2b3d105d9869924e2c17c24355486832eed00f667cb6e38984bc6075cb037f5c9ed06dd119a098943ed38216fd724592e3bbf62f7
+Size (R/httpuv_1.6.9.tar.gz) = 1875081 bytes
+SHA1 (patch-src_Makevars) = 4d09f61e9ae12e61a3e1808f0574df6023593d8a
diff --git a/www/R-httpuv/patches/patch-src_Makevars b/www/R-httpuv/patches/patch-src_Makevars
index dc5072555cc6..25e260567587 100644
--- a/www/R-httpuv/patches/patch-src_Makevars
+++ b/www/R-httpuv/patches/patch-src_Makevars
@@ -1,20 +1,19 @@
-$NetBSD: patch-src_Makevars,v 1.4 2021/06/05 08:55:12 mef Exp $
+$NetBSD: patch-src_Makevars,v 1.5 2023/03/12 07:20:54 mef Exp $
 
 date: 2019-12-18 21:44:39 +0900;  author: joerg;  state: Exp;  commitid: UcBUFje0SklPFbPB;
 Use external libuv.
 
---- src/Makevars.orig	2020-06-06 01:40:07.000000000 +0900
-+++ src/Makevars	2021-06-05 17:47:54.804407283 +0900
-@@ -5,7 +5,7 @@ CXX_STD=CXX11
- 
+--- src/Makevars.orig	2023-02-09 04:27:58.000000000 +0900
++++ src/Makevars	2023-03-12 16:12:54.495701401 +0900
+@@ -1,6 +1,6 @@
  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
  
  ifeq ($(UNAME), Darwin)
  PKG_LIBS += -framework CoreServices
-@@ -23,7 +23,7 @@ endif
+@@ -18,7 +18,7 @@ endif
  
  PKG_CFLAGS = $(C_VISIBILITY) -DSTRICT_R_HEADERS
  PKG_CXXFLAGS = $(CXX_VISIBILITY) -DSTRICT_R_HEADERS
@@ -23,7 +22,7 @@ Use external libuv.
  
  # To avoid spurious warnings from `R CMD check --as-cran`, about compiler
  # warning flags like -Werror.
-@@ -43,7 +43,7 @@ CONFIGURE_FLAGS="--quiet"
+@@ -38,7 +38,7 @@ CONFIGURE_FLAGS="--quiet"
  # PKG_CPPFLAGS += -D_GLIBCXX_ASSERTIONS