CVS commit: pkgsrc/doc

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

Module Name:    pkgsrc
Committed By:   mef
Date:           Tue Apr 21 13:55:36 UTC 2020

Modified Files:
        pkgsrc/doc: CHANGES-2020 TODO

Log Message:
doc: Updated net/cacti to 1.2.11


To generate a diff of this commit:
cvs rdiff -u -r1.2434 -r1.2435 pkgsrc/doc/CHANGES-2020
cvs rdiff -u -r1.19840 -r1.19841 pkgsrc/doc/TODO

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

Modified files:

Index: pkgsrc/doc/CHANGES-2020
diff -u pkgsrc/doc/CHANGES-2020:1.2434 pkgsrc/doc/CHANGES-2020:1.2435
--- pkgsrc/doc/CHANGES-2020:1.2434      Tue Apr 21 13:43:10 2020
+++ pkgsrc/doc/CHANGES-2020     Tue Apr 21 13:55:36 2020
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2020,v 1.2434 2020/04/21 13:43:10 nia Exp $
+$NetBSD: CHANGES-2020,v 1.2435 2020/04/21 13:55:36 mef Exp $
 
 Changes to the packages collection and infrastructure in 2020:
 
@@ -3363,4 +3363,9 @@ Changes to the packages collection and i
        Updated www/ocsigen-i18n to 3.5.0 [jaapb 2020-04-21]
        Added audio/pragha version 1.3.4 [nia 2020-04-21]
        Updated security/openssl to 1.1.1g [sevan 2020-04-21]
+<<<<<<< CHANGES-2020
+       Updated net/cacti to 1.2.7 [mef 2020-04-21]
+=======
        Updated graphics/feh to 3.4 [nia 2020-04-21]
+>>>>>>> 1.2434
+       Updated net/cacti to 1.2.11 [mef 2020-04-21]

Index: pkgsrc/doc/TODO
diff -u pkgsrc/doc/TODO:1.19840 pkgsrc/doc/TODO:1.19841
--- pkgsrc/doc/TODO:1.19840     Tue Apr 21 10:18:35 2020
+++ pkgsrc/doc/TODO     Tue Apr 21 13:55:36 2020
@@ -1,4 +1,4 @@
-$NetBSD: TODO,v 1.19840 2020/04/21 10:18:35 nia Exp $
+$NetBSD: TODO,v 1.19841 2020/04/21 13:55:36 mef Exp $
 
 Suggested new packages
 ======================
@@ -465,7 +465,6 @@ For possible Perl packages updates, see 
        o bzr-svn-1.2.2
        o bzrtools-2.6.0
        o c4-1.10
-       o cacti-1.2.7
        o cacti-spine-1.2.7
        o cal3d-0.11.0
        o calc-2.11.10.1