document recent changes, clean up old pkg_delete options

4 files changed, 55 insertions, 20 deletions

diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 624c260232e..afd334d8524 100644
--- a/usr.sbin/pkg_add/pkg_add
+++ b/usr.sbin/pkg_add/pkg_add
@@ -1,7 +1,7 @@
 #! /usr/bin/perl
 
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_add,v 1.432 2009/12/21 10:38:58 espie Exp $
+# $OpenBSD: pkg_add,v 1.433 2009/12/21 11:03:00 espie Exp $
 #
 # Copyright (c) 2003-2009 Marc Espie <espie@openbsd.org>
 #
@@ -692,7 +692,7 @@ sub install_set
 our ($opt_a, $opt_A, $opt_P, $opt_Q, $opt_r, $opt_u, $opt_U, $opt_l, $opt_z);
 
 handle_options('aqchruUzl:A:P:Q:', {},
-    'pkg_add [-acIinqrUuvxz] [-A arch] [-B pkg-destdir] [-F keywords]',
+    'pkg_add [-acIinqrsUuvxz] [-A arch] [-B pkg-destdir] [-F keywords]',
     '[-L localbase] [-l file] [-P type] [-Q quick-destdir] pkg-name [...]');
 
 local $SIG{'INFO'} = sub { $state->status->print($state); };
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 549b0fd72cc..a49d4f49906 100644
--- a/usr.sbin/pkg_add/pkg_add.1
+++ b/usr.sbin/pkg_add/pkg_add.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_add.1,v 1.88 2009/12/06 07:53:08 jmc Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.89 2009/12/21 11:03:00 espie Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.Dd $Mdocdate: December 6 2009 $
+.Dd $Mdocdate: December 21 2009 $
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -24,7 +24,7 @@
 .Sh SYNOPSIS
 .Nm pkg_add
 .Bk -words
-.Op Fl acIinqrUuvxz
+.Op Fl acIinqrsUuvxz
 .Op Fl A Ar arch
 .Op Fl B Ar pkg-destdir
 .Op Fl F Ar keywords
@@ -342,6 +342,13 @@ use
 .Fl F Ar updatedepends
 to force the replacement
 .Pc .
+.It Fl s
+Don't actually install packages, skip as many steps as needed and report
+only the disk size changes that would happen.
+Similar to
+.Fl n ,
+except it also skips fetching full packages and stops at getting the
+information it needs.
 .It Fl U
 Update dependencies if required before installing the new package(s).
 .It Fl u
@@ -361,6 +368,24 @@ Turn on verbose output.
 Several
 .Fl v
 turn on more verbose output.
+By default,
+.Nm
+is almost completely silent, but it reacts to keyboard status requests
+.Po
+see
+.Xr stty 1
+.Pc .
+.Fl v
+turns on basic messages,
+.Fl vv
+adds relevant system operations,
+.Fl vvv
+shows most internal computations apart from individual file/directory
+additions,
+.Fl vvvv
+also shows dependencies adjustments, and
+.Fl vvvvv
+shows everything.
 .It Fl x
 Disable progress-meter.
 .It Fl z
diff --git a/usr.sbin/pkg_add/pkg_delete b/usr.sbin/pkg_add/pkg_delete
index 8a6ec09bed5..d38e43e1f64 100644
--- a/usr.sbin/pkg_add/pkg_delete
+++ b/usr.sbin/pkg_add/pkg_delete
@@ -1,6 +1,6 @@
 #!/usr/bin/perl
 # ex:ts=8 sw=4:
-# $OpenBSD: pkg_delete,v 1.131 2009/12/21 10:38:58 espie Exp $
+# $OpenBSD: pkg_delete,v 1.132 2009/12/21 11:03:00 espie Exp $
 #
 # Copyright (c) 2003-2007 Marc Espie <espie@openbsd.org>
 #
@@ -39,10 +39,8 @@ use OpenBSD::Delete;
 use OpenBSD::PackageInfo;
 use OpenBSD::UpdateSet;
 
-our ($opt_d, $opt_p, $opt_i);
-
-handle_options('chixDdnqpS:', {},
-    'pkg_delete [-cIinqvx] [-B pkg-destdir] [-F keywords] pkg-name [...]');
+handle_options('chxDnq', {},
+    'pkg_delete [-cIinqsvx] [-B pkg-destdir] [-F keywords] pkg-name [...]');
 
 local $SIG{'INFO'} = sub { $state->status->print($state); };
 $opt_B = $ENV{'PKG_DESTDIR'} unless defined $opt_B;
@@ -52,13 +50,6 @@ if ($opt_B ne '') {
 }
 $ENV{'PKG_DESTDIR'} = $opt_B;
 
-if (defined $opt_p) {
-	Usage "Option p is obsolete";
-}
-if (defined $opt_d) {
-	Usage "Option d is obsolete";
-}
-
 $state->{destdir} = $opt_B;
 if ($opt_B eq '') {
     $state->{destdirname} = '';
diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1
index c5281366610..1ddaf4c4163 100644
--- a/usr.sbin/pkg_add/pkg_delete.1
+++ b/usr.sbin/pkg_add/pkg_delete.1
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: pkg_delete.1,v 1.29 2009/04/14 17:53:58 espie Exp $
+.\"	$OpenBSD: pkg_delete.1,v 1.30 2009/12/21 11:03:00 espie Exp $
 .\"
 .\" Documentation and design originally from FreeBSD. All the code has
 .\" been rewritten since. We keep the documentation's notice:
@@ -15,7 +15,7 @@
 .\" Jordan K. Hubbard
 .\"
 .\"
-.Dd $Mdocdate: April 14 2009 $
+.Dd $Mdocdate: December 21 2009 $
 .Dt PKG_DELETE 1
 .Os
 .Sh NAME
@@ -23,7 +23,7 @@
 .Nd delete software package distributions
 .Sh SYNOPSIS
 .Nm pkg_delete
-.Op Fl cIinqvx
+.Op Fl cIinqsvx
 .Op Fl B Ar pkg-destdir
 .Op Fl F Ar keywords
 .Ar pkg-name Op Ar ...
@@ -96,11 +96,30 @@ files.
 For signed packages, do not bother verifying signatures either.
 If used twice,
 it will not bother with checksums for configuration files either.
+.It Fl s
+Don't actually deinstall packages, report the disk size changes
+that would happen.
 .It Fl v
 Turn on verbose output.
 Several
 .Fl v
 turn on more verbose output.
+By default,
+.Nm
+is almost completely silent, but it reacts to keyboard status requests
+.Po
+see
+.Xr stty 1
+.Pc .
+.Fl v
+turns on basic messages,
+.Fl vv
+adds relevant system operations,
+.Fl vvv
+shows most internal computations apart from individual file/directory
+additions, and
+.Fl vvvvv
+shows everything.
 .It Fl x
 Disable progress-meter.
 .El