CVS commit: pkgsrc/math/R

["Thomas Klausner" <wiz%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   wiz
Date:           Wed Mar 22 13:53:29 UTC 2023

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

Log Message:
R: accept curl 8


To generate a diff of this commit:
cvs rdiff -u -r1.96 -r1.97 pkgsrc/math/R/distinfo
cvs rdiff -u -r1.1 -r1.2 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.

Modified files:

Index: pkgsrc/math/R/distinfo
diff -u pkgsrc/math/R/distinfo:1.96 pkgsrc/math/R/distinfo:1.97
--- pkgsrc/math/R/distinfo:1.96 Fri Apr 22 14:01:19 2022
+++ pkgsrc/math/R/distinfo      Wed Mar 22 13:53:29 2023
@@ -1,9 +1,9 @@
-$NetBSD: distinfo,v 1.96 2022/04/22 14:01:19 wen Exp $
+$NetBSD: distinfo,v 1.97 2023/03/22 13:53:29 wiz Exp $
 
 BLAKE2s (R-4.2.0.tar.gz) = 387280cfca2ea0ed9963f4a9ed4f8cd1a2a81fc9235808659dd22a516e5ddd22
 SHA512 (R-4.2.0.tar.gz) = 99e71dad00b63e44bfcb8dc9539ff1951809112882d9ee7e06a4e99bce2e6ceac24e8348fd598c21e6d5ab0e0629a85170cde208bfa8145af91c398ac4ef7bcd
 Size (R-4.2.0.tar.gz) = 37585694 bytes
 SHA1 (patch-configure.ac) = d6661984716a131bbfa1a2aa56385c535881d43d
-SHA1 (patch-m4_R.m4) = 704d5514e10adf0b5217bb71b06f44a612eca6e0
+SHA1 (patch-m4_R.m4) = c55ae5a10bb995e147aceb12fd7393d8a6a64876
 SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe
 SHA1 (patch-src_main_character.c) = 842ae5d291f36f2beead4d32c1d41b18cbff878d

Index: pkgsrc/math/R/patches/patch-m4_R.m4
diff -u pkgsrc/math/R/patches/patch-m4_R.m4:1.1 pkgsrc/math/R/patches/patch-m4_R.m4:1.2
--- pkgsrc/math/R/patches/patch-m4_R.m4:1.1     Fri Oct  6 20:47:37 2017
+++ pkgsrc/math/R/patches/patch-m4_R.m4 Wed Mar 22 13:53:29 2023
@@ -1,10 +1,10 @@
-$NetBSD: patch-m4_R.m4,v 1.1 2017/10/06 20:47:37 rumko Exp $
+$NetBSD: patch-m4_R.m4,v 1.2 2023/03/22 13:53:29 wiz Exp $
 
 Ensure tests for clog & co. fail, not just emit warning
 
---- m4/R.m4.orig       2017-01-05 23:15:05.000000000 +0000
+--- m4/R.m4.orig       2022-04-03 22:15:01.000000000 +0000
 +++ m4/R.m4
-@@ -226,7 +226,7 @@ if test -z "${texi2any_version_maj}" \
+@@ -225,7 +225,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
-@@ -1015,6 +1015,9 @@ ${F77} ${FFLAGS} -c conftestf.f 1>&AS_ME
+@@ -904,6 +904,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];
-@@ -1107,6 +1110,9 @@ typedef struct {
+@@ -996,6 +999,9 @@ typedef struct {
  
  extern void F77_SYMBOL(cftest)(Rcomplex *x);
  
@@ -33,7 +33,7 @@ Ensure tests for clog & co. fail, not ju
  int main () {
      Rcomplex z[3];
  
-@@ -3639,9 +3645,9 @@ R_CHECK_FUNCS([cabs carg cexp clog csqrt
+@@ -3733,9 +3739,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,3 +46,15 @@ Ensure tests for clog & co. fail, not ju
  #endif
  ])],
                     [AS_VAR_SET(ac_Symbol, yes)],
+@@ -4277,9 +4283,9 @@ AC_CACHE_CHECK([if libcurl is version 7 
+ int main() 
+ {
+ #ifdef LIBCURL_VERSION_MAJOR
+-#if LIBCURL_VERSION_MAJOR > 7
++#if LIBCURL_VERSION_MAJOR > 8
+   exit(1);
+-#elif LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28
++#elif (LIBCURL_VERSION_MAJOR == 7 && LIBCURL_VERSION_MINOR >= 28) || LIBCURL_VERSION_MAJOR == 8
+   exit(0);
+ #else
+   exit(1);