summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorJason McIntyre <jmc@cvs.openbsd.org>2005-09-07 09:11:23 +0000
committerJason McIntyre <jmc@cvs.openbsd.org>2005-09-07 09:11:23 +0000
commit389172160e6dd6f165b7e66ce6920109a1fd8dcd (patch)
treedc583724e0dce287e5a17dc4b8d3244c9e786c6b
parente0c1ee12f325a473f21a741cdea1ee35acfddf1a (diff)
sort options, and sync usage();
-rw-r--r--usr.sbin/pkg_add/pkg_add6
-rw-r--r--usr.sbin/pkg_add/pkg_add.18
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index d2051cdc599..06b18655d14 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.199 2005/09/05 11:41:03 espie Exp $
+# $OpenBSD: pkg_add,v 1.200 2005/09/07 09:11:22 jmc Exp $
#
# Copyright (c) 2003-2004 Marc Espie <espie@openbsd.org>
#
@@ -756,8 +756,8 @@ sub reorder
}
}
-set_usage('pkg_add [-aciInqrvvx] [-A arch] [-B pkg-destdir] [-F keywords]',
-'[-L localbase] [-P type] [-Q quick-destdir] pkgname [...]');
+set_usage('pkg_add [-acIinqruvx] [-A arch] [-B pkg-destdir] [-F keywords]',
+'[-L localbase] [-P type] [-Q quick-destdir] pkg-name [...]');
our ($opt_a, $opt_v, $opt_n, $opt_I, $opt_L, $opt_B, $opt_A, $opt_P, $opt_Q, $opt_x, $opt_r, $opt_q, $opt_c, $opt_i, $opt_u);
$opt_v = 0;
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 260aaa3deae..f820c282554 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.47 2005/09/04 22:47:56 espie Exp $
+.\" $OpenBSD: pkg_add.1,v 1.48 2005/09/07 09:11:22 jmc Exp $
.\"
.\" FreeBSD install - a package for the installation and maintenance
.\" of non-core utilities.
@@ -26,7 +26,7 @@
.Sh SYNOPSIS
.Nm pkg_add
.Bk -words
-.Op Fl aciInqruvx
+.Op Fl acIinqruvx
.Op Fl A Ar arch
.Op Fl B Ar pkg-destdir
.Op Fl F Ar keywords
@@ -175,12 +175,12 @@ unsafe update: old packing-list will run scripts that may fail.
.It Ar updatedepends
force update even if forward dependencies no longer match.
.El
+.It Fl I
+If scripts exist for a given package, do not execute them.
.It Fl i
Switch on interactive mode.
.Nm
may ask questions to the user if faced with difficult decisions.
-.It Fl I
-If scripts exist for a given package, do not execute them.
.It Fl L Ar localbase
Install a package under
.Ar localbase .