Radish alpha
H
rad:z3QDZAW2FAfuLvihrhiyDC9fAD8G9
HardenedBSD Package Manager
Radicle
Git
Merge branch 'long-opts'
Matthew Seaman committed 11 years ago
commit c3c200b102795f836c29c51386a20341dd594d37
parent 5ff713d
31 files changed +610 -347
modified docs/pkg-add.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd March 21, 2014
+
.Dd May 25, 2014
.Dt PKG-ADD 8
.Os
.Sh NAME
@@ -28,6 +28,15 @@
.Nm
.Op Fl IAfMq
.Ar <protocol>://<path>/<pkg-name> ...
+
.Pp
+
.Nm
+
.Op Cm --{no-scripts,automatic,force,accept-missing,quiet}
+
.Op Cm --relocate Ar location
+
.Ar pkg-name ...
+
.Nm
+
.Op Cm --{no-scripts,automatic,force,accept-missing,quiet}
+
.Op Cm --relocate Ar location
+
.Ar <protocol>://<path>/<pkg-name> ...
.Sh DESCRIPTION
.Nm
installs packages from either a local source or a remote one.
@@ -67,21 +76,28 @@ has unmet dependencies.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width I1
-
.It Fl I
-
If any installation scripts (pre-install or post-install) exist for given
-
packages, do not execute them.
-
.It Fl A
+
.Bl -tag -width automatic
+
.It Fl A , Cm --automatic
Mark the installed packages as orphan.
Will be automatically removed if no other packages depend on them.
For more information please refer to
.Xr pkg-autoremove 8
-
.It Fl f
+
.It Fl f , Cm --force
Force the reinstallation of the package if already installed.
-
.It Fl M
+
.It Fl I , Cm --no-scripts
+
If any installation scripts (pre-install or post-install) exist for given
+
packages, do not execute them.
+
.It Fl M , Cm --accept-missing
Force the installation of the package with missing dependencies.
-
.It Fl q
+
.It Fl q , Cm --quiet
Force quiet output.
+
.It Cm --relocate Ar location
+
Annotates the package as having been relocated to
+
.Pa location ,
+
which is an alternate system root.
+
This is an experimental feature and intended for cross-architecture
+
package management.
+
There is no corresponding single letter option.
.El
.Sh ENVIRONMENT
The following environment variables affect the execution of
modified docs/pkg-audit.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 6, 2014
+
.Dd May 25, 2014
.Dt PKG-AUDIT 8
.Os
.Sh NAME
@@ -24,7 +24,12 @@
.Sh SYNOPSIS
.Nm
.Op Fl Fq
-
.Op Fl f Ar file
+
.Op Fl f Ar filename
+
.Ar pkg-name
+
.Pp
+
.Nm
+
.Op Cm --{fetch,quiet}
+
.Op Cm --file Ar filename
.Ar pkg-name
.Sh DESCRIPTION
.Nm
@@ -54,19 +59,19 @@ will audit only that package.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl f Ar file
+
.Bl -tag -width fetch
+
.It Fl f Ar filename , Cm --file Ar filename
Use
-
.Pa file
+
.Pa filename
as the local copy of the vulnerability database.
If used in combination with
.Fl F
download the vulnerability database to the named
-
.Pa file
+
.Pa filename
before auditing installed ports against it.
-
.It Fl F
+
.It Fl F , Cm --fetch
Fetch the database before checking.
-
.It Fl q
+
.It Fl q , Cm --quiet
Be ``quiet''.
Prints only the requested information without
displaying many hints.
modified docs/pkg-autoremove.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd February 25, 2013
+
.Dd May 25, 2014
.Dt PKG-AUTOREMOVE 8
.Os
.Sh NAME
@@ -23,7 +23,10 @@
.Nd removes orphan packages
.Sh SYNOPSIS
.Nm
-
.Op Fl ynq
+
.Op Fl nqy
+
.Pp
+
.Nm
+
.Op Cm --{dry-run,quiet,yes}
.Sh DESCRIPTION
.Nm
is used for removing orphan packages, which were installed
@@ -31,15 +34,15 @@ during dependency resolution and are no longer needed.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl y
-
Assume yes when asked for confirmation before package autoremoval.
-
.It Fl n
+
.Bl -tag -width dry-run
+
.It Fl n , Cm --dry-run
Dry-run mode.
The list of changes to packages is always printed, but
no changes are actually made.
-
.It Fl q
+
.It Fl q , Cm --quiet
Force quiet output
+
.It Fl y , Cm --yes
+
Assume yes when asked for confirmation before package autoremoval.
.El
.Sh ENVIRONMENT
The following environment variables affect the execution of
modified docs/pkg-backup.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd February 25, 2013
+
.Dd May 25, 2014
.Dt PKG-BACKUP 8
.Os
.Sh NAME
@@ -23,31 +23,33 @@
.Nd backup and restore the local package database
.Sh SYNOPSIS
.Nm
-
.Fl d
-
.Ar dest_file
+
.Fl d Ar dest_file
.Nm
-
.Fl r
-
.Ar src_file
-
.Sh DESCRIPTION
+
.Fl r Ar src_file
+
.Pp
+
.Nm
+
.Cm --dump Ar dest_file
.Nm
+
.Cm --restore Ar src_file
+
.Sh DESCRIPTION
is used for backing up and restoring of the local package database.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl d Ar dest_file
+
.Bl -tag -width restore
+
.It Fl d Ar dest_file , Cm --dump Ar dest_file
Dumps the local package database to a file specified on the command-line.
If
.Ar -
is specified as the argument
.Nm
will use stdout for its output.
-
.It Fl r Ar src_file
+
.It Fl r Ar src_file , Cm --restore Ar src_file
Uses
-
.Ar file
+
.Ar src_file
in order to restore the local package database.
Useful in case of a database
-
crash of lost to restore your database from previously made backup.
+
crash or loss to restore your database from a previously made backup.
.El
.Sh ENVIRONMENT
The following environment variables affect the execution of
modified docs/pkg-check.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 18, 2014
+
.Dd May 25, 2014
.Dt PKG-CHECK 8
.Os
.Sh NAME
@@ -24,43 +24,58 @@
.Sh SYNOPSIS
.Nm
.Op Fl Bdsr
-
.Op Fl vyn
+
.Op Fl nvy
.Op Fl a | Cgix Ar pattern
+
.Pp
+
.Nm
+
.Op Cm --{shlibs,dependencies,checksums,recompute}
+
.Op Cm --{dry-run,verbose,yes}
+
.Op Cm --all | Cm --{case-sensitive,glob,case-insensitive,regex} Ar pattern
.Sh DESCRIPTION
.Nm
.Fl B
+
or
+
.Nm
+
.Cm --shlibs
is used to reanalyse shared libraries of installed packages.
.Pp
.Nm
.Fl d
+
or
+
.Nm
+
.Cm --dependencies
is used to check for and install missing dependencies.
.Pp
.Nm
.Fl r
+
or
+
.Nm
+
.Cm --recompute
is used to recompute sizes and checksums of installed packages.
.Pp
.Nm
.Fl s
+
or
+
.Nm
+
.Cm --checksums
is used to find invalid checksums for installed packages.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl y
-
Assume yes when asked for confirmation before installing missing dependencies.
-
.It Fl v
-
Be verbose.
-
.It Fl n
-
Merely check for missing dependencies and do not install them.
-
.It Fl a
+
.Bl -tag -width dependencies
+
.It Fl a , Cm --all
Process all packages.
-
.It Fl C
+
.It Fl C , Cm --case-sensitive
Make the standard or regular expression
.Fl ( x )
matching against
.Ar pattern
case sensitive.
-
.It Fl i
+
.It Fl g , Cm --glob
+
Treat
+
.Ar pattern
+
as a shell glob pattern.
+
.It Fl i , Cm --case-insensitive
Make the standard or regular expression
.Fl ( x )
matching against
@@ -70,16 +85,18 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH 
to true in
.Pa pkg.conf .
-
.It Fl g
-
Treat
-
.Ar pattern
-
as a shell glob pattern.
-
.It Fl x
+
.It Fl n , Cm --dry-run
+
Merely check for missing dependencies and do not install them.
+
.It Fl v , Cm --verbose
+
Be verbose.
+
.It Fl x , Cm --regex
Treat
.Ar pattern
as a regular expression.
This uses the "modern" or "extended" syntax described in
.Xr re_format 7
+
.It Fl y , Cm --yes
+
Assume yes when asked for confirmation before installing missing dependencies.
.El
.Sh ENVIRONMENT
The following environment variables affect the execution of
modified docs/pkg-clean.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd July 10, 2013
+
.Dd May 25, 2014
.Dt PKG-CLEAN 8
.Os
.Sh NAME
@@ -24,6 +24,9 @@
.Sh SYNOPSIS
.Nm
.Op Fl anqy
+
.Pp
+
.Nm
+
.Op Cm --{all,dry-run,quiet,yes}
.Sh DESCRIPTION
.Nm
is used to cleanup the local cache of packages downloaded from remote
@@ -34,23 +37,23 @@ any packages that are no longer provided.
The following options are supported by
.Nm :
.Bl -tag -width F1
-
.It Fl a
+
.It Fl a , Cm --all
Delete all cached packages.
-
.It Fl n
-
Dry-run: do not delete any package files from the cache, but show what
+
.It Fl n , Cm --dry-run
+
Does not delete any package files from the cache, but show what
would be done instead.
Forces the preview of the packages that would be deleted to be shown,
even when used with
.Fl y .
Note: the package cache file permissions only permit root access.
Results will be disappointing for any other user.
-
.It Fl q
+
.It Fl q , Cm --quiet
Be quiet.
Suppress most output.
All output is suppressed if
.Fl y
is also used.
-
.It Fl y
+
.It Fl y , Cm --yes
Assume a yes answer instead of asking for confirmation before deleting
any out-of-date or redundant packages from the cache.
.El
modified docs/pkg-convert.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd February 25, 2013
+
.Dd May 25, 2014
.Dt PKG-CONVERT 8
.Os
.Sh NAME
@@ -25,25 +25,30 @@
.Nm
.Op Fl d Ar pkg_dbdir
.Op Fl nr
+
.Pp
+
.Nm
+
.Op Cm --pkg-dbdir Ar pkg_dbdir
+
.Op Cm --{dry-run,revert}
.Sh DESCRIPTION
.Nm
-
is used to convert from/to pkgng local database to legacy pkg_install tools
-
format.
+
is used to convert from/to
+
.Xr pkg 8
+
local database to legacy pkg_install tools format.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl d
+
.Bl -tag -width revert
+
.It Fl d Ar pkg_dbdir , Cm --pkg-dbdir Ar pkg_dbdir
The location of the
.Xr pkg_add 1
dbdir.
Defaults to
.Fa /var/db/pkg .
-
.It Fl n
+
.It Fl n , Cm --dry-run
Dry-run mode.
Do not actually convert anything.
Just show what would be done.
-
.It Fl r
+
.It Fl r , Cm --revert
Revert conversion
.El
.Sh FILES
modified docs/pkg-create.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 16, 2014
+
.Dd May 26, 2014
.Dt PKG-CREATE 8
.Os
.\" ---------------------------------------------------------------------------
@@ -50,6 +50,33 @@
.Op Fl r Ar rootdir
.Fl a
.\" ---------------------------------------------------------------------------
+
.Pp
+
.Nm
+
.Op Cm --no-clobber
+
.Op Cm --format Ar format
+
.Op Cm --out-dir Ar outdir
+
.Op Cm --plist Ar plist
+
.Op Cm --root-dir Ar rootdir
+
.Cm --metadata Ar metadatadir
+
.Nm
+
.Op Cm --no-clobber
+
.Op Cm --format Ar format
+
.Op Cm --out-dir Ar outdir
+
.Op Cm --root-dir Ar rootdir
+
.Cm --manifest Ar manifest
+
.Nm
+
.Op Cm --{glob,no-clobber,regex}
+
.Op Cm --format Ar format
+
.Op Cm --out-dir Ar outdir
+
.Op Cm --root-dir Ar rootdir
+
.Ar pkg-name ...
+
.Nm
+
.Op Cm --no-clobber
+
.Op Cm --format Ar format
+
.Op Cm --out-dir Ar outdir
+
.Op Cm --root-dir Ar rootdir
+
.Cm --all
+
.\" ---------------------------------------------------------------------------
.Sh DESCRIPTION
.Nm
is used to create packages from binaries or other files installed on
@@ -80,14 +107,14 @@ command.
The following options are supported by
.Nm :
.Bl -tag -width ".Fl m Ar metadatadir"
-
.It Fl a
+
.It Fl a , Cm --all
Create package tarballs from all packages installed on your system.
This option is incompatible with the
.Fl g , x
or
.Fl m Ar metadatadir
options.
-
.It Fl g
+
.It Fl g , Cm --glob
Interpret
.Ar pkg-name
as a shell glob pattern and create package only for installed binaries whose
@@ -97,7 +124,7 @@ This option is incompatible with the
or
.Fl m Ar metadatadir
options.
-
.It Fl x
+
.It Fl x , Cm --regex
Like
.Fl g ,
but interpret
@@ -109,7 +136,7 @@ This option is incompatible with the
or
.Fl m Ar metadatadir
options.
-
.It Fl f Ar format
+
.It Fl f Ar format , Cm --format Ar format
Set
.Ar format
as the package output format.
@@ -121,7 +148,7 @@ which are currently the only supported format.
If an invalid or no format is specified
.Ar txz
is assumed.
-
.It Fl m Ar metadatadir
+
.It Fl m Ar metadatadir , Cm --metadata Ar metadatadir
Specify the directory containing the package manifest,
.Pa +MANIFEST
and optionally three other files; one containing a message to be
@@ -150,7 +177,7 @@ This option is incompatible with the
or
.Fl x
options.
-
.It Fl M Ar manifest
+
.It Fl M Ar manifest , Cm --manifest Ar manifest
Read all of the package metadata from the
.Ar manifest
file.
@@ -164,22 +191,22 @@ This option is incompatible with the
or
.Fl x
options.
-
.It Fl n
+
.It Fl n , Cm --no-clobber
Do not overwrite already existing packages
-
.It Fl o Ar outdir
+
.It Fl o Ar outdir , Cm --out-dir Ar outdir
Set
.Ar outdir
as the output directory.
If this option is not given, all created packages will
be saved in the current directory.
-
.It Fl p Ar plist
+
.It Fl p Ar plist , Cm --plist Ar plist
Specify some package metadata using the legacy plist format from
.Xr pkg_add 1 ,
commonly found in
.Pa pkg-plist
files in the ports tree.
Metadata from the
-
G.Ar plist
+
.Ar plist
file, if specified, will take precedence over any equivalents from
the
.Ar metadatadir .
@@ -188,7 +215,7 @@ Only has any effect when used with
See
.Sx "PLIST FORMAT"
for details
-
.It Fl r Ar rootdir
+
.It Fl r Ar rootdir , Cm --root-dir Ar rootdir
.Ar rootdir
specifies the top-level directory to be treated as the root of the
filesystem hierarchy containing the package files.
modified docs/pkg-delete.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 18, 2014
+
.Dd May 26, 2014
.Dt PKG-DELETE 8
.Os
.Sh NAME
@@ -29,6 +29,14 @@
.Nm
.Op Fl Dnqy
.Fl a
+
.Pp
+
.Nm
+
.Op Cm --{no-deinstall-script,force,dry-run,quiet,recursive,yes}
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
+
.Ar pkg-name ...
+
.Nm
+
.Op Cm --{no-deinstall-script,dry-run,quiet,yes}
+
.Cm --all
.Sh DESCRIPTION
.Nm
is used for deleting installed packages from the system.
@@ -53,22 +61,22 @@ option.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl a
+
.Bl -tag -width recursive
+
.It Fl a , Cm --all
Deletes all installed packages from the system and empties the database.
-
.It Fl C
+
.It Fl C , Cm --case-sensitive
Make the standard or regular expression
.Fl ( x )
matching against
.Ar pkg-name
case sensitive.
-
.It Fl D
+
.It Fl D , Cm --no-deinstall-script
If a deinstallation script exists for a given package, do not execute it.
-
.It Fl f
+
.It Fl f , Cm --force
Forces packages to be removed despite leaving unresolved dependencies.
-
.It Fl g
+
.It Fl g , Cm --glob
Treat the package names as shell glob patterns.
-
.It Fl i
+
.It Fl i , Cm --case-insensitive
Make the standard or regular expression
.Fl ( x )
matching against
@@ -78,23 +86,23 @@ This is the defalt, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl n
+
.It Fl n , Cm --dry-run
Dry run mode.
The list of packages to delete is always printed, but no packages are
actually deleted.
-
.It Fl q
+
.It Fl q , Cm --quiet
Force quiet output, except where
.Fl n
is also used, when
.Nm
will show the list of packages to be deleted.
-
.It Fl R
+
.It Fl R , Cm --recursive
Delete all packages that require the listed packages as well.
-
.It Fl x
+
.It Fl x , Cm --regex
Treat the package names as regular expressions according to the
"modern" or "extended" syntax of
.Xr re_format 7 .
-
.It Fl y
+
.It Fl y , Cm --yes
Assume yes when asked for confirmation before package deletion.
.El
.Sh ENVIRONMENT
modified docs/pkg-fetch.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 18, 2014
+
.Dd May 26, 2014
.Dt PKG-FETCH 8
.Os
.Sh NAME
@@ -36,6 +36,21 @@
.Op Fl r Ar reponame
.Op Fl dqUy
.Fl u
+
.Pp
+
.Nm
+
.Op Cm --repository Ar reponame
+
.Op Cm --{dependencies,quiet,no-repo-update,yes}
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
+
.Ar pkg-name
+
.Op ...
+
.Nm
+
.Op Cm --repository Ar reponame
+
.Op Cm --{dependencies,quiet,no-repo-update,yes}
+
.Cm --all
+
.Nm
+
.Op Cm --repository Ar reponame
+
.Op Cm --{dependencies,quiet,no-repo-update,yes}
+
.Cm --available-updates
.Sh DESCRIPTION
.Nm
is used to download binary packages from a remote repository.
@@ -56,22 +71,22 @@ in
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl a
+
.Bl -tag -width dependencies
+
.It Fl a , Cm --all
Fetch all packages.
-
.It Fl C
+
.It Fl C , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
matching against
.Ar pkg-name
case sensitive.
-
.It Fl d
+
.It Fl d , Cm --dependencies
Fetch the package and its dependencies as well.
-
.It Fl g
+
.It Fl g , Cm --glob
Treat
.Ar pkg-name
as a shell glob pattern.
-
.It Fl i
+
.It Fl i , Cm --case-insensitive
Make the standard or regular expression
.Fl ( x )
matching against
@@ -81,30 +96,30 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl q
+
.It Fl q , Cm --glob
Quiet mode.
Show less output.
-
.It Fl r Ar reponame
+
.It Fl r Ar reponame , Cm --repository Ar reponame
Fetches packages from the given
.Ar reponame
if multiple repo support is enabled.
See
.Xr pkg.conf 5 .
-
.It Fl u
+
.It Fl u , Cm --available-updates
Fetch all available updates for the currently installed packages.
-
.It Fl U
+
.It Fl U , Cm --no-repo-update
Suppress the automatic update of the local copy of the repository catalogue
from remote. 
Automatic repository catalogue updates are only attempted when the
effective UID of the process has write access to the package database.
Otherwise they are silently ignored.
-
.It Fl x
+
.It Fl x , Cm --regex
Treat
.Ar pkg-name
as a regular expression according to the "modern" or "extended" syntax
of
.Xr re_format 7 .
-
.It Fl y
+
.It Fl y , Cm --yes
Assume yes when asked for confirmation before fetching packages.
.El
.Sh ENVIRONMENT
modified docs/pkg-info.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 18, 2014
+
.Dd May 26, 2014
.Dt PKG-INFO 8
.Os
.Sh NAME
@@ -27,48 +27,64 @@
.Nm
.Fl a
.Nm
-
.Op Fl AbBDdefIklOqRrs
+
.Op Fl AbBDdefIklOpqRrs
.Op Fl Cgix
.Ar pkg-name
.Nm
-
.Op Fl AbBDdfIlqRrs
+
.Op Fl AbBDdfIlpqRrs
.Fl F Ar pkg-file
+
.Pp
+
.Nm
+
.Ar pkg-name
+
.Nm
+
.Cm --all
+
.Nm
+
.Op Cm --{annotations,provided-shlibs,required-shlibs}
+
.Op Cm --{pkg-message,dependencies,exists,full,comment,locked}
+
.Op Cm --{list-files,by-origin,quiet,prefix,raw,required-by,size}
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
+
.Ar pkg-name
+
.Nm
+
.Op Cm --{annotations,provided-shlibs,required-shlibs}
+
.Op Cm --{pkg-message,dependencies,full,comment,list-files}
+
.Op Cm --{quiet,prefix,raw,required-by,size}
+
.Cm --file Ar pkg-file
.Sh DESCRIPTION
.Nm
is used for displaying information for packages.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl a
+
.Bl -tag -width origin
+
.It Fl a , Cm --all
Display all installed packages.
-
.It Fl A
+
.It Fl A , Cm --annotations
Display any annotations added to the package.
-
.It Fl C
+
.It Fl C , Cm --case-insensitive
Make the standard or the regular expression
.Fl ( x )
matching against
.Ar pkg-name
case sensitive.
-
.It Fl f
+
.It Fl f , Cm --full
Display full information about the packages matching
.Ar pkg-name .
This is the default.
-
.It Fl R
-
Display the full manifest (raw) about the packages matching
+
.It Fl R , Cm --raw
+
Display the full manifest (raw) for the packages matching
.Ar pkg-name .
-
.It Fl e
+
.It Fl e , Cm --exists
If
.Ar pkg-name
is installed and registered in the database, return 0, otherwise return 1.
Useful for checking whether the package is installed.
-
.It Fl D
+
.It Fl D , Cm --pkg-message
Show the pkg-message for matching packages.
-
.It Fl g
+
.It Fl g , Cm --glob
Treat
.Ar pkg-name
as a shell glob pattern.
-
.It Fl i
+
.It Fl i , Cm --case-insensitive
Make the standard or the regular expression
.Fl ( x )
matching against
@@ -78,20 +94,20 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl x
+
.It Fl x , Cm --regex
Treat
.Ar pkg-name
as a regular expression according to the "modern" or "extended" syntax
of
.Xr re_format 7 .
-
.It Fl d
+
.It Fl d , Cm --dependencies
Display the list of packages on which
.Ar pkg-name
depends.
-
.It Fl r
+
.It Fl r , Cm --required-by
Display the list of packages which require
.Ar pkg-name .
-
.It Fl k
+
.It Fl k , Cm --locked
Show the locking status for
.Ar pkg-name .
When used in combination with
@@ -104,39 +120,39 @@ Locking status is only meaningful for installed packages; all locking
statuses will show as unlocked when information about a
.Ar pkg-file
is queried.
-
.It Fl l
+
.It Fl l , Cm --list-files
Display all files installed by
.Ar pkg-name .
-
.It Fl b
+
.It Fl b , Cm --provided-shlibs
Display all shared libraries provided by
.Ar pkg-name .
-
.It Fl B
+
.It Fl B , Cm --required-shlibs
Display all shared libraries used by
.Ar pkg-name .
-
.It Fl s
+
.It Fl s , Cm --size
Display the total size of files installed by
.Ar pkg-name
-
.It Fl q
+
.It Fl q , Cm --quiet
Be
.Dq quiet .
Prints only the requested information without displaying many hints.
-
.It Fl O
+
.It Fl O , Cm --by-origin
Search is done by the
.Ar pkg-name
origin.
Added only for Ports compatibility.
.Pp
-
.It Fl E
+
.It Fl E , Cm --show-name-only
Hides the full package output and only shows the package name.
This option is deprecated and exists only for Ports compatibility.
-
.It Fl o
+
.It Fl o , Cm --origin
Display
.Ar pkg-name
origin.
-
.It Fl p
+
.It Fl p , --prefix
Display the installation prefix for each package matching
.Ar pkg-name .
-
.It Fl F Ar pkg-file
+
.It Fl F Ar pkg-file , Cm --file Ar pkg-file
Displays information from the package archive
.Ar pkg-file .
.El
modified docs/pkg-install.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 05, 2014
+
.Dd May 26, 2014
.Dt PKG-INSTALL 8
.Os
.Sh NAME
@@ -27,6 +27,13 @@
.Op Fl r Ar reponame
.Op Fl Cgix
.Ar <pkg-origin|pkg-name|pkg-name-version> ...
+
.Pp
+
.Nm
+
.Op Cm --{automatic,force,no-install-scripts,ignore-missing}
+
.Op Cm --{dry-run,fetch-only,quiet,from-root,no-repo-update,yes}
+
.Op Cm --repository Ar reponame
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
+
.Ar <pkg-origin|pkg-name|pkg-name-version> ...
.Sh DESCRIPTION
.Nm
is used for installation of packages from a package repository or
@@ -106,28 +113,28 @@ in
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl A
+
.Bl -tag -width automatic
+
.It Fl A , Cm --automatic
Mark the installed packages as orphan.
Will be automatically removed if no other packages depend on them.
For more information please refer to
.Xr pkg-autoremove 8
-
.It Fl C
+
.It Fl C , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
matching against
.Ar pkg-name
case sensitive.
-
.It Fl f
+
.It Fl f , Cm --force
Force the reinstallation of the package if already installed.
-
.It Fl g
+
.It Fl g , Cm --glob
Treat the package names as shell glob patterns.
-
.It Fl I
+
.It Fl I , Cm --no-install-scripts
If any installation scripts (pre-install or post-install) exist for a given
package, do not execute them.
When a package is updated, deinstallation
scripts (pre-deinstall or post-deinstall) are not run either.
-
.It Fl i
+
.It Fl i , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
matching against
@@ -137,42 +144,42 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl M
+
.It Fl M , Cm --ignore-missing
Force the installation of the package with missing dependencies.
-
.It Fl n
+
.It Fl n , Cm --dry-run
Dry-run mode.
The list of changes to packages is always printed, but
no changes are actually made.
-
.It Fl F
+
.It Fl F , Cm --fetch-only
Do not perform actual installation of packages, merely fetch packages
that should be upgraded and detect possible conflicts.
-
.It Fl q
+
.It Fl q , Cm --quiet
Force quiet output, except when
.Fl n
is used, where
.Nm
will always show packages to be installed, upgraded or deleted.
-
.It Fl R
+
.It Fl R , Cm --from-root
When used with
.Fl f ,
reinstalls any packages that require the given package.
-
.It Fl r Ar reponame
+
.It Fl r Ar reponame , Cm --repository Ar reponame
Install packages from only the named repository,
irrespective of the configured
.Dq active
status from
.Pa repo.conf .
-
.It Fl U
+
.It Fl U , Cm --no-repo-update
Suppress the automatic update of the local copy of the repository catalogue
from remote. 
Automatic repository catalogue updates are only attempted when the
effective UID of the process has write access to the package database.
Otherwise they are silently ignored.
-
.It Fl x
+
.It Fl x , Cm --regex
Treat the package names as regular expressions according to the
"modern" or "extended" syntax of
.Xr re_format 7 .
-
.It Fl y
+
.It Fl y , Cm --yes
Assume yes when asked for confirmation before package installation.
.El
.Sh ENVIRONMENT
modified docs/pkg-lock.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 10, 2014
+
.Dd May 26, 2014
.Dt PKG-LOCK 8
.Os
.Sh NAME
@@ -24,19 +24,34 @@
.Nd lock or unlock packages
.Sh SYNOPSIS
.Nm
-
.Op Fl qy
-
.Fl a
+
.Op Fl lqy
+
.Op Fl a
.Nm
-
.Op Fl qy
+
.Op Fl lqy
.Op Fl Cgix
.Ar pkg-name
.Nm "pkg unlock"
-
.Op Fl qy
-
.Fl a
+
.Op Fl lqy
+
.Op Fl a
.Nm "pkg unlock"
-
.Op Fl qy
+
.Op Fl lqy
.Op Fl Cgix
.Ar pkg-name
+
.Pp
+
.Nm
+
.Op Cm --{show-locked,quiet,yes}
+
.Op Cm --all
+
.Nm
+
.Op Cm --{show-locked,quiet,yes}
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
+
.Ar pkg-name
+
.Nm "pkg unlock"
+
.Op Cm --{show-locked,quiet,yes}
+
.Op Cm --all
+
.Nm "pkg unlock"
+
.Op Cm --{show-locked,quiet,yes}
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
+
.Ar pkg-name
.Sh DESCRIPTION
.Nm
is used to lock packages against reinstallation,
@@ -71,22 +86,20 @@ some third package.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl a
+
.Bl -tag -width all
+
.It Fl a , Cm --all
Lock or unlock all installed packages.
-
.It Fl l
-
List of all locked packages.
-
.It Fl C
+
.It Fl C , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
matching against
.Ar pkg-name
case sensitive.
-
.It Fl g
+
.It Fl g , Cm --glob
Treat
.Ar pkg-name
as a shell glob pattern.
-
.It Fl i
+
.It Fl i , Cm --case-insensitive
Make the standard or the regular expression
.Fl ( x )
matching against
@@ -96,15 +109,17 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl q
+
.It Fl l , Cm --show-locked
+
Show list of all locked packages after any lock or unlock operations.
+
.It Fl q , Cm --quiet
Operate quietly: do not output anything other than confirmatory questions.
-
.It Fl x
+
.It Fl x , Cm --regex
Treat
.Ar pkg-name
as a regular expression according to the "modern" or "extended" syntax
of
.Xr re_format 7 .
-
.It Fl y
+
.It Fl y , Cm --yes
Assume "yes" as the answer to all questions.
.El
.Sh ENVIRONMENT
modified docs/pkg-query.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 18, 2014
+
.Dd May 26, 2014
.Dt PKG-QUERY 8
.Os
.Sh NAME
@@ -24,15 +24,27 @@
.Sh SYNOPSIS
.Nm
.Ao query-format Ac Ao pkg-name Ac
+
.Pp
.Nm
.Op Fl a
.Ao query-format Ac
.Nm
-
.Fl F Ao pkg-name Ac Ao query-format Ac
+
.Fl F Ao pkg-file Ac Ao query-format Ac
.Nm
.Fl e Ao evaluation-condition Ac Ao query-format Ac
.Nm
-
.Op Fl gix
+
.Op Fl Cgix
+
.Ao query-format Ac Ao pattern Ac Ao ... Ac
+
.Pp
+
.Nm
+
.Op Cm --all
+
.Ao query-format Ac
+
.Nm
+
.Cm --file Ao pkg-file Ac Ao query-format Ac
+
.Nm
+
.Cm --evaluate Ao evaluation-condition Ac Ao query-format Ac
+
.Nm
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
.Ao query-format Ac Ao pattern Ac Ao ... Ac
.Sh DESCRIPTION
.Nm
@@ -40,23 +52,23 @@ is used for displaying information about packages.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl a
+
.Bl -tag -width evaluate
+
.It Fl a , Cm --all
Match all packages from the database
-
.It Fl C
+
.It Fl C , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
matching against
.Ar pkg-name
case sensitive.
-
.It Fl e
+
.It Fl e , Cm --evaluate
Match packages using the given
.Ar evaluation-condition.
See EVALUATION FORMAT for details.
-
.It Fl F Ar pkg-name
+
.It Fl F Ar pkg-file , Cm --file Ar pkg-file
Display information only for the package file
.Ar pkg-name
-
.It Fl i
+
.It Fl i , Cm --case-insensitive
Make the standard or regular expression
.Fl ( x )
matching against
@@ -66,11 +78,11 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl g
+
.It Fl g , Cm --glob
Treat
.Ao pattern Ac
as a glob pattern.
-
.It Fl x
+
.It Fl x , Cm --regex
Treat
.Ao pattern Ac
as a regular expression according to the "modern" or "extended" syntax
modified docs/pkg-register.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 16, 2014
+
.Dd May 25, 2014
.Dt PKG-REGISTER 8
.Os
.Sh NAME
@@ -30,13 +30,16 @@
.Nm
.Op Fl dlOt
.Fl M Ar metadatafile
+
.Pp
.Nm
-
.Op Cm --debug|legacy|old|test|relocate
+
.Op Cm --{debug,legacy,old,test}
+
.Op Cm --relocate Ar location
.Op Cm --plist Ar plist-file
.Cm --metadata Ar metadatadir
.Cm --root Ar input-path
.Nm
-
.Op Cm --debug|legacy|old|test|relocate
+
.Op Cm --{debug,legacy,old,test}
+
.Op Cm --relocate Ar location
.Cm --manifest Ar metadatafile
.Sh DESCRIPTION
.Nm
@@ -160,11 +163,11 @@ This is a temporary compatibility flag for internal use within the
ports tree only.
This flag will be removed once
.Xr pkg_tools 8
-
reached end-of-life.
+
reaches end-of-life.
Generates an old-style packing list on
.Pa stdout ,
without registering the port in the package database.
-
.It Cm --relocate location
+
.It Cm --relocate Ar location
Annotates the package as having been relocated to
.Pa location ,
which is an alternate system root.
modified docs/pkg-repo.8
@@ -26,6 +26,11 @@
.Op Fl lq
.Op Fl o Ar output-dir
.Ao Ar repo-path Ac Op Ao Ar rsa-key Ac | signing_command: Ao Ar the command Ac
+
.Pp
+
.Nm
+
.Op Cm --{list-files,quiet}
+
.Op Cm --output-dir Ar output-dir
+
.Ao Ar repo-path Ac Op Ao Ar rsa-key Ac | signing_command: Ao Ar the command Ac
.Sh DESCRIPTION
.Nm
is used for creating a catalogue of the available
@@ -55,6 +60,8 @@ origin is included in the catalogue.
.Pp
The repository will be created in the package directory unless the
.Fl o Ar output-dir
+
or
+
.Cm --output-dir Ar output-dir
is specified, in which case it will be created there.
.Pp
Optionally you may sign the repository catalogue by specifying the
@@ -113,12 +120,12 @@ Signing the catalogue is strongly recommended.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl q
+
.Bl -tag -width quiet
+
.It Fl q , Cm --quiet
Force quiet output
-
.It Fl l
+
.It Fl l , Cm --list-files
Generate list of all files in repo as filesite.txz archive.
-
.It Fl o Ar output-dir
+
.It Fl o Ar output-dir , Cm --output-dir Ar output-dir
Create the repository in the specified directory instead of the package directory.
.El
.Sh FILES
modified docs/pkg-rquery.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 27, 2014
+
.Dd May 26, 2014
.Dt PKG-RQUERY 8
.Os
.Sh NAME
@@ -42,6 +42,27 @@
.Op Fl r Ar reponame
.Sm Fl I |
.Ao query-format Ac Sm Ao pattern Ac Ao ... Ac
+
.Pp
+
.Nm
+
.Sm Cm --index-line |
+
.Ao query-format Ac Sm Ao pkg-name Ac
+
.Nm
+
.Op Cm --{all,no-repo-update}
+
.Op Cm --repository Ar reponame
+
.Sm Cm --index-line |
+
.Ao query-format Ac Sm
+
.Nm
+
.Op Cm --no-repo-update
+
.Cm --evaluate Ao evaluation-condition Ac
+
.Op Cm --repository Ar reponame
+
.Sm Cm --index-line |
+
.Ao query-format Ac Sm
+
.Nm
+
.Op Cm --no-repo-update
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
+
.Op Cm --repository Ar reponame
+
.Sm Cm --index-line |
+
.Ao query-format Ac Sm Ao pattern Ac Ao ... Ac
.Sh DESCRIPTION
.Nm
is used for displaying information about remote packages.
@@ -60,20 +81,20 @@ in
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl a
+
.Bl -tag -width repository
+
.It Fl a , Cm --all
Match all packages from the database
-
.It Fl C
+
.It Fl C , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
matching against
.Ar pkg-name
case sensitive.
-
.It Fl e
+
.It Fl e , Cm --evaluate
Match packages using the given
.Ar evaluation-condition.
See EVALUATION FORMAT for details.
-
.It Fl I
+
.It Fl I , Cm --index-line
Print out the corresponding line from the ports
.Pa INDEX
file for each matched package.
@@ -83,7 +104,7 @@ argument.
Only the first query format (including the
.Fl I
option) on the command line will be interpreted.
-
.It Fl r Ar reponame
+
.It Fl r Ar reponame , Cm --repository Ar reponame
Query for data about packages from only the named repository,
irrespective of the configured
.Dq active
@@ -92,11 +113,11 @@ status from
By default all repository catalogues marked
.Dq active
are queried.
-
.It Fl g
+
.It Fl g , Cm --glob
Treat
.Ao pattern Ac
as a glob pattern.
-
.It Fl i
+
.It Fl i , Cm --case-insensitive
Make the standard or regular expression
.Fl ( x )
matching against
@@ -106,13 +127,13 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl U
+
.It Fl U , Cm --no-repo-update
Suppress the automatic update of the local copy of the repository catalogue
from remote.
Automatic repository catalogue updates are only attempted when the
effective UID of the process has write access to the package database.
Otherwise they are silently ignored.
-
.It Fl x
+
.It Fl x , Cm --regex
Treat
.Ao pattern Ac
as a regular expression according to the "modern" or "extended" syntax
modified docs/pkg-search.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 18, 2014
+
.Dd May 26, 2014
.Dt PKG-SEARCH 8
.Os
.Sh NAME
@@ -31,9 +31,24 @@
.Op Fl Cegix
.Ar pattern
.Nm
-
.Op Fl cDdfopqRU
+
.Op Fl cDdfopqRsU
.Op Fl r Ar reponame
-
.Op Cegix
+
.Op Fl Cegix
+
.Ar pattern
+
.Pp
+
.Nm
+
.Op Cm --no-repo-update
+
.Op Cm --repository Ar reponame
+
.Op Cm --search Ar search
+
.Op Cm --label Ar label
+
.Op Cm --query-modifier Ar query-modifier
+
.Op Cm --{case-sensitive,exact,glob,case-insensitive,regex}
+
.Ar pattern
+
.Nm
+
.Op Cm --{comment,description,depends-on,full,origins,prefix}
+
.Op Cm --{quiet,raw,size,no-repo-update}
+
.Op Cm --repository Ar reponame
+
.Op Cm --{case-sensitive,exact,glob,case-insensitive,regex}
.Ar pattern
.Sh DESCRIPTION
.Nm
@@ -68,8 +83,8 @@ for details.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl C
+
.Bl -tag -width repository
+
.It Fl C , Cm --case-sensitive
Make the exact
.Fl ( e )
or the regular expression
@@ -77,33 +92,33 @@ or the regular expression
matching against
.Ar pkg-name
case sensitive.
-
.It Fl c
+
.It Fl c , Cm --comment
Search for packages with comment text matching
.Ar pattern .
Equivalent to
.Fl "S comment" .
-
.It Fl D
+
.It Fl D , Cm --description
Search for packages with description text matching
.Ar pattern .
Equivalent to
.Fl "S description" .
-
.It Fl d
+
.It Fl d , Cm --depends-on
Display the list of packages depended on by each matched package.
Equivalent to
.Fl "Q depends-on" .
-
.It Fl e
+
.It Fl e , Cm --exact
.Ar pattern
should be an exact match against the search field.
-
.It Fl f
+
.It Fl f , Cm --full
Show ``full'' information about the package.
Equivalent to
.Fl "Q full" .
-
.It Fl g
+
.It Fl g , Cm --glob
Treat
.Ar pattern
as a shell globbing expression.
The glob pattern must match the entire field being seached.
-
.It Fl i
+
.It Fl i , Cm --case-insensitive
Make the exact
.Fl ( e )
or regular expression
@@ -115,7 +130,7 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl L Ar label
+
.It Fl L Ar label , Cm --label Ar label
Select which identifying label is printed for each matched package,
unless
.Fl q
@@ -132,20 +147,21 @@ If unspecified,
is set to the same as the value searched via the
.Fl S Ar search
option.
-
.It Fl o
+
.It Fl o , Cm --origins
List packages by origin for each package matching
.Ar pattern .
Equivalent to
.Fl "L origin" .
-
.It Fl p
+
.It Fl p , Cm --prefix
Display the package installation prefix for each matched package.
Equivalent to
.Fl "Q prefix" .
-
.It Fl q
-
Be ``quiet''.
+
.It Fl q , Cm --quiet
+
Be
+
.Dq quiet .
Produce less output.
In particular do not show an identifying label field for each package.
-
.It Fl Q Ar query-modifier
+
.It Fl Q Ar query-modifier , Cm --query-modifier Ar query-modifier
Modify the query output by adding an additional field to the result.
Multiple fields can be added by using additional
.Fl Q Ar query-modifier
@@ -153,7 +169,7 @@ flags.
See the
.Qq Sx Output Modifier Options
section for details.
-
.It Fl r Ar reponame
+
.It Fl r Ar reponame , Cm --repository Ar reponame
Search for packages from only the named repository,
irrespective of the configured
.Dq active
@@ -162,9 +178,9 @@ status from
By default all repository catalogues marked
.Dq active
are searched.
-
.It Fl R
+
.It Fl R , Cm --raw
Display the full manifest (raw) from the matching packages.
-
.It Fl S Ar search
+
.It Fl S Ar search , Cm --search Ar search
Specify the field to search the repository catalogue on.
If unspecified, searches on
.Ar pkg-name
@@ -178,17 +194,17 @@ field.
See the
.Qq Sx Search and Label Options
sections for more details.
-
.It Fl s
+
.It Fl s , Cm --size
Display the installed size of matched packages.
Equivalent to
.Fl "Q size" .
-
.It Fl U
+
.It Fl U, Cm --no-repo-update
Suppress the automatic update of the local copy of the repository catalogue
from remote. 
Automatic repository catalogue updates are only attempted when the
effective UID of the process has write access to the package database.
Otherwise they are silently ignored.
-
.It Fl x
+
.It Fl x , Cm --regex
Treat
.Ar pattern
as a regular expression according to the "modern" or "extended"
modified docs/pkg-set.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 18, 2014
+
.Dd May 26, 2014
.Dt PKG-SET 8
.Os
.Sh NAME
@@ -29,6 +29,14 @@
.Op Fl y
.Op Fl Cgix
.Ar pkg-name
+
.Pp
+
.Nm
+
.Op Cm --all
+
.Op Cm --automatic Op Ar 01
+
.Op Cm --change-origin Ar oldorigin:neworigin
+
.Op Cm --yes
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
+
.Ar pkg-name
.Sh DESCRIPTION
.Nm
is used to modify information concerning installed packages.
@@ -37,24 +45,24 @@ should always be used with caution.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl A Ar 01
+
.Bl -tag -width automatic
+
.It Fl A Ar 01 , Cm --automatic Ar 01
Set automatic flag for the package: 0 is not automatic, 1 is automatic.
This affects the operation of
.Xr pkg-autoremove 8 .
-
.It Fl a
+
.It Fl a , Cm --all
Match all installed packages.
-
.It Fl C
+
.It Fl C , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
matching against
.Ar pkg-name
case sensitive.
-
.It Fl g
+
.It Fl g , Cm --glob
Match
.Ar pkg-name
as a globbing expression.
-
.It Fl i
+
.It Fl i , Cm --case-insensitive
Make the standard or regular expression
.Fl ( x )
matching against
@@ -64,7 +72,7 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl o Ar oldorigin:neworigin
+
.It Fl o Ar oldorigin:neworigin , Cm --change-origin Ar oldorigin:neworigin
Change the port origin of a given dependency from
.Ar oldorigin
to
@@ -78,12 +86,12 @@ Also see
.Xr pkg-updating 8
and
.Sx EXAMPLES .
-
.It Fl x
+
.It Fl x , Cm --regex
Match
.Ar pkg-name
as a regular expression according to the "modern" or "extended" syntax of
.Xr re_format 7 .
-
.It Fl y
+
.It Fl y , Cm --yes
Assume yes rather than asking for confirmation before package autoremoval.
.El
.Pp
modified docs/pkg-shlib.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd March 3, 2013
+
.Dd May 26, 2014
.Dt PKG-SHLIB 8
.Os
.Sh NAME
@@ -31,6 +31,10 @@ Only exact matches are handled.
.Nm
.Op Fl PR
.Ar library
+
.Pp
+
.Nm
+
.Op Cm --{provides,requires}
+
.Ar library
.Sh DESCRIPTION
.Nm
is used for displaying the packages that provide
@@ -41,11 +45,11 @@ by containing binaries that link to it.
.Sh OPTIONS
The following mutually exclusive options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl P
+
.Bl -tag -width provides
+
.It Fl P , Cm --provides
Show only the installed packages which provide the named
.Ar library .
-
.It Fl R
+
.It Fl R , Cm --requires
Show only the installed packages which require
.Ar library.
.El
modified docs/pkg-stats.8
@@ -24,21 +24,24 @@
.Sh SYNOPSIS
.Nm
.Op Fl qlrb
+
.Pp
+
.Nm
+
.Op Cm --{quiet,local,remote,bytes}
.Sh DESCRIPTION
.Nm
is used to display different statistics about the package databases.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl q
+
.Bl -tag -width quiet
+
.It Fl q , Cm --quiet
Quiet mode.
Show less output.
-
.It Fl l
+
.It Fl l , Cm --local
Display stats only for the local package database.
-
.It Fl r
+
.It Fl r , Cm --remote
Display stats only for the remote package database(s).
-
.It Fl b
+
.It Fl b , Cm --bytes
Display disk space usage in bytes only.
.El
.Sh ENVIRONMENT
modified docs/pkg-update.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 13, 2014
+
.Dd May 26, 2014
.Dt PKG-UPDATE 8
.Os
.Sh NAME
@@ -26,6 +26,10 @@ package repositories
.Nm
.Op Fl fq
.Op Fl r Ar reponame
+
.Pp
+
.Nm
+
.Op Cm --{force,quiet}
+
.Op Cm --repository Ar reponame
.Sh DESCRIPTION
.Nm
is used for updating the local copy of a repository catalogue from
@@ -69,13 +73,13 @@ for more information.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl q
+
.Bl -tag -width quiet
+
.It Fl q , Cm --quiet
Force quiet output
-
.It Fl f
+
.It Fl f , Cm --force
Force a full download of the repository catalogue without regard to the
respective ages of the local and remote copies of the catalogue
-
.It Fl r Ar reponame
+
.It Fl r Ar reponame , Cm --repository Ar reponame
Download the catalogue for the named repository only.
This will update only the named repository, irrespective of the configured
.Dq active
modified docs/pkg-updating.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd February 25, 2013
+
.Dd May 26, 2013
.Dt PKG-UPDATING 8
.Os
.Sh NAME
@@ -26,7 +26,11 @@
.Op Fl d Ar date
.Op Fl f Ar file
.Op Ar pkg-name ...
+
.Pp
.Nm
+
.Op Cm --date Ar date
+
.Op Cm --file Ar file
+
.Op Ar pkg-name ...
.Sh DESCRIPTION
The
.Nm
@@ -36,15 +40,15 @@ Alternativly a list of pkg-names could be passed.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Ar pkg-name ...
+
.Bl -tag -width file
+
.It Ar pkg-name ... 
UPDATING entries for the named packages are displayed.
-
.It Fl d Ar date
+
.It Fl d Ar date , Cm --date Ar date
Only entries newer than
.Ar date
are shown.
Use a YYYYMMDD date format.
-
.It Fl f Ar file
+
.It Fl f Ar file , Cm --file Ar file
Defines a alternative location of the UPDATING
.Ar file .
.El
modified docs/pkg-upgrade.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd May 05, 2014
+
.Dd May 26, 2014
.Dt PKG-UPGRADE 8
.Os
.Sh NAME
@@ -27,6 +27,13 @@
.Op Fl r Ar reponame
.Op Fl Cgix
.Op Ar <pkg-origin|pkg-name|pkg-name-version> ...
+
.Pp
+
.Nm
+
.Op Cm --{force,no-install-scripts,dry-run,fetch-only}
+
.Op Cm --{quiet,no-repo-update,yes}
+
.Op Cm --repository Ar reponame
+
.Op Cm --{case-sensitive,glob,case-insensitive,regex}
+
.Op Ar <pkg-origin|pkg-name|pkg-name-version> ...
.Sh DESCRIPTION
.Nm
is used for upgrading packaged software distributions.
@@ -114,60 +121,58 @@ work list.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl f
-
Force reinstalling/upgrading the whole set of packages
-
.It Fl I
+
.Bl -tag -width repository
+
.It Fl C , Cm --case-sensitive
+
Make the standard or the regular expression
+
.Fl ( x )
+
matching against
+
.Ar pkg-name
+
case sensitive.
+
.It Fl F , Cm --fetch-only
+
Do not perform installation of packages, merely fetch packages that should be
+
upgraded and detect possible conflicts.
+
.It Fl f , Cm --force
+
Force the reinstallation or upgrade of the whole set of packages.
+
.It Fl g , Cm --glob
+
Treat the package names as shell glob patterns.
+
.It Fl I , Cm --no-install-scripts
If any installation scripts (pre-install or post-install) or deinstallation
scripts (pre-deinstall or post-deinstall) exist for a given package, do not
execute them.
-
.It Fl n
+
.It Fl i , Cm --case-insensitive
+
Make the standard or the regular expression
+
.Fl ( x )
+
matching against
+
.Ar pkg-name
+
case insensitive.
+
This is the default, unless modified by setting
+
.Ev CASE_SENSITIVE_MATCH
+
to true in
+
.Pa pkg.conf .
+
.It Fl n , Cm --dry-run
Dry-run mode: show what packages have updates available, but do not perform
any upgrades.
Repository catalogues will be updated as usual unless the
-
.Fl U
+
.Fl U 
option is also given.
-
.It Fl F
-
Do not perform installation of packages, merely fetch packages that should be
-
upgraded and detect possible conflicts.
-
.It Fl q
+
.It Fl q , Cm --quiet
Force quiet output, except when
.Fl n
is used, where a summary of the work list is always displayed.
-
.It Fl U
-
Suppress the automatic update of the local copy of the repository catalogue
-
from remote. 
-
Automatic repository catalogue updates are only attempted when the
-
effective UID of the process has write access to the package database.
-
Otherwise they are silently ignored.
-
.It Fl r Ar reponame
+
.It Fl r Ar reponame , Cm --repository Ar reponame
Install packages from only the named repository,
irrespective of the configured
.Dq active
status from
.Pa repo.conf .
-
.It Fl y
+
.It Fl U , Cm --no-repo-update
+
Suppress the automatic update of the local copy of the repository catalogue
+
from remote. 
+
Automatic repository catalogue updates are only attempted when the
+
effective UID of the process has write access to the package database.
+
Otherwise they are silently ignored.
+
.It Fl y , Cm --yes
Assume yes when asked for confirmation before package installation.
-
.It Fl C
-
Make the standard or the regular expression
-
.Fl ( x )
-
matching against
-
.Ar pkg-name
-
case sensitive.
-
.It Fl f
-
Force the reinstallation of the package if already installed.
-
.It Fl g
-
Treat the package names as shell glob patterns.
-
.It Fl i
-
Make the standard or the regular expression
-
.Fl ( x )
-
matching against
-
.Ar pkg-name
-
case insensitive.
-
This is the default, unless modified by setting
-
.Ev CASE_SENSITIVE_MATCH
-
to true in
-
.Pa pkg.conf .
.El
.Sh ENVIRONMENT
The following environment variables affect the execution of
modified docs/pkg-version.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd April 26, 2014
+
.Dd May 26, 2014
.Dt PKG-VERSION 8
.Os
.Sh NAME
@@ -35,6 +35,20 @@
.Fl t Ar version1 Ar version2
.Nm
.Fl T Ar pkgname Ar pattern
+
.Pp
+
.Nm
+
.Op Cm --{index,ports,remote}
+
.Op Cm --{help,origin,quiet,verbose,no-repo-update}
+
.Op Cm --like Ar limchar
+
.Op Cm --not-like Ar limchar
+
.Op Cm --{case-sensitive,exact,glob,case-insensitive,regex} Ar pattern
+
.Op Cm --repository Ar reponame
+
.Op Cm --match-origin Ar origin
+
.Op Ar index
+
.Nm
+
.Cm --test-version Ar version1 Ar version2
+
.Nm
+
.Cm --test-pattern Ar pkgname Ar pattern
.Sh DESCRIPTION
.Nm
is used for generating a report of packages installed by
@@ -106,16 +120,17 @@ with the corresponding entry in the index.
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl C
+
.Bl -tag -width repository
+
.It Fl C , Cm --case-sensitive
Make the standard or the regular expression
.Fl ( x )
matching against
.Ar pkg-name
case sensitive.
-
.It Fl h
+
.It Fl h , Cm --help
Displays usage information
-
.It Fl I Op Ar index
+
.It Fl I Op Ar index 
+
.It Cm --index Op Ar index
Use
.Pa index
file for determining if a package is out of date.
@@ -123,18 +138,18 @@ If no
.Pa index
file name is specified, uses the default index file.
This is the default, if the index file exists.
-
.It Fl P
+
.It Fl P , Cm --ports
Use ports for determining if a package is out of date.
This is the default if the index file is not present and a ports tree
exists.
The tree used can be overridden by PORTSDIR, see
.Xr pkg 5
for more information.
-
.It Fl R
+
.It Fl R , Cm --remote
Use repository catalogue for determining if a package is out of date.
This is the default if neither the ports index nor the ports tree
exists.
-
.It Fl U
+
.It Fl U , Cm --no-repo-update
Suppress the automatic update of the local copy of the repository catalogue
from remote.
This only has any effect in combination with the
@@ -143,7 +158,7 @@ option.
Automatic repository catalogue updates are only attempted when the
effective UID of the process has write access to the package database.
Otherwise they are silently ignored.
-
.It Fl r Ar reponame
+
.It Fl r Ar reponame , Cm --repository Ar reponame
When using
.Fl R
compare installed package versions to packages available from the
@@ -155,24 +170,24 @@ By default all repository catalogues marked
.Dq active
are used for version comparisons.
.Fl R
-
.It Fl o
+
.It Fl o , Cm --origin
Display package origin, instead of package name.
-
.It Fl q
+
.It Fl q , Cm --quiet
Be quiet.
Less output will be produced.
-
.It Fl v
+
.It Fl v , Cm --verbose
Be verbose.
-
.It Fl l Ar limchar
+
.It Fl l Ar limchar , Cm --like Ar limchar
Display only the packages which status flag matches the one specified by
.Ar limchar
-
.It Fl L Ar limchar
+
.It Fl L Ar limchar , Cm --not-like Ar limchar
Does the opposite of
.Fl l
flag.
Displays the packages which status flag does not match the one
specified by
.Ar limchar
-
.It Fl i
+
.It Fl i , Cm --case-insensitive
Make the exact
.Fl ( e )
or regular expression
@@ -184,18 +199,18 @@ This is the default, unless modified by setting
.Ev CASE_SENSITIVE_MATCH
to true in
.Pa pkg.conf .
-
.It Fl x Ar pattern
+
.It Fl x Ar pattern , Cm --regex Ar pattern
Only display the packages that match the regular expression.
Uses the "modern" or "extended" syntax of
.Xr re_format 7 .
-
.It Fl g Ar pattern
+
.It Fl g Ar pattern , Cm --glob Ar pattern
Only display the packages that match the glob expression.
-
.It Fl e Ar string
+
.It Fl e Ar string , Cm --exact Ar string
Only display the packages that exactly match the string.
-
.It Fl O Ar origin
+
.It Fl O Ar origin , Cm --match-origin Ar origin
Display only the packages which origin matches
.Ar origin
-
.It Fl t Ar version1 Ar version2
+
.It Fl t Ar version1 Ar version2 , Cm --test-version Ar version1 Ar version2
Test a pair of version number strings and exit.
The output consists of one of the single characters
.Li =
@@ -205,7 +220,7 @@ The output consists of one of the single characters
.Li \&>
(left-hand number greater) on standard output.
This flag is mostly useful for scripts or for testing.
-
.It Fl T Ar pkgname Ar pattern
+
.It Fl T Ar pkgname Ar pattern , Cm --test-pattern Ar pkgname Ar pattern
Compare
.Ar pkgname
against shell glob
modified docs/pkg-which.8
@@ -23,7 +23,11 @@
.Nd displays which package installed a specific file
.Sh SYNOPSIS
.Nm
-
.Op Fl qog
+
.Op Fl gopq
+
.Ar file
+
.Pp
+
.Nm
+
.Op Cm --{glob,origin,path-search,quiet}
.Ar file
.Sh DESCRIPTION
.Nm
@@ -32,17 +36,17 @@ is used for displaying the package that installed
.Sh OPTIONS
The following options are supported by
.Nm :
-
.Bl -tag -width F1
-
.It Fl q
-
Be quiet
-
.It Fl o
-
Shows the origin of the package instead of name-version
-
.It Fl g
+
.Bl -tag -width origin
+
.It Fl g , Cm --glob
Treat
.Ao file Ac
as a glob pattern.
-
.It Fl p
+
.It Fl o , Cm --origin
+
Shows the origin of the package instead of name-version
+
.It Fl p , Cm --path-search
Search for the filename in PATH.
+
.It Fl q , Cm --quiet
+
Be quiet
.El
.Sh ENVIRONMENT
The following environment variables affect the execution of
@@ -52,6 +56,7 @@ See
for further description.
.Bl -tag -width ".Ev NO_DESCRIPTIONS"
.It Ev PKG_DBDIR
+
.It Ev PATH
.El
.Sh FILES
See
modified docs/pkg.8
@@ -15,7 +15,7 @@
.\"     @(#)pkg.8
.\" $FreeBSD$
.\"
-
.Dd February 26, 2014
+
.Dd May 26, 2014
.Dt PKG 8
.Os
.\" ---------------------------------------------------------------------------
@@ -34,6 +34,16 @@
.Op Fl C Ao configuration file Ac
.Op Fl R Ao repository configuration directory Ac
.Ao command Ac Ao Ar flags Ac
+
.Pp
+
.Nm
+
.Op Cm --version
+
.Op Cm --debug
+
.Op Cm --list
+
.Op Cm --check-activationN
+
.Op Cm --jail Ao jail name or id Ac | Cm --chroot Ao chroot path Ac
+
.Op Cm --config Ao configuration file Ac
+
.Op Cm --repo-conf-dir Ao repository configuration directory Ac
+
.Ao command Ac Ao Ar flags Ac
.\" ---------------------------------------------------------------------------
.Sh DESCRIPTION
provides an interface for manipulating packages - registering,
@@ -52,12 +62,12 @@ for details.
The following options are supported by
.Nm :
.Bl -tag -width indent
-
.It Fl v
+
.It Fl v , Cm --version
Displays the current version of
.Nm
-
.It Fl d
+
.It Fl d , Cm --debug
Show debug information
-
.It Fl l
+
.It Fl l , Cm --list
List all the available command names, and exit without performing any
other action.
The
@@ -67,12 +77,12 @@ option takes precedence over
but
.Fl l
will override any other command line arguments.
-
.It Fl o Ao option=value Ac
+
.It Fl o Ao option=value Ac , Cm --option Ao option=value Ac
Set configuration option for
.Nm
from the command line. Options that are set from the environment are
redefined. It is permitted to specify this option multiple times. 
-
.It Fl N
+
.It Fl N , Cm --check-activation
Activation status check mode.
Prevent
.Nm
@@ -97,6 +107,11 @@ The exit status should be a reliable indication of whether a system
is configured to use
.Nm
as its package management system or not.
+
Since
+
.Xr pkg 7
+
does not support long options, it is recommended to always use the short
+
.Fl N
+
form.
.Pp
Example usage:
.Bd -literal -offset indent
@@ -131,7 +146,7 @@ is installed and activated:
    # pkg_install-specifics
  fi
.Ed
-
.It Fl j Ao jail name or id Ac
+
.It Fl j Ao jail name or id Ac , Cm --jail Ao jail name or id Ac
.Nm
will execute in the given
.Ao jail name or id Ac ,
@@ -147,15 +162,15 @@ See
.Xr jail 8
and
.Xr jls 8 .
-
.It Fl c Ao chroot path Ac
+
.It Fl c Ao chroot path Ac , Cm --chroot Ao chroot path Ac
.Nm
will chroot in the
.Ao chroot path Ac
Environment
-
.It Fl C Ao configuration file Ac
+
.It Fl C Ao configuration file Ac , Cm --config Ao configuration file Ac
.Nm
will use the specified file as a configuration file
-
.It Fl R Ao repository configuration directory Ac
+
.It Fl R Ao repo conf dir Ac , Cm --repo-conf-dir Ao repo conf dir Ac
.Nm
will search the directory for per-repository configuration files.
This overrides any value of
modified src/fetch.c
@@ -71,7 +71,7 @@ exec_fetch(int argc, char **argv)
		{ "case-insensitive",	no_argument,		NULL,	'i' },
		{ "quiet",		no_argument,		NULL,	'q' },
		{ "repository",		required_argument,	NULL,	'r' },
-
		{ "avaialbe-updates",	no_argument,		NULL,	'u' },
+
		{ "available-updates",	no_argument,		NULL,	'u' },
		{ "no-repo-update",	no_argument,		NULL,	'U' },
		{ "regex",		no_argument,		NULL,	'x' },
		{ "yes",		no_argument,		NULL,	'y' },
modified src/info.c
@@ -121,7 +121,7 @@ exec_info(int argc, char **argv)
		{ "by-origin",		no_argument,		NULL,	'O' },
		{ "prefix",		no_argument,		NULL,	'p' },
		{ "guiet",		no_argument,		NULL,	'q' },
-
		{ "requirements",	no_argument,		NULL,	'r' },
+
		{ "required-by",	no_argument,		NULL,	'r' },
		{ "raw",		no_argument,		NULL,	'R' },
		{ "size",		no_argument,		NULL,	's' },
		{ "regex",		no_argument,		NULL,	'x' },
modified src/lock.c
@@ -46,10 +46,8 @@ static int do_unlock(struct pkgdb *db, struct pkg *pkg);
void
usage_lock(void)
{
-
	fprintf(stderr, "Usage: pkg lock [-lqy] [-Cgix] <pkg-name>\n");
-
	fprintf(stderr, "       pkg lock [-lqy] -al\n");
-
	fprintf(stderr, "       pkg unlock [-lqy] [-Cgix] <pkg-name>\n");
-
	fprintf(stderr, "       pkg unlock [-lqy] -a\n");
+
	fprintf(stderr, "Usage: pkg lock [-lqy] [-a|[-Cgix] <pkg-name>]\n");
+
	fprintf(stderr, "       pkg unlock [-lqy] [-a|[-Cgix] <pkg-name>]\n");
	fprintf(stderr, "For more information see 'pkg help lock'.\n");
}

@@ -182,7 +180,9 @@ exec_lock_unlock(int argc, char **argv, enum action action)
	argc -= optind;
	argv += optind;

-
	if (!(match == MATCH_ALL && argc == 0) && argc != 1) {
+
	
+

+
	if (!(match == MATCH_ALL && argc == 0) && argc != 1 && !show_locked) {
		usage_lock();
		return (EX_USAGE);
	}
@@ -219,21 +219,23 @@ exec_lock_unlock(int argc, char **argv, enum action action)
		return (EX_TEMPFAIL);
	}

-
	if ((it = pkgdb_query(db, pkgname, match)) == NULL) {
-
		exitcode = EX_IOERR;
-
		goto cleanup;
-
	}
-

-
	while ((retcode = pkgdb_it_next(it, &pkg, 0)) == EPKG_OK) {
-
		if (action == LOCK)
-
			retcode = do_lock(db, pkg);
-
		else
-
			retcode = do_unlock(db, pkg);
-

-
		if (retcode != EPKG_OK) {
+
	if (match == MATCH_ALL || argc != 0) {
+
		if ((it = pkgdb_query(db, pkgname, match)) == NULL) {
			exitcode = EX_IOERR;
			goto cleanup;
		}
+

+
		while ((retcode = pkgdb_it_next(it, &pkg, 0)) == EPKG_OK) {
+
			if (action == LOCK)
+
				retcode = do_lock(db, pkg);
+
			else
+
				retcode = do_unlock(db, pkg);
+

+
			if (retcode != EPKG_OK) {
+
				exitcode = EX_IOERR;
+
				goto cleanup;
+
			}
+
		}
	}

	if (show_locked) 
modified src/query.c
@@ -854,7 +854,7 @@ exec_query(int argc, char **argv)
		{ "all",		no_argument,		NULL,	'a' },
		{ "case-sensitive",	no_argument,		NULL,	'C' },
		{ "evaluate",		required_argument,	NULL,	'e' },
-
		{ "read-file",		required_argument,	NULL,	'F' },
+
		{ "file",		required_argument,	NULL,	'F' },
		{ "glob",		no_argument,		NULL,	'g' },
		{ "case-insensitive",	no_argument,		NULL,	'i' },
		{ "regex",		no_argument,		NULL,	'x' },