document tweaked checksum behavior, reorder environment, remove old cruft.

1 files changed, 16 insertions, 26 deletions

diff --git a/usr.sbin/pkg_add/pkg_add.1 b/usr.sbin/pkg_add/pkg_add.1
index 6473e2df8f7..f642a0c59aa 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.144 2017/03/11 17:34:40 schwarze Exp $
+.\"	$OpenBSD: pkg_add.1,v 1.145 2017/03/25 19:53:33 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: March 11 2017 $
+.Dd $Mdocdate: March 25 2017 $
 .Dt PKG_ADD 1
 .Os
 .Sh NAME
@@ -117,7 +117,7 @@ enforces signed packages, except if they come from a trusted source
 .Ev TRUSTED_PKG_PATH
 .Pc
 or if
-.Fl D Ar unsigned
+.Fl D Ns Ar unsigned
 is specified.
 .Pp
 In normal mode,
@@ -313,18 +313,20 @@ Recognized keywords include:
 Do not trim older p* variants of packages for updates.
 .It Ar arch
 Architecture recorded in package may not match.
+.It Ar checksum
+Verify checksums before deleting or tieing old files.
 .It Ar dontmerge
 By default, if dependencies are too strict,
 .Nm
 will merge updates together to make sure everything stays in sync.
-.Fl D Ar dontmerge
+.Fl D Ns Ar dontmerge
 disables that behavior.
 .It Ar donttie
 By default,
 .Nm
 will try to find new files in old packages by comparing the stored sha256,
 and tie the entries together to avoid extracting files needlessly.
-.Fl D Ar donttie
+.Fl D Ns Ar donttie
 disables that behavior.
 .It Ar downgrade
 Don't filter out package versions older than what's currently installed.
@@ -334,11 +336,9 @@ In update mode, reinstall an existing package with the same update signature.
 Library specifications may not be fulfilled.
 .It Ar nonroot
 Install even if not running as root.
-.\" .It Ar nosig
-.\" do not check digital signatures.
-.\" Still displays a very prominent message if a signature is found.
 .It Ar paranoid
 Very safe update: don't run any @exec/@unexec.
+This may break some packages that will need manual intervention.
 .It Ar repair
 Attempt to repair installed packages with missing registration data.
 .It Ar scripts
@@ -429,11 +429,8 @@ can be
 .Sq cdrom
 or
 .Sq ftp .
-.It Fl q
-Replace package quickly; do not bother with checksums before removing normal
-files.
-If used twice,
-it will not bother with checksums for configuration files either.
+.It Fl qq
+Do not bother with checksums for configuration files.
 .It Fl r
 Replace existing packages.
 .Nm
@@ -780,16 +777,12 @@ Override use of
 .Xr ftp 1 .
 Must point to a command that understands
 .Li ${FETCH_CMD} -o - url .
-.It Ev FTP_KEEPALIVE
-Have
-.Xr ftp 1
-send a byte after every
-.Ev FTP_KEEPALIVE
-seconds,
-so that incorrectly configured network equipment won't aggressively drop it.
-See
-.Dq ftp -k
-for more information.
+.It Ev PKG_CACHE
+If set, any package retrieved from a distant location will be copied to
+that directory as well.
+.It Ev PKG_CHECKSUM
+If set, verify files checksums during deletion, exactly like
+.Fl D Ns Ar checksum .
 .It Ev PKG_DBDIR
 Where to register packages instead of
 .Pa /var/db/pkg .
@@ -799,9 +792,6 @@ Value for
 if no
 .Fl B
 option is specified.
-.It Ev PKG_CACHE
-If set, any package retrieved from a distant location will be copied to
-that directory as well.
 .It Ev PKG_PATH
 If a given package name cannot be found,
 the directories named by