CVS commit: pkgsrc/math/R

["Makoto Fujiwara" <mef%netbsd.org@localhost>]

Module Name:    pkgsrc
Committed By:   mef
Date:           Mon Jan  8 23:15:39 UTC 2024

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

Log Message:
(math/R) correction on patch-m4.R again


To generate a diff of this commit:
cvs rdiff -u -r1.101 -r1.102 pkgsrc/math/R/distinfo
cvs rdiff -u -r1.4 -r1.5 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.101 pkgsrc/math/R/distinfo:1.102
--- pkgsrc/math/R/distinfo:1.101        Mon Jan  8 23:13:02 2024
+++ pkgsrc/math/R/distinfo      Mon Jan  8 23:15:39 2024
@@ -1,8 +1,8 @@
-$NetBSD: distinfo,v 1.101 2024/01/08 23:13:02 mef Exp $
+$NetBSD: distinfo,v 1.102 2024/01/08 23:15:39 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) = 3cd063c424b7b9674f434d49c771b76dde73ac5c
-SHA1 (patch-m4_R.m4) = 4d6eb8f2fae83cf36583d553bb5f4cc42296746c
+SHA1 (patch-m4_R.m4) = 48a1d38b5505cbb87bd2c156f262680156c07a02
 SHA1 (patch-src_library_stats_src_Makefile.in) = 4eb93292858392792c37a706399e2cef91821bbe

Index: pkgsrc/math/R/patches/patch-m4_R.m4
diff -u pkgsrc/math/R/patches/patch-m4_R.m4:1.4 pkgsrc/math/R/patches/patch-m4_R.m4:1.5
--- pkgsrc/math/R/patches/patch-m4_R.m4:1.4     Mon Jan  8 23:03:50 2024
+++ pkgsrc/math/R/patches/patch-m4_R.m4 Mon Jan  8 23:15:39 2024
@@ -1,4 +1,4 @@
-$NetBSD: patch-m4_R.m4,v 1.4 2024/01/08 23:03:50 mef Exp $
+$NetBSD: patch-m4_R.m4,v 1.5 2024/01/08 23:15:39 mef Exp $
 
 Ensure tests for clog & co. fail, not just emit warning
 
@@ -54,7 +54,7 @@ Ensure tests for clog & co. fail, not ju
 +#if LIBCURL_VERSION_MAJOR > 8
    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);