(math/R) pick (merge) proper side patches, rm TODO

To: pkgsrc-wip-changes%NetBSD.org@localhost
Subject: (math/R) pick (merge) proper side patches, rm TODO
From: Makoto Fujiwara (via pkgsrc-wip) <commit-notify%pkgsrc.org@localhost>
Date: Fri, 2 Jan 2026 23:48:28 +0000
Module Name:	pkgsrc-wip
Committed By:	Makoto Fujiwara <makoto%if.t.u-tokyo.ac.jp@localhost>
Pushed By:	mef
Date:		Sat Jan 3 08:46:35 2026 +0900
Changeset:	7ce82dc25c807566c4e56febb609e988fb305746

Modified Files:
	R/distinfo
Added Files:
	R/patches/patch-src_extra_xdr_xdr__mem.c
	R/patches/patch-src_extra_xdr_xdr__stdio.c
	R/patches/patch-src_include_R__ext_Error.h
Removed Files:
	R/TODO

Log Message:
(math/R) pick (merge) proper side patches, rm TODO

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

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

diffstat:
 R/TODO                                     | 77 ------------------------------
 R/distinfo                                 |  3 ++
 R/patches/patch-src_extra_xdr_xdr__mem.c   | 28 +++++++++++
 R/patches/patch-src_extra_xdr_xdr__stdio.c | 27 +++++++++++
 R/patches/patch-src_include_R__ext_Error.h | 16 +++++++
 5 files changed, 74 insertions(+), 77 deletions(-)

diffs:
diff --git a/R/TODO b/R/TODO
deleted file mode 100644
index 0c20e3aa6e..0000000000
--- a/R/TODO
+++ /dev/null
@@ -1,77 +0,0 @@
-2.
- (not fixed yet)
-
-=> Checking file-check results for R-4.4.3
-ERROR: ************************************************************
-ERROR: The following files are in the PLIST but not in /tmp/wip/R/work/.destdir/usr/pkg:
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/info/R-FAQ.info
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/info/R-admin.info
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/info/R-data.info
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/info/R-exts.info
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/info/R-intro.info
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/info/R-ints.info
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/info/R-lang.info
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/lib/R/doc/manual/R-FAQ.html
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/lib/R/doc/manual/R-admin.html
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/lib/R/doc/manual/R-data.html
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/lib/R/doc/manual/R-exts.html
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/lib/R/doc/manual/R-intro.html
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/lib/R/doc/manual/R-ints.html
-ERROR:         /tmp/wip/R/work/.destdir/usr/pkg/lib/R/doc/manual/R-lang.html
-*** Error code 1
-
--- problem below has been fixed now --
-1.
-On NetBSD/amd64 9.3: I have Following configure problem:
-
-=> Checking for portability problems in extracted files
-configure: WARNING: unrecognized options: --disable-nls, --with-x
-checking build system type... x86_64--netbsd
-checking host system type... x86_64--netbsd
-loading site script './config.site'
-loading build-specific script './config.site'
-./configure: 4392: Syntax error: Word "blas" unexpected (expecting ")")
-*** Error code 2
-
-Chat memo for above problem:
-
-20:06 < mef> Newly updated (by myself, sorry) math/R 4.4.3 has problem on 9.3 with_blas variable related probably
-20:07 < mef> m4 version and blas version is the same
-20:07 < mef> (10.99.12 and 9.3, both amd64)
-
-20:08 < mef> generated configure is a little bit different
-20:08 < mef> autoconf are the same version as well
-
-20:12 < mef> on 10.99.12  (OK)
-20:12 < mef>    4767 # Check whether --with-blas was given.
-20:12 < mef>    4768 if test ${with_blas+y}
-20:12 < mef>    4769 then :
-20:12 < mef>    4770   withval=$with_blas; if test "${withval}" = no; then
-20:12 < mef>    4771   use_blas=no
-20:12 < mef>    4772 else
-20:12 < mef>    4773   use_blas=yes
-20:12 < mef>    4774 fi
-
-20:13 < mef> 0n 9.3   (BAD)
-20:13 < mef>    4389 # Check whether --with-blas was given.
-20:13 < mef>    4390 if test ${with_blas+y}
-20:13 < mef>    4391 then :
-20:13 < mef>    4392   withval=$with_blas; R_ARG_USE(blas)
-20:13 < mef>    4393 else case e in #(
-20:13 < mef>    4394   e) use_blas=unset ;;
-20:13 < mef>    4395 esac
-20:13 < mef>    4396 fi
-20:15 < mef>  blas version are the same
-
-
-20:15 < mef> --- R_ARG_USE(blas) ---
-20:15 < mef> part is differenet
-
-20:12 < mef>    4770   withval=$with_blas; if test "${withval}" = no; then
-20:13 < mef>    4392   withval=$with_blas; R_ARG_USE(blas)
-
-20:19 < mef> I'll put new R-4.4.3 under wip, and revert math side ;-(
-
-The problem may not depend on Release, but may be by just my hosts setup,
-not checked that point.
-
diff --git a/R/distinfo b/R/distinfo
index a4fd884a76..81257d3a4b 100644
--- a/R/distinfo
+++ b/R/distinfo
@@ -5,5 +5,8 @@ SHA512 (R-4.4.3.tar.gz) = 2a1d1e5ee2e18c928e2b3e58df372083b4bbd0822863a844140499
 Size (R-4.4.3.tar.gz) = 40234425 bytes
 SHA1 (patch-configure.ac) = 41bb6ab2034cbd39c93bbf733097fab21328ba0b
 SHA1 (patch-m4_R.m4) = 3e1d390d8aa9895aee7cb479ddab371d82562b88
+SHA1 (patch-src_extra_xdr_xdr__mem.c) = 2e607b070db8b24a6ad5501e9c7c1549bf1b1d82
+SHA1 (patch-src_extra_xdr_xdr__stdio.c) = e4d8ace08ad282f44113941dd6a3b194769b8167
+SHA1 (patch-src_include_R__ext_Error.h) = bc55a8bba6bf931e3f6794577e63bfafdfc740cf
 SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
 SHA1 (patch-src_main_character.c) = c1be2cae404ecbdd547343b70e9d072e9e1d5549
diff --git a/R/patches/patch-src_extra_xdr_xdr__mem.c b/R/patches/patch-src_extra_xdr_xdr__mem.c
new file mode 100644
index 0000000000..bc6cddce4f
--- /dev/null
+++ b/R/patches/patch-src_extra_xdr_xdr__mem.c
@@ -0,0 +1,28 @@
+$NetBSD: patch-src_extra_xdr_xdr__mem.c,v 1.1 2025/01/20 21:26:02 he Exp $
+
+Don't do the ntohl() / htonl() dance on NetBSD.
+
+--- ./src/extra/xdr/xdr_mem.c.orig	2025-01-20 17:36:36.874607200 +0000
++++ ./src/extra/xdr/xdr_mem.c
+@@ -24,6 +24,8 @@ static uint32_t ntohl(uint32_t x)
+ #endif 
+ }
+ #else /* net is big-endian: little-endian hosts need byte-swap code */
++#if !defined(__NetBSD__)
++/* Not needed on NetBSD, ntohl() and htonl() already declared */
+ #ifndef WORDS_BIGENDIAN
+ static uint32_t ntohl (uint32_t x)
+ {
+@@ -33,7 +35,11 @@ static uint32_t ntohl (uint32_t x)
+ #define ntohl(x) (x)
+ #endif
+ #endif
+-#define htonl ntohl
++#endif
++#if !defined(__NetBSD__)
++/* Not needed on NetBSD, ntohl() and htonl() already declared */
++#define htonl(x) ntohl(x)
++#endif
+ 
+ /*********************************************************************
+  * RPC for the Windows NT Operating System
diff --git a/R/patches/patch-src_extra_xdr_xdr__stdio.c b/R/patches/patch-src_extra_xdr_xdr__stdio.c
new file mode 100644
index 0000000000..f262f427de
--- /dev/null
+++ b/R/patches/patch-src_extra_xdr_xdr__stdio.c
@@ -0,0 +1,27 @@
+$NetBSD: patch-src_extra_xdr_xdr__stdio.c,v 1.1 2025/01/20 21:26:02 he Exp $
+
+Don't do the ntohl() / htonl() dance on NetBSD.
+
+--- src/extra/xdr/xdr_stdio.c.orig	2025-01-20 17:42:42.369938152 +0000
++++ src/extra/xdr/xdr_stdio.c
+@@ -20,6 +20,8 @@ static uint32_t ntohl(uint32_t x)
+ #endif
+ }
+ #else /* net is big-endian: little-endian hosts need byte-swap code */
++#if !defined(__NetBSD__)
++/* Not needed on NetBSD, ntohl() and htonl() already declared */
+ #ifndef WORDS_BIGENDIAN
+ /* #ifdef LITTLE_ENDIAN */
+ static uint32_t ntohl (uint32_t x)
+@@ -30,7 +32,11 @@ static uint32_t ntohl (uint32_t x)
+ #define ntohl(x) (x)
+ #endif
+ #endif
++#endif
++#if !defined(__NetBSD__)
++/* Not needed on NetBSD, ntohl() and htonl() already declared */
+ #define htonl ntohl
++#endif
+ 
+ /*********************************************************************
+  * RPC for the Windows NT Operating System
diff --git a/R/patches/patch-src_include_R__ext_Error.h b/R/patches/patch-src_include_R__ext_Error.h
new file mode 100644
index 0000000000..c679a7be10
--- /dev/null
+++ b/R/patches/patch-src_include_R__ext_Error.h
@@ -0,0 +1,16 @@
+$NetBSD: patch-src_include_R__ext_Error.h,v 1.3 2025/03/02 11:38:51 mef Exp $
+
+Fix building with C++.
+
+--- src/include/R_ext/Error.h.orig	2024-03-05 16:09:06.557665563 +0000
++++ src/include/R_ext/Error.h
+@@ -35,7 +35,8 @@ extern "C" {
+  * In C11 there is _Noreturn * (or noreturn in header <stdnoreturn.h>).
+  */
+ #if defined NORET
+-#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L)
++#elif (defined(__STDC_VERSION__) && __STDC_VERSION__ >= 202301L) || \
++      (defined(__cplusplus) && __cplusplus >= 201103L)
+ # define NORET [[noreturn]]
+ #elif defined(__STDC_VERSION__) && __STDC_VERSION__ >= 201102L
+ # define NORET _Noreturn
Prev by Date: (math/R) Packaged fine by pbulk w/o BUILD_DEPENDS (NetBSD/9.4)
Next by Date: (math/R) fix make patch stage
Previous by Thread: (math/R) Packaged fine by pbulk w/o BUILD_DEPENDS (NetBSD/9.4)
Next by Thread: (math/R) fix make patch stage
Indexes:
Home | Main Index | Thread Index | Old Index