(math/R) Add two missing patches

[Makoto Fujiwara <makoto%ki.nu@localhost>]

Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%ki.nu@localhost>
Pushed By:	mef
Date:		Fri Jan 5 13:02:19 2024 +0900
Changeset:	53f6948325b310d9775c724888dee66997a1b9f2

Modified Files:
	R/Makefile
Added Files:
	R/patches/patch-src_extr_tre_tre-internal.h
	R/patches/patch-src_main_character.c

Log Message:
(math/R) Add two missing patches

To see a diff of this commit:
https://wip.pkgsrc.org/cgi-bin/gitweb.cgi?p=pkgsrc-wip.git;a=commitdiff;h=53f6948325b310d9775c724888dee66997a1b9f2

Please note that diffs are not public domain; they are subject to the
copyright notices on the relevant files.

diffstat:
 R/Makefile                                  | 25 +++++++++++++++++++++++++
 R/patches/patch-src_extr_tre_tre-internal.h | 12 ++++++++++++
 R/patches/patch-src_main_character.c        | 20 ++++++++++++++++++++
 3 files changed, 57 insertions(+)

diffs:
diff --git a/R/Makefile b/R/Makefile
index 6e7968bfff..42a5b3af07 100644
--- a/R/Makefile
+++ b/R/Makefile
@@ -148,6 +148,31 @@ SUBST_STAGE.fixwrap=	post-build
 SUBST_FILES.fixwrap=	libtool
 SUBST_SED.fixwrap=	-e "s,${WRAPPER_BINDIR}/libtool,${PKG_LIBTOOL},g"
 
+SUBST_CLASSES+=		strtoi
+SUBST_STAGE.strtoi=	pre-configure
+
+SUBST_FILES.strtoi= 	\
+	tests/reg-tests-1d.R \
+	doc/NEWS.3	 \
+	doc/html/NEWS.2.html \
+	doc/html/NEWS.3.html \
+	doc/NEWS.2 \
+	doc/NEWS.3.Rd \
+	doc/NEWS.2.Rd \
+	src/include/Internal.h \
+	src/library/base/man/hexmode.Rd \
+	src/library/base/man/octmode.Rd \
+	src/library/base/man/strtoi.Rd \
+	src/library/base/R/octhex.R \
+	src/library/base/R/version.R \
+	src/library/base/R/character.R \
+	src/gnuwin32/Rdll.hide \
+	src/main/names.c \
+	src/main/character.c
+
+SUBST_SED.strtoi=	-e "s,strtoi,strtoiR,g"
+
+
 BUILDLINK_API_DEPENDS.bzip2+=	bzip2>=1.0.5
 
 # failed to convert strong functions and variables: Invalid type identifier
diff --git a/R/patches/patch-src_extr_tre_tre-internal.h b/R/patches/patch-src_extr_tre_tre-internal.h
new file mode 100644
index 0000000000..f809bbf205
--- /dev/null
+++ b/R/patches/patch-src_extr_tre_tre-internal.h
@@ -0,0 +1,12 @@
+$NetBSD$
+
+--- src/extra/tre/tre-internal.h.orig	2022-03-25 08:02:02.000000000 +0900
++++ src/extra/tre/tre-internal.h	2024-01-01 18:30:52.973421432 +0900
+@@ -18,6 +18,7 @@
+ #endif /* !HAVE_WCTYPE_H */
+ 
+ #include <ctype.h>
++#include <stdint.h>
+ #include "tre.h"
+ 
+ #ifdef TRE_DEBUG
diff --git a/R/patches/patch-src_main_character.c b/R/patches/patch-src_main_character.c
new file mode 100644
index 0000000000..526a4f5e3a
--- /dev/null
+++ b/R/patches/patch-src_main_character.c
@@ -0,0 +1,20 @@
+--- src/main/character.c.orig	2023-07-05 07:15:01.000000000 +0900
++++ src/main/character.c	2024-01-05 10:23:29.080790235 +0900
+@@ -74,7 +74,7 @@ abbreviate chartr make.names strtrim tol
+ /* Used to indicate that we can safely convert marked UTF-8 strings
+    to wchar_t* -- not currently used.
+ */
+-#if defined(Win32) || defined(__STDC_ISO_10646__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun)
++#if defined(Win32) || defined(__STDC_ISO_10646__) || defined(__APPLE__) || defined(__FreeBSD__) || defined(__sun) || defined(__NetBSD__)
+ # define TO_WCS_OK 1
+ #else
+ /*
+@@ -1748,7 +1748,7 @@ attribute_hidden SEXP do_strtrim(SEXP ca
+     UNPROTECT(1);
+     return s;
+ }
+-
++#undef _NETBSD_SOURCE
+ static int strtoi(SEXP s, int base)
+ {
+     if(s == NA_STRING || CHAR(s)[0] == '\0') return(NA_INTEGER);