Content-Transfer-Encoding: 7bit
Content-Type: multipart/mixed; boundary="_----------=_170475503089440"
MIME-Version: 1.0
Date: Mon, 8 Jan 2024 23:03:50 +0000
From: "Makoto Fujiwara" <mef@netbsd.org>
Subject: CVS commit: pkgsrc/math/R
To: pkgsrc-changes@NetBSD.org
Reply-To: mef@netbsd.org
Message-Id: <20240108230350.772C2FA42@cvs.NetBSD.org>
Sender: pkgsrc-changes-owner@NetBSD.org
Precedence: bulk

This is a multi-part message in MIME format.

--_----------=_170475503089440
Content-Disposition: inline
Content-Transfer-Encoding: 8bit
Content-Type: text/plain; charset="US-ASCII"

Module Name:	pkgsrc
Committed By:	mef
Date:		Mon Jan  8 23:03:50 UTC 2024

Modified Files:
	pkgsrc/math/R: distinfo
	pkgsrc/math/R/patches: patch-configure.ac patch-m4_R.m4

Log Message:
(math/R) Correction on patches


To generate a diff of this commit:
cvs rdiff -u -r1.99 -r1.100 pkgsrc/math/R/distinfo
cvs rdiff -u -r1.6 -r1.7 pkgsrc/math/R/patches/patch-configure.ac
cvs rdiff -u -r1.3 -r1.4 pkgsrc/math/R/patches/patch-m4_R.m4

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


--_----------=_170475503089440
Content-Disposition: inline
Content-Length: 4534
Content-Transfer-Encoding: binary
Content-Type: text/x-diff; charset=us-ascii

Modified files:

Index: pkgsrc/math/R/distinfo
diff -u pkgsrc/math/R/distinfo:1.99 pkgsrc/math/R/distinfo:1.100
--- pkgsrc/math/R/distinfo:1.99	Mon Jan  8 07:18:26 2024
+++ pkgsrc/math/R/distinfo	Mon Jan  8 23:03:50 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.99 2024/01/08 07:18:26 mef Exp $
+$NetBSD: distinfo,v 1.100 2024/01/08 23:03:50 mef Exp $
 
 BLAKE2s (R-4.3.2.tar.gz) = a79080d65222ec6698175c037390e666385567b1e123acf6ce1e33ee3f122005
 SHA512 (R-4.3.2.tar.gz) = 125114357f20d4a3248aee86727768d1dc15e07e44353f8a68fe2ef1fedae508e85d944301d00c0edd61e8b012b0b3cdcde53ac60be903713f96542d83ad5b1d
 Size (R-4.3.2.tar.gz) = 35039225 bytes
-SHA1 (patch-configure.ac) = d6661984716a131bbfa1a2aa56385c535881d43d
-SHA1 (patch-m4_R.m4) = f21948d2c1f662611e0bca3922dc2dedeabd473e
+SHA1 (patch-configure.ac) = ba01daf66dd48005e3cfe604a24ad2339ac164d3
+SHA1 (patch-m4_R.m4) = 4d6eb8f2fae83cf36583d553bb5f4cc42296746c
 SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe

Index: pkgsrc/math/R/patches/patch-configure.ac
diff -u pkgsrc/math/R/patches/patch-configure.ac:1.6 pkgsrc/math/R/patches/patch-configure.ac:1.7
--- pkgsrc/math/R/patches/patch-configure.ac:1.6	Wed Mar 23 21:16:44 2022
+++ pkgsrc/math/R/patches/patch-configure.ac	Mon Jan  8 23:03:50 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-configure.ac,v 1.6 2022/03/23 21:16:44 wiz Exp $
+$NetBSD: patch-configure.ac,v 1.7 2024/01/08 23:03:50 mef Exp $
 
 Do not include system paths in R_LD_LIBRARY_PATH.
 NetBSD, FreeBSD, DragonFly, Darwin and Solaris fixes
@@ -84,8 +84,8 @@ NetBSD, FreeBSD, DragonFly, Darwin and S
  : ${CXXPICFLAGS="${cxxpicflags}"}
  if test -n "${CXX}" -a -z "${CXXPICFLAGS}"; then
    case "${host_os}" in
--    aix*|mingw*)
-+    aix*|mingw*|darwin*)
+-    aix*|mingw*|msys)
++    aix*|mingw*||msys|darwin*)
        ;;
      *)
        warn_cxxpicflags="I could not determine CXXPICFLAGS."

Index: pkgsrc/math/R/patches/patch-m4_R.m4
diff -u pkgsrc/math/R/patches/patch-m4_R.m4:1.3 pkgsrc/math/R/patches/patch-m4_R.m4:1.4
--- pkgsrc/math/R/patches/patch-m4_R.m4:1.3	Sat Dec 23 20:10:56 2023
+++ pkgsrc/math/R/patches/patch-m4_R.m4	Mon Jan  8 23:03:50 2024
@@ -1,10 +1,10 @@
-$NetBSD: patch-m4_R.m4,v 1.3 2023/12/23 20:10:56 thor Exp $
+$NetBSD: patch-m4_R.m4,v 1.4 2024/01/08 23:03:50 mef Exp $
 
 Ensure tests for clog & co. fail, not just emit warning
 
---- m4/R.m4.orig	2022-11-01 23:15:01.000000000 +0000
-+++ m4/R.m4
-@@ -225,7 +225,7 @@ if test -z "${texi2any_version_maj}" \
+--- m4/R.m4.orig	2023-07-30 07:15:01.000000000 +0900
++++ m4/R.m4	2024-01-09 08:02:14.228733733 +0900
+@@ -226,7 +226,7 @@ if test -z "${texi2any_version_maj}" \
  elif test ${texi2any_version_maj} -gt 5; then
    r_cv_prog_texi2any_v5=yes
  elif test ${texi2any_version_maj} -lt 5 \
@@ -13,7 +13,7 @@ Ensure tests for clog & co. fail, not ju
    r_cv_prog_texi2any_v5=no
  else
    r_cv_prog_texi2any_v5=yes
-@@ -904,6 +904,9 @@ dnl Yes we need to double quote this ...
+@@ -905,6 +905,9 @@ dnl Yes we need to double quote this ...
  
  extern void F77_SYMBOL(cftest)(int *a, int *b, double *x, double *y);
  
@@ -23,7 +23,7 @@ Ensure tests for clog & co. fail, not ju
  int main () {
    int a[3] = {17, 237, 2000000000}, b[2], res = 0;
    double x[3] = {3.14159265, 123.456789, 2.3e34}, z[3];
-@@ -996,6 +999,9 @@ typedef struct {
+@@ -1000,6 +1003,9 @@ typedef union {
  
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
  
@@ -33,7 +33,7 @@ Ensure tests for clog & co. fail, not ju
  int main () {
      Rcomplex z[3];
  
-@@ -3763,9 +3769,9 @@ R_CHECK_FUNCS([cabs carg cexp clog csqrt
+@@ -3858,9 +3864,9 @@ R_CHECK_FUNCS([cabs carg cexp clog csqrt
  AC_DEFUN([R_CHECK_DECL],
  [AS_VAR_PUSHDEF([ac_Symbol], [ac_cv_have_decl_$1])dnl
  AC_CACHE_CHECK([whether $1 exists and is declared], ac_Symbol,
@@ -46,15 +46,15 @@ Ensure tests for clog & co. fail, not ju
  #endif
  ])],
                     [AS_VAR_SET(ac_Symbol, yes)],
-@@ -4307,9 +4313,9 @@ AC_CACHE_CHECK([if libcurl is version 7
- int main(int argc, const char * argv[]) 
+@@ -4682,9 +4688,9 @@ AC_CACHE_CHECK([if libcurl is >= 7.28.0]
+ int main(void) 
  {
  #ifdef LIBCURL_VERSION_MAJOR
 -#if LIBCURL_VERSION_MAJOR > 7
 +#if LIBCURL_VERSION_MAJOR > 8
-   exit(1);
+   exit(0);
 -#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
-+#elif (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28) || LIBCURL_VERSION_MAJOR == 8
++#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28 || LIBCURL_VERSION_MAJOR == 8
    exit(0);
  #else
    exit(1);


--_----------=_170475503089440--