summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2009-12-06 07:53:07 +0000
committerjmc <jmc@openbsd.org>2009-12-06 07:53:07 +0000
commit3fa466a121aa93134a58b710397d36a68d26d1f9 (patch)
treeb9d60ecf63e3f313f39733f4124f9228264056b2
parentconsistently refer to the softc pointer as sc, not sd. (diff)
downloadwireguard-openbsd-3fa466a121aa93134a58b710397d36a68d26d1f9.tar.xz
wireguard-openbsd-3fa466a121aa93134a58b710397d36a68d26d1f9.zip
-U before -u;
-rw-r--r--usr.sbin/pkg_add/pkg_add4
-rw-r--r--usr.sbin/pkg_add/pkg_add.110
2 files changed, 7 insertions, 7 deletions
diff --git a/usr.sbin/pkg_add/pkg_add b/usr.sbin/pkg_add/pkg_add
index 05fde5c6a94..fd4f6a2a64d 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.417 2009/12/05 23:13:01 espie Exp $
+# $OpenBSD: pkg_add,v 1.418 2009/12/06 07:53:07 jmc Exp $
#
# Copyright (c) 2003-2009 Marc Espie <espie@openbsd.org>
#
@@ -627,7 +627,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 [-acIinqrUuvxz] [-A arch] [-B pkg-destdir] [-F keywords]',
'[-L localbase] [-l file] [-P type] [-Q quick-destdir] pkg-name [...]');
$state->{do_faked} = 0;
diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index fd391d0cb1e..549b0fd72cc 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.87 2009/12/05 23:13:01 espie Exp $
+.\" $OpenBSD: pkg_add.1,v 1.88 2009/12/06 07:53:08 jmc 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 5 2009 $
+.Dd $Mdocdate: December 6 2009 $
.Dt PKG_ADD 1
.Os
.Sh NAME
@@ -24,7 +24,7 @@
.Sh SYNOPSIS
.Nm pkg_add
.Bk -words
-.Op Fl acIinqruUvxz
+.Op Fl acIinqrUuvxz
.Op Fl A Ar arch
.Op Fl B Ar pkg-destdir
.Op Fl F Ar keywords
@@ -342,6 +342,8 @@ use
.Fl F Ar updatedepends
to force the replacement
.Pc .
+.It Fl U
+Update dependencies if required before installing the new package(s).
.It Fl u
Update the given
.Ar pkgname(s) ,
@@ -354,8 +356,6 @@ will update all installed packages.
This relies on
.Ev PKG_PATH
to figure out the new package names.
-.It Fl U
-Update dependencies if required before installing the new package(s).
.It Fl v
Turn on verbose output.
Several