[src/trunk]: src/external/bsd/bzip2/dist Fix mismerge of man page after 1.0.8...

[wiz <wiz%NetBSD.org@localhost>]

details:   https://anonhg.NetBSD.org/src/rev/ce3b3fed799b
branches:  trunk
changeset: 1000317:ce3b3fed799b
user:      wiz <wiz%NetBSD.org@localhost>
date:      Sun Jul 21 21:07:12 2019 +0000

description:
Fix mismerge of man page after 1.0.8 import.

diffstat:

 external/bsd/bzip2/dist/bzip2.1 |  127 ++++++++++++++-------------------------
 1 files changed, 46 insertions(+), 81 deletions(-)

diffs (142 lines):

diff -r 8dfa257cd268 -r ce3b3fed799b external/bsd/bzip2/dist/bzip2.1
--- a/external/bsd/bzip2/dist/bzip2.1   Sun Jul 21 19:03:12 2019 +0000
+++ b/external/bsd/bzip2/dist/bzip2.1   Sun Jul 21 21:07:12 2019 +0000
@@ -1,40 +1,31 @@
-.\"    $NetBSD: bzip2.1,v 1.4 2019/07/21 11:52:14 maya Exp $
+.\"    $NetBSD: bzip2.1,v 1.5 2019/07/21 21:07:12 wiz Exp $
 .\"
-.PU
-.TH bzip2 1
-.SH NAME
-bzip2, bunzip2 \- a block-sorting file compressor, v1.0.8
-.br
-bzcat \- decompresses files to stdout
-.br
-bzip2recover \- recovers data from damaged bzip2 files
-
-.SH SYNOPSIS
-.ll +8
-.B bzip2
-.RB [ " \-cdfkqstvzVL123456789 " ]
-[
-.I "filenames \&..."
-]
-.ll -8
-.br
-.B bunzip2
-.RB [ " \-fkvsVL " ]
-[ 
-.I "filenames \&..."
-]
-.br
-.B bzcat
-.RB [ " \-s " ]
-[ 
-.I "filenames \&..."
-]
-.br
-.B bzip2recover
-.I "filename"
-
-.SH DESCRIPTION
-.I bzip2
+.Dd July 13, 2019
+.Dt BZIP2 1
+.Os
+.Sh NAME
+.Nm bzip2 ,
+.Nm bunzip2 ,
+.Nm bzcat ,
+.Nm bzip2recover
+.Nd block-sorting file compressor
+.Sh SYNOPSIS
+.Nm bzip2
+.Op Fl 123456789cdfkLqstVvz
+.Op Ar filename Ar
+.Pp
+.Nm bunzip2
+.Op Fl fkLVvs
+.Op Ar filename Ar
+.Pp
+.Nm bzcat
+.Op Fl s
+.Op Ar filename Ar
+.Pp
+.Nm bzip2recover
+.Ar filename
+.Sh DESCRIPTION
+.Nm bzip2
 compresses files using the Burrows-Wheeler block sorting
 text compression algorithm, and Huffman coding.
 Compression is generally considerably better than that achieved by
@@ -495,51 +486,25 @@
 .Nm bzip2
 tries hard to detect I/O errors and exit cleanly, but the details of
 what the problem is sometimes seem rather misleading.
-
+.Pp
 This manual page pertains to version 1.0.8 of
-.I bzip2.  
+.Nm bzip2 .
 Compressed data created by this version is entirely forwards and
 backwards compatible with the previous public releases, versions
-0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the following
-exception: 0.9.0 and above can correctly decompress multiple
-concatenated compressed files.  0.1pl2 cannot do this; it will stop
-after decompressing just the first file in the stream.
-
-.I bzip2recover
-versions prior to 1.0.2 used 32-bit integers to represent
-bit positions in compressed files, so they could not handle compressed
-files more than 512 megabytes long.  Versions 1.0.2 and above use
-64-bit ints on some platforms which support them (GNU supported
-targets, and Windows).  To establish whether or not bzip2recover was
-built with such a limitation, run it without arguments.  In any event
-you can build yourself an unlimited version if you can recompile it
-with MaybeUInt64 set to be an unsigned 64-bit integer.
-
-
-
-.SH AUTHOR
-Julian Seward, jseward%acm.org@localhost.
-
-https://sourceware.org/bzip2/
-
-The ideas embodied in
-.I bzip2
-are due to (at least) the following
-people: Michael Burrows and David Wheeler (for the block sorting
-transformation), David Wheeler (again, for the Huffman coder), Peter
-Fenwick (for the structured coding model in the original
-.I bzip,
-and many refinements), and Alistair Moffat, Radford Neal and Ian Witten
-(for the arithmetic coder in the original
-.I bzip).  
-I am much
-indebted for their help, support and advice.  See the manual in the
-source distribution for pointers to sources of documentation.  Christian
-von Roques encouraged me to look for faster sorting algorithms, so as to
-speed up compression.  Bela Lubkin encouraged me to improve the
-worst-case compression performance.  
-Donna Robinson XMLised the documentation.
-The bz* scripts are derived from those of GNU gzip.
-Many people sent patches, helped
-with portability problems, lent machines, gave advice and were generally
-helpful.
+0.1pl2, 0.9.0, 0.9.5, 1.0.0, 1.0.1, 1.0.2 and above, but with the
+following exception: 0.9.0 and above can correctly decompress multiple
+concatenated compressed files.
+0.1pl2 cannot do this; it will stop after decompressing just the first
+file in the stream.
+.Pp
+.Nm bzip2recover
+versions prior to 1.0.2 used 32-bit integers to represent bit
+positions in compressed files, so they could not handle compressed
+files more than 512 megabytes long.
+Versions 1.0.2 and above use 64-bit ints on some platforms which
+support them (GNU supported targets, and Windows).
+To establish whether or not
+.Nm bzip2recover
+was built with such a limitation, run it without arguments.
+In any event you can build yourself an unlimited version if you can
+recompile it with MaybeUInt64 set to be an unsigned 64-bit integer.