[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_chk Fix -q which ate the next argument. ...

[cube <cube%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/f8f6a653ad72
branches:  trunk
changeset: 517201:f8f6a653ad72
user:      cube <cube%pkgsrc.org@localhost>
date:      Sun Aug 06 12:21:09 2006 +0000

description:
Fix -q which ate the next argument.  Only document -i and -c in the
"Deprecated options" part of the manual.

PR#34145 by Dieter Roelants.

diffstat:

 pkgtools/pkg_chk/Makefile         |  4 ++--
 pkgtools/pkg_chk/files/pkg_chk.8  |  8 ++------
 pkgtools/pkg_chk/files/pkg_chk.sh |  8 +++-----
 3 files changed, 7 insertions(+), 13 deletions(-)

diffs (76 lines):

diff -r 10b2782ce116 -r f8f6a653ad72 pkgtools/pkg_chk/Makefile
--- a/pkgtools/pkg_chk/Makefile Sun Aug 06 11:36:59 2006 +0000
+++ b/pkgtools/pkg_chk/Makefile Sun Aug 06 12:21:09 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.40 2006/08/04 12:04:00 rillig Exp $
+# $NetBSD: Makefile,v 1.41 2006/08/06 12:21:09 cube Exp $
 
-DISTNAME=      pkg_chk-1.77
+DISTNAME=      pkg_chk-1.78
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 10b2782ce116 -r f8f6a653ad72 pkgtools/pkg_chk/files/pkg_chk.8
--- a/pkgtools/pkg_chk/files/pkg_chk.8  Sun Aug 06 11:36:59 2006 +0000
+++ b/pkgtools/pkg_chk/files/pkg_chk.8  Sun Aug 06 12:21:09 2006 +0000
@@ -1,4 +1,4 @@
-.\"    $NetBSD: pkg_chk.8,v 1.20 2006/07/28 21:58:04 wiz Exp $
+.\"    $NetBSD: pkg_chk.8,v 1.21 2006/08/06 12:21:09 cube Exp $
 .\"
 .\" Copyright (c) 2001 by David Brownlee (abs%NetBSD.org@localhost)
 .\" Absolutely no warranty.
@@ -69,11 +69,7 @@
 .Fl a
 or
 .Fl u
-to perform the fetch before any building, or with
-.Fl c
-or
-.Fl i
-to just fetch missing/mismatches packages.
+to perform the fetch before any building.
 .It Fl g
 Generate an initial
 .Pa pkgchk.conf
diff -r 10b2782ce116 -r f8f6a653ad72 pkgtools/pkg_chk/files/pkg_chk.sh
--- a/pkgtools/pkg_chk/files/pkg_chk.sh Sun Aug 06 11:36:59 2006 +0000
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh Sun Aug 06 12:21:09 2006 +0000
@@ -1,6 +1,6 @@
 #!@SH@ -e
 #
-# $Id: pkg_chk.sh,v 1.38 2006/07/22 20:41:20 abs Exp $
+# $Id: pkg_chk.sh,v 1.39 2006/08/06 12:21:09 cube Exp $
 #
 # TODO: Make -g check dependencies and tsort
 # TODO: Variation of -g which only lists top level packages
@@ -546,12 +546,10 @@
        -B      Check the "Build version" of packages
        -b      Install binary packages
        -C conf Use pkgchk.conf file 'conf'
-       -c      Check installed packages against pkgchk.conf
        -D tags Comma separated list of additional pkgchk.conf tags to set
        -f      Perform a 'make fetch' for all required packages
        -g      Generate an initial pkgchk.conf file
        -h      This help
-       -i      Check versions of installed packages (not using pkgchk.conf)
        -k      Continue with further packages if errors are encountered
        -L file Redirect output from commands run into file (should be fullpath)
        -l      List binary packages including dependencies (implies -c)
@@ -566,7 +564,7 @@
        -v      Verbose
 
 pkg_chk verifies installed packages against pkgsrc.
-The most common usage is 'pkg_chk -i' to check all installed packages or
+The most common usage is 'pkg_chk -u -q' to check all installed packages or
 'pkg_chk -u' to update all out of date packages.
 For more advanced usage, including defining a set of desired packages based
 on hostname and type, see pkg_chk(8).
@@ -615,7 +613,7 @@
        -N )    opt_N=1 ;;
        -n )    opt_n=1 ;;
        -P )    opt_P="$2" ; shift ;;
-       -q )    opt_q=1 ; shift ;;
+       -q )    opt_q=1 ;;
        -r )    opt_r=1 ;;
        -s )    opt_s=1 ;;
        -U )    opt_U="$2" ; shift ;;