summaryrefslogtreecommitdiffstats
path: root/usr.sbin/pkg_install
diff options
context:
space:
mode:
authordd <dd@FreeBSD.org>2001-07-15 08:06:20 +0000
committerdd <dd@FreeBSD.org>2001-07-15 08:06:20 +0000
commit911ca14c8798a89d240d36ecbc63b5df5dd99f66 (patch)
tree62f210bf3aee25e49335dc77030fff6e97fbe447 /usr.sbin/pkg_install
parenta145482cf625d5f04072fd1d20b5c2062cbe8e47 (diff)
downloadFreeBSD-src-911ca14c8798a89d240d36ecbc63b5df5dd99f66.zip
FreeBSD-src-911ca14c8798a89d240d36ecbc63b5df5dd99f66.tar.gz
Remove whitespace at EOL.
Diffstat (limited to 'usr.sbin/pkg_install')
-rw-r--r--usr.sbin/pkg_install/add/pkg_add.158
-rw-r--r--usr.sbin/pkg_install/create/pkg_create.138
-rw-r--r--usr.sbin/pkg_install/delete/pkg_delete.116
-rw-r--r--usr.sbin/pkg_install/info/pkg_info.118
-rw-r--r--usr.sbin/pkg_install/sign/pkg_sign.12
-rw-r--r--usr.sbin/pkg_install/version/pkg_version.136
6 files changed, 84 insertions, 84 deletions
diff --git a/usr.sbin/pkg_install/add/pkg_add.1 b/usr.sbin/pkg_install/add/pkg_add.1
index 500f9e3..6bff9f1 100644
--- a/usr.sbin/pkg_install/add/pkg_add.1
+++ b/usr.sbin/pkg_install/add/pkg_add.1
@@ -54,7 +54,7 @@ insure it poses no danger to your system's integrity. Pay particular
attention to any +INSTALL, +POST-INSTALL, +DEINSTALL, +POST-DEINSTALL,
+REQUIRE or +MTREE_DIRS files, and inspect the +CONTENTS file for
.Cm @cwd ,
-.Cm @mode
+.Cm @mode
(check for setuid),
.Cm @dirrm ,
.Cm @exec ,
@@ -72,7 +72,7 @@ The named packages are installed. A package name of - will cause
.Nm
to read from stdin.
If the packages are not found in the current
-working directory,
+working directory,
.Nm
will search them in each directory named by
.Ev PKG_PATH .
@@ -91,7 +91,7 @@ you know what you are doing!
.It Fl r
Use the remote fetching feature.
This will determine the appropriate
-objformat and release and then fetch and install the package.
+objformat and release and then fetch and install the package.
.It Fl f
Force installation to proceed even if prerequisite packages are not
installed or the requirements script fails. Although
@@ -123,8 +123,8 @@ options).
.It Fl t Ar template
Use
.Ar template
-as the input to
-.Xr mktemp 3
+as the input to
+.Xr mktemp 3
when creating a
.Dq staging area .
By default, this is the string
@@ -239,7 +239,7 @@ final location, otherwise it is extracted into the staging area.
.It
If the package contains a
.Ar require
-file (see
+file (see
.Xr pkg_create 1 ) ,
then execute it with the following arguments:
.Bd -ragged -offset indent -compact
@@ -275,9 +275,9 @@ The
keyword will not appear if separate scripts for pre-install and post-install
are given during package creation time (using the
.Fl i
-and
+and
.Fl I
-flags to
+flags to
.Xr pkg_create 1 ) .
.It
If
@@ -294,19 +294,19 @@ file (see
then mtree is invoked as:
.Bd -ragged -offset indent -compact
.Cm mtree
-.Fl u
-.Fl f
+.Fl u
+.Fl f
.Ar mtreefile
.Fl d
-.Fl e
-.Fl p
-.Pa prefix
+.Fl e
+.Fl p
+.Pa prefix
.Ed
where
.Pa prefix
is either the prefix specified with the
.Fl p
-flag or, if no
+flag or, if no
.Fl p
flag was specified, the name of the first directory named by a
.Cm @cwd
@@ -314,11 +314,11 @@ directive within this package.
.It
If a
.Ar post-install
-script exists for the package, it is then executed as
+script exists for the package, it is then executed as
.Bd -ragged -offset indent -compact
.Cm script
.Ar pkg-name
-.Ar POST-INSTALL
+.Ar POST-INSTALL
.Ed
where
.Ar pkg-name
@@ -332,9 +332,9 @@ The
keyword will not appear if separate scripts for pre-install and post-install
are given during package creation time (using the
.Fl i
-and
+and
.Fl I
-flags to
+flags to
.Xr pkg_create 1 ) .
.Pp
Reasoning behind passing keywords such as
@@ -355,7 +355,7 @@ script, description, and display files are copied into
.Pa /var/db/pkg/<pkg-name>
for subsequent possible use by
.Xr pkg_delete 1 .
-Any package dependencies are recorded in the other packages'
+Any package dependencies are recorded in the other packages'
.Pa /var/db/pkg/<other-pkg>/+REQUIRED_BY
file
(if the environment variable PKG_DBDIR is set, this overrides the
@@ -394,27 +394,27 @@ The environment variables
and
.Ev TMPDIR ,
in that order, are taken to name temporary directories where
-.Nm
+.Nm
will attempt to create its staging area in.
If these variables are not present or if the directories named lack
-sufficient space, then
+sufficient space, then
.Nm
-will use the first of
+will use the first of
.Pa /var/tmp ,
-.Pa /tmp
+.Pa /tmp
or
.Pa /usr/tmp
with sufficient space.
.Pp
The environment variable
.Ev PACKAGEROOT
-specifies an alternate location for
+specifies an alternate location for
.Nm
to fetch from.
The fetch URL is built using this environment variable and the automatic
directory logic that
.Nm
-uses when the
+uses when the
.Fl r
option is invoked.
An example setting would be
@@ -422,13 +422,13 @@ An example setting would be
.Pp
The environment variable
.Ev PACKAGESITE
-specifies an alternate location for
+specifies an alternate location for
.Nm
to fetch from.
This variable subverts the automatic directory logic
that
.Nm
-uses when the
+uses when the
.Fl r
option is invoked.
Thus it should be a complete URL to the remote package file(s).
@@ -445,7 +445,7 @@ Next choice if
.Pa /var/tmp
does not exist or has insufficient space.
.It Pa /usr/tmp
-Last choice if
+Last choice if
.Pa /var/tmp
and
.Pa /tmp
@@ -471,7 +471,7 @@ Hard links between files in a distribution are only preserved if either
(1) the staging area is on the same file system as the target directory of
all the links to the file, or (2) all the links to the file are bracketed by
.Cm @cwd
-directives in the contents file,
+directives in the contents file,
.Em and
the link names are extracted with a single
.Cm tar
diff --git a/usr.sbin/pkg_install/create/pkg_create.1 b/usr.sbin/pkg_install/create/pkg_create.1
index 92809cb..c7d61ae 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
-.\" $FreeBSD$
+.\" $FreeBSD$
.\"
.\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords,
.\" added dependency tracking, etc.
@@ -201,7 +201,7 @@ during package creation.
.It Fl t Ar template
Use
.Ar template
-as the input to
+as the input to
.Xr mktemp 3 .
By default, this is the string
.Pa /tmp/instmp.XXXXXX ,
@@ -233,15 +233,15 @@ legal notices on almost-free software, etc.
.It Fl m Ar mtreefile
Run
.Xr mtree 8
-with input from mtreefile before the package is installed.
+with input from mtreefile before the package is installed.
Mtree is invoked as
.Cm mtree
-.Fl u
-.Fl f
+.Fl u
+.Fl f
.Ar mtreefile
.Fl d
-.Fl e
-.Fl p
+.Fl e
+.Fl p
.Pa prefix ,
where
.Pa prefix
@@ -391,12 +391,12 @@ trying to document some particularly hairy sequence that
may trip someone up later.
.It Cm @ignore
Used internally to tell extraction to ignore the next file (don't
-copy it anywhere), as it's used for some special purpose.
+copy it anywhere), as it's used for some special purpose.
.It Cm @ignore_inst
Similar to
.Cm @ignore ,
but the ignoring of the next file is delayed one evaluation cycle. This
-makes it possible to use this directive in the
+makes it possible to use this directive in the
.Ar packinglist
file, so you can pack a
specialized datafile in with a distribution for your install script (or
@@ -426,15 +426,15 @@ Declare
.Pa name
as an
.Xr mtree 8
-input file to be used at install time (see
+input file to be used at install time (see
.Fl m
above). Only the first
.Cm @mtree
-directive is honored.
+directive is honored.
.It Cm @display Ar name
Declare
.Pa name
-as the file to be displayed at install time (see
+as the file to be displayed at install time (see
.Fl D
above).
.It Cm @pkgdep Ar pkgname
@@ -454,14 +454,14 @@ The environment variable
.Ev PKG_TMPDIR
names the directory where
.Nm
-will attempt to create its temporary files.
+will attempt to create its temporary files.
If
.Ev PKG_TMPDIR
-is not set,
+is not set,
the directory named by the contents of
-.Ev TMPDIR
+.Ev TMPDIR
will be used.
-If neither of
+If neither of
.Ev PKG_TMPDIR
and
.Ev TMPDIR
@@ -470,16 +470,16 @@ are set, the builtin defaults are used.
.Bl -tag -width /usr/tmp -compact
.It Pa /var/tmp
Temporary directory if environmental variables
-.Ev PKG_TMPDIR
+.Ev PKG_TMPDIR
and
.Ev TMPDIR
are not set.
.It Pa /tmp
-The next choice if
+The next choice if
.Pa /var/tmp
does not exist.
.It Pa /usr/tmp
-The last choice if
+The last choice if
.Pa /tmp
is unsuitable.
.El
diff --git a/usr.sbin/pkg_install/delete/pkg_delete.1 b/usr.sbin/pkg_install/delete/pkg_delete.1
index 2657d61..c998bb3 100644
--- a/usr.sbin/pkg_install/delete/pkg_delete.1
+++ b/usr.sbin/pkg_install/delete/pkg_delete.1
@@ -56,7 +56,7 @@ Pay particular attention to any +INSTALL, +POST-INSTALL, +DEINSTALL,
+POST-DEINSTALL, +REQUIRE or +MTREE_DIRS files, and inspect the +CONTENTS
file for
.Cm @cwd ,
-.Cm @mode
+.Cm @mode
(check for setuid),
.Cm @dirrm ,
.Cm @exec ,
@@ -99,7 +99,7 @@ normal files/directories or with the
directive) will be removed at deinstallation time. This option tells
.Nm
to also remove any directories that were emptied as a result of removing
-the package.
+the package.
.It Fl f
Force removal of the package, even if a dependency is recorded or the
deinstall or require script fails.
@@ -122,7 +122,7 @@ regular expression from the list.
.El
.Sh TECHNICAL DETAILS
.Nm
-does pretty much what it says. It examines installed package records in
+does pretty much what it says. It examines installed package records in
.Pa /var/db/pkg/<pkg-name> ,
deletes the package contents, and finally removes the package records.
If the environment variable
@@ -140,7 +140,7 @@ option is given).
.Pp
If the package contains a
.Ar require
-file (see
+file (see
.Xr pkg_create 1 ) ,
then this is executed first as
.Bd -ragged -offset indent -compact
@@ -185,9 +185,9 @@ The
keyword will not appear if separate scripts for deinstall and post-deinstall
are given during package creation time (using the
.Fl k
-and
+and
.Fl K
-flags to
+flags to
.Xr pkg_create 1 ) .
.Pp
If a
@@ -219,9 +219,9 @@ The
keyword will not appear if separate scripts for deinstall and post-deinstall
are given during package creation time (using the
.Fl k
-and
+and
.Fl K
-flags to
+flags to
.Xr pkg_create 1 ) .
.Pp
Reasoning behind passing keywords such as
diff --git a/usr.sbin/pkg_install/info/pkg_info.1 b/usr.sbin/pkg_install/info/pkg_info.1
index 1aa6267..ac2d448 100644
--- a/usr.sbin/pkg_install/info/pkg_info.1
+++ b/usr.sbin/pkg_install/info/pkg_info.1
@@ -75,7 +75,7 @@ Show files that don't match the recorded checksum.
.It Fl i
Show the install script (if any) for each package.
.It Fl I
-Show an index line for each package. This option takes
+Show an index line for each package. This option takes
precedence over all other package formatting options.
.It Fl k
Show the de-install script (if any) for each package.
@@ -110,7 +110,7 @@ automatically expands shell glob patterns in the
For the specified
.Ar filename
argument show which package it belongs to. If the file is not in the
-current directory, and does not have an absolute path, then the
+current directory, and does not have an absolute path, then the
.Ev PATH
is searched using
.Xr which 1 .
@@ -142,8 +142,8 @@ each field.
.It Fl t Ar template
Use
.Ar template
-as the input to
-.Xr mktemp 3
+as the input to
+.Xr mktemp 3
when creating a
.Dq staging area .
By default, this is the string
@@ -159,7 +159,7 @@ to fill in with a unique ID.
Note: This should really not be necessary with
.Nm ,
since very little information is extracted from each package
-and one would have to have a very small
+and one would have to have a very small
.Pa /tmp
indeed to overflow it.
.Ed
@@ -185,16 +185,16 @@ specifies an alternative location for the installed package database.
.It Pa /var/tmp
Used if the environment variables
.Ev PKG_TMPDIR
-and
+and
.Ev TMPDIR
are not set, or if the directories named have insufficient space.
.It Pa /tmp
-The next choice if
+The next choice if
.Pa /var/tmp
does not exist or has insufficient space.
.It Pa /usr/tmp
-The last choice if
-.Pa /tmp
+The last choice if
+.Pa /tmp
is unsuitable.
.It Pa /var/db/pkg
Default location of the installed package database.
diff --git a/usr.sbin/pkg_install/sign/pkg_sign.1 b/usr.sbin/pkg_install/sign/pkg_sign.1
index 7d7d59d..7fea4b7 100644
--- a/usr.sbin/pkg_install/sign/pkg_sign.1
+++ b/usr.sbin/pkg_install/sign/pkg_sign.1
@@ -53,7 +53,7 @@ embeds a cryptographic signature within a gzip file
.Ar type
can be
.Cm pgp
-(default),
+(default),
.Cm sha1 ,
or
.Cm x509 .
diff --git a/usr.sbin/pkg_install/version/pkg_version.1 b/usr.sbin/pkg_install/version/pkg_version.1
index 0a64ec7..3a4d9a8 100644
--- a/usr.sbin/pkg_install/version/pkg_version.1
+++ b/usr.sbin/pkg_install/version/pkg_version.1
@@ -43,9 +43,9 @@
The
.Nm
command is used to produce a report of non-base software packages
-installed using the
+installed using the
.Xr pkg_add 1
-command.
+command.
.Pp
Each package's version number is checked against one of two sources to
see if that package may require updating. If the package contains
@@ -53,14 +53,14 @@ information about its origin in the
.Fx
ports tree, and a version number can be determined from the port's
.Pa Makefile ,
-then the version number from the
+then the version number from the
.Pa Makefile
will be used to determine whether the installed package is up-to-date
or requires updating.
.Pp
-If no origin for a package can be found, or if the port's
+If no origin for a package can be found, or if the port's
.Pa Makefile
-cannot be located,
+cannot be located,
.Nm
will search for the package in the ports collection index file
(typically
@@ -68,9 +68,9 @@ will search for the package in the ports collection index file
Any matching version number(s) there will be used to determine whether
the installed package is up-to-date or requires updating.
.Pp
-Generally, using the version number from a port's
+Generally, using the version number from a port's
.Pa Makefile
-will provide a more accurate result, since, unlike the index file, it
+will provide a more accurate result, since, unlike the index file, it
provides an unambiguous current version number, even when multiple
versions of a port exist in the ports collection.
Moreover, the ports collection index file is only updated at
@@ -88,8 +88,8 @@ The installed version of the package is newer than the current version.
This situation can arise with an out-of-date index file, or when
testing new ports.
.It Li \&?
-The installed package does not appear in the index.
-This could be due to an out of date index or a package taken from a PR
+The installed package does not appear in the index.
+This could be due to an out of date index or a package taken from a PR
that has not yet been committed.
.It Li *
There are multiple versions of a particular software package
@@ -106,7 +106,7 @@ was unable to compare the version number of the installed package
with the corresponding entry in the index.
.El
.Sh OPTIONS
-.Nm
+.Nm
supports several command-line arguments:
.Bl -tag -width indent
.It Fl c
@@ -118,7 +118,7 @@ This feature does
not
.Ef
constitute an automated packages updating system.
-The output of this command
+The output of this command
.Bf Em
must
.Ef
@@ -129,11 +129,11 @@ Enable debugging output.
.It Fl h
Print help message.
.It Fl l
-Limit the output to those packages whose status flag matches the
+Limit the output to those packages whose status flag matches the
character(s) in
.Ar limchar .
More than one character can be specified in
-.Ar limchar .
+.Ar limchar .
Note that because some of the status flag characters are also special
to the shell, it is best to quote
.Ar limchar
@@ -142,7 +142,7 @@ with single quotes.
Limit the output to those packages whose status flag doesn't match
.Ar limchar .
You may specify more than one character to match in
-.Ar limchar .
+.Ar limchar .
Note that because some of the status flag characters are also special
to the shell, it is best to quote
.Ar limchar
@@ -207,7 +207,7 @@ These commands must
not
.Ef
be run without suitable editing.
-They should be treated as suggestions, and may need to be reordered
+They should be treated as suggestions, and may need to be reordered
to account for dependencies between installed packages, or may need to
be disregarded if multiple versions of an installed package can coexist.
Blindly running the output of this command may leave a system in an
@@ -227,12 +227,12 @@ The following command compares two package version strings:
.An Doug Barton Aq DougB@gorean.org ,
.An Akinori MUSHA Aq knu@FreeBSD.org
.Sh BUGS
-The commands output feature is
-.Bf Em
+The commands output feature is
+.Bf Em
not
.Ef
an automated ports/packages updating system.
-It does not even attempt to handle dependencies between installed
+It does not even attempt to handle dependencies between installed
packages correctly, and can produce incorrect results if multiple
versions of a package can coexist on a system.
.Pp
OpenPOWER on IntegriCloud