Document pkg_add's dependency auto-install. While I'm here, fix

a couple typos, and consistent double-spacing after sentences.

This is actually a spinoff from the "ports-current discontinued"
blow-up some time ago.

Ack'd by: jkh

3 files changed, 19 insertions, 15 deletions

diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index 1332606..7b54281 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -18,7 +18,7 @@
 .\"
 .Dd November 25, 1994
 .Dt pkg_add 1
-.Os FreeBSD 2.0
+.Os FreeBSD
 .Sh NAME
 .Nm pkg_add
 .Nd a utility for installing software package distributions.
@@ -87,7 +87,10 @@ you know what you are doing!
 .Em "Optional."
 .It Fl f
 Forces installation to proceed even if prerequisite packages are not
-installed or the requirements script fails.
+installed or the requirements script fails.  Although
+.Nm
+will still try to find and auto-install missing prerequisite packages,
+a failure to find one will not be fatal.
 .Em "Optional."
 .It Fl p Ar prefix
 Sets
@@ -197,9 +200,9 @@ passive mode
 ftp.
 .Sh TECHNICAL DETAILS
 .Nm
-is fairly simple.  It extracts each packages' "packing list"
+is fairly simple.  It extracts each package's "packing list"
 into a special staging directory in /tmp (or $PKG_TMPDIR if set), parses it,
-then runs through the following sequence to fully extract the contents:
+and then runs through the following sequence to fully extract the contents:
 .Bl -enum -indent indent
 .It
 Check if the package is already recorded as installed.  If so,
@@ -209,8 +212,9 @@ Scan all the package dependencies (from
 .Cm @pkgdep
 directives, see
 .Xr pkg_create 1 )
-and make sure each one is met. If not, print the missing dependencies and
-terminate the installation.
+and make sure each one is met.  If not, try and find the missing
+dependencies' packages and auto-install them; if they can't be found
+the installation is terminated.
 .It
 Search for any
 .Cm @option
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index d2ccdb7..231132a 100644
--- a/usr.sbin/pkg_install/create/pkg_create.1
+++ b/usr.sbin/pkg_install/create/pkg_create.1
@@ -15,7 +15,7 @@
 .\"
 .\"
 .\"     @(#)pkg_create.1
-.\"	$Id: pkg_create.1,v 1.20 1997/06/19 15:18:29 jkh Exp $	
+.\"	$Id: pkg_create.1,v 1.21 1997/07/01 06:13:44 jkh Exp $	
 .\"
 .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
 .\" added dependency tracking, etc.
@@ -25,7 +25,7 @@
 .\"
 .Dd April 21, 1995
 .Dt pkg_create 1
-.Os FreeBSD 2.0
+.Os FreeBSD
 .Sh NAME
 .Nm pkg_create
 .Nd a utility for creating software package distributions.
@@ -53,7 +53,7 @@ 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
+the job rather than muddling through it yourself.  Nonetheless, a short
 description of the input syntax is included in this document.
 .Sh OPTIONS
 The following command line options are supported.
@@ -112,7 +112,7 @@ when the package is later installed.
 .Em "Optional."
 .It Fl P Ar pkgs
 Sets the initial package dependency list to
-.Ar pkgs.
+.Ar pkgs .
 This is assumed to be a whitespace separated list of package names
 and is meant as a convenient shorthand for specifying multiple
 .Cm @pkgdep
@@ -170,7 +170,7 @@ with
 flag) for further information on using this flag.
 .It Fl D Ar displayfile
 Display the file (using
-.Xr more 1 ) 
+.Xr more 1 )
 after installing the package.  Useful for things like
 legal notices on almost-free software, etc.
 .It Fl m Ar mtreefile
@@ -203,7 +203,7 @@ for a package that could be installed potentially anywhere, there is
 another method of specifying where things are supposed to go
 and, optionally, what ownership and mode information they should be
 installed with.  This is done by imbeding specialized command sequences
-in the packing list. Briefly described, these sequences are:
+in the packing list.  Briefly described, these sequences are:
 .Bl -tag -width indent -compact
 .It Cm @cwd Ar directory
 Sets the internal directory pointer to point to
@@ -269,7 +269,7 @@ removable).  The advantage of using
 over a deinstallation script is that you can use the ``special
 sequence expansion'' to get at files regardless of where they've
 been potentially redirected (see
-.Fl p )
+.Fl p ) .
 .It Cm @mode Ar mode
 Sets default permission for all subsequently extracted files to
 .Ar mode .
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index bcff583..c10ea82 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -18,7 +18,7 @@
 .\"
 .Dd November 25, 1994
 .Dt pkg_info 1
-.Os FreeBSD 2.0
+.Os FreeBSD
 .Sh NAME
 .Nm pkg_info
 .Nd a utility for displaying information on software packages.
@@ -102,7 +102,7 @@ By default, this is the string
 but it may be necessary to override it in the situation where
 space in your
 .Pa /tmp
-directory is limited. Be sure to leave some number of `X' characters
+directory is limited.  Be sure to leave some number of `X' characters
 for
 .Xr mktemp 3
 to fill in with a unique ID.