From 3b26c608f8095ab44c601129b2a754848c3b403d Mon Sep 17 00:00:00 2001
From: "David E. O'Brien" <obrien@FreeBSD.org>
Date: Mon, 12 Jun 2006 22:39:32 +0000
Subject: [PATCH] Allow variable amounts of verbosity.

---
 usr.sbin/pkg_install/add/main.c     | 2 +-
 usr.sbin/pkg_install/create/main.c  | 2 +-
 usr.sbin/pkg_install/delete/main.c  | 2 +-
 usr.sbin/pkg_install/info/main.c    | 2 +-
 usr.sbin/pkg_install/lib/global.c   | 2 +-
 usr.sbin/pkg_install/lib/lib.h      | 2 +-
 usr.sbin/pkg_install/version/main.c | 2 +-
 7 files changed, 7 insertions(+), 7 deletions(-)

diff --git a/usr.sbin/pkg_install/add/main.c b/usr.sbin/pkg_install/add/main.c
index 2d6f6ffa174b..1bd1c1c84409 100644
--- a/usr.sbin/pkg_install/add/main.c
+++ b/usr.sbin/pkg_install/add/main.c
@@ -108,7 +108,7 @@ main(int argc, char **argv)
     while ((ch = getopt(argc, argv, Options)) != -1) {
 	switch(ch) {
 	case 'v':
-	    Verbose = TRUE;
+	    Verbose++;
 	    break;
 
 	case 'p':
diff --git a/usr.sbin/pkg_install/create/main.c b/usr.sbin/pkg_install/create/main.c
index a2973d975d03..17fd665dd04c 100644
--- a/usr.sbin/pkg_install/create/main.c
+++ b/usr.sbin/pkg_install/create/main.c
@@ -60,7 +60,7 @@ main(int argc, char **argv)
     while ((ch = getopt(argc, argv, Options)) != -1)
 	switch(ch) {
 	case 'v':
-	    Verbose = TRUE;
+	    Verbose++;
 	    break;
 
 	case 'x':
diff --git a/usr.sbin/pkg_install/delete/main.c b/usr.sbin/pkg_install/delete/main.c
index 3100ae35772b..b81b79a91d92 100644
--- a/usr.sbin/pkg_install/delete/main.c
+++ b/usr.sbin/pkg_install/delete/main.c
@@ -52,7 +52,7 @@ main(int argc, char **argv)
     while ((ch = getopt(argc, argv, Options)) != -1)
 	switch(ch) {
 	case 'v':
-	    Verbose = TRUE;
+	    Verbose++;
 	    break;
 
 	case 'f':
diff --git a/usr.sbin/pkg_install/info/main.c b/usr.sbin/pkg_install/info/main.c
index 76fcaa88e437..90351b238365 100644
--- a/usr.sbin/pkg_install/info/main.c
+++ b/usr.sbin/pkg_install/info/main.c
@@ -69,7 +69,7 @@ main(int argc, char **argv)
 	    break;
 
 	case 'v':
-	    Verbose = TRUE;
+	    Verbose++;
 	    /* Reasonable definition of 'everything' */
 	    Flags = SHOW_COMMENT | SHOW_DESC | SHOW_PLIST | SHOW_INSTALL |
 		SHOW_DEINSTALL | SHOW_REQUIRE | SHOW_DISPLAY | SHOW_MTREE;
diff --git a/usr.sbin/pkg_install/lib/global.c b/usr.sbin/pkg_install/lib/global.c
index 8e94f56eb0c7..e136ec86a6f2 100644
--- a/usr.sbin/pkg_install/lib/global.c
+++ b/usr.sbin/pkg_install/lib/global.c
@@ -26,7 +26,7 @@ __FBSDID("$FreeBSD$");
 
 /* These are global for all utils */
 Boolean	Quiet		= FALSE;
-Boolean	Verbose		= FALSE;
 Boolean	Fake		= FALSE;
 Boolean	Force		= FALSE;
 int AutoAnswer		= FALSE;
+int	Verbose			= 0;		/* Allow multiple levels of verbose. */
diff --git a/usr.sbin/pkg_install/lib/lib.h b/usr.sbin/pkg_install/lib/lib.h
index ad87024b32af..933af380b27e 100644
--- a/usr.sbin/pkg_install/lib/lib.h
+++ b/usr.sbin/pkg_install/lib/lib.h
@@ -230,9 +230,9 @@ int		version_cmp(const char *, const char *);
 
 /* Externs */
 extern Boolean	Quiet;
-extern Boolean	Verbose;
 extern Boolean	Fake;
 extern Boolean  Force;
 extern int	AutoAnswer;
+extern int	Verbose;
 
 #endif /* _INST_LIB_LIB_H_ */
diff --git a/usr.sbin/pkg_install/version/main.c b/usr.sbin/pkg_install/version/main.c
index d56dddfe9704..362bd75af5de 100644
--- a/usr.sbin/pkg_install/version/main.c
+++ b/usr.sbin/pkg_install/version/main.c
@@ -54,7 +54,7 @@ main(int argc, char **argv)
     else while ((ch = getopt(argc, argv, Options)) != -1) {
 	switch(ch) {
 	case 'v':
-	    Verbose = TRUE;
+	    Verbose++;
 	    break;
 
 	case 'I':