[src/trunk]: src/usr.sbin/pkg_install Alphabetize options.

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

details:   https://anonhg.NetBSD.org/src/rev/f3462ab3b841
branches:  trunk
changeset: 501751:f3462ab3b841
user:      hubertf <hubertf%NetBSD.org@localhost>
date:      Sun Jan 07 01:39:20 2001 +0000

description:
Alphabetize options.

diffstat:

 usr.sbin/pkg_install/add/pkg_add.1       |   90 +++++++++++-----------
 usr.sbin/pkg_install/admin/pkg_admin.1   |   40 +++++-----
 usr.sbin/pkg_install/create/pkg_create.1 |  120 +++++++++++++++---------------
 usr.sbin/pkg_install/delete/pkg_delete.1 |   41 +++++-----
 4 files changed, 145 insertions(+), 146 deletions(-)

diffs (truncated from 443 to 300 lines):

diff -r 33bce1313e71 -r f3462ab3b841 usr.sbin/pkg_install/add/pkg_add.1
--- a/usr.sbin/pkg_install/add/pkg_add.1        Sun Jan 07 00:30:29 2001 +0000
+++ b/usr.sbin/pkg_install/add/pkg_add.1        Sun Jan 07 01:39:20 2001 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_add.1,v 1.20 2000/10/05 12:45:22 ad Exp $
+.\" $NetBSD: pkg_add.1,v 1.21 2001/01/07 01:39:20 hubertf Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -86,23 +86,37 @@
 environment variable.
 Any dependencies required by the installed package will be searched
 in the same location that the original package was installed from.
-.It Fl v
-Turn on verbose output.
-.It Fl I
-If an installation script exists for a given package, do not execute it.
-.It Fl n
-Don't actually install a package, just report the steps that
-would be taken if it was.
-.It Fl R
-Do not record the installation of a package.  This means
-that you cannot deinstall it later, so only use this option if
-you know what you are doing!
 .It Fl f
 Force installation to proceed even if prerequisite packages are not
 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.
+.It Fl I
+If an installation script exists for a given package, do not execute it.
+.It Fl M
+Run in
+.Cm MASTER
+mode.  This is a very specialized mode for running
+.Nm
+and is meant to be run in conjunction with
+.Cm SLAVE
+mode.  When run in this mode,
+.Nm
+does no work beyond extracting the package into a temporary staging
+area (see the
+.Fl t
+option), reading in the packing list, and then dumping it (prefaced by
+the current staging area) to stdout where it may be filtered by a
+program such as
+.Xr sed 1 .
+When used in conjunction with
+.Cm SLAVE
+mode, it allows you to make radical changes to the package structure
+before acting on its contents.
+.It Fl n
+Don't actually install a package, just report the steps that
+would be taken if it was.
 .It Fl p Ar prefix
 Set
 .Ar prefix
@@ -125,6 +139,23 @@
 and
 .Fl S
 options).
+.It Fl R
+Do not record the installation of a package.  This means
+that you cannot deinstall it later, so only use this option if
+you know what you are doing!
+.It Fl S
+Run in
+.Cm SLAVE
+mode.  This is a very specialized mode for running
+.Nm
+and is meant to be run in conjunction with
+.Cm MASTER
+mode.  When run in this mode,
+.Nm
+expects the release contents to be already extracted and waiting
+in the staging area, the location of which is read as a string
+from stdin.  The complete packing list is also read from stdin,
+and the contents then acted on as normal.
 .It Fl t Ar template
 Use
 .Ar template
@@ -146,39 +177,8 @@
 to reside on the same disk partition as target directories for package
 file installation; often this is
 .Pa /usr .
-.It Fl M
-Run in
-.Cm MASTER
-mode.  This is a very specialized mode for running
-.Nm
-and is meant to be run in conjunction with
-.Cm SLAVE
-mode.  When run in this mode,
-.Nm
-does no work beyond extracting the package into a temporary staging
-area (see the
-.Fl t
-option), reading in the packing list, and then dumping it (prefaced by
-the current staging area) to stdout where it may be filtered by a
-program such as
-.Xr sed 1 .
-When used in conjunction with
-.Cm SLAVE
-mode, it allows you to make radical changes to the package structure
-before acting on its contents.
-.It Fl S
-Run in
-.Cm SLAVE
-mode.  This is a very specialized mode for running
-.Nm
-and is meant to be run in conjunction with
-.Cm MASTER
-mode.  When run in this mode,
-.Nm
-expects the release contents to be already extracted and waiting
-in the staging area, the location of which is read as a string
-from stdin.  The complete packing list is also read from stdin,
-and the contents then acted on as normal.
+.It Fl v
+Turn on verbose output.
 .El
 .Pp
 One or more
diff -r 33bce1313e71 -r f3462ab3b841 usr.sbin/pkg_install/admin/pkg_admin.1
--- a/usr.sbin/pkg_install/admin/pkg_admin.1    Sun Jan 07 00:30:29 2001 +0000
+++ b/usr.sbin/pkg_install/admin/pkg_admin.1    Sun Jan 07 01:39:20 2001 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pkg_admin.1,v 1.10 2000/11/12 15:32:57 wiz Exp $
+.\"    $NetBSD: pkg_admin.1,v 1.11 2001/01/07 01:39:20 hubertf Exp $
 .\"
 .\" Copyright (c) 1999 Hubert Feyrer.  All rights reserved.
 .\"
@@ -43,25 +43,6 @@
 Packages System. Available commands are:
 .Pp
 .Bl -tag -width check [pkg]
-.It Cm rebuild
-Rebuild the package database mapping from scratch, scanning
-subdirectories in
-.Pa /var/db/pkg
-for
-.Pa +CONTENTS
-files, parsing them and writing the resulting absolute pathnames
-together with the package they belong to into the package database.
-.Pp
-This option is intended to be used for upgrading from non-pkgdb-pkg_*
-tools to pkgdb-pkg_* tools, further manipulation of the pkgdb will be
-done by
-.Xr pkg_add 1 ,
-.Xr pkg_delete 1
-and
-.Xr pkg_create 1 .
-.Pp
-Needs to be run as root.
-.Pp
 .It Cm check Ar [pkg ...]
 Use this command to check the files belonging to some or all of the
 packages installed on the local machine against their MD5 checksum
@@ -110,6 +91,25 @@
 /usr/pkgsrc/packages/i386ELF/All/mit-pthreads-1.60b6.tgz
 /usr/pkgsrc/packages/i386ELF/All/unproven-pthreads-0.15.tgz
 .Ed
+.It Cm rebuild
+Rebuild the package database mapping from scratch, scanning
+subdirectories in
+.Pa /var/db/pkg
+for
+.Pa +CONTENTS
+files, parsing them and writing the resulting absolute pathnames
+together with the package they belong to into the package database.
+.Pp
+This option is intended to be used for upgrading from non-pkgdb-pkg_*
+tools to pkgdb-pkg_* tools, further manipulation of the pkgdb will be
+done by
+.Xr pkg_add 1 ,
+.Xr pkg_delete 1
+and
+.Xr pkg_create 1 .
+.Pp
+Needs to be run as root.
+.Pp
 .El
 .Pp
 .Sh ENVIRONMENT
diff -r 33bce1313e71 -r f3462ab3b841 usr.sbin/pkg_install/create/pkg_create.1
--- a/usr.sbin/pkg_install/create/pkg_create.1  Sun Jan 07 00:30:29 2001 +0000
+++ b/usr.sbin/pkg_install/create/pkg_create.1  Sun Jan 07 01:39:20 2001 +0000
@@ -1,4 +1,4 @@
-.\" $NetBSD: pkg_create.1,v 1.24 2000/07/05 15:45:36 msaitoh Exp $
+.\" $NetBSD: pkg_create.1,v 1.25 2001/01/07 01:39:20 hubertf Exp $
 .\"
 .\" FreeBSD install - a package for the installation and maintainance
 .\" of non-core utilities.
@@ -104,6 +104,15 @@
 .Sh OPTIONS
 The following command line options are supported:
 .Bl -tag -width indent
+.It Fl b Ar build-version-file
+Install the file
+.Ar build-version-file
+so that users of binary packages 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 binary package and viewed wherever it is installed,
+using
+.Xr pkg_info 1 .
 .It Fl B Ar build-info-file
 Install the file
 .Ar build-info-file
@@ -115,65 +124,6 @@
 to be retained in a binary package and viewed wherever it is installed,
 using
 .Xr pkg_info 1 .
-.It Fl C Ar cpkgs
-Set the initial package conflict list to
-.Ar cpkgs .
-This is assumed to be a whitespace separated list of package names
-and is meant as a convenient shorthand for specifying multiple
-.Cm @pkgcfl
-directives in the packing list (see PACKING LIST DETAILS section below).
-.It Fl D Ar displayfile
-Display the file after installing the package. Useful for things like
-legal notices on almost-free software, etc.
-.It Fl L Ar SrcDir
-This sets the package's @src directive; see below for a description
-of what this does.
-.It Fl O
-Go into a `packing list Only' mode.
-This is used to do `fake pkg_add' operations when a package is installed.
-In such cases, it is necessary to know what the final, adjusted packing
-list will look like.
-.It Fl P Ar dpkgs
-Set the initial package dependency list to
-.Ar dpkgs .
-This is assumed to be a whitespace separated list of package names
-and is meant as a convenient shorthand for specifying multiple
-.Cm @pkgdep
-directives in the packing list (see PACKING LIST DETAILS section below).
-.It Fl R
-Re-order any directories in the pkg/PLIST file into reverse alphabetic
-order, so that child directories will automatically be removed before
-parent directories.
-.It Fl S Ar size-all-file
-Store the given file for later querying with the
-.Xr pkg_info 1 
-.Ar -S
-flag. The file is expected to contain the size (in bytes) of all files of
-this package plus any required packages added up and stored as a
-ASCII string, terminated by a newline.
-.It Fl X Ar excludefile
-Pass
-.Ar excludefile
-as a
-.Fl -exclude-from
-argument to
-.Cm tar
-when creating final package.  See
-.Cm tar
-man page (or run
-.Cm tar
-with
-.Fl -help
-flag) for further information on using this flag.
-.It Fl b Ar build-version-file
-Install the file
-.Ar build-version-file
-so that users of binary packages 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 binary package and viewed wherever it is installed,
-using
-.Xr pkg_info 1 .
 .It Fl c Ar [-]desc
 Fetch package ``one line description'' from file
 .Ar desc
@@ -182,12 +132,22 @@
 the argument itself.  This string should also
 give some idea of which version of the product (if any) the package
 represents.
+.It Fl C Ar cpkgs
+Set the initial package conflict list to
+.Ar cpkgs .
+This is assumed to be a whitespace separated list of package names
+and is meant as a convenient shorthand for specifying multiple
+.Cm @pkgcfl
+directives in the packing list (see PACKING LIST DETAILS section below).
 .It Fl d Ar [-]desc
 Fetch long description for package from file
 .Ar desc
 or, if preceded by
 .Cm - ,
 the argument itself.
+.It Fl D Ar displayfile
+Display the file after installing the package. Useful for things like
+legal notices on almost-free software, etc.
 .It Fl f Ar packinglist
 Fetch ``packing list'' for package from the file
 .Ar packinglist
@@ -221,6 +181,9 @@