summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMarc Espie <espie@cvs.openbsd.org>2010-06-05 07:11:44 +0000
committerMarc Espie <espie@cvs.openbsd.org>2010-06-05 07:11:44 +0000
commit92e510b14471af22aa56205d409226d89d69d754 (patch)
treefc3eb28c5eca6e662ddae0731ec4d3343a20d78a
parent17b1aa71842860dc13e50612f2ce5139ab041ca5 (diff)
document front-end changes
-rw-r--r--usr.sbin/pkg_add/pkg.132
-rw-r--r--usr.sbin/pkg_add/pkg_add.110
-rw-r--r--usr.sbin/pkg_add/pkg_create.110
-rw-r--r--usr.sbin/pkg_add/pkg_delete.110
4 files changed, 43 insertions, 19 deletions
diff --git a/usr.sbin/pkg_add/pkg.1 b/usr.sbin/pkg_add/pkg.1
index 939697fcb63..f603368d4e4 100644
--- a/usr.sbin/pkg_add/pkg.1
+++ b/usr.sbin/pkg_add/pkg.1
@@ -1,6 +1,6 @@
-.\" $OpenBSD: pkg.1,v 1.4 2010/05/10 09:17:54 espie Exp $
+.\" $OpenBSD: pkg.1,v 1.5 2010/06/05 07:11:43 espie Exp $
.\"
-.\" Copyright (c) 2001-2004 Marc Espie <espie@openbsd.org>
+.\" Copyright (c) 2010 Marc Espie <espie@openbsd.org>
.\"
.\" Permission to use, copy, modify, and distribute this software for any
.\" purpose with or without fee is hereby granted, provided that the above
@@ -14,21 +14,33 @@
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
.\"
-.Dd $Mdocdate: May 10 2010 $
+.Dd $Mdocdate: June 5 2010 $
.Dt PKG 1
.Os
.Sh NAME
.Nm pkg
-.Nd replacement-to-be of pkg_* tools
+.Nd front-end to package tools
.Sh DESCRIPTION
.Nm
-is meant to be a replacement of the old pkg_* tools.
-For the time being, it should only be invoked internally by
+is the actual script that starts
.Xr pkg_add 1 ,
-to handle dependencies.
+.Xr pkg_create 1 ,
+.Xr pkg_delete 1 ,
+and
+.Xr pkg_info 1 .
+.Pp
+It can be invoked as a link to those commands, or with
+.Ar add ,
+.Ar create ,
+.Ar delete ,
+.Ar info
+as first argument.
+.Pp
+Refer to the documentation of those commands for further info.
.Sh SEE ALSO
-.Xr pkg_add 1
+.Xr pkg_add 1 ,
+.Xr pkg_create 1 ,
+.Xr pkg_delete 1 ,
+.Xr pkg_info 1
.Sh AUTHORS
This program was written by Marc Espie.
-.Sh BUGS
-This program's design is not even finished yet.
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index f62a672a607..f7c3b3a4a46 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.99 2010/05/10 14:14:08 jmc Exp $
+.\" $OpenBSD: pkg_add.1,v 1.100 2010/06/05 07:11:43 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: May 10 2010 $
+.Dd $Mdocdate: June 5 2010 $
.Dt PKG_ADD 1
.Os
.Sh NAME
@@ -24,7 +24,7 @@
.Sh SYNOPSIS
.Nm pkg_add
.Bk -words
-.Op Fl acIinqrsUuvxz
+.Op Fl acIimnqrsUuvxz
.Op Fl A Ar arch
.Op Fl B Ar pkg-destdir
.Oo Fl D Ar name
@@ -311,6 +311,10 @@ and
will try its best to reproduce the installation, even if the
version numbers don't quite match and even if some packages cannot
be found.
+.It Fl m
+Causes
+.Nm
+to always display the progress meter in cases it would not do so by default.
.It Fl n
Don't actually install a package, just report the steps that
would be taken if it was.
diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1
index 75b94ea7b1a..24eeff3e562 100644
--- a/usr.sbin/pkg_add/pkg_create.1
+++ b/usr.sbin/pkg_add/pkg_create.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: pkg_create.1,v 1.61 2010/05/10 09:17:55 espie Exp $
+.\" $OpenBSD: pkg_create.1,v 1.62 2010/06/05 07:11:43 espie Exp $
.\"
.\" Documentation and design originally from FreeBSD. All the code has
.\" been rewritten since. We keep the documentation's notice:
@@ -21,7 +21,7 @@
.\" [jkh] Took John's changes back and made some additional extensions for
.\" better integration with FreeBSD's new ports collection.
.\"
-.Dd $Mdocdate: May 10 2010 $
+.Dd $Mdocdate: June 5 2010 $
.Dt PKG_CREATE 1
.Os
.Sh NAME
@@ -30,7 +30,7 @@
.Sh SYNOPSIS
.Nm pkg_create
.Bk -words
-.Op Fl nQqvx
+.Op Fl mnQqvx
.Op Fl A Ar arches
.Op Fl B Ar pkg-destdir
.Oo Fl D Ar name
@@ -163,6 +163,10 @@ Display the file (using
after installing the package.
Useful for things like
legal notices on almost-free software, etc.
+.It Fl m
+Causes
+.Nm
+to always display the progress meter in cases it would not do so by default.
.It Fl n
Don't actually create a package.
.It Fl P Ar pkg-dependency
diff --git a/usr.sbin/pkg_add/pkg_delete.1 b/usr.sbin/pkg_add/pkg_delete.1
index 4248ef32edf..ae4f07ce378 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.34 2010/05/10 09:12:18 espie Exp $
+.\" $OpenBSD: pkg_delete.1,v 1.35 2010/06/05 07:11:43 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: May 10 2010 $
+.Dd $Mdocdate: June 5 2010 $
.Dt PKG_DELETE 1
.Os
.Sh NAME
@@ -23,7 +23,7 @@
.Nd delete software package distributions
.Sh SYNOPSIS
.Nm pkg_delete
-.Op Fl cIinqsvx
+.Op Fl cIimnqsvx
.Op Fl B Ar pkg-destdir
.Oo Fl D Ar name
.Ns Oo Ns = Ns Ar value
@@ -93,6 +93,10 @@ If scripts exist for a given package, do not execute them.
Switch on interactive mode.
.Nm
may ask questions to the user if faced with difficult decisions.
+.It Fl m
+Causes
+.Nm
+to always display the progress meter in cases it would not do so by default.
.It Fl n
Don't actually deinstall a package, just report the steps that
would be taken if it were.