Sync pkgtools/pkg_install with src/usr.sbin/pkg_install from 20031121.

11 files changed, 192 insertions, 180 deletions

diff --git a/pkgtools/pkg_install/files/add/pkg_add.cat1 b/pkgtools/pkg_install/files/add/pkg_add.cat1
index e466a6f7d15..0ec9b688c58 100644
--- a/pkgtools/pkg_install/files/add/pkg_add.cat1
+++ b/pkgtools/pkg_install/files/add/pkg_add.cat1
@@ -1,4 +1,4 @@
-PKG_ADD(1)                  NetBSD Reference Manual                 PKG_ADD(1)
+PKG_ADD(1)              NetBSD General Commands Manual              PKG_ADD(1)
 
 NNAAMMEE
      ppkkgg__aadddd - a utility for installing and upgrading software package distri-
@@ -14,13 +14,14 @@ DDEESSCCRRIIPPTTIIOONN
      been previously created with the pkg_create(1) command.  Packages are
      prepared collections of pre-built binaries, documentation, configura-
      tions, installation instructions and/or other files.  ppkkgg__aadddd can recur-
-     sively install other packages that the current package depends on or re-
-     quires from both local disk and via FTP or HTTP.
+     sively install other packages that the current package depends on or
+     requires from both local disk and via FTP or HTTP.
 
 WWAARRNNIINNGG
-     _S_i_n_c_e _t_h_e ppkkgg__aadddd _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _c_o_n_t_a_i_n_e_d _w_i_t_h_-
-     _i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_e_s_'_' _o_r
-     _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e _f_i_l_e_s_.
+     _S_i_n_c_e _t_h_e ppkkgg__aadddd _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _c_o_n_t_a_i_n_e_d
+     _w_i_t_h_i_n _a _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n
+     _h_o_r_s_e_s_'_' _o_r _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s
+     _p_a_c_k_a_g_e _f_i_l_e_s_.
 
      _Y_o_u _a_r_e _a_d_v_i_s_e_d _t_o _v_e_r_i_f_y _t_h_e _c_o_m_p_e_t_e_n_c_e _a_n_d _i_d_e_n_t_i_t_y _o_f _t_h_o_s_e _w_h_o _p_r_o_-
      _v_i_d_e _i_n_s_t_a_l_l_a_b_l_e _p_a_c_k_a_g_e _f_i_l_e_s_.  _F_o_r _e_x_t_r_a _p_r_o_t_e_c_t_i_o_n_, _u_s_e _t_h_e _d_i_g_i_t_a_l
@@ -40,9 +41,9 @@ OOPPTTIIOONNSS
              or a local pathname, a package name of "-" will cause ppkkgg__aadddd to
              read from stdin.  If the packages are not found in the current
              working directory, ppkkgg__aadddd will search them in each directory
-             named by the PKG_PATH environment variable.  Any dependencies re-
-             quired by the installed package will be searched in the same lo-
-             cation that the original package was installed from.
+             named by the PKG_PATH environment variable.  Any dependencies
+             required by the installed package will be searched in the same
+             location that the original package was installed from.
 
      --ff      Force installation to proceed even if prerequisite packages are
              not installed or the requirements script fails.  Although ppkkgg__aadddd
@@ -77,12 +78,12 @@ OOPPTTIIOONNSS
              Set _p_r_e_f_i_x as the directory in which to extract files from a
              package.  If a package has set its default directory, it will be
              overridden by this flag.  Note that only the first @@ccwwdd directive
-             will be replaced, since ppkkgg__aadddd has no way of knowing which di-
-             rectory settings are relative and which are absolute.  It is rare
-             in any case to see more than one directory transition made, but
-             when such does happen and you wish to have control over *all* di-
-             rectory transitions, then you may then wish to look into the use
-             of MMAASSTTEERR and SSLLAAVVEE modes (see the --MM and --SS options).
+             will be replaced, since ppkkgg__aadddd has no way of knowing which
+             directory settings are relative and which are absolute.  It is
+             rare in any case to see more than one directory transition made,
+             but when such does happen and you wish to have control over *all*
+             directory transitions, then you may then wish to look into the
+             use of MMAASSTTEERR and SSLLAAVVEE modes (see the --MM and --SS options).
 
      --RR      Do not record the installation of a package.  This means that you
              cannot deinstall it later, so only use this option if you know
@@ -104,14 +105,14 @@ OOPPTTIIOONNSS
              are defined: none, gpg and pgp5.  The signature will be verified
              at install time, and the results will be displayed.  If the sig-
              nature type is anything other than none, the user will be asked
-             if ppkkgg__aadddd should proceed to install the binary package.  The us-
-             er must then take the decision whether to proceed or not, depend-
-             ing upon the amount of trust that is placed in the signatory of
-             the binary package.  Please note that, at the current time, it is
-             not possible to use the verification feature when using ppkkgg__aadddd
-             to add a binary package via a URL - the package, and the related
-             detached signature file, must be local for the verification to
-             work.
+             if ppkkgg__aadddd should proceed to install the binary package.  The
+             user must then take the decision whether to proceed or not,
+             depending upon the amount of trust that is placed in the signa-
+             tory of the binary package.  Please note that, at the current
+             time, it is not possible to use the verification feature when
+             using ppkkgg__aadddd to add a binary package via a URL - the package,
+             and the related detached signature file, must be local for the
+             verification to work.
 
      --tt _t_e_m_p_l_a_t_e
              Use _t_e_m_p_l_a_t_e as the input to mktemp(3) when creating a ``staging
@@ -125,9 +126,10 @@ OOPPTTIIOONNSS
              _t_e_m_p_l_a_t_e to reside on the same disk partition as target directo-
              ries for package file installation; often this is _/_u_s_r.
 
-     --uu      If the package that's being installed is already installed, ei-
-             ther in the same or a different version, an update is performed.
-             See below for a more detailed description of the process.
+     --uu      If the package that's being installed is already installed,
+             either in the same or a different version, an update is per-
+             formed.  See below for a more detailed description of the
+             process.
 
      --VV      Print version number and exit.
 
@@ -135,8 +137,8 @@ OOPPTTIIOONNSS
 
      --WW _v_i_e_w_b_a_s_e
              Set _v_i_e_w_b_a_s_e as the base directory for the managed views.  The
-             default _v_i_e_w_b_a_s_e directory is set by pkg_view(1).  This value al-
-             so may be set from the LOCALBASE environment variable.
+             default _v_i_e_w_b_a_s_e directory is set by pkg_view(1).  This value
+             also may be set from the LOCALBASE environment variable.
 
      --ww _v_i_e_w
              Set the _v_i_e_w to which packages should be added after installa-
@@ -150,15 +152,15 @@ OOPPTTIIOONNSS
      ppkkgg__aadddd ftp://ftp.NetBSD.org/pub/NetBSD/pack-
      ages/1.5/i386/shells/bash-2.04.tgz or ppkkgg__aadddd http://www.exam-
      ple.org/packages/screen-4.0.tbz).  Note:  For ftp transfers, if you wish
-     to use _p_a_s_s_i_v_e _m_o_d_e  ftp in such transfers, set the variable _F_T_P___P_A_S_-
-     _S_I_V_E___M_O_D_E  to some value in your environment.  Otherwise, the more stan-
+     to use _p_a_s_s_i_v_e _m_o_d_e ftp in such transfers, set the variable _F_T_P___P_A_S_-
+     _S_I_V_E___M_O_D_E to some value in your environment.  Otherwise, the more stan-
      dard ACTIVE mode may be used.  If ppkkgg__aadddd consistently fails to fetch a
      package from a site known to work, it may be because you have a firewall
-     that demands the usage of _p_a_s_s_i_v_e _m_o_d_e  ftp.
+     that demands the usage of _p_a_s_s_i_v_e _m_o_d_e ftp.
 
 TTEECCHHNNIICCAALL DDEETTAAIILLSS
-     ppkkgg__aadddd extracts each package's "packing list" into a special staging di-
-     rectory in /var/tmp (or $PKG_TMPDIR if set) and then runs through the
+     ppkkgg__aadddd extracts each package's "packing list" into a special staging
+     directory in /var/tmp (or $PKG_TMPDIR if set) and then runs through the
      following sequence to fully extract the contents of the package:
 
            1.   A check is made to determine if the package or another version
@@ -172,18 +174,18 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
                 ful, replacing is prepared by moving an existing _+_R_E_Q_U_I_R_E_D___B_Y
                 file aside (if it exists), and running pkg_delete(1) on the
                 installed package.  Installation then proceeds as if the pack-
-                age was not installed, and restores the _+_R_E_Q_U_I_R_E_D___B_Y file af-
-                terwards.
+                age was not installed, and restores the _+_R_E_Q_U_I_R_E_D___B_Y file
+                afterwards.
 
            2.   A check is made to determine if the package conflicts (from
-                @@ppkkggccffll directives, see pkg_create(1)) with an already record-
-                ed as installed package.  If it is, installation is terminat-
-                ed.
+                @@ppkkggccffll directives, see pkg_create(1)) with an already
+                recorded as installed package.  If it is, installation is ter-
+                minated.
 
            3.   All package dependencies (from @@ppkkggddeepp directives, see
                 pkg_create(1)) are read from the packing list.  If any of
-                these required packages are not currently installed, an at-
-                tempt is made to find and install it; if the missing package
+                these required packages are not currently installed, an
+                attempt is made to find and install it; if the missing package
                 cannot be found or installed, the installation is terminated.
 
            4.   A search is made for any @@ooppttiioonn directives which control how
@@ -192,9 +194,9 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
                 package to be extracted directly into its prefix directory
                 rather than moving it through a staging area in _/_v_a_r_/_t_m_p.
 
-           5.   If @@ooppttiioonn eexxttrraacctt--iinn--ppllaaccee is enabled, the package is now ex-
-                tracted directly into its final location, otherwise it is ex-
-                tracted into the staging area.
+           5.   If @@ooppttiioonn eexxttrraacctt--iinn--ppllaaccee is enabled, the package is now
+                extracted directly into its final location, otherwise it is
+                extracted into the staging area.
 
            6.   If the package contains a _r_e_q_u_i_r_e script (see pkg_create(1)),
                 it is executed with the following arguments:
@@ -215,8 +217,8 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
                 _p_k_g_-_n_a_m_e      The name of the package being installed.
 
                 PPRREE--IINNSSTTAALLLL   Keyword denoting that the script is to perform
-                              any actions needed before the package is in-
-                              stalled.
+                              any actions needed before the package is
+                              installed.
 
                 If the _i_n_s_t_a_l_l script exits with a non-zero status code, the
                 installation is terminated.
@@ -250,8 +252,8 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
                 an alternate package database directory is specified, then it
                 overrides the _/_v_a_r_/_d_b_/_p_k_g path shown above).
 
-           12.  If the package is a depoted package, then add it to the de-
-                fault view.
+           12.  If the package is a depoted package, then add it to the
+                default view.
 
            13.  The staging area is deleted and the program terminates.
 
@@ -275,12 +277,12 @@ EENNVVIIRROONNMMEENNTT
                  directory is _/_v_a_r_/_d_b_/_p_k_g.
 
      PKG_PATH    The value of the PKG_PATH is used if a given package can't be
-                 found, it's usually set to _/_u_s_r_/_p_k_g_s_r_c_/_p_a_c_k_a_g_e_s_/_A_l_l.  The en-
-                 vironment variable should be a series of entries separated by
-                 semicolons.  Each entry consists of a directory name or URL.
-                 The current directory may be indicated implicitly by an empty
-                 directory name, or explicitly by a single period.  FTP URLs
-                 may not end with a slash.
+                 found, it's usually set to _/_u_s_r_/_p_k_g_s_r_c_/_p_a_c_k_a_g_e_s_/_A_l_l.  The
+                 environment variable should be a series of entries separated
+                 by semicolons.  Each entry consists of a directory name or
+                 URL.  The current directory may be indicated implicitly by an
+                 empty directory name, or explicitly by a single period.  FTP
+                 URLs may not end with a slash.
 
      PKG_TMPDIR  Staging directory for installing packages, defaults to
                  /var/tmp.  Set to directory with lots of free disk if you run
@@ -290,8 +292,8 @@ EENNVVIIRROONNMMEENNTT
                  variable.
 
 EEXXAAMMPPLLEESS
-     In all cases, ppkkgg__aadddd will try to install binary packages listed in de-
-     pendencies list.
+     In all cases, ppkkgg__aadddd will try to install binary packages listed in
+     dependencies list.
 
      You can specify a compiled binary package explicitly on the command line.
 
@@ -337,4 +339,4 @@ BBUUGGSS
 
      Sure to be others.
 
-NetBSD 1.6.1                    October 3, 2003                              6
+NetBSD 1.6                      October 3, 2003                     NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/create/pkg_create.cat1 b/pkgtools/pkg_install/files/create/pkg_create.cat1
index 68ebca65391..22a8cb8602f 100644
--- a/pkgtools/pkg_install/files/create/pkg_create.cat1
+++ b/pkgtools/pkg_install/files/create/pkg_create.cat1
@@ -14,8 +14,8 @@ SSYYNNOOPPSSIISS
 
 DDEESSCCRRIIPPTTIIOONN
      The ppkkgg__ccrreeaattee command is used to create packages that will subsequently
-     be fed to one of the package extraction/info utilities.  The input de-
-     scription and command line arguments for the creation of a package are
+     be fed to one of the package extraction/info utilities.  The input
+     description and command line arguments for the creation of a package are
      not really meant to be human-generated, though it is easy enough to do
      so.  It is more expected that you will use a front-end tool for the job
      rather than muddling through it yourself.  Nonetheless, a short descrip-
@@ -35,16 +35,16 @@ OOPPTTIIOONNSS
              Install the file _b_u_i_l_d_-_v_e_r_s_i_o_n_-_f_i_l_e so that users of binary pack-
              ages can see what versions of the files used to control the build
              were used when creating the binary package.  This allows some
-             fine-grained version control information to be retained in a bi-
-             nary package and viewed wherever it is installed, using
+             fine-grained version control information to be retained in a
+             binary package and viewed wherever it is installed, using
              pkg_info(1).
 
      --CC _c_p_k_g_s
              Set the initial package conflict list to _c_p_k_g_s.  This is assumed
              to be a whitespace separated list of package names and is meant
              as a convenient shorthand for specifying multiple @@ppkkggccffll direc-
-             tives in the packing list (see PACKING LIST DETAILS section be-
-             low).
+             tives in the packing list (see PACKING LIST DETAILS section
+             below).
 
      --cc _[_-_]_d_e_s_c
              Fetch package (one line description) from file _d_e_s_c or, if pre-
@@ -75,8 +75,8 @@ OOPPTTIIOONNSS
 
      --ii _i_s_c_r_i_p_t
              Set _i_s_c_r_i_p_t to be the install procedure for the package.  This
-             can be any executable program (or shell script).  It will be in-
-             voked automatically when the package is later installed.
+             can be any executable program (or shell script).  It will be
+             invoked automatically when the package is later installed.
 
      --KK _p_k_g___d_b_d_i_r
              Set _p_k_g___d_b_d_i_r as the package database directory.  If this option
@@ -86,9 +86,9 @@ OOPPTTIIOONNSS
 
      --kk _d_s_c_r_i_p_t
              Set _d_s_c_r_i_p_t to be the de-install procedure for the package.  This
-             can be any executable program (or shell script).  It will be in-
-             voked automatically when the package is later (if ever) de-in-
-             stalled.
+             can be any executable program (or shell script).  It will be
+             invoked automatically when the package is later (if ever) de-
+             installed.
 
      --LL _S_r_c_D_i_r
              This sets the package's @src directive; see below for a descrip-
@@ -100,15 +100,15 @@ OOPPTTIIOONNSS
              which are targeted at full path names.
 
      --mm _m_t_r_e_e_f_i_l_e
-             Run mtree(8) with input from mtreefile before the package is in-
-             stalled.  Mtree is invoked as mmttrreeee --uu --ff _m_t_r_e_e_f_i_l_e --dd --ee --pp
+             Run mtree(8) with input from mtreefile before the package is
+             installed.  Mtree is invoked as mmttrreeee --uu --ff _m_t_r_e_e_f_i_l_e --dd --ee --pp
              _p_r_e_f_i_x, where _p_r_e_f_i_x is the name of the first directory named by
              a @@ccwwdd directive.
 
      --nn _p_r_e_s_e_r_v_e_-_f_i_l_e
-             The file is used to denote that the package should not be delet-
-             ed.  This is intended for use where the deletion of packages may
-             present a bootstrap problem.
+             The file is used to denote that the package should not be
+             deleted.  This is intended for use where the deletion of packages
+             may present a bootstrap problem.
 
      --OO      Go into a (packing list only) mode.  This is used to do (fake
              pkg_add) operations when a package is installed.  In such cases,
@@ -116,8 +116,8 @@ OOPPTTIIOONNSS
              will look like.
 
      --PP _d_p_k_g_s
-             Set the initial package dependency list to _d_p_k_g_s.  This is as-
-             sumed to be a whitespace separated list of package names and is
+             Set the initial package dependency list to _d_p_k_g_s.  This is
+             assumed to be a whitespace separated list of package names and is
              meant as a convenient shorthand for specifying multiple @@ppkkggddeepp
              directives in the packing list (see PACKING LIST DETAILS section
              below).  In addition, the exact versions of the packages referred
@@ -125,18 +125,18 @@ OOPPTTIIOONNSS
              form of @@bbllddddeepp directives.
 
      --pp _p_r_e_f_i_x
-             Set _p_r_e_f_i_x as the initial directory (base) to start from in se-
-             lecting files for the package.
+             Set _p_r_e_f_i_x as the initial directory (base) to start from in
+             selecting files for the package.
 
-     --RR      Re-order any directories in the pkg/PLIST file into reverse al-
-             phabetic order, so that child directories will automatically be
+     --RR      Re-order any directories in the pkg/PLIST file into reverse
+             alphabetic order, so that child directories will automatically be
              removed before parent directories.
 
      --rr _r_s_c_r_i_p_t
              Set _r_s_c_r_i_p_t to be the (requirements) procedure for the package.
              This can be any executable program (or shell script).  It will be
-             invoked automatically at installation/deinstallation time to de-
-             termine whether or not installation/deinstallation should pro-
+             invoked automatically at installation/deinstallation time to
+             determine whether or not installation/deinstallation should pro-
              ceed.
 
      --SS _s_i_z_e_-_a_l_l_-_f_i_l_e
@@ -176,9 +176,9 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
      since absolute pathnames are generally a bad idea for a package that
      could be installed potentially anywhere, there is another method of spec-
      ifying where things are supposed to go and, optionally, what ownership
-     and mode information they should be installed with.  This is done by em-
-     bedding specialized command sequences in the packing list.  Briefly de-
-     scribed, these sequences are:
+     and mode information they should be installed with.  This is done by
+     embedding specialized command sequences in the packing list.  Briefly
+     described, these sequences are:
      @@ccwwdd _d_i_r_e_c_t_o_r_y
              Set the internal directory pointer to point to _d_i_r_e_c_t_o_r_y.  All
              subsequent filenames will be assumed relative to this directory.
@@ -255,17 +255,17 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
              Set the name of the package.  This is mandatory and is usually
              put at the top.  This name is potentially different than the name
              of the file it came in, and is used when keeping track of the
-             package for later deinstallation.  Note that ppkkgg__ccrreeaattee will de-
-             rive this field from the package name and add it automatically if
-             none is given.
+             package for later deinstallation.  Note that ppkkgg__ccrreeaattee will
+             derive this field from the package name and add it automatically
+             if none is given.
      @@ddiirrrrmm _n_a_m_e
-             Declare directory _n_a_m_e to be deleted at deinstall time.  By de-
-             fault, directories created by a package installation are not
-             deleted when the package is deinstalled; this provides an explic-
-             it directory cleanup method.  This directive should appear at the
-             end of the package list.  If more than one @@ddiirrrrmm directives are
-             used, the directories are removed in the order specified.  The
-             _n_a_m_e directory will not be removed unless it is empty.
+             Declare directory _n_a_m_e to be deleted at deinstall time.  By
+             default, directories created by a package installation are not
+             deleted when the package is deinstalled; this provides an
+             explicit directory cleanup method.  This directive should appear
+             at the end of the package list.  If more than one @@ddiirrrrmm direc-
+             tives are used, the directories are removed in the order speci-
+             fied.  The _n_a_m_e directory will not be removed unless it is empty.
      @@mmttrreeee _n_a_m_e
              Declare _n_a_m_e as an mtree(8) input file to be used at install time
              (see --mm above).  Only the first @@mmttrreeee directive is honored.
@@ -280,8 +280,8 @@ PPAACCKKIINNGG LLIISSTT DDEETTAAIILLSS
              depends on multiple other packages.
      @@bbllddddeepp _p_k_g_n_a_m_e
              Declare that this package was built with the exact version of
-             _p_k_g_n_a_m_e (since the @@ppkkggddeepp directive may contain wildcards or re-
-             lational package version information).
+             _p_k_g_n_a_m_e (since the @@ppkkggddeepp directive may contain wildcards or
+             relational package version information).
      @@ppkkggccffll _p_k_g_c_f_l_n_a_m_e
              Declare a conflict with the _p_k_g_c_f_l_n_a_m_e package, as the two pack-
              ages contain references to the same files, and so cannot co-exist
@@ -304,10 +304,10 @@ AAUUTTHHOORRSS
              etc.
 
 BBUUGGSS
-     Hard links between files in a distribution must be bracketed by @@ccwwdd di-
-     rectives in order to be preserved as hard links when the package is ex-
-     tracted.  They additionally must not end up being split between ttaarr invo-
-     cations due to exec argument-space limitations (this depends on the value
-     returned by ssyyssccoonnff(___S_C___A_R_G___M_A_X)).
+     Hard links between files in a distribution must be bracketed by @@ccwwdd
+     directives in order to be preserved as hard links when the package is
+     extracted.  They additionally must not end up being split between ttaarr
+     invocations due to exec argument-space limitations (this depends on the
+     value returned by ssyyssccoonnff(___S_C___A_R_G___M_A_X)).
 
 NetBSD 1.6                     September 2, 2003                    NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/delete/pkg_delete.cat1 b/pkgtools/pkg_install/files/delete/pkg_delete.cat1
index 0c507bd3af8..d5ba518a894 100644
--- a/pkgtools/pkg_install/files/delete/pkg_delete.cat1
+++ b/pkgtools/pkg_install/files/delete/pkg_delete.cat1
@@ -36,8 +36,8 @@ OOPPTTIIOONNSS
              sulted for the package to which the given file belongs.  These
              packages are then deinstalled.
 
-     --DD      If a deinstallation script exists for a given package, do not ex-
-             ecute it.
+     --DD      If a deinstallation script exists for a given package, do not
+             execute it.
 
      --dd      Remove empty directories created by file cleanup.  By default,
              only files/directories explicitly listed in a package's contents
@@ -67,8 +67,8 @@ OOPPTTIIOONNSS
              not touch the package or its files itself.
 
      --pp _p_r_e_f_i_x
-             Set _p_r_e_f_i_x as the directory in which to delete files from any in-
-             stalled packages which do not explicitly set theirs.  For most
+             Set _p_r_e_f_i_x as the directory in which to delete files from any
+             installed packages which do not explicitly set theirs.  For most
              packages, the prefix will be set automatically to the installed
              location by pkg_add(1).
 
@@ -77,8 +77,8 @@ OOPPTTIIOONNSS
              some other package still needs them.  This can be used to delete
              a package and all the packages it needs.
 
-     --rr      ppkkgg__ddeelleettee first builds a list of all packages that require (di-
-             rectly and indirectly) the one being deleted.  It then deletes
+     --rr      ppkkgg__ddeelleettee first builds a list of all packages that require
+             (directly and indirectly) the one being deleted.  It then deletes
              these packages using ppkkgg__ddeelleettee with the given options before
              deleting the user specified package.
 
@@ -88,9 +88,9 @@ OOPPTTIIOONNSS
 
 TTEECCHHNNIICCAALL DDEETTAAIILLSS
      ppkkgg__ddeelleettee does pretty much what it says.  It examines installed package
-     records in _/_v_a_r_/_d_b_/_p_k_g_/_<_p_k_g_-_n_a_m_e_>, deletes the package contents, and fi-
-     nally removes the package records (if an alternate package database di-
-     rectory is specified, then it overrides the _/_v_a_r_/_d_b_/_p_k_g path shown
+     records in _/_v_a_r_/_d_b_/_p_k_g_/_<_p_k_g_-_n_a_m_e_>, deletes the package contents, and
+     finally removes the package records (if an alternate package database
+     directory is specified, then it overrides the _/_v_a_r_/_d_b_/_p_k_g path shown
      above).
 
      If a package is required by other installed packages, ppkkgg__ddeelleettee will
@@ -98,8 +98,8 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
      the --ff option is given).
 
      If a package has been marked as a pprreesseerrvveedd package, it will not be able
-     to be deleted (unless more than one occurrence of the --ff option is giv-
-     en).
+     to be deleted (unless more than one occurrence of the --ff option is
+     given).
 
      If a filename is given instead of a package name, the package of which
      the given file belongs to can be deleted if the --FF Flag is given.  The
@@ -110,8 +110,8 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
      executed first as
            rreeqquuiirree _<_p_k_g_-_n_a_m_e_> _D_E_I_N_S_T_A_L_L
      (where _p_k_g_-_n_a_m_e is the name of the package in question and _D_E_I_N_S_T_A_L_L is a
-     keyword denoting that this is a deinstallation) to see whether or not de-
-     installation should continue.  A non-zero exit status means no, unless
+     keyword denoting that this is a deinstallation) to see whether or not
+     deinstallation should continue.  A non-zero exit status means no, unless
      the --ff option is specified.
 
      If a ddeeiinnssttaallll script exists for the package, it is executed before and
diff --git a/pkgtools/pkg_install/files/info/pkg_info.1 b/pkgtools/pkg_install/files/info/pkg_info.1
index 781846415f2..ce24ee847b6 100644
--- a/pkgtools/pkg_install/files/info/pkg_info.1
+++ b/pkgtools/pkg_install/files/info/pkg_info.1
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_info.1,v 1.4 2003/09/23 07:13:51 grant Exp $
+.\" $NetBSD: pkg_info.1,v 1.5 2003/12/08 13:50:50 grant Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintenance
 .\" of non-core utilities.
@@ -128,7 +128,7 @@ will sort before
 .Pa name-1.3
 and after
 .Pa name-1.2.9
-Similarily
+Similarly
 .Pa name-1.3alpha2
 will sort before
 .Pa name-1.3beta1
diff --git a/pkgtools/pkg_install/files/info/pkg_info.cat1 b/pkgtools/pkg_install/files/info/pkg_info.cat1
index b21c693ecbd..3c3599df601 100644
--- a/pkgtools/pkg_install/files/info/pkg_info.cat1
+++ b/pkgtools/pkg_install/files/info/pkg_info.cat1
@@ -23,8 +23,8 @@ DDEESSCCRRIIPPTTIIOONN
 
      --aa      Show information for all currently installed packages.
 
-     --BB      Show some of the important definitions used when building the bi-
-             nary package (the "Build information") for each package.
+     --BB      Show some of the important definitions used when building the
+             binary package (the "Build information") for each package.
 
      --bb      Show the NetBSD RCS Id strings from the files used in the con-
              struction of the binary package (the "Build version") for each
@@ -40,29 +40,31 @@ DDEESSCCRRIIPPTTIIOONN
      --ee _p_k_g_-_n_a_m_e
              This option allows you to test for the presence of another (per-
              haps prerequisite) package from a script.  If the package identi-
-             fied by _p_k_g_-_n_a_m_e is currently installed, return 0, otherwise re-
-             turn 1.  In addition, the names of any package(s) found installed
-             are printed to stdout unless turned off using the --qq option.
+             fied by _p_k_g_-_n_a_m_e is currently installed, return 0, otherwise
+             return 1.  In addition, the names of any package(s) found
+             installed are printed to stdout unless turned off using the --qq
+             option.
 
              If the given _p_k_g_-_n_a_m_e contains a shell meta character, it will be
              matched against all installed packages using fnmatch(3).  csh(1)
              style {,} alternates have also been implemented in addition to
-             this.  Package version numbers can also be matched in a relation-
-             al manner using the _>_=_, _<_=_, _> and _< operators.  For example,
+             this.  Package version numbers can also be matched in a rela-
+             tional manner using the _>_=_, _<_=_, _> and _< operators.  For example,
              _p_k_g___i_n_f_o _-_e _'_n_a_m_e_>_=_1_._3_' will match versions 1.3 and later of the
              _n_a_m_e package.  The collating sequence of the various package ver-
              sion numbers is unusual, but strives to be consistent.  The magic
              string ``alpha'' equates to _a_l_p_h_a _v_e_r_s_i_o_n and sorts before a beta
              version.  The magic string ``beta'' equates to _b_e_t_a _v_e_r_s_i_o_n and
              sorts before a release candidate.  The magic string ``rc''
-             equates to _r_e_l_e_a_s_e _c_a_n_d_i_d_a_t_e and sorts before a release.  For ex-
-             ample, _n_a_m_e_-_1_._3_r_c_3 will sort before _n_a_m_e_-_1_._3 and after _n_a_m_e_-_1_._2_._9
-             Similarily _n_a_m_e_-_1_._3_a_l_p_h_a_2 will sort before _n_a_m_e_-_1_._3_b_e_t_a_1 and they
-             both sort before _n_a_m_e_-_1_._3_r_c_1 In addition, alphabetic characters
-             sort in the same place as their numeric counterparts, so that
-             _n_a_m_e_-_1_._2_e has the same sorting value as _n_a_m_e_-_1_._2_._5 The magic
-             string ``pl'' equates to a _p_a_t_c_h _l_e_v_e_l and has the same value as
-             a dot in the dewey-decimal ordering schemes.
+             equates to _r_e_l_e_a_s_e _c_a_n_d_i_d_a_t_e and sorts before a release.  For
+             example, _n_a_m_e_-_1_._3_r_c_3 will sort before _n_a_m_e_-_1_._3 and after
+             _n_a_m_e_-_1_._2_._9 Similarly _n_a_m_e_-_1_._3_a_l_p_h_a_2 will sort before
+             _n_a_m_e_-_1_._3_b_e_t_a_1 and they both sort before _n_a_m_e_-_1_._3_r_c_1 In addition,
+             alphabetic characters sort in the same place as their numeric
+             counterparts, so that _n_a_m_e_-_1_._2_e has the same sorting value as
+             _n_a_m_e_-_1_._2_._5 The magic string ``pl'' equates to a _p_a_t_c_h _l_e_v_e_l and
+             has the same value as a dot in the dewey-decimal ordering
+             schemes.
 
      --FF      Interpret any pkg-name given as filename, and translate it to a
              package name using the Package Database.  This can be used to
@@ -88,11 +90,11 @@ DDEESSCCRRIIPPTTIIOONN
              generated.
 
      --ll _s_t_r  Prefix each information category header (see --qq) shown with _s_t_r.
-             This is primarily of use to front-end programs that want to re-
-             quest a lot of different information fields at once for a pack-
+             This is primarily of use to front-end programs that want to
+             request a lot of different information fields at once for a pack-
              age, but don't necessary want the output intermingled in such a
-             way that they can't organize it.  This lets you add a special to-
-             ken to the start of each field.
+             way that they can't organize it.  This lets you add a special
+             token to the start of each field.
 
      --mm      Show the mtree file (if any) for each package.
 
@@ -136,12 +138,12 @@ EENNVVIIRROONNMMEENNTT
                 which to create a ``staging area'' for any files extracted by
                 ppkkgg__iinnffoo from package files.  If neither PKG_TMPDIR nor TMPDIR
                 yields a suitable scratch directory, _/_v_a_r_/_t_m_p, _/_t_m_p, and
-                _/_u_s_r_/_t_m_p are tried in turn.  Note that _/_u_s_r_/_t_m_p may be creat-
-                ed, if it doesn't already exist.
+                _/_u_s_r_/_t_m_p are tried in turn.  Note that _/_u_s_r_/_t_m_p may be cre-
+                ated, if it doesn't already exist.
 
-                Since ppkkgg__iinnffoo requires very little information to be extract-
-                ed from any package files examined, it is unlikely that these
-                environment variables would ever need to be used to work
+                Since ppkkgg__iinnffoo requires very little information to be
+                extracted from any package files examined, it is unlikely that
+                these environment variables would ever need to be used to work
                 around limited available space in the default locations.
 
 TTEECCHHNNIICCAALL DDEETTAAIILLSS
@@ -152,8 +154,8 @@ TTEECCHHNNIICCAALL DDEETTAAIILLSS
      A filename can be given instead of a (installed) package name to query
      information on the package this file belongs to.  This filename is then
      resolved to a package name using the Package Database.  For this transla-
-     tion to take place, the --FF flag must be given.  The filename must be ab-
-     solute, compare the output of pkg_info --aaFF.
+     tion to take place, the --FF flag must be given.  The filename must be
+     absolute, compare the output of pkg_info --aaFF.
 
 SSEEEE AALLSSOO
      pkg_add(1), pkg_admin(1), pkg_create(1), pkg_delete(1), mktemp(3),
diff --git a/pkgtools/pkg_install/files/lib/file.c b/pkgtools/pkg_install/files/lib/file.c
index 1da29045f37..f21f45d99e6 100644
--- a/pkgtools/pkg_install/files/lib/file.c
+++ b/pkgtools/pkg_install/files/lib/file.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: file.c,v 1.9 2003/10/29 23:00:28 jlam Exp $	*/
+/*	$NetBSD: file.c,v 1.10 2003/12/08 13:50:50 grant Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: file.c,v 1.29 1997/10/08 07:47:54 charnier Exp";
 #else
-__RCSID("$NetBSD: file.c,v 1.9 2003/10/29 23:00:28 jlam Exp $");
+__RCSID("$NetBSD: file.c,v 1.10 2003/12/08 13:50:50 grant Exp $");
 #endif
 #endif
 
@@ -585,8 +585,9 @@ unpack(const char *pkg, const char *extra1, const char *extra2)
 	const char *decompress_cmd[3];
 	const char *suf;
 	int     pipefds[2];
-	pid_t   pid;
+	pid_t   tarpid, gzpid;
 	int	state;
+	int	ret;
 
 	if (!IS_STDIN(pkg)) {
 		suf = suffix_of(pkg);
@@ -618,12 +619,12 @@ unpack(const char *pkg, const char *extra1, const char *extra2)
 		warnx("cannot create pipe -- %s extract of %s failed!", TAR_CMD, pkg);
 		return 1;
 	}
-	if ((pid = fork()) == -1) {
+	if ((gzpid = fork()) == -1) {
 		warnx("cannot fork process for %s -- %s extract of %s failed!",
 		      decompress_cmd[0], TAR_CMD, pkg);
 		return 1;
 	}
-	if (pid == 0) {		/* The child */
+	if (gzpid == 0) {		/* The child */
 		if (dup2(pipefds[1], STDOUT_FILENO) == -1) {
 			warnx("dup2 failed before executing %s command",
 			      decompress_cmd[0]);
@@ -644,12 +645,12 @@ unpack(const char *pkg, const char *extra1, const char *extra2)
 
 	/* Meanwhile, back in the parent process ... */
 	/* fork off an untar process */
-	if ((pid = fork()) == -1) {
+	if ((tarpid = fork()) == -1) {
 		warnx("cannot fork process for %s -- %s extract of %s failed!",
 		      TAR_CMD, TAR_CMD, pkg);
 		return 1;
 	}
-	if (pid == 0) {		/* The child */
+	if (tarpid == 0) {		/* The child */
 		if (dup2(pipefds[0], STDIN_FILENO) == -1) {
 			warnx("dup2 failed before executing %s command",
 			      TAR_CMD);
@@ -666,13 +667,20 @@ unpack(const char *pkg, const char *extra1, const char *extra2)
 	close(pipefds[0]);
 	close(pipefds[1]);
 
-	/* wait for tar exit so we are sure the needed files exist */
-	if (waitpid(pid, &state, 0) < 0) {
+	ret = 0;
+	/* wait for decompress process ... */
+	if (waitpid(gzpid, &state, 0) < 0) {
 		/* error has been reported by child */
-		return 1;
+		ret = 1;
 	}
 
-	return 0;
+	/* ... and for tar exit so we are sure the needed files exist */
+	if (waitpid(tarpid, &state, 0) < 0) {
+		/* error has been reported by child */
+		ret = 1;
+	}
+
+	return ret;
 }
 
 /*
diff --git a/pkgtools/pkg_install/files/lib/version.h b/pkgtools/pkg_install/files/lib/version.h
index 49d620f68f5..c290aa9c876 100644
--- a/pkgtools/pkg_install/files/lib/version.h
+++ b/pkgtools/pkg_install/files/lib/version.h
@@ -1,4 +1,4 @@
-/*	$NetBSD: version.h,v 1.17 2003/10/29 23:00:28 jlam Exp $	*/
+/*	$NetBSD: version.h,v 1.18 2003/12/08 13:50:50 grant Exp $	*/
 
 /*
  * Copyright (c) 2001 Thomas Klausner.  All rights reserved.
@@ -33,6 +33,6 @@
 #ifndef _INST_LIB_VERSION_H_
 #define _INST_LIB_VERSION_H_
 
-#define PKGTOOLS_VERSION "20031003"
+#define PKGTOOLS_VERSION "20031121"
 
 #endif /* _INST_LIB_VERSION_H_ */
diff --git a/pkgtools/pkg_install/files/view/linkfarm.1 b/pkgtools/pkg_install/files/view/linkfarm.1
index a509a15da2b..93c1b1cec6f 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.1
+++ b/pkgtools/pkg_install/files/view/linkfarm.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: linkfarm.1,v 1.4 2003/09/23 07:13:55 grant Exp $
+.\"	$NetBSD: linkfarm.1,v 1.5 2003/12/08 13:50:50 grant Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -144,4 +144,4 @@ directory, and it defaults to "info/dir *[~#] *.OLD *.orig *,v".
 The
 .Nm
 utility was written by
-.An Alistair G. Crooks Aq agc@netbsd.org .
+.An Alistair G. Crooks Aq agc@NetBSD.org .
diff --git a/pkgtools/pkg_install/files/view/linkfarm.cat1 b/pkgtools/pkg_install/files/view/linkfarm.cat1
index 44f5b56ac44..61a97a08a9b 100644
--- a/pkgtools/pkg_install/files/view/linkfarm.cat1
+++ b/pkgtools/pkg_install/files/view/linkfarm.cat1
@@ -62,6 +62,6 @@ SSEEEE AALLSSOO
      lndir(1), pkg_view(1)
 
 AAUUTTHHOORRSS
-     The lliinnkkffaarrmm utility was written by Alistair G. Crooks <agc@netbsd.org>.
+     The lliinnkkffaarrmm utility was written by Alistair G. Crooks <agc@NetBSD.org>.
 
 NetBSD 1.6                     September 2, 2003                    NetBSD 1.6
diff --git a/pkgtools/pkg_install/files/view/pkg_view.1 b/pkgtools/pkg_install/files/view/pkg_view.1
index e0c06a53be8..fb0399fd62b 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.1
+++ b/pkgtools/pkg_install/files/view/pkg_view.1
@@ -1,4 +1,4 @@
-.\"	$NetBSD: pkg_view.1,v 1.6 2003/09/23 07:13:55 grant Exp $
+.\"	$NetBSD: pkg_view.1,v 1.7 2003/12/08 13:50:50 grant Exp $
 .\"
 .\" Copyright (c) 2003 The NetBSD Foundation, Inc.
 .\" All rights reserved.
@@ -268,4 +268,4 @@ directory.
 The
 .Nm
 utility was written by
-.An Alistair G. Crooks Aq agc@netbsd.org .
+.An Alistair G. Crooks Aq agc@NetBSD.org .
diff --git a/pkgtools/pkg_install/files/view/pkg_view.cat1 b/pkgtools/pkg_install/files/view/pkg_view.cat1
index 148e902f413..edae38ae310 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.cat1
+++ b/pkgtools/pkg_install/files/view/pkg_view.cat1
@@ -13,17 +13,17 @@ DDEESSCCRRIIPPTTIIOONN
 
 WWAARRNNIINNGG
      _S_i_n_c_e _t_h_e ppkkgg__vviieeww _c_o_m_m_a_n_d _m_a_y _e_x_e_c_u_t_e _s_c_r_i_p_t_s _o_r _p_r_o_g_r_a_m_s _p_r_o_v_i_d_e_d _b_y _a
-     _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_e_s_'_' _o_r _o_t_h_-
-     _e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e _f_i_l_e_s_.
+     _p_a_c_k_a_g_e _f_i_l_e_, _y_o_u_r _s_y_s_t_e_m _m_a_y _b_e _s_u_s_c_e_p_t_i_b_l_e _t_o _`_`_T_r_o_j_a_n _h_o_r_s_e_s_'_' _o_r
+     _o_t_h_e_r _s_u_b_t_l_e _a_t_t_a_c_k_s _f_r_o_m _m_i_s_c_r_e_a_n_t_s _w_h_o _c_r_e_a_t_e _d_a_n_g_e_r_o_u_s _p_a_c_k_a_g_e _f_i_l_e_s_.
 
      _Y_o_u _a_r_e _a_d_v_i_s_e_d _t_o _v_e_r_i_f_y _t_h_e _c_o_m_p_e_t_e_n_c_e _a_n_d _i_d_e_n_t_i_t_y _o_f _t_h_o_s_e _w_h_o _p_r_o_-
      _v_i_d_e _i_n_s_t_a_l_l_a_b_l_e _p_a_c_k_a_g_e _f_i_l_e_s_.  _F_o_r _e_x_t_r_a _p_r_o_t_e_c_t_i_o_n_, _e_x_a_m_i_n_e _a_l_l _t_h_e
      _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s _i_n _t_h_e _p_a_c_k_a_g_e _d_a_t_a_b_a_s_e _d_i_r_e_c_t_o_r_y
-     _(_/_u_s_r_/_p_k_g_/_p_a_c_k_a_g_e_s_/_<_p_k_g_-_n_a_m_e_>_/_)_.  _P_a_y _p_a_r_t_i_c_u_l_a_r _a_t_t_e_n_t_i_o_n _t_o _a_n_y _+_I_N_-
-     _S_T_A_L_L_, _+_D_E_I_N_S_T_A_L_L_, _+_R_E_Q_U_I_R_E _o_r _+_M_T_R_E_E___D_I_R_S _f_i_l_e_s_, _a_n_d _i_n_s_p_e_c_t _t_h_e _+_C_O_N_-
-     _T_E_N_T_S _f_i_l_e _f_o_r @@ccwwdd_, @@mmooddee _(_c_h_e_c_k _f_o_r _s_e_t_u_i_d_)_, @@ddiirrrrmm_, @@eexxeecc_, _a_n_d @@uunneexxeecc
-     _d_i_r_e_c_t_i_v_e_s_, _a_n_d_/_o_r _u_s_e _t_h_e pkg_info(_1) _c_o_m_m_a_n_d _t_o _e_x_a_m_i_n_e _t_h_e _i_n_s_t_a_l_l_e_d
-     _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s_.
+     _(_/_u_s_r_/_p_k_g_/_p_a_c_k_a_g_e_s_/_<_p_k_g_-_n_a_m_e_>_/_)_.  _P_a_y _p_a_r_t_i_c_u_l_a_r _a_t_t_e_n_t_i_o_n _t_o _a_n_y
+     _+_I_N_S_T_A_L_L_, _+_D_E_I_N_S_T_A_L_L_, _+_R_E_Q_U_I_R_E _o_r _+_M_T_R_E_E___D_I_R_S _f_i_l_e_s_, _a_n_d _i_n_s_p_e_c_t _t_h_e
+     _+_C_O_N_T_E_N_T_S _f_i_l_e _f_o_r @@ccwwdd_, @@mmooddee _(_c_h_e_c_k _f_o_r _s_e_t_u_i_d_)_, @@ddiirrrrmm_, @@eexxeecc_, _a_n_d
+     @@uunneexxeecc _d_i_r_e_c_t_i_v_e_s_, _a_n_d_/_o_r _u_s_e _t_h_e pkg_info(_1) _c_o_m_m_a_n_d _t_o _e_x_a_m_i_n_e _t_h_e
+     _i_n_s_t_a_l_l_e_d _p_a_c_k_a_g_e _c_o_n_t_r_o_l _f_i_l_e_s_.
 
 OOPPTTIIOONNSS
      The following command-line options are supported:
@@ -59,10 +59,10 @@ OOPPTTIIOONNSS
              by the LOCALBASE environment variable.
 
      --ww _v_i_e_w
-             Set _v_i_e_w as the directory in _v_i_e_w_b_a_s_e in which the package in-
-             stances should be added or deleted.  The default _v_i_e_w is the emp-
-             ty view but may be overridden by the PKG_VIEW environment vari-
-             able.
+             Set _v_i_e_w as the directory in _v_i_e_w_b_a_s_e in which the package
+             instances should be added or deleted.  The default _v_i_e_w is the
+             empty view but may be overridden by the PKG_VIEW environment
+             variable.
 
      The following commands are supported:
 
@@ -85,8 +85,8 @@ EENNVVIIRROONNMMEENNTT
 
      PKG_DBDIR
              If the --kk flag isn't given, then the value of the environment
-             variable PKG_DBDIR is the package database directory for the de-
-             fault view, otherwise it defaults to _/_v_a_r_/_d_b_/_p_k_g.
+             variable PKG_DBDIR is the package database directory for the
+             default view, otherwise it defaults to _/_v_a_r_/_d_b_/_p_k_g.
 
      PLIST_IGNORE_FILES
              This can be used to specify files in _p_a_c_k_a_g_e that should ignored
@@ -110,12 +110,12 @@ FFIILLEESS
              _p_a_c_k_a_g_e  The name of the package instance being added.
 
              VVIIEEWW--IINNSSTTAALLLL
-                      Keyword denoting that the script is to perform any ac-
-                      tions needed after the package instance is added to a
+                      Keyword denoting that the script is to perform any
+                      actions needed after the package instance is added to a
                       view.
 
-             If the _i_n_s_t_a_l_l script exits with a non-zero status code, the in-
-             stallation is terminated.
+             If the _i_n_s_t_a_l_l script exits with a non-zero status code, the
+             installation is terminated.
 
      <pkg-dbdir>/<package>/+DEINSTALL
              If the package contains an _d_e_i_n_s_t_a_l_l script (see pkg_create(1)),
@@ -125,9 +125,9 @@ FFIILLEESS
              _p_a_c_k_a_g_e  The name of the package instance being deleted.
 
              VVIIEEWW--DDEEIINNSSTTAALLLL
-                      Keyword denoting that the script is to perform any ac-
-                      tions needed before the package instance is deleted from
-                      a view.
+                      Keyword denoting that the script is to perform any
+                      actions needed before the package instance is deleted
+                      from a view.
 
              If the _d_e_i_n_s_t_a_l_l script exits with a non-zero status code, the
              de-installation is terminated.
@@ -139,6 +139,6 @@ SSEEEE AALLSSOO
      linkfarm(1), pkg_delete(1)
 
 AAUUTTHHOORRSS
-     The ppkkgg__vviieeww utility was written by Alistair G. Crooks <agc@netbsd.org>.
+     The ppkkgg__vviieeww utility was written by Alistair G. Crooks <agc@NetBSD.org>.
 
 NetBSD 1.6                     September 8, 2003                    NetBSD 1.6