Received: by mail.netbsd.org (Postfix, from userid 605) id 0E7F384F7E; Mon, 8 Jan 2024 23:15:41 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id 3C6A484F7B for ; Mon, 8 Jan 2024 23:15:40 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([IPv6:::1]) by localhost (mail.netbsd.org [IPv6:::1]) (amavisd-new, port 10025) with ESMTP id r8hG5vj3ug1E for ; Mon, 8 Jan 2024 23:15:39 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.NetBSD.org [IPv6:2001:470:a085:999:28c:faff:fe03:5984]) by mail.netbsd.org (Postfix) with ESMTP id AE51E84CC8 for ; Mon, 8 Jan 2024 23:15:39 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id A6546FA42; Mon, 8 Jan 2024 23:15:39 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_1704755739155220" MIME-Version: 1.0 Date: Mon, 8 Jan 2024 23:15:39 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc/math/R To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20240108231539.A6546FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_1704755739155220 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: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. --_----------=_1704755739155220 Content-Disposition: inline Content-Length: 1797 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.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); --_----------=_1704755739155220--