Miscellaneous man page fixes.

11 files changed, 214 insertions, 181 deletions

diff --git a/pkgtools/cdpack/files/cdpack.1 b/pkgtools/cdpack/files/cdpack.1
index 1859327dfd6..e5c9717b9df 100644
--- a/pkgtools/cdpack/files/cdpack.1
+++ b/pkgtools/cdpack/files/cdpack.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: cdpack.1,v 1.5 2001/06/24 21:46:34 dmcmahill Exp $
+.\" $NetBSD: cdpack.1,v 1.6 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2001 Dan McMahill, All rights reserved.
 .\"
@@ -31,7 +31,7 @@
 .\"
 .Dd April 25, 2001
 .Dt CDPACK 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm cdpack
 .Nd produce multi-CD binary package images
@@ -59,9 +59,9 @@ used to determine which packages are placed on which CD.  The
 directory
 .Ar cd_image_directory
 is used as a staging area and the final ISO 9660 images are left in
-that directory.  A file, 
+that directory.  A file,
 .Ar .index ,
-which lists the contents of each CD will be left in the root 
+which lists the contents of each CD will be left in the root
 directory of each CD image.
 .Bl -tag -width "-x directory "
 .It Fl l Ar logfile
@@ -70,10 +70,10 @@ Log the output of mkisofs -v -v to the file
 .It Fl n
 Do not duplicate packages in order to prevent inter-CD dependencies.
 The default without the
-.Fl n 
+.Fl n
 option will place a package and all of its dependencies on the same
 CD.  If a particular package is also required by pacakges on other
-CD's, it will be placed there as well.  
+CD's, it will be placed there as well.
 When the
 .Fl n
 option is used packages are not duplicated.  This results in slightly
@@ -102,13 +102,22 @@ to be present on each CD in the set.
 Includes the contents of
 .Ar directory
 on the last CD in the set.  This is useful for adding
-a pkgsrc.tar.gz tarball, i.e. a file which does not 
+a pkgsrc.tar.gz tarball, i.e. a file which does not
 need to be on each CD.
 .El
 .Pp
 The
 .Nm
 utility exits 0 on success, and >0 if an error occurs.
+.Sh ENVIRONMENT
+.Nm
+uses the fillowing environment variables if set.
+.Bl -tag -width "TMPDIR"
+.It Ev TMPDIR
+Directory for holding temporary files during the image creation.
+Defaults to
+.Dq Li /tmp .
+.El
 .Sh EXAMPLES
 This example takes all of the binary packages found in
 /usr/pkgsrc/packages/All and creates cd images in
@@ -118,19 +127,10 @@ This example takes all of the binary packages found in
 .Pp
 To include a common set of files on all CD's, place them in a
 directory, /tmp/foo, in this example, and pass in the directory name
-with the 
+with the
 .Fl x
 option.
 .Dl cdpack -x /tmp/foo /usr/pkgsrc/packages/All /u2/cdimages
-.Sh ENVIRONMENT
-.Nm
-uses the fillowing environment variables if set.
-.Bl -tag -width "TMPDIR"
-.It Ev TMPDIR
-Directory for holding temporary files during the image creation.
-Defaults to
-.Dq Li /tmp .
-.El
 .Sh SEE ALSO
 .Xr mkisofs 1
 .Sh HISTORY
@@ -139,7 +139,7 @@ The
 utility first appeared in the
 .Nx
 packages collection in April, 2001.
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
 utility was written by Dan McMahill (dmcmahill@netbsd.org).  The
diff --git a/pkgtools/digest/files/digest.1 b/pkgtools/digest/files/digest.1
index aebc56c4767..fe2d3a20485 100644
--- a/pkgtools/digest/files/digest.1
+++ b/pkgtools/digest/files/digest.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: digest.1,v 1.2 2001/03/12 09:08:40 agc Exp $
+.\" $NetBSD: digest.1,v 1.3 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\"
 .\" Copyright (c) 2001 Alistair G. Crooks.  All rights reserved.
@@ -33,14 +33,14 @@
 .\"
 .Dd February 28, 2001
 .Dt DIGEST 1
-.Os NetBSD
+.Os
 .Sh NAME
 .Nm digest
-.Nd calculate message digests 
+.Nd calculate message digests
 .Sh SYNOPSIS
-.Nm ""
+.Nm
 .Ar algorithm
-.Op file...
+.Op file ...
 .Sh DESCRIPTION
 The
 .Nm
@@ -94,7 +94,8 @@ The
 .Nm
 utility first appeared in
 .Nx 1.6 .
-.Sh AUTHOR
+.Sh AUTHORS
 The
 .Nm
-utility was written by Alistair G. Crooks (agc@netbsd.org).
+utility was written by
+.An Alistair G. Crooks Aq agc@netbsd.org .
diff --git a/pkgtools/pkgchk/files/pkgchk.8 b/pkgtools/pkgchk/files/pkgchk.8
index 84a6301f7c8..2ce1c2311ac 100644
--- a/pkgtools/pkgchk/files/pkgchk.8
+++ b/pkgtools/pkgchk/files/pkgchk.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkgchk.8,v 1.8 2001/11/21 23:01:56 abs Exp $
+.\"	$NetBSD: pkgchk.8,v 1.9 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2001 by David Brownlee (abs@netbsd.org)
 .\" Absolutely no warranty.
@@ -85,7 +85,6 @@ will be left with missing packaged.
 Verbose - list the tags set when checking pkgchk.conf, and all packages checked.
 .El
 .Sh FILE FORMAT
-.Pp
 Each non comment line in pkgsrc.conf should contain a package
 directory (such as sysutils/skill) followed by an optional list of
 tags. Tags are checked against the current machine's set:
@@ -118,7 +117,7 @@ match the current machine.
 .Pp
 The default set of tags used to determine which packages to match in
 pkgsrc.conf are equivalent to the output of the following with any spaces
-converted to hypens (-): hostname -s, hostname, uname -srm, uname -sr, uname -sm, uname -s, uname -r, uname -m. If 
+converted to hypens (-): hostname -s, hostname, uname -srm, uname -sr, uname -sm, uname -s, uname -r, uname -m. If
 .Pa /usr/X11R6/lib/libX11.so
 or
 .Pa /usr/X11R6/lib/libX11.a
@@ -144,7 +143,7 @@ Defaults to
 Location of binary packages. If not set in environment then read from
 .Pa /etc/mk.conf .
 Defaults to
-.Pa ${PKGSRCDIR}/packages.
+.Pa ${PKGSRCDIR}/packages .
 .Pp
 Unless in a completely homogeneous environment (every machine running
 exactly the same OS version and architecture) setting
@@ -154,14 +153,14 @@ in
 to a value such as
 .Bd -literal
 ${PKGSRCDIR}/packages/${LOWER_OPSYS}-${OS_VERSION}-${MACHINE_ARCH}
-
 .Ed
-is strongly recommended. If 
+.Pp
+is strongly recommended. If
 .Em cpuflags
 (devel/cpuflags) is being used to optimally target individual CPU types,
 then
 .Ev ${CPU_DIR}
-should be appended to 
+should be appended to
 .Ev ${PACKAGES} .
 .It Ev PKGCHK_CONF
 Pathname to pkg_chk configuration file. If not set in environment
@@ -189,9 +188,9 @@ www/communicator                x11+sparc x11+sparc64
 www/navigator                	x11+i386
 x11/xlockmore                   x11 -wopr
 .Ed
-.Sh AUTHOR
+.Sh AUTHORS
 David Brownlee <abs@netbsd.org>, plus much from Stoned Elipot.
-.Sh CAVEATS
+.Sh BUGS
 Updating packages on which other packages depend can currently only be done
 via source (not binary packages).
 .Pp
@@ -206,7 +205,7 @@ depends on
 .Nm
 will correctly skip the update of
 .Em a .
-However, if 
+However, if
 .Em a
 depends on
 .Em b
diff --git a/pkgtools/pkgdiff/files/mkpatches.1 b/pkgtools/pkgdiff/files/mkpatches.1
index 24f87af8b2a..4e75f2ca82b 100644
--- a/pkgtools/pkgdiff/files/mkpatches.1
+++ b/pkgtools/pkgdiff/files/mkpatches.1
@@ -1,10 +1,10 @@
-.\"	$NetBSD: mkpatches.1,v 1.1.1.1 2000/06/28 01:42:43 wiz Exp $
+.\"	$NetBSD: mkpatches.1,v 1.2 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2000 by Thomas Klausner <wiz@netbsd.org>
 .\" All Rights Reserved.  Absolutely no warranty.
 .\"
 .Dd June 25, 2000
-.Dt mkpatches
+.Dt MKPATCHES 1
 .Os
 .Sh NAME
 .Nm mkpatches
@@ -16,21 +16,27 @@
 .Nm
 is a perl script that simplifies creating patches from a changed work
 tree if for each changed file the original was kept with an added
-extension '.orig'.
-
+extension
+.Dq .orig .
+.Pp
 .Nm
 must be called from the package's main directory, that is
-$PKGSRC/category/program. It then proceeds to find all files that
-match the pattern '*.orig'. Each of these is then compared to the
-changed file of the same name (with no '.orig' extension) using
+.Pa ${PKGSRC}/category/program .
+It then proceeds to find all files that
+match the pattern
+.Dq *.orig .
+Each of these is then compared to the
+changed file of the same name (with no
+.Dq .orig
+extension) using
 .Xr pkgdiff 1 .
-
-The resulting patches are saved in the directory $WRKDIR/.newpatches
+.Pp
+The resulting patches are saved in the directory
+.Pa ${WRKDIR}/.newpatches
 or the directory specified after
 .Fl d ,
 and can be easily compared to the currently existing set using
 .Xr patchdiff 1 .
-.Pp
 .Sh SEE ALSO
 .Xr patchdiff 1 ,
 .Xr pkgdiff 1
diff --git a/pkgtools/pkgdiff/files/patchdiff.1 b/pkgtools/pkgdiff/files/patchdiff.1
index c12db91e81d..9ccb3c557e3 100644
--- a/pkgtools/pkgdiff/files/patchdiff.1
+++ b/pkgtools/pkgdiff/files/patchdiff.1
@@ -1,10 +1,10 @@
-.\"	$NetBSD: patchdiff.1,v 1.1.1.1 2000/06/28 01:42:43 wiz Exp $
+.\"	$NetBSD: patchdiff.1,v 1.2 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2000 by Thomas Klausner <wiz@netbsd.org>
 .\" All Rights Reserved.  Absolutely no warranty.
 .\"
 .Dd June 25, 2000
-.Dt patchdiff
+.Dt PATCHDIFF 1
 .Os
 .Sh NAME
 .Nm patchdiff
@@ -17,18 +17,19 @@
 is a perl script that simplifies comparing a set of previously
 existing patches with a new one created with
 .Xr mkpatches 1 .
-
+.Pp
 .Nm
 must be called from the package's main directory, that is
-$PKGSRC/category/program. For each patch existing in either the
-patches or the $WRKDIR/.newpatches directory (the second of which can
-be overridden by the argument of the
+.Pa ${PKGSRC}/category/program .
+For each patch existing in either the
+patches or the
+.Pa ${WRKDIR}/.newpatches
+directory (the second of which can be overridden by the argument of the
 .Fl d
 option), a matching patch is
 looked for in the other directory, and, if one is found, the two are
 compared with
 .Xr diff 1 .
-.Pp
 .Sh SEE ALSO
 .Xr diff 1 ,
 .Xr patchdiff 1 ,
diff --git a/pkgtools/pkgdiff/files/pkgdiff.1 b/pkgtools/pkgdiff/files/pkgdiff.1
index 8af3a92f480..f4435816a5f 100644
--- a/pkgtools/pkgdiff/files/pkgdiff.1
+++ b/pkgtools/pkgdiff/files/pkgdiff.1
@@ -1,32 +1,37 @@
-.\"	$NetBSD: pkgdiff.1,v 1.2 2001/06/13 17:50:31 zuntum Exp $
+.\"	$NetBSD: pkgdiff.1,v 1.3 2001/12/03 19:03:22 wiz Exp $
 .\"
 .\" Copyright (c) 2000 by Hubert Feyrer <hubertf@netbsd.org>
 .\" All Rights Reserved.  Absolutely no warranty.
 .\"
 .Dd May 14, 2000
-.Dt pkgdiff
+.Dt PKGDIFF 1
 .Os
 .Sh NAME
 .Nm pkgdiff
 .Nd diff files in a way appropriate for pkgsrc
 .Sh SYNOPSIS
 .Nm
-.Op Ar diff(1) options
+.Op Ar options
 .Ar oldfile
 .Ar newfile
 .Sh DESCRIPTION
-The 
+The
 .Nm
-utility runs 
+utility runs
 .Xr diff 1
 on the named files, and generates output on stdout that is appropriate
-to be put as patch file into pkgsrc. An empty NetBSD RCS ID is output
+to be put as patch file into pkgsrc.  An empty
+.Nx
+RCS ID is output
 first, and some effort is made to ensure that the generated patch does
 not include any RCS IDs.
 .Pp
+.Ar options
+can be any options that are allowed for
+.Xr diff 1 .
 .Sh SEE ALSO
-.Xr pkgvi 1 ,
 .Xr cvs 1 ,
 .Xr diff 1 ,
 .Xr mkpatches 1 ,
-.Xr patch 1
+.Xr patch 1 ,
+.Xr pkgvi 1
diff --git a/pkgtools/pkgdiff/files/pkgvi.1 b/pkgtools/pkgdiff/files/pkgvi.1
index dc12730507d..82b9d47ae32 100644
--- a/pkgtools/pkgdiff/files/pkgvi.1
+++ b/pkgtools/pkgdiff/files/pkgvi.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkgvi.1,v 1.4 2001/10/31 07:58:20 zuntum Exp $
+.\"	$NetBSD: pkgvi.1,v 1.5 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 2001 Tomasz Luchowski. All rights reserved.
 .\"
@@ -12,7 +12,7 @@
 .\"    documentation and/or other materials provided with the distribution.
 .\" 3. All advertising materials mentioning features or use of this software
 .\"    must display the following acknowledgement:
-.\"	This product includes software developed by Tomasz Luchowski 
+.\"	This product includes software developed by Tomasz Luchowski
 .\"	for the NetBSD Project
 .\" 4. The name of the author may not be used to endorse or promote products
 .\"    derived from this software without specific prior written permission.
@@ -29,9 +29,8 @@
 .\" OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
 .\" SUCH DAMAGE.
 .\"
-
-.Dd Jan 17, 2001
-.Dt pkgvi 1
+.Dd January 17, 2001
+.Dt PKGVI 1
 .Os
 .Sh NAME
 .Nm pkgvi
@@ -41,7 +40,7 @@
 .Ar file
 .Sh DESCRIPTION
 The
-.Nm 
+.Nm
 utility runs the user's favourite editor
 on a copy of specified file.
 If no changes are made in the editor, nothing happens.
@@ -49,22 +48,22 @@ Else the original file is kept as
 .Pa filename.orig ,
 and the modified file
 is saved as
-.Pa filename.
-If 
+.Pa filename .
+If
 .Nm
 finds
 .Pa filename.orig ,
-it behaves as normal editor and changes are only made to 
+it behaves as normal editor and changes are only made to
 .Pa filename ,
 not affecting
 .Pa filename.orig .
 .Sh ENVIRONMENT
 .Nm
 uses $PKGEDITOR if defined, then it looks for $EDITOR,
-if neither is defined, it uses 
+if neither is defined, it uses
 .Xr vi 1 .
-.Pp
 .Sh SEE ALSO
-.Xr pkgdiff 1 ,
-.Sh AUTHOR
-The pkgvi utility was written by Tomasz Luchowski <zuntum@netbsd.org>.
+.Xr pkgdiff 1
+.Sh AUTHORS
+The pkgvi utility was written by
+.An Tomasz Luchowski Aq zuntum@netbsd.org .
diff --git a/pkgtools/pkglint/files/lintpkgsrc.1 b/pkgtools/pkglint/files/lintpkgsrc.1
index cbd239aa483..3bc906f7775 100644
--- a/pkgtools/pkglint/files/lintpkgsrc.1
+++ b/pkgtools/pkglint/files/lintpkgsrc.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: lintpkgsrc.1,v 1.19 2001/07/07 18:21:29 dmcmahill Exp $
+.\"	$NetBSD: lintpkgsrc.1,v 1.20 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 1999 by David Brownlee (abs@netbsd.org)
 .\" Absolutely no warranty.
@@ -7,7 +7,7 @@
 .Dt LINTPKGSRC 1
 .Sh NAME
 .Nm lintpkgsrc
-.Nd a verifier for the pkgsrc tree
+.Nd verifier for the pkgsrc tree
 .Sh SYNOPSIS
 .Nm
 .Op Fl BDLORSVdhilmopru
@@ -23,21 +23,26 @@ tries to verify the entire contents of the pkgsrc tree.
 uses simple regular-expression matching for verifying
 files that make up a pkgsrc directory.
 Note that it does NOT implement complete Makefile parser.
-.Pp
-.Sy Options
+.Ss Options
 .Bl -tag -width xxxxxxxxxxxx
 .It Fl B
 List packages marked as BROKEN.
 .It Fl D Ar paths
-Parse Makefiles and output contents (Useful for debugging).
+Parse Makefiles and output contents (useful for debugging).
 .It Fl K Ar PACKAGES
 Override binary packages base directory, normally set from
 .Pa /etc/mk.conf
-or defaulted to PKGSRCDIR/packages.
+or defaulted to
+.Pa ${PKGSRCDIR}/packages .
 .Pp
 Note: lintpkgsrc treats
 .Em PACKAGES
-slightly differently to the pkgsrc build system. -p, -R and -V check for
+slightly differently to the pkgsrc build system.
+.Fl p ,
+.Fl R
+and
+.Fl V
+check for
 binary packages in any depth of PACKAGES subdirs - this allows packages for all
 architectures/OS versions to be checked simultaneously with an
 .Pa /etc/mk.conf
@@ -49,12 +54,14 @@ PACKAGES=${PKGSRCDIR}/packages
 PACKAGES=${PKGSRCDIR}/packages/${OS_VERSION}/${MACHINE_ARCH}
 \&.endif
 .Pp
-Which would be an alternative to -K.
+Which would be an alternative to
+.Fl K .
 .Ed
 .It Fl L
 List the filenames of Makefiles as they are parsed (for debugging).
 .It Fl M Ar DISTDIR
-Set directory for distfiles, defaults to PKGSRCDIR/distfiles.
+Set directory for distfiles, defaults to
+.Pa ${PKGSRCDIR}/distfiles .
 .It Fl O
 Report any binary packages in any subdirs of
 .Em PACKAGES ,
@@ -82,7 +89,7 @@ lists.
 List any prebuilt packages in any subdirs of
 .Em PACKAGES
 with known vulnerabilities, based on the data in
-PKGSRCDIR/distfiles/vulnerabilities .
+.Pa ${PKGSRCDIR}/distfiles/vulnerabilities .
 .It Fl d
 Extract the
 .Ql DEPENDS
@@ -91,21 +98,22 @@ verify the version specified in each DEPEND correctly matches a current
 pkgsrc package.
 .It Fl g Ar pkgsrcmap
 Generate pkgsrcmap file containing an entry for each package of
-.Ql pkgname pkgdir pkgver
-.
+.Ql pkgname pkgdir pkgver .
 .It Fl h
 Basic help and usage.
 .It Fl i
 Check the version of each installed package against the current version in
 pkgsrc.
 .It Fl l
-Run pkglint on every package in pkgsrc.
+Run
+.Xr pkglint 1
+on every package in pkgsrc.
 .It Fl m
 For each current distfile, verify its checksum against the appropriate
 package's distinfo file. Also report if any package's distinfo file references
 the same distfile with a different distinfo checksum.
 .It Fl o
-Report any old distfile (not referenced by any package's distinfo file).
+Report any old distfiles (not referenced by any package's distinfo file).
 .It Fl p
 Report any old binary packages in any subdirs of
 .Em PACKAGES .
@@ -113,9 +121,14 @@ Report any old binary packages in any subdirs of
 Remove distfiles which are not referenced from any package's distinfo file,
 or have an incorrect checksum (usually due to an interrupted download),
 and any old binary packages. To remove any given type, additionally
-specify the -o, -m, or -p flags respectively.
+specify the
+.Fl o ,
+.Fl m ,
+or
+.Fl p
+flags respectively.
 .It Fl u
-As 
+As
 .Fl i
 plus for mismatched packages, display REQUIRED details and run
 .Ql make fetch-list | sh
@@ -124,9 +137,9 @@ the latest version are present.
 .Pp
 Warning: The behaviour of this command may change in a later version.
 .El
-.Sh AUTHOR
-David Brownlee <abs@netbsd.org>
-.Sh CAVEATS
+.Sh AUTHORS
+.An David Brownlee Aq abs@netbsd.org
+.Sh BUGS
 The
 .Fl R ,
 .Fl V ,
@@ -136,16 +149,16 @@ options default to using
 .Em PACKAGES
 as the base directory from which to
 search for binary packages. If this includes OS or architecture information
-then packages for other OS/architecture combinations will be missed. 
+then packages for other OS/architecture combinations will be missed.
 In this case
 .Em PACKAGES
-can be overridden with 
+can be overridden with
 .Fl K
 or set conditionally in
 .Pa /etc/mk.conf
 based on the value of
 .Em LINTPKGSRC .
-.Sh BUGS
+.Pp
 The
 .Ql Makefile parsing
 algorithm used to obtain package versions
diff --git a/pkgtools/port2pkg/files/port2pkg.1 b/pkgtools/port2pkg/files/port2pkg.1
index 5daed21749a..18864cb8941 100644
--- a/pkgtools/port2pkg/files/port2pkg.1
+++ b/pkgtools/port2pkg/files/port2pkg.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: port2pkg.1,v 1.1.1.1 1999/07/27 11:33:06 sakamoto Exp $
+.\"	$NetBSD: port2pkg.1,v 1.2 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 1999 by Kazuki Sakamoto (sakamoto@netbsd.org)
 .\" Absolutely no warranty.
@@ -7,7 +7,7 @@
 .Dt PORT2PKG 1
 .Sh NAME
 .Nm port2pkg
-.Nd convert FreeBSD ports to NetBSD pkgsrc
+.Nd convert a FreeBSD port to a NetBSD package
 .Sh SYNOPSIS
 .Nm
 .Op Fl m Ar maintainer
@@ -15,38 +15,41 @@
 .Ar pkgsrcdir
 .Sh DESCRIPTION
 .Nm
-tries convet FreeBSD ports to NetBSD pkgsrc.
+tries to convert a
+.Fx
+port to a
+.Nx
+package.
 .Nm
 copies files
 from
 .Ar portsdir
 to
 .Ar pkgsrcdir
-(if noexists, mkdir
-.Ar pkgsrcdir),
-and tries adapting Makefile, patches and some files
-to NetBSD in
-.Ar pkgsrcdir .
-.Pp
-.Sy Options
+(if
+.Ar pkgsrcdir
+doesn't exists, it is created first),
+and tries adapting the Makefile, patches and some other files
+to
+.Nx
+pkgsrc.
+.Ss Options
 .Bl -tag -width Fl
 .It Fl m
-Adjust maintainer this package
+Adjust maintainer of this package
 (default: packages@netbsd.org).
 .El
 .Sh EXAMPLES
-.Pp
 .Dl port2pkg /mnt/ports/<category>/foo /usr/pkgsrc/<category>/foo
 or
 .Dl port2pkg -m your@email /mnt/ports/<category>/foo /usr/pkgsrc/<category>/foo
-.Pp
 .Sh SEE ALSO
 Read
 .Ar Package Constructor's Guide
 in
-.Ar pkgsrc/Packages.txt .
+.Pa pkgsrc/Packages.txt .
+.Sh AUTHORS
+.An Kazuki Sakamoto Aq sakamoto@netbsd.org
 .Sh BUGS
 .Nm
 is not a magic wand, please double-check converted pkgsrc.
-.Sh AUTHOR
-Kazuki Sakamoto <sakamoto@netbsd.org>
diff --git a/pkgtools/rpm2pkg/files/rpm2pkg.8 b/pkgtools/rpm2pkg/files/rpm2pkg.8
index d5d2277e758..26b3362138f 100644
--- a/pkgtools/rpm2pkg/files/rpm2pkg.8
+++ b/pkgtools/rpm2pkg/files/rpm2pkg.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: rpm2pkg.8,v 1.4 2001/03/20 20:18:07 manu Exp $
+.\"	$NetBSD: rpm2pkg.8,v 1.5 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -51,15 +51,17 @@
 .Sh DESCRIPTION
 .Nm
 helps in building BSD packages from RPM files by unpacking each specified
-.Ar rpm_file, 
-and by building a 
+.Ar rpm_file ,
+and by building a
 .Ar package_list
 according to what was extracted. The
 .Ar package_list
-has the format expected by the NetBSD package system.
-.Pp 
-.Nm 
-also provides a mechanism that helps in selecting what is actually 
+has the format expected by the
+.Nx
+package system.
+.Pp
+.Nm
+also provides a mechanism that helps in selecting what is actually
 extracted from the RPM files. It is therefore possible to reject files
 that are of no interest when building a BSD package. This is especially
 useful for files that are to be extracted in
@@ -70,10 +72,12 @@ or
 The following options are available:
 .Bl -tag -width indent
 .It Fl d Ar directory
-Change working directory to 
+Change working directory to
 .Ar directory .
 .It Fl f Ar package_list
-Produce a NetBSD package list 
+Produce a
+.Nx
+package list
 .Ar package_list
 from what was actually extracted from the RPM files archives.
 .It Fl i Ar ignored_dir
@@ -81,11 +85,11 @@ Do not extract files contained in the
 .Ar ignored_dir
 directory of the RPM file's archives.
 .It Fl p Ar prefix
-Use 
-.Ar prefix 
+Use
+.Ar prefix
 when extracting files.
 .It Fl s Ar strip_path_count
-Strip 
+Strip
 .Ar strip_path_count
 leading directories in file names.
 .El
@@ -97,26 +101,26 @@ leading directories in file names.
 .Fl i Ar tmp
 .Fl i Ar var
 .Fl i Ar usr/tmp
-.Ar /usr/pkgsrc/distfiles/more_linux_lib/foo.rpm 
+.Ar /usr/pkgsrc/distfiles/more_linux_lib/foo.rpm
 .Ar /usr/pkgsrc/distfiles/more_linux_lib/bar.rpm
 .Pp
-This will extract 
-.Pa foo.rpm 
+This will extract
+.Pa foo.rpm
 and
 .Pa bar.rpm
-into 
+into
 .Pa /usr/pkg/emul/linux .
-A packing list called 
+A packing list called
 .Pa PLIST_DYNAMIC
-will be created, with pathnames relative to 
+will be created, with pathnames relative to
 .Pa /usr/pkg ,
-because this is the directory into which we asked 
+because this is the directory into which we asked
 .Nm
 to change with the
 .Fl d
 option.
 .Pp
-.Nm 
+.Nm
 will not extract files contained in the
 .Pa tmp ,
 .Pa var ,
@@ -129,9 +133,9 @@ directories of the RPM file's archives.
 .Fl d Ar /usr/pkg
 .Ar /usr/pkgsrc/distfiles/pack/bar.rpm
 .Pp
-This will extract the 
+This will extract the
 .Ar bar.rpm
-file in 
+file in
 .Pa /usr/pkg
 while striping the leading directory of files path in
 .Ar bar.rpm .
@@ -140,18 +144,18 @@ This is useful for dealing with RPM archives that contains files like
 which you would like to go in
 .Pa /usr/pkg/bin .
 .Sh COMPATIBILITY
-.Nm 
+.Nm
 should work with any regular RPM file.
-.Sh AUTHOR(S)
-.An Matthias Scheler Aq tron@netbsd.org
-.br
-This man page was written by 
-.An Emmanuel Dreyfus Aq manu@netbsd.org
 .Sh SEE ALSO
+.Xr cpio 1 ,
 .Xr rpm 8 ,
-.Xr rpm2cpio 8 ,
-.Xr cpio 1
+.Xr rpm2cpio 8
 .br
-.Em Dq Documentation on the NetBSD Package System , 
+.Em Dq Documentation on the NetBSD Package System ,
 .An Hubert Feyrer Aq hubert.feyrer@informatik.fh-regensburg.de ,
 .An Alistair Crooks Aq agc@pkgsrc.org
+.Sh AUTHORS
+.An Matthias Scheler Aq tron@netbsd.org
+.br
+This man page was written by
+.An Emmanuel Dreyfus Aq manu@netbsd.org
diff --git a/pkgtools/url2pkg/files/url2pkg.8 b/pkgtools/url2pkg/files/url2pkg.8
index 34fe8aca8fc..a2bd46ca10b 100644
--- a/pkgtools/url2pkg/files/url2pkg.8
+++ b/pkgtools/url2pkg/files/url2pkg.8
@@ -1,4 +1,4 @@
-.\"	$NetBSD: url2pkg.8,v 1.2 2001/04/09 14:51:47 hubertf Exp $
+.\"	$NetBSD: url2pkg.8,v 1.3 2001/12/03 19:03:23 wiz Exp $
 .\"
 .\" Copyright (c) 2001 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -45,16 +45,16 @@
 .Op Ar URL
 .Sh DESCRIPTION
 .Nm
-takes the 
-.Ar URL 
+takes the
+.Ar URL
 to a package's distfile that should be
 turned into a package. The
-generated package includes a 
-.Pa Makefile 
+generated package includes a
+.Pa Makefile
 and a basic set of files to get the
 package going. Any customisations to get the package going need to be
-adjusted manually after 
-.Nm 
+adjusted manually after
+.Nm
 has finished it's job.
 .Pp
 .Nm
@@ -64,36 +64,30 @@ intended to fly on autopilot, though.
 The
 .Pa Makefile
 contains all the requiered variable, such as DISTNAME or MASTER_SITES, but some of them cannot be automatically set. Hence, the user's usual editor is invoked to edit the
-.Pa Makefile.
+.Pa Makefile .
 .Pp
 After the
-.Pa Makefile 
-is completed, 
-.Nm 
+.Pa Makefile
+is completed,
+.Nm
 fetches the archive, and computes its checksum via the
 .Ic make makesum
-target. Then archive extraction is done, via the 
+target. Then archive extraction is done, via the
 .Ic make extract
-target, and finally, 
+target, and finally,
 .Nm
 attempts to detect if
-the software uses a 
-.Ic configure 
-script, and if it's from GNU 
-.Ic autoconf.
+the software uses a
+.Ic configure
+script, and if it's from GNU
+.Ic autoconf .
 .Pp
 If the user does not supply the
 .Ar URL
-on the command line, then 
+on the command line, then
 .Nm
 will prompt for it.
-.Sh EXAMPLES
-.Nm
-.Ar http://www.foo.com/bar/buz.tgz
-.Pp
-Will generate a template NetBSD package for the software that can be found at
-.Ar http://www.foo.com/bar/buz.tgz
-.Sh ENVIRONMENTAL VARIABLES
+.Sh ENVIRONMENT
 .Bl -tag -width indent
 .It PKGEDITOR, EDITOR
 Editor used for
@@ -101,23 +95,31 @@ Editor used for
 edition.
 .It PKGMAINTAINER, REPLYTO
 Name used for the MAINTAINER field in the package
-.Pa Makefile.
+.Pa Makefile .
 .El
-.Sh BUGS
+.Sh EXAMPLES
 .Nm
-does not generate an empty 
-.Pa patches
-directory
-.Sh AUTHOR(S)
-.Nm 
-was written by
-.An Hubert Feyrer Aq hubertf@netbsd.org
-.br
-This man page was written by 
-.An Emmanuel Dreyfus Aq manu@netbsd.org
+.Ar http://www.foo.com/bar/buz.tgz
+.Pp
+Will generate a template
+.Nx
+package for the software that can be found at
+.Ar http://www.foo.com/bar/buz.tgz
 .Sh SEE ALSO
 .Xr packages 7
 .br
-.Em "Documentation on the NetBSD Package System", 
+.Em "Documentation on the NetBSD Package System" ,
 .An Hubert Feyrer Aq hubertf@netbsd.org
 .An Alistair Crooks Aq agc@pkgsrc.org
+.Sh AUTHORS
+.Nm
+was written by
+.An Hubert Feyrer Aq hubertf@netbsd.org
+.br
+This man page was written by
+.An Emmanuel Dreyfus Aq manu@netbsd.org
+.Sh BUGS
+.Nm
+does not generate an empty
+.Pa patches
+directory