From b136c3aa6cb1ff880bdbf70258dd69dbb6c32afe Mon Sep 17 00:00:00 2001 From: abs Date: Sun, 24 Feb 2008 21:58:13 +0000 Subject: update pkg_chk to 1.90: - Remove obsolete and no longer accurate 'implies -c' and 'implies -i' notes from usage - noted by Andreas Burghardt --- pkgtools/pkg_chk/Makefile | 4 ++-- pkgtools/pkg_chk/files/pkg_chk.sh | 16 ++++++++-------- 2 files changed, 10 insertions(+), 10 deletions(-) diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index 1f7fbd43be6..b9b65704b76 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.58 2008/02/17 00:55:20 tnn Exp $ +# $NetBSD: Makefile,v 1.59 2008/02/24 21:58:13 abs Exp $ -DISTNAME= pkg_chk-1.89 +DISTNAME= pkg_chk-1.90 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index 3c29304b4ec..510defc3cb1 100755 --- a/pkgtools/pkg_chk/files/pkg_chk.sh +++ b/pkgtools/pkg_chk/files/pkg_chk.sh @@ -1,6 +1,6 @@ #!@SH@ -e # -# $Id: pkg_chk.sh,v 1.54 2008/02/17 01:05:39 tnn Exp $ +# $Id: pkg_chk.sh,v 1.55 2008/02/24 21:58:13 abs Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Variation of -g which only lists top level packages @@ -299,7 +299,7 @@ list_packages() for pkg in $pkglist ; do set -o noglob deplist="$(list_dependencies $PACKAGES/$pkg)" - verbose "$pkg: dependencies - `echo $deplist`" + verbose "$pkg: dependencies - `echo $deplist`" if [ -n "$deplist" ] ; then for depmatch in $deplist ; do dep=`${PKG_ADMIN} -b -d $PACKAGES lsbest "$depmatch"` @@ -307,7 +307,7 @@ list_packages() fatal_later "$depmatch: dependency missing for $pkg" else pairlist="$pairlist$dep $pkg\n" - case $dep_cache in + case $dep_cache in *" $dep "*) # depmatch_cache is a quick cache of already verbose "$pkg: $deplist - cached" @@ -509,7 +509,7 @@ pkg_fetchlist() { PKGLIST=$@ msg_progress Fetch - while [ $# != 0 ]; do + while [ $# != 0 ]; do pkg_fetch $1 $2 shift ; shift; done @@ -613,7 +613,7 @@ usage() echo fi echo 'Usage: pkg_chk [opts] - -a Add all missing packages (implies -c) + -a Add all missing packages -B Check the "Build version" of packages -b Use binary packages -C conf Use pkgchk.conf file 'conf' @@ -623,16 +623,16 @@ usage() -h This help -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) + -l List binary packages including dependencies -N List installed packages for which a newer version is in TODO -n Display actions that would be taken, but do not perform them -p Display the list of pkgdirs that match the current tags -P dir Set PACKAGES dir (overrides any other setting) -q Do not display actions or take any action; only list packages - -r Recursively remove mismatches (use with care) (implies -i) + -r Recursively remove mismatches (use with care) -s Use source for building packages -U tags Comma separated list of pkgchk.conf tags to unset ('*' for all) - -u Update all mismatched packages (implies -i) + -u Update all mismatched packages -v Verbose pkg_chk verifies installed packages against pkgsrc. -- cgit v1.2.3