diff --git a/add/main.c b/add/main.c index 824cd95..713f140 100644 --- a/add/main.c +++ b/add/main.c @@ -21,14 +21,14 @@ #include __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/add/main.c,v 1.76 2008/02/26 14:35:01 kensmith Exp $"); -#include #include #include +#include +#include + #include "lib.h" #include "add.h" -static char Options[] = "hviIRfFnrp:P:SMt:C:K"; - char *Prefix = NULL; Boolean PrefixRecursive = FALSE; char *Chroot = NULL; @@ -95,6 +95,25 @@ int getosreldate(void); static void usage(void); +static char opts[] = "hviIRfFnrp:P:SMt:C:K"; +static struct option longopts[] = { + { "chroot", required_argument, NULL, 'C' }, + { "dry-run", no_argument, NULL, 'n' }, + { "force", no_argument, NULL, 'f' }, + { "help", no_argument, NULL, 'h' }, + { "keep", no_argument, NULL, 'K' }, + { "master", no_argument, NULL, 'M' }, + { "no-deps", no_argument, NULL, 'i' }, + { "no-record", no_argument, NULL, 'R' }, + { "no-script", no_argument, NULL, 'I' }, + { "prefix", required_argument, NULL, 'p' }, + { "remote", no_argument, NULL, 'r' }, + { "template", required_argument, NULL, 't' }, + { "slave", no_argument, NULL, 'S' }, + { "verbose", no_argument, NULL, 'v' }, + { NULL, 0, NULL, 0 } +}; + int main(int argc, char **argv) { @@ -110,7 +129,7 @@ main(int argc, char **argv) PkgAddCmd = argv[0]; start = argv; - while ((ch = getopt(argc, argv, Options)) != -1) { + while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) { switch(ch) { case 'v': Verbose++; @@ -170,12 +189,12 @@ main(int argc, char **argv) case 'C': Chroot = optarg; break; + case 'i': IgnoreDeps = TRUE; break; case 'h': - case '?': default: usage(); break; diff --git a/add/pkg_add.1 b/add/pkg_add.1 index b496164..a716c17 100644 --- a/add/pkg_add.1 +++ b/add/pkg_add.1 @@ -81,31 +81,31 @@ working directory, .Nm will search them in each directory named by .Ev PKG_PATH . -.It Fl v +.It Fl v , -verbose Turn on verbose output. -.It Fl K +.It Fl K , -keep Keep any downloaded package in .Ev PKGDIR if it is defined or in current directory by default. -.It Fl i +.It Fl i , -no-deps Install the package without fetching and installing dependencies. -.It Fl I +.It Fl I , -no-scripts If any installation scripts (pre-install or post-install) exist for a given package, do not execute them. -.It Fl n +.It Fl n , -dry-run Do not actually install a package, just report the steps that would be taken if it was. -.It Fl R +.It Fl R , -no-record 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 r +.It Fl r , -remote Use the remote fetching feature. This will determine the appropriate objformat and release and then fetch and install the package. -.It Fl f +.It Fl f , -force Force installation to proceed even if prerequisite packages are not installed or the requirements script fails. Although @@ -114,7 +114,7 @@ will still try to find and auto-install missing prerequisite packages, a failure to find one will not be fatal. .It Fl F Already installed packages are not an error. -.It Fl p Ar prefix +.It Fl p , -prefix Ar prefix Set .Ar prefix as the directory in which to extract files from a package. @@ -162,7 +162,7 @@ flag on the command line, it overrides its effect, causing to use the given .Ar prefix recursively. -.It Fl t Ar template +.It Fl t , -template Ar template Use .Ar template as the input to @@ -185,7 +185,7 @@ You can get a performance boost by setting the staging area to reside on the same disk partition as target directories for package file installation; often this is .Pa /usr . -.It Fl M +.It Fl M , -master Run in .Cm MASTER mode. @@ -207,7 +207,7 @@ 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 +.It Fl S , -slave Run in .Cm SLAVE mode. @@ -223,7 +223,7 @@ 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 C Ar chrootdir +.It Fl C , -chroot Ar chrootdir Before doing any operations, .Xr chroot 2 to the diff --git a/create/create.h b/create/create.h index 5efff14..e0dc7ef 100644 --- a/create/create.h +++ b/create/create.h @@ -1,4 +1,4 @@ -/* $FreeBSD: src/usr.sbin/pkg_install/create/create.h,v 1.27 2008/05/27 05:10:54 keramida Exp $ */ +/* $FreeBSD: src/usr.sbin/pkg_install/create/create.h,v 1.26 2005/11/08 20:48:26 krion Exp $ */ /* * FreeBSD install - a package for the installation and maintainance @@ -46,7 +46,6 @@ extern char PlayPen[]; extern int Dereference; extern int PlistOnly; extern int Recursive; -extern int Regenerate; enum zipper {NONE, GZIP, BZIP, BZIP2 }; extern enum zipper Zipper; diff --git a/create/main.c b/create/main.c index 09a8070..f5ef34c 100644 --- a/create/main.c +++ b/create/main.c @@ -10,14 +10,14 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/main.c,v 1.43 2008/05/27 19:06:45 keramida Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/main.c,v 1.41 2007/11/07 10:53:36 kevlo Exp $"); +#include #include + #include "lib.h" #include "create.h" -static char Options[] = "EGYNnORhjvxyzf:p:P:C:c:d:i:I:k:K:r:t:X:D:m:s:S:o:b:"; - match_t MatchType = MATCH_GLOB; char *Prefix = NULL; char *Comment = NULL; @@ -41,7 +41,7 @@ char PlayPen[FILENAME_MAX]; int Dereference = FALSE; int PlistOnly = FALSE; int Recursive = FALSE; -int Regenerate = TRUE; +int Help = FALSE; #if defined(__FreeBSD_version) && __FreeBSD_version >= 500039 enum zipper Zipper = BZIP2; #else @@ -51,6 +51,24 @@ enum zipper Zipper = GZIP; static void usage(void); +static char opts[] = "EGYNORhjvxyzf:p:P:C:c:d:i:I:k:K:r:t:X:D:m:s:S:o:b:"; +static struct option longopts[] = { + { "backup", required_argument, NULL, 'b' }, + { "extended", no_argument, NULL, 'E' }, + { "help", no_argument, &Help, TRUE }, + { "no", no_argument, NULL, 'N' }, + { "no-glob", no_argument, NULL, 'G' }, + { "origin", required_argument, NULL, 'o' }, + { "plist-only", no_argument, NULL, 'O' }, + { "prefix", required_argument, NULL, 'p' }, + { "recursive", no_argument, NULL, 'R' }, + { "regex", no_argument, NULL, 'x' }, + { "template", required_argument, NULL, 't' }, + { "verbose", no_argument, NULL, 'v' }, + { "yes", no_argument, NULL, 'Y' }, + { NULL, 0, NULL, 0 }, +}; + int main(int argc, char **argv) { @@ -58,7 +76,7 @@ main(int argc, char **argv) char **pkgs, **start, *tmp; pkgs = start = argv; - while ((ch = getopt(argc, argv, Options)) != -1) + while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) switch(ch) { case 'v': Verbose++; @@ -193,11 +211,11 @@ main(int argc, char **argv) Recursive = TRUE; break; - case 'n': - Regenerate = FALSE; - break; + case 0: + if (Help) + usage(); + break; - case '?': default: usage(); break; @@ -233,12 +251,12 @@ static void usage() { fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n%s\n", -"usage: pkg_create [-YNOhjnvyz] [-C conflicts] [-P pkgs] [-p prefix]", +"usage: pkg_create [-YNOhjvyz] [-C conflicts] [-P pkgs] [-p prefix]", " [-i iscript] [-I piscript] [-k dscript] [-K pdscript]", " [-r rscript] [-s srcdir] [-S basedir]", " [-t template] [-X excludefile]", " [-D displayfile] [-m mtreefile] [-o originpath]", " -c comment -d description -f packlist pkg-filename", -" pkg_create [-EGYNRhnvxy] -b pkg-name [pkg-filename]"); +" pkg_create [-EGYNRhvxy] -b pkg-name [pkg-filename]"); exit(1); } diff --git a/create/perform.c b/create/perform.c index 8a7ff84..44ee887 100644 --- a/create/perform.c +++ b/create/perform.c @@ -19,7 +19,7 @@ */ #include -__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.83 2008/05/27 05:10:54 keramida Exp $"); +__FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.82 2006/01/07 22:10:57 krion Exp $"); #include "lib.h" #include "create.h" @@ -28,8 +28,6 @@ __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/create/perform.c,v 1.83 2008/05/27 #include #include #include -#include -#include #include #include #include @@ -338,7 +336,6 @@ pkg_perform(char **pkgs) static void make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist) { - struct stat sb; char tball[FILENAME_MAX]; PackingList p; int ret; @@ -358,16 +355,6 @@ make_dist(const char *homedir, const char *pkg, const char *suff, Package *plist else snprintf(tball, FILENAME_MAX, "%s/%s.%s", homedir, pkg, suff); - /* - * If the package tarball exists already, and we are running in `no - * clobber' mode, skip this package. - */ - if (stat(tball, &sb) == 0 && Regenerate == FALSE) { - if (Verbose) - printf("Skipping package '%s'. It already exists.\n", tball); - return; - } - args[nargs++] = "-c"; args[nargs++] = "-f"; args[nargs++] = tball; diff --git a/create/pkg_create.1 b/create/pkg_create.1 index 5e8a7be..a6b6dfa 100644 --- a/create/pkg_create.1 +++ b/create/pkg_create.1 @@ -15,7 +15,7 @@ .\" .\" .\" @(#)pkg_create.1 -.\" $FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.73 2008/05/27 05:10:54 keramida Exp $ +.\" $FreeBSD: src/usr.sbin/pkg_install/create/pkg_create.1,v 1.72 2007/12/09 11:01:57 krion Exp $ .\" .\" hacked up by John Kohl for NetBSD--fixed a few bugs, extended keywords, .\" added dependency tracking, etc. @@ -23,7 +23,7 @@ .\" [jkh] Took John's changes back and made some additional extensions for .\" better integration with FreeBSD's new ports collection. .\" -.Dd May 27, 2008 +.Dd November 8, 2005 .Dt PKG_CREATE 1 .Os .Sh NAME @@ -31,7 +31,7 @@ .Nd a utility for creating software package distributions .Sh SYNOPSIS .Nm -.Op Fl YNOhjnvyz +.Op Fl YNOhjvyz .Op Fl C Ar conflicts .Op Fl P Ar pkgs .Op Fl p Ar prefix @@ -52,7 +52,7 @@ .Fl f Ar packlist .Ar pkg-filename .Nm -.Op Fl EGYNRhnvxy +.Op Fl EGYNRhvxy .Fl b Ar pkg-name .Op Ar pkg-filename .Sh DESCRIPTION @@ -103,11 +103,11 @@ Fetch long description for package from file or, if preceded by .Cm - , the argument itself. -.It Fl Y +.It Fl Y , -yes Assume a default answer of `Yes' for any questions asked. -.It Fl N +.It Fl N , -no Assume a default answer of `No' for any questions asked. -.It Fl O +.It Fl O , -plist-only Go into a `packing list Only' mode. This is a custom hack for the .Fx @@ -115,7 +115,7 @@ This is a custom hack for the and is used to do `fake pkg_add' operations when a port is installed. In such cases, it is necessary to know what the final, adjusted packing list will look like. -.It Fl v +.It Fl v , -verbose Turn on verbose output. .It Fl h Force tar to follow symbolic links, so that the files they point to @@ -179,7 +179,7 @@ recorded into the packing list along with the using .Cm @comment directive. -.It Fl p Ar prefix +.It Fl p , -prefix Ar prefix Set .Ar prefix as the initial directory @@ -243,7 +243,7 @@ during package creation. will be prefixed to all .Cm @cwd during package creation. -.It Fl t Ar template +.It Fl t , -template Ar template Use .Ar template as the input to @@ -296,7 +296,7 @@ where is the name of the first directory named by a .Cm @cwd directive. -.It Fl o Ar originpath +.It Fl o , -origin Ar originpath Record an .Ar originpath , as location of the port from which package has been created in the @@ -325,7 +325,7 @@ Compatibility synonym for Use .Xr gzip 1 utility to compress package tarball. -.It Fl b Ar pkg-name +.It Fl b , -backup Ar pkg-name Create package file from a locally installed package named .Ar pkg-name . If the @@ -334,40 +334,22 @@ is not specified, then resulting archive will be created in the current directory and named .Ar pkg-name with an appropriate extraction suffix applied. -.It Fl R +.It Fl R , -recursive When creating package file from a locally installed package also create package files for all packages required by .Ar pkg-name . Resulting archive(s) will be created in the current directory and named using name of the respective package with appropriate extraction suffix applied. -.It Fl x +.It Fl x , -regex Use basic regular expressions for .Ar pkg-name . -.It Fl E +.It Fl E , -extended Use extended (modern) regular expressions for .Ar pkg-name . -.It Fl G +.It Fl G , -no-glob Use exact matching for .Ar pkg-name . -.It Fl n -Run in -.Dq no clobber -mode. -If a package tarball exists, the -.Nm -utility will not overwrite it. -This is useful, for example, when multiple packages are saved with -several consecutive runs of -.Nm -with the -.Fl Rb -options. -Saving common dependencies multiple times would do a lot of duplicate -work in this case. -The -.Fl n -option avoids repackaging common dependencies multiple times. .El .Sh PACKING LIST DETAILS The diff --git a/delete/main.c b/delete/main.c index 29e6c41..4b3651c 100644 --- a/delete/main.c +++ b/delete/main.c @@ -24,12 +24,12 @@ __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/delete/main.c,v 1.29 2007/11/07 10: #include #include +#include #include + #include "lib.h" #include "delete.h" -static char Options[] = "adDfGhinp:rvxX"; - char *Prefix = NULL; Boolean CleanDirs = FALSE; Boolean Interactive = FALSE; @@ -39,6 +39,25 @@ match_t MatchType = MATCH_GLOB; static void usage(void); +static char opts[] = "adDfGhinp:rvxX"; +static struct option longopts[] = { + { "all", no_argument, NULL, 'a' }, + { "clean-dirs", no_argument, NULL, 'd' }, + { "dry-run", no_argument, NULL, 'n' }, + { "extended", no_argument, NULL, 'X' }, + { "force", no_argument, NULL, 'f' }, + { "help", no_argument, NULL, 'h' }, + { "interactive",no_argument, NULL, 'i' }, + { "prefix", required_argument, NULL, 'p' }, + { "recursive", no_argument, NULL, 'r' }, + { "regex", no_argument, NULL, 'x' }, + { "no-glob", no_argument, NULL, 'G' }, + { "no-script", no_argument, NULL, 'D' }, + { "no-scripts", no_argument, NULL, 'D' }, + { "verbose", no_argument, NULL, 'v' }, + { NULL, 0, NULL, 0 }, +}; + int main(int argc, char **argv) { @@ -49,7 +68,7 @@ main(int argc, char **argv) struct stat stat_s; pkgs = start = argv; - while ((ch = getopt(argc, argv, Options)) != -1) + while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) switch(ch) { case 'v': Verbose++; @@ -101,7 +120,6 @@ main(int argc, char **argv) break; case 'h': - case '?': default: usage(); break; diff --git a/delete/pkg_delete.1 b/delete/pkg_delete.1 index 415e91b..fda2035 100644 --- a/delete/pkg_delete.1 +++ b/delete/pkg_delete.1 @@ -72,20 +72,20 @@ The following command line options are supported: .Bl -tag -width indent .It Ar pkg-name ... The named packages are deinstalled. -.It Fl a +.It Fl a , -all Unconditionally delete all currently installed packages. -.It Fl i +.It Fl i , -interactive Request confirmation before attempting to delete each package, regardless whether or not the standard input device is a terminal. -.It Fl v +.It Fl v , -verbose Turn on verbose output. -.It Fl D +.It Fl D , -no-script , -no-scripts If a deinstallation script exists for a given package, do not execute it. -.It Fl n +.It Fl n , -dry-run Do not actually deinstall a package, just report the steps that would be taken if it were. -.It Fl p Ar prefix +.It Fl p , -prefix Ar prefix Set .Ar prefix as the directory in which to delete files from any installed packages @@ -93,7 +93,7 @@ which do not explicitly set theirs. For most packages, the prefix will be set automatically to the installed location by .Xr pkg_add 1 . -.It Fl d +.It Fl d , -clean-dirs Remove empty directories created by file cleanup. By default, only files/directories explicitly listed in a package's contents (either as @@ -104,17 +104,17 @@ This option tells .Nm to also remove any directories that were emptied as a result of removing the package. -.It Fl f +.It Fl f , -force Force removal of the package, even if a dependency is recorded or the deinstall or require script fails. -.It Fl G +.It Fl G , -no-glob Do not try to expand shell glob patterns in the .Ar pkg-name when selecting packages to be deleted (by default .Nm automatically expands shell glob patterns in the .Ar pkg-name ) . -.It Fl x +.It Fl x , -regex Treat the .Ar pkg-name as a regular expression and delete all packages whose names match @@ -124,13 +124,13 @@ provided, in that case .Nm deletes all packages that match at least one regular expression from the list. -.It Fl X +.It Fl X , -extended Like .Fl x , but treats the .Ar pkg-name as an extended regular expression. -.It Fl r +.It Fl r , -recursive Recursive removal. In addition to specified packages, delete all packages that depend on those packages as well. diff --git a/info/main.c b/info/main.c index 3971533..0f03a4c 100644 --- a/info/main.c +++ b/info/main.c @@ -22,11 +22,11 @@ #include __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/info/main.c,v 1.52 2008/04/16 13:05:35 flz Exp $"); -#include "lib.h" -#include "info.h" +#include #include -static char Options[] = "abcdDe:EfgGhiIjkKl:LmoO:pPqQrRst:vVW:xX"; +#include "lib.h" +#include "info.h" int Flags = 0; match_t MatchType = MATCH_GLOB; @@ -41,6 +41,17 @@ struct which_head *whead; static void usage(void); +static char opts[] = "abcdDe:EfgGhiIjkKl:LmoO:pPqQrRst:vVW:xX"; +static struct option longopts[] = { + { "all", no_argument, NULL, 'a' }, + { "blocksize", no_argument, NULL, 'b' }, + { "help", no_argument, NULL, 'h' }, + { "quiet", no_argument, NULL, 'q' }, + { "template", required_argument, NULL, 't' }, + { "verbose", no_argument, NULL, 'v' }, + { "version", no_argument, NULL, 'P' }, +}; + int main(int argc, char **argv) { @@ -58,7 +69,7 @@ main(int argc, char **argv) MatchType = MATCH_ALL; Flags = SHOW_INDEX; } - else while ((ch = getopt(argc, argv, Options)) != -1) { + else while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) { switch(ch) { case 'a': MatchType = MATCH_ALL; @@ -209,7 +220,6 @@ main(int argc, char **argv) break; case 'h': - case '?': default: usage(); break; diff --git a/updating/main.c b/updating/main.c index a3692fa..53238a4 100644 --- a/updating/main.c +++ b/updating/main.c @@ -13,6 +13,7 @@ __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/updating/main.c,v 1.2 2007/11/10 10 #include #include #include +#include #include "lib.h" #include "pathnames.h" @@ -24,6 +25,14 @@ typedef struct installedport { int usage(void); +static char opts[] = "d:f:h"; +static struct option longopts[] = { + { "date", required_argument, NULL, 'd' }, + { "file", required_argument, NULL, 'f' }, + { "help", no_argument, NULL, 'h' }, + { NULL, 0, NULL, 0 }, +}; + /* * Parse /usr/port/UPDATING for corresponding entries. If no argument is * passed to pkg_updating all entries for all installed ports are displayed. @@ -74,7 +83,7 @@ main(int argc, char *argv[]) DIR *dir; FILE *fd; - while ((ch = getopt(argc, argv, "f:d:")) != -1) { + while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) { switch (ch) { case 'd': dflag = 1; @@ -83,7 +92,7 @@ main(int argc, char *argv[]) case 'f': updatingfile = optarg; break; - case '?': + case 'h': default: usage(); } @@ -247,7 +256,7 @@ int usage(void) { fprintf(stderr, - "usage: pkg_updating [-d YYYYMMDD] [-f file] [portname ...]\n"); + "usage: pkg_updating [-h] [-d YYYYMMDD] [-f file] [portname ...]\n"); exit(EX_USAGE); } diff --git a/updating/pkg_updating.1 b/updating/pkg_updating.1 index 7e5ac82..0fa4961 100644 --- a/updating/pkg_updating.1 +++ b/updating/pkg_updating.1 @@ -18,6 +18,7 @@ .Nd a utility for displaying UPDATING entries of software packages .Sh SYNOPSIS .Nm +.Op Fl h .Op Fl d Ar date .Op Fl f Ar file .Op Ar pkg-name ... @@ -32,10 +33,15 @@ The following command line options are supported: .Bl -tag -width indent .It Ar pkg-name ... UPDATING entries for the named packages are displayed. -.It Fl d Ar date -Only entries newer than this date are shown. Use a YYYYMMDD date format. -.It Fl f Ar UPDATING file -Defines a alternative location of the UPDATING file. +.It Fl d , -date Ar date +Only entries newer than +.Ar date +are shown. Use a YYYYMMDD date format. +.It Fl f , -file Ar file +Defines a alternative location of the UPDATING +.Ar file . +.It Fl h , -help +Print help message. .El .Sh EXAMPLES .Bl -tag -width indent diff --git a/version/main.c b/version/main.c index 58f3fa6..98182ba 100644 --- a/version/main.c +++ b/version/main.c @@ -21,11 +21,12 @@ #include __FBSDID("$FreeBSD: src/usr.sbin/pkg_install/version/main.c,v 1.8 2007/11/07 10:53:37 kevlo Exp $"); -#include "lib.h" -#include "version.h" + +#include #include -static char Options[] = "dIhl:L:qs:XtTO:ov"; +#include "lib.h" +#include "version.h" char *LimitChars = NULL; char *PreventChars = NULL; @@ -37,6 +38,21 @@ Boolean ShowOrigin = FALSE; static void usage(void); +static char opts[] = "dIhl:L:qs:XtTO:ov"; +static struct option longopts[] = { + { "extended", no_argument, NULL, 'X' }, + { "help", no_argument, NULL, 'h' }, + { "match", required_argument, NULL, 's' }, + { "no-status", required_argument, NULL, 'L' }, + { "origin", required_argument, NULL, 'O' }, + { "quiet", no_argument, NULL, 'q' }, + { "show-origin",no_argument, NULL, 'o' }, + { "status", required_argument, NULL, 'l' }, + { "use-index", no_argument, NULL, 'I' }, + { "verbose", no_argument, NULL, 'v' }, + { NULL, 0, NULL, 0 } +}; + int main(int argc, char **argv) { @@ -51,7 +67,7 @@ main(int argc, char **argv) cmp = version_match(argv[3], argv[2]); exit(cmp == 1 ? 0 : 1); } - else while ((ch = getopt(argc, argv, Options)) != -1) { + else while ((ch = getopt_long(argc, argv, opts, longopts, NULL)) != -1) { switch(ch) { case 'v': Verbose++; @@ -98,7 +114,6 @@ main(int argc, char **argv) break; case 'h': - case '?': default: usage(); break; diff --git a/version/pkg_version.1 b/version/pkg_version.1 index 2d0d6c5..eb7f74f 100644 --- a/version/pkg_version.1 +++ b/version/pkg_version.1 @@ -118,14 +118,14 @@ The .Nm utility supports several command-line arguments: .Bl -tag -width indent -.It Fl h +.It Fl h , -help Print help message. -.It Fl I +.It Fl I , -use-index Use only the index file for determining if a package is out of date. This is much faster than using the version number from a port's Makefile, at the expense of potentially giving an incorrect result if the index file is out of date. -.It Fl l +.It Fl l , -status Ar limchar Limit the output to those packages whose status flag matches the character(s) in .Ar limchar . @@ -135,7 +135,7 @@ Note that because some of the status flag characters are also special to the shell, it is best to quote .Ar limchar with single quotes. -.It Fl L +.It Fl L , -no-status Ar limchar Limit the output to those packages whose status flag does not match .Ar limchar . You may specify more than one character to match in @@ -144,13 +144,13 @@ Note that because some of the status flag characters are also special to the shell, it is best to quote .Ar limchar with single quotes. -.It Fl o +.It Fl o , -show-origin Show the origin recorded on package generation instead of the package name. -.It Fl O +.It Fl O , -origin Ar origin Only list packages whose registered origin is .Ar origin . -.It Fl q +.It Fl q , -quiet Enable quiet output. Quiet output precludes printing the .Ar limchar @@ -160,10 +160,10 @@ or .Fl L . This is useful when used as the input to .Xr portupgrade 8 . -.It Fl s +.It Fl s , -match Ar string Limit the output to those packages whose names match a given .Ar string . -.It Fl X +.It Fl X , -extended Interpret .Ar string as a extended regular expression.