Update usage() - sync with manpage, add missing options, etc.

4 files changed, 23 insertions, 21 deletions

diff --git a/pkgtools/pkg_install/files/add/main.c b/pkgtools/pkg_install/files/add/main.c
index f24a4db02f7..b1d782497cd 100644
--- a/pkgtools/pkg_install/files/add/main.c
+++ b/pkgtools/pkg_install/files/add/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.9 2005/11/05 13:20:09 wiz Exp $	*/
+/*	$NetBSD: main.c,v 1.10 2006/06/27 23:36:13 hubertf Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.16 1997/10/08 07:45:43 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.9 2005/11/05 13:20:09 wiz Exp $");
+__RCSID("$NetBSD: main.c,v 1.10 2006/06/27 23:36:13 hubertf Exp $");
 #endif
 #endif
 
@@ -72,9 +72,9 @@ static void
 usage(void)
 {
 	(void) fprintf(stderr, "%s\n%s\n%s\n",
-	    "usage: pkg_add [-AfhILMnRSuVv] [-p prefix] [-s verification-type]",
-	    "               [-t template] [-W viewbase] [-w view]",
-	    "               pkg-name [pkg-name ...]");
+	    "usage: pkg_add [-AfhILMnRSuVv] [-K pkg_dbdir] [-p prefix]",
+	    "               [-s verification-type] [-t template] [-W viewbase] [-w view]",
+	    "               [[ftp|http]://[user[:password]@]host[:port]][/path/]pkg-name ...");
 	exit(1);
 }
 
diff --git a/pkgtools/pkg_install/files/create/main.c b/pkgtools/pkg_install/files/create/main.c
index 5f71f7f25f4..809d2a94fb6 100644
--- a/pkgtools/pkg_install/files/create/main.c
+++ b/pkgtools/pkg_install/files/create/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.6 2004/12/29 12:16:56 agc Exp $	*/
+/*	$NetBSD: main.c,v 1.7 2006/06/27 23:36:13 hubertf Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static const char *rcsid = "from FreeBSD Id: main.c,v 1.17 1997/10/08 07:46:23 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.6 2004/12/29 12:16:56 agc Exp $");
+__RCSID("$NetBSD: main.c,v 1.7 2006/06/27 23:36:13 hubertf Exp $");
 #endif
 #endif
 
@@ -66,13 +66,14 @@ Boolean File2Pkg = FALSE;
 static void
 usage(void)
 {
-	fprintf(stderr, "%s\n%s\n%s\n%s\n%s\n%s\n",
-	    "usage: pkg_create [-ORUEhlVv] [-P dpkgs] [-C cpkgs] [-p prefix] [-f contents]",
-	    "                  [-i iscript] [-k dscript] [-r rscript] [-t template]",
-	    "                  [-X excludefile] [-D displayfile] [-m mtreefile]",
-	    "                  [-b build-version-file] [-B build-info-file]",
-	    "                  [-I realprefix]",
-	    "                  -c comment -d description -f packlist pkg-name");
+	fprintf(stderr,
+	    "usage: pkg_create [-EhlORUVv] [-B build-info-file] [-b build-version-file]\n"
+            "                  [-C cpkgs] [-D displayfile] [-I realprefix] [-i iscript]\n"
+            "                  [-K pkg_dbdir] [-k dscript] [-L SrcDir] [-m mtreefile]\n"
+            "                  [-n preserve-file] [-P dpkgs] [-p prefix] [-r rscript]\n"
+            "                  [-S size-all-file] [-s size-pkg-file] [-t template]\n"
+            "                  [-X excludefile] -c comment -d description -f packlist\n"
+            "                  pkg-name\n");
 	exit(1);
 }
 
diff --git a/pkgtools/pkg_install/files/info/main.c b/pkgtools/pkg_install/files/info/main.c
index 1322b40e90a..cbcaf68c0c7 100644
--- a/pkgtools/pkg_install/files/info/main.c
+++ b/pkgtools/pkg_install/files/info/main.c
@@ -1,4 +1,4 @@
-/*	$NetBSD: main.c,v 1.15 2006/04/24 13:52:04 dillo Exp $	*/
+/*	$NetBSD: main.c,v 1.16 2006/06/27 23:36:14 hubertf Exp $	*/
 
 #if HAVE_CONFIG_H
 #include "config.h"
@@ -11,7 +11,7 @@
 #if 0
 static char *rcsid = "from FreeBSD Id: main.c,v 1.14 1997/10/08 07:47:26 charnier Exp";
 #else
-__RCSID("$NetBSD: main.c,v 1.15 2006/04/24 13:52:04 dillo Exp $");
+__RCSID("$NetBSD: main.c,v 1.16 2006/06/27 23:36:14 hubertf Exp $");
 #endif
 #endif
 
@@ -68,10 +68,10 @@ static void
 usage(void)
 {
 	fprintf(stderr, "%s\n%s\n%s\n%s\n",
-	    "usage: pkg_info [-BbcDdFfhIikLmNnpqRrSsVvX] [-e package] [-K pkg_dbdir] [-l prefix]",
-	    "                pkg-name [...]",
+	    "usage: pkg_info [-BbcDdFfhIikLmNnpqRrSsVvX] [-e package] [-K pkg_dbdir]",
+	    "                [-l prefix] pkg-name ...",
 	    "       pkg_info [-a | -u] [flags]",
-	    "       pkg_info -Q variable pkg-name [pkg-name ...]");
+	    "       pkg_info [-Q variable] pkg-name ...");
 	exit(1);
 }
 
diff --git a/pkgtools/pkg_install/files/view/pkg_view.sh.in b/pkgtools/pkg_install/files/view/pkg_view.sh.in
index 96b69e16884..2d05b717074 100644
--- a/pkgtools/pkg_install/files/view/pkg_view.sh.in
+++ b/pkgtools/pkg_install/files/view/pkg_view.sh.in
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# $NetBSD: pkg_view.sh.in,v 1.6 2004/08/20 20:09:53 jlam Exp $
+# $NetBSD: pkg_view.sh.in,v 1.7 2006/06/27 23:36:14 hubertf Exp $
 
 #
 # Copyright (c) 2001 Alistair G. Crooks.  All rights reserved.
@@ -57,7 +57,8 @@ sedprog="@SED@"
 touchprog="@TOUCH@"
 
 usage() {
-	echo 'Usage: pkg_view [-n] [-v] [-i ignore] [-k pkg_dbdir_dflt] [-w viewname] [-d stowdir] [-W viewbase] add|check|delete pkgname...'
+	echo 'Usage: pkg_view [-nVv] [-d stowdir] [-i ignore] [-k pkg_dbdir] [-W viewbase]'
+	echo '                [-w viewname] add|check|delete pkgname...'
 	exit 1
 }