diff options
author | Marc Espie <espie@cvs.openbsd.org> | 2010-06-09 10:25:18 +0000 |
---|---|---|
committer | Marc Espie <espie@cvs.openbsd.org> | 2010-06-09 10:25:18 +0000 |
commit | 33bdb057624d6d6e6bdd9a4df593ccf2b48b8581 (patch) | |
tree | 4dda2717dd8355807fb84bd2bce895d29798f4f1 /usr.sbin/pkg_add | |
parent | de104a5ea36410fa94867bf455f03152de85e2d5 (diff) |
uniform spelling: packing-list
Diffstat (limited to 'usr.sbin/pkg_add')
-rw-r--r-- | usr.sbin/pkg_add/OpenBSD/PkgInfo.pm | 6 | ||||
-rw-r--r-- | usr.sbin/pkg_add/pkg_add.1 | 10 | ||||
-rw-r--r-- | usr.sbin/pkg_add/pkg_create.1 | 12 | ||||
-rw-r--r-- | usr.sbin/pkg_add/pkg_info.1 | 8 | ||||
-rw-r--r-- | usr.sbin/pkg_add/pkg_mklocatedb.1 | 6 |
5 files changed, 21 insertions, 21 deletions
diff --git a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm index 00286319579..ae3be9fac24 100644 --- a/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm +++ b/usr.sbin/pkg_add/OpenBSD/PkgInfo.pm @@ -1,6 +1,6 @@ #! /usr/bin/perl # ex:ts=8 sw=4: -# $OpenBSD: PkgInfo.pm,v 1.2 2010/06/09 07:26:01 espie Exp $ +# $OpenBSD: PkgInfo.pm,v 1.3 2010/06/09 10:25:17 espie Exp $ # # Copyright (c) 2003-2010 Marc Espie <espie@openbsd.org> # @@ -348,7 +348,7 @@ sub print_info } else { $plist = $handle->plist(\&OpenBSD::PackingList::FilesOnly); } - $state->fatal("bad packing list for", $handle->url) + $state->fatal("bad packing-list for", $handle->url) unless defined $plist; } if ($opt_L) { @@ -400,7 +400,7 @@ sub print_info if ($opt_f) { just_in_time_header($pkg, $handle ,\$done); - print $opt_l, "Packing list:\n" unless $opt_q; + print $opt_l, "Packing-list:\n" unless $opt_q; $plist->write(\*STDOUT); print "\n"; } diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1 index f7c3b3a4a46..9c9d2894fb3 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.100 2010/06/05 07:11:43 espie Exp $ +.\" $OpenBSD: pkg_add.1,v 1.101 2010/06/09 10:25:17 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: June 5 2010 $ +.Dd $Mdocdate: June 9 2010 $ .Dt PKG_ADD 1 .Os .Sh NAME @@ -450,7 +450,7 @@ For each new package in an updateset, .Nm extracts the package's .Dq packing information -(the packing list, description, and installation/deinstallation scripts) +(the packing-list, description, and installation/deinstallation scripts) into a special staging directory in .Pa /var/tmp (or @@ -483,7 +483,7 @@ and .Cm @wantlib directives; see .Xr pkg_create 1 ) -are read from the packing list. +are read from the packing-list. If any of these dependencies are not currently fulfilled, an attempt is made to find a package that meets them and install it, looking first in the current updateset, then in the list of packages @@ -513,7 +513,7 @@ If the .Ar install script exits with a non-zero status code, the installation is terminated. .It -The packing list is used as a guide for extracting +The packing-list is used as a guide for extracting files from the package into their final locations. .It If an diff --git a/usr.sbin/pkg_add/pkg_create.1 b/usr.sbin/pkg_add/pkg_create.1 index 24eeff3e562..a5ef2641f26 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.62 2010/06/05 07:11:43 espie Exp $ +.\" $OpenBSD: pkg_create.1,v 1.63 2010/06/09 10:25:17 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: June 5 2010 $ +.Dd $Mdocdate: June 9 2010 $ .Dt PKG_CREATE 1 .Os .Sh NAME @@ -142,7 +142,7 @@ or, if preceded by the argument itself. .It Fl f Ar packinglist Fetch -.Dq packing list +.Dq packing-list for package from the file .Ar packinglist . Several packing-lists can be mentioned, in which case they will be @@ -237,9 +237,9 @@ package: .Bd -literal -offset indent pkg_create -f /var/db/pkg/kdelibs-3.4.3/+CONTENTS .Ed -.Sh PACKING LIST DETAILS +.Sh PACKING-LIST DETAILS The -.Dq packing list +.Dq packing-list format (see .Fl f ) is fairly simple, being basically a list of filenames and directory names @@ -265,7 +265,7 @@ Describe the file as an binary executable (not a script). .Pp .It Cm @comment Ar string -Imbed a comment in the packing list. +Imbed a comment in the packing-list. Useful in trying to document some particularly hairy sequence that may trip someone up later. Can also be used to comment out elements that update-plist diff --git a/usr.sbin/pkg_add/pkg_info.1 b/usr.sbin/pkg_add/pkg_info.1 index 1eedf10b59d..d6ca72c7894 100644 --- a/usr.sbin/pkg_add/pkg_info.1 +++ b/usr.sbin/pkg_add/pkg_info.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_info.1,v 1.38 2010/05/10 09:17:55 espie Exp $ +.\" $OpenBSD: pkg_info.1,v 1.39 2010/06/09 10:25:17 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 9 2010 $ .Dt PKG_INFO 1 .Os .Sh NAME @@ -110,7 +110,7 @@ For example, will match any package that was compiled according to .Pa ${PORTSDIR}/x11/kde/base3 . .It Fl f -Show the packing list instructions for each package. +Show the packing-list instructions for each package. .It Fl I Show the index entry for each package. .It Fl K @@ -120,7 +120,7 @@ Always used together with .It Fl L Show the files within each package. This is different from just -viewing the packing list, since full pathnames for everything +viewing the packing-list, since full pathnames for everything are generated. .It Fl l Ar str Prefix each information category header (see diff --git a/usr.sbin/pkg_add/pkg_mklocatedb.1 b/usr.sbin/pkg_add/pkg_mklocatedb.1 index 615b65752fa..a0554948604 100644 --- a/usr.sbin/pkg_add/pkg_mklocatedb.1 +++ b/usr.sbin/pkg_add/pkg_mklocatedb.1 @@ -1,4 +1,4 @@ -.\" $OpenBSD: pkg_mklocatedb.1,v 1.11 2010/05/10 09:17:55 espie Exp $ +.\" $OpenBSD: pkg_mklocatedb.1,v 1.12 2010/06/09 10:25:17 espie Exp $ .\" Copyright (c) 2005-2007 Marc Espie <espie@openbsd.org> .\" .\" Permission to use, copy, modify, and distribute this software for any @@ -13,7 +13,7 @@ .\" 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 9 2010 $ .Dt PKG_MKLOCATEDB 1 .Os .Sh NAME @@ -86,7 +86,7 @@ Do not pipe output to .It Fl P Prepend file names with pkgpath information instead of package name. .It Fl p Ar portsdir -Retrieve packing lists from the ports tree instead of binary packages. +Retrieve packing-lists from the ports tree instead of binary packages. .It Fl q Be quiet: do not report every package processed to standard error. .It Fl r Ar release |