[pkgsrc/trunk]: pkgsrc Update pkg_chk to 1.49:

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/6d54b43573ec
branches:  trunk
changeset: 477336:6d54b43573ec
user:      abs <abs%pkgsrc.org@localhost>
date:      Wed Jun 30 09:53:42 2004 +0000

description:
Update pkg_chk to 1.49:
    When -v (verbose) is given with -l (list binary packages required for
    target config), display which package pulled in a particular dependency

diffstat:

 doc/CHANGES                       |   4 +++-
 pkgtools/pkg_chk/Makefile         |   4 ++--
 pkgtools/pkg_chk/files/pkg_chk.sh |  37 +++++++++++++++++++------------------
 3 files changed, 24 insertions(+), 21 deletions(-)

diffs (111 lines):

diff -r 268a4b554215 -r 6d54b43573ec doc/CHANGES
--- a/doc/CHANGES       Wed Jun 30 08:37:11 2004 +0000
+++ b/doc/CHANGES       Wed Jun 30 09:53:42 2004 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES,v 1.6401 2004/06/30 07:13:32 grant Exp $
+$NetBSD: CHANGES,v 1.6402 2004/06/30 09:54:16 abs Exp $
 
 Changes to the packages collection and infrastructure in 2004:
 
@@ -3185,3 +3185,5 @@
        Updated dvd+rw-tools to 5.19.4.9.7 [wiz 2004-06-30]
        Updated easytag to 0.31 [wiz 2004-06-30]
        Added p5-Log-Dispatch-DBI-0.02 [grant 2004-06-30]
+       Updated pkg_chk to 1.49 [abs 2004-06-30]
+
diff -r 268a4b554215 -r 6d54b43573ec pkgtools/pkg_chk/Makefile
--- a/pkgtools/pkg_chk/Makefile Wed Jun 30 08:37:11 2004 +0000
+++ b/pkgtools/pkg_chk/Makefile Wed Jun 30 09:53:42 2004 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.5 2004/05/09 17:56:17 abs Exp $
+# $NetBSD: Makefile,v 1.6 2004/06/30 09:53:42 abs Exp $
 
-DISTNAME=      pkg_chk-1.48
+DISTNAME=      pkg_chk-1.49
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 268a4b554215 -r 6d54b43573ec pkgtools/pkg_chk/files/pkg_chk.sh
--- a/pkgtools/pkg_chk/files/pkg_chk.sh Wed Jun 30 08:37:11 2004 +0000
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh Wed Jun 30 09:53:42 2004 +0000
@@ -1,6 +1,6 @@
 #!@SH@ -e
 #
-# $Id: pkg_chk.sh,v 1.5 2004/05/09 17:56:17 abs Exp $
+# $Id: pkg_chk.sh,v 1.6 2004/06/30 09:53:42 abs Exp $
 #
 # TODO: Handle updates with dependencies via binary packages
 
@@ -53,11 +53,11 @@
                    echo "$PKGNAME: build version information mismatch"
                    MISMATCH_TODO="$MISMATCH_TODO $PKGNAME"
                    # should we mark this pkg to be updated if -u is given ??
-               elif [ -n "$opt_v" ];then
-                   echo "$PKGNAME: OK"
+               else
+                   verbose "$PKGNAME: OK"
                fi
-           elif [ -n "$opt_v" ];then
-               echo "$PKGNAME: OK"
+           else
+               verbose "$PKGNAME: OK"
            fi
        fi
     done
@@ -85,9 +85,7 @@
            fi
            continue
        fi
-       if [ -n "$opt_v" ];then
-           echo "$PKGNAME.tgz: found"
-       fi
+       verbose "$PKGNAME.tgz: found"
        CHECKLIST="$CHECKLIST$PKGNAME ";
     done
     while [ "$CHECKLIST" != ' ' ]; do
@@ -104,14 +102,12 @@
            for dep in $(pkg_info -N $PACKAGES/All/$pkg.tgz | ${SED} '1,/Built using:/d' | ${GREP} ..) ; do
                case "$PKGLIST$NEXTCHECK" in
                    *\ $dep\ *)
-                       if [ -n "$opt_v" ];then
-                           echo "Duplicate depend $dep"
-                       fi;;
+                       verbose "$pkg: Duplicate depend $dep"
+                       ;;
                    *)
                        NEXTCHECK="$NEXTCHECK$dep "
-                       if [ -n "$opt_v" ];then
-                           echo "Add depend $dep"
-                       fi;;
+                       verbose "$pkg: Add depend $dep"
+                       ;;
                esac
            done
        done
@@ -304,6 +300,13 @@
     fi
     }
 
+verbose()
+    {
+    if [ -n "$opt_v" ];then
+       echo $*
+    fi
+    }
+
 args=$(getopt BC:D:L:U:abcfghiklnrsuv $*)
 if [ $? != 0 ]; then
     opt_h=1
@@ -452,10 +455,8 @@
     if [ -n "$opt_D" ];then
        TAGS="$TAGS,$opt_D"
     fi
-    if [ -n "$opt_v" ];then
-       echo "set   TAGS=$TAGS"
-       echo "unset TAGS=$opt_U"
-    fi
+    verbose "set   TAGS=$TAGS"
+    verbose "unset TAGS=$opt_U"
 
     # Extract list of valid pkgdirs (skip any 'alreadyset' in $PKGDIRLIST)
     #