Index: Makefile
===================================================================
RCS file: /cvs/ports/sysutils/colortree/Makefile,v
retrieving revision 1.5
diff -u -p -u -r1.5 Makefile
--- Makefile 12 Jul 2019 20:49:40 -0000 1.5
+++ Makefile 17 Jan 2022 07:54:02 -0000
@@ -2,7 +2,7 @@
COMMENT = print a tree of the directory structure
-V = 1.8.0
+V = 2.0.1
DISTNAME = tree-$V
PKGNAME= colortree-$V
CATEGORIES = sysutils
Index: distinfo
===================================================================
RCS file: /cvs/ports/sysutils/colortree/distinfo,v
retrieving revision 1.2
diff -u -p -u -r1.2 distinfo
--- distinfo 28 Dec 2018 06:44:54 -0000 1.2
+++ distinfo 17 Jan 2022 07:54:02 -0000
@@ -1,2 +1,2 @@
-SHA256 (tree-1.8.0.tgz) = cV1dS0NDIc50cG0N0GdQW7YMXqg7Xws2VdrkCqb5t8I=
-SIZE (tree-1.8.0.tgz) = 50286
+SHA256 (tree-2.0.1.tgz) = 4zOcWhlM9rQIDxXsWfqjZ58C1aeTshR5Evv8+0zfIjk=
+SIZE (tree-2.0.1.tgz) = 57213
Index: patches/patch-doc_tree_1
===================================================================
RCS file: /cvs/ports/sysutils/colortree/patches/patch-doc_tree_1,v
retrieving revision 1.2
diff -u -p -u -r1.2 patch-doc_tree_1
--- patches/patch-doc_tree_1 28 Dec 2018 06:44:54 -0000 1.2
+++ patches/patch-doc_tree_1 17 Jan 2022 07:54:02 -0000
@@ -2,18 +2,22 @@ $OpenBSD: patch-doc_tree_1,v 1.2 2018/12
Index: doc/tree.1
--- doc/tree.1.orig
+++ doc/tree.1
-@@ -17,22 +17,22 @@
+@@ -17,11 +17,11 @@
.\" Foundation, Inc., 59 Temple Place, Suite 330, Boston, MA 02111-1307 USA
.\"
...
--.TH TREE 1 "" "Tree 1.8.0"
-+.TH COLORTREE 1 "" "Colortree 1.8.0"
+-.TH TREE 1 "" "Tree 2.0.0"
++.TH COLORTREE 1 "" "Colortree 2.0.0"
.SH NAME
-tree \- list contents of directories in a tree-like format.
+colortree \- list contents of directories in a tree-like format.
.SH SYNOPSIS
--\fBtree\fP [\fB-acdfghilnpqrstuvxACDFQNSUX\fP] [\fB-L\fP \fIlevel\fP [\fB-R\fP]] [\fB-H\fP \fIbaseHREF\fP] [\fB-T\fP \fItitle\fP] [\fB-o\fP \fIfilename\fP] [\fB--nolinks\fP] [\fB-P\fP \fIpattern\fP] [\fB-I\fP \fIpattern\fP] [\fB--inodes\fP] [\fB--device\fP] [\fB--noreport\fP] [\fB--dirsfirst\fP] [\fB--version\fP] [\fB--help\fP] [\fB--filelimit\fP \fI#\fP] [\fB--si\fP] [\fB--prune\fP] [\fB--du\fP] [\fB--timefmt\fP \fIformat\fP] [\fB--matchdirs\fP] [\fB--fromfile\fP] [\fB--\fP] [\fIdirectory\fP ...]
-+\fBcolortree\fP [\fB-acdfghilnpqrstuvxACDFQNSUX\fP] [\fB-L\fP \fIlevel\fP [\fB-R\fP]] [\fB-H\fP \fIbaseHREF\fP] [\fB-T\fP \fItitle\fP] [\fB-o\fP \fIfilename\fP] [\fB--nolinks\fP] [\fB-P\fP \fIpattern\fP] [\fB-I\fP \fIpattern\fP] [\fB--inodes\fP] [\fB--device\fP] [\fB--noreport\fP] [\fB--dirsfirst\fP] [\fB--version\fP] [\fB--help\fP] [\fB--filelimit\fP \fI#\fP] [\fB--si\fP] [\fB--prune\fP] [\fB--du\fP] [\fB--timefmt\fP \fIformat\fP] [\fB--matchdirs\fP] [\fB--fromfile\fP] [\fB--\fP] [\fIdirectory\fP ...]
+-\fBtree\fP
++\fBcolortree\fP
+ [\fB-acdfghilnpqrstuvxACDFJQNSUX\fP]
+ [\fB-L\fP \fIlevel\fP [\fB-R\fP]]
+ [\fB-H\fP \fIbaseHREF\fP]
+@@ -53,13 +53,13 @@ tree \- list contents of directories in a tree-like fo
.br
.SH DESCRIPTION
@@ -23,18 +27,15 @@ Index: doc/tree.1
\fBLS_COLORS\fP environment variable is set and output is to tty. With no
-arguments, \fItree\fP lists the files in the current directory. When directory
-arguments are given, \fItree\fP lists all the files and/or directories found in
--the given directories each in turn. Upon completion of listing all
++arguments, \fIcolortree\fP lists the files in the current directory. When directory
++arguments are given, \fIcolortree\fP lists all the files and/or directories found in
+ the given directories each in turn. Upon completion of listing all
-files/directories found, \fItree\fP returns the total number of files and/or
--directories listed.
-+arguments, \fIcolortree\fP lists the files in the current directory. When
-+directory arguments are given, \fIcolortree\fP lists all the files and/or
-+directories found in the given directories each in turn. Upon completion of
-+listing all files/directories found, \fIcolortree\fP returns the total number
-+of files and/or directories listed.
++files/directories found, \fIcolortree\fP returns the total number of files and/or
+ directories listed.
By default, when a symbolic link is encountered, the path that the symbolic
- link refers to is printed after the name of the link in the format:
-@@ -42,19 +42,19 @@ link refers to is printed after the name of the link i
+@@ -70,19 +70,19 @@ link refers to is printed after the name of the link i
.br
If the `\fB-l\fP' option is given and the symbolic link refers to an actual
@@ -58,18 +59,16 @@ Index: doc/tree.1
constructs `.' (current directory) and `..' (previous directory).
.PP
.TP
-@@ -82,8 +82,8 @@ Max display depth of the directory tree.
+@@ -110,7 +110,7 @@ Max display depth of the directory tree.
.TP
.B -R
Recursively cross down the tree each \fIlevel\fP directories (see \fB-L\fP
-option), and at each of them execute \fBtree\fP again adding `-o 00Tree.html'
--as a new option.
-+option), and at each of them execute \fBcolortree\fP again adding
-+`-o 00Tree.html' as a new option.
++option), and at each of them execute \fBcolortree\fP again adding `-o 00Tree.html'
+ as a new option.
.PP
.TP
- .B -P \fIpattern\fP
-@@ -114,7 +114,7 @@ pattern will not be pruned.
+@@ -155,7 +155,7 @@ after the indentation lines.
.PP
.TP
.B --prune
@@ -78,7 +77,7 @@ Index: doc/tree.1
conjunction with \fB-P\fP or \fB-I\fP. See \fBBUGS AND NOTES\fP below for
more information on this option.
.PP
-@@ -187,7 +187,7 @@ Like \fB-h\fP but use SI units (powers of 1000) instea
+@@ -233,7 +233,7 @@ Like \fB-h\fP but use SI units (powers of 1000) instea
For each directory report its size as the accumulation of sizes of all its files
and sub-directories (and their files, and so on). The total amount of used
space is also given in the final report (like the 'du -c' command.) This option
@@ -87,7 +86,7 @@ Index: doc/tree.1
\fBBUGS AND NOTES\fP below. Implies \fB-s\fP.
.PP
.TP
-@@ -249,7 +249,7 @@ Sort the output by \fItype\fR instead of name. Possibl
+@@ -300,7 +300,7 @@ Sort the output by \fItype\fR instead of name. Possibl
.TP
.B -i
@@ -96,7 +95,19 @@ Index: doc/tree.1
with the \fB-f\fP option. Also removes as much whitespace as possible when used
with the \fB-J\fP or \fB-x\fP options.
.PP
-@@ -319,7 +319,7 @@ Outputs a verbose usage listing.
+@@ -360,9 +360,9 @@ Turns off hyperlinks in HTML output.
+ .B --fromfile
+ Reads a directory listing from a file rather than the file-system. Paths
+ provided on the command line are files to read from rather than directories to
+-search. The dot (.) directory indicates that tree should read paths from
++search. The dot (.) directory indicates that colortree should read paths from
+ standard input. NOTE: this is only suitable for reading the output of a program
+-such as find, not 'tree -fi' as symlinks cannot (at least as yet) be distinguished
++such as find, not 'colortree -fi' as symlinks cannot (at least as yet) be distinguished
+ from files that simply contain ' -> ' as part of the filename.
+
+ .SH MISC OPTIONS
+@@ -373,7 +373,7 @@ Outputs a verbose usage listing.
.PP
.TP
.B --version
@@ -105,7 +116,7 @@ Index: doc/tree.1
.PP
.TP
.B --
-@@ -338,7 +338,7 @@ Option processing terminator. No further options will
+@@ -411,7 +411,7 @@ share the same comment.
.br
\fBTREE_COLORS\fP Uses this for color information over LS_COLORS if it is set.
.br
@@ -114,27 +125,30 @@ Index: doc/tree.1
.br
\fBCLICOLOR\fP Enables colorization even if TREE_COLORS or LS_COLORS is not set.
.br
-@@ -358,8 +358,8 @@ HTML output hacked by Francesc Rocher (rocher@econ.udg
+@@ -431,7 +431,7 @@ HTML output hacked by Francesc Rocher (rocher@econ.udg
Charsets and OS/2 support by Kyosuke Tokoro (NBG01720@nifty.ne.jp)
.SH BUGS AND NOTES
-Tree does not prune "empty" directories when the -P and -I options are used by
--default. Use the --prune option.
-+Colortree does not prune "empty" directories when the -P and -I options are used
-+by default. Use the --prune option.
++Colortree does not prune "empty" directories when the -P and -I options are used by
+ default. Use the --prune option.
The -h and --si options round to the nearest whole number unlike the ls
- implementations which rounds up always.
-@@ -367,9 +367,9 @@ implementations which rounds up always.
+@@ -440,7 +440,7 @@ implementations which rounds up always.
Pruning files and directories with the -I, -P and --filelimit options will
lead to incorrect file/directory count reports.
-The --prune and --du options cause tree to accumulate the entire tree in memory
--before emitting it. For large directory trees this can cause a significant delay
--in output and the use of large amounts of memory.
-+The --prune and --du options cause colortree to accumulate the entire tree in
-+memory before emitting it. For large directory trees this can cause a
-+significant delay in output and the use of large amounts of memory.
-
- The timefmt expansion buffer is limited to a ridiculously large 255 characters.
- Output of time strings longer than this will be undefined, but are guaranteed
++The --prune and --du options cause colortree to accumulate the entire tree in memory
+ before emitting it. For large directory trees this can cause a significant delay
+ in output and the use of large amounts of memory.
+
+@@ -452,7 +452,7 @@ XML/JSON trees are not colored, which is a bit of a sh
+
+ Probably more.
+
+-As of version 2.0.0, in Linux, tree will attempt to automatically output a
++As of version 2.0.0, in Linux, colortree will attempt to automatically output a
+ compact JSON tree on file descriptor 3 (what I call stddata,) if present. It
+ is hoped that some day a better Linux/Unix shell may take advantage of this
+ feature, though BSON would probably be a better format for this.
Here is an update of (color)tree to 2.0.1.
This version now writes JSON by default to fd 3 on Linux, and therefore
some breakage has been reported in dependent programs (e.g. password-
store) on Linux.
Looking through the source code, this behaviour seems to be limited to
"#ifdef __linux__" though, and I found no problems while lightly testing
it on amd6, including with password-store.
No comments:
Post a Comment