Received: by mail.netbsd.org (Postfix, from userid 605) id A6F9E84E5B; Sun, 21 Jan 2024 10:05:44 +0000 (UTC) Received: from localhost (localhost [127.0.0.1]) by mail.netbsd.org (Postfix) with ESMTP id D753284DC1 for ; Sun, 21 Jan 2024 10:05:43 +0000 (UTC) X-Virus-Scanned: amavisd-new at netbsd.org Received: from mail.netbsd.org ([127.0.0.1]) by localhost (mail.netbsd.org [127.0.0.1]) (amavisd-new, port 10025) with ESMTP id wCIh8OKnRZJl for ; Sun, 21 Jan 2024 10:05:43 +0000 (UTC) Received: from cvs.NetBSD.org (ivanova.netbsd.org [199.233.217.197]) by mail.netbsd.org (Postfix) with ESMTP id 2C16884DBD for ; Sun, 21 Jan 2024 10:05:43 +0000 (UTC) Received: by cvs.NetBSD.org (Postfix, from userid 500) id 1DD03FA42; Sun, 21 Jan 2024 10:05:43 +0000 (UTC) Content-Transfer-Encoding: 7bit Content-Type: multipart/mixed; boundary="_----------=_170583154331670" MIME-Version: 1.0 Date: Sun, 21 Jan 2024 10:05:43 +0000 From: "Makoto Fujiwara" Subject: CVS commit: pkgsrc To: pkgsrc-changes@NetBSD.org Reply-To: mef@netbsd.org X-Mailer: log_accum Message-Id: <20240121100543.1DD03FA42@cvs.NetBSD.org> Sender: pkgsrc-changes-owner@NetBSD.org List-Id: Precedence: bulk List-Unsubscribe: This is a multi-part message in MIME format. --_----------=_170583154331670 Content-Disposition: inline Content-Transfer-Encoding: 8bit Content-Type: text/plain; charset="US-ASCII" Module Name: pkgsrc Committed By: mef Date: Sun Jan 21 10:05:43 UTC 2024 Modified Files: pkgsrc/doc: CHANGES-2024 pkgsrc/math: Makefile Log Message: Added math/R-conflicted version 1.2.0 To generate a diff of this commit: cvs rdiff -u -r1.526 -r1.527 pkgsrc/doc/CHANGES-2024 cvs rdiff -u -r1.585 -r1.586 pkgsrc/math/Makefile Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files. --_----------=_170583154331670 Content-Disposition: inline Content-Length: 1254 Content-Transfer-Encoding: binary Content-Type: text/x-diff; charset=us-ascii Modified files: Index: pkgsrc/doc/CHANGES-2024 diff -u pkgsrc/doc/CHANGES-2024:1.526 pkgsrc/doc/CHANGES-2024:1.527 --- pkgsrc/doc/CHANGES-2024:1.526 Sun Jan 21 09:13:39 2024 +++ pkgsrc/doc/CHANGES-2024 Sun Jan 21 10:05:42 2024 @@ -1,4 +1,4 @@ -$NetBSD: CHANGES-2024,v 1.526 2024/01/21 09:13:39 mef Exp $ +$NetBSD: CHANGES-2024,v 1.527 2024/01/21 10:05:42 mef Exp $ Changes to the packages collection and infrastructure in 2024: @@ -678,3 +678,4 @@ Changes to the packages collection and i Added time/R-RcppDate version 0.0.3 [mef 2024-01-21] Updated www/ruby-liquid to 4.0.3nb1 [taca 2024-01-21] Added time/R-RcppCCTZ version 0.2.12 [mef 2024-01-21] + Added math/R-conflicted version 1.2.0 [mef 2024-01-21] Index: pkgsrc/math/Makefile diff -u pkgsrc/math/Makefile:1.585 pkgsrc/math/Makefile:1.586 --- pkgsrc/math/Makefile:1.585 Sat Jan 20 04:35:26 2024 +++ pkgsrc/math/Makefile Sun Jan 21 10:05:42 2024 @@ -1,4 +1,4 @@ -# $NetBSD: Makefile,v 1.585 2024/01/20 04:35:26 mef Exp $ +# $NetBSD: Makefile,v 1.586 2024/01/21 10:05:42 mef Exp $ COMMENT= Mathematics @@ -46,6 +46,7 @@ SUBDIR+= R-classInt SUBDIR+= R-coda SUBDIR+= R-combinat SUBDIR+= R-compositions +SUBDIR+= R-conflicted SUBDIR+= R-date SUBDIR+= R-dplyr SUBDIR+= R-e1071 --_----------=_170583154331670--