[pkgsrc/trunk]: pkgsrc Update pkg_tools/pkg_chk to 1.76 - output the pkgdir r...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/7872c2302a12
branches:  trunk
changeset: 515925:7872c2302a12
user:      abs <abs%pkgsrc.org@localhost>
date:      Mon Jul 10 23:47:18 2006 +0000

description:
Update pkg_tools/pkg_chk to 1.76 - output the pkgdir rather than pkgname at the start of each line

diffstat:

 doc/CHANGES-2006                  |   3 ++-
 pkgtools/pkg_chk/Makefile         |   5 ++---
 pkgtools/pkg_chk/files/pkg_chk.sh |  10 +++++-----
 3 files changed, 9 insertions(+), 9 deletions(-)

diffs (66 lines):

diff -r 25ba5649a6e6 -r 7872c2302a12 doc/CHANGES-2006
--- a/doc/CHANGES-2006  Mon Jul 10 22:59:26 2006 +0000
+++ b/doc/CHANGES-2006  Mon Jul 10 23:47:18 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2006,v 1.694 2006/07/10 22:08:15 adam Exp $
+$NetBSD: CHANGES-2006,v 1.695 2006/07/10 23:48:23 abs Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -3334,3 +3334,4 @@
        Updated editors/abiword to 2.4.5 [adam 2006-07-10]
        Updated editors/abiword-plugins to 2.4.5 [adam 2006-07-10]
        Updated graphics/gimp to 2.2.12 [adam 2006-07-11]
+       Updated pkg_tools/pkg_chk to 1.76 [abs 2006-07-11]
diff -r 25ba5649a6e6 -r 7872c2302a12 pkgtools/pkg_chk/Makefile
--- a/pkgtools/pkg_chk/Makefile Mon Jul 10 22:59:26 2006 +0000
+++ b/pkgtools/pkg_chk/Makefile Mon Jul 10 23:47:18 2006 +0000
@@ -1,7 +1,6 @@
-# $NetBSD: Makefile,v 1.37 2006/07/10 22:46:15 salo Exp $
+# $NetBSD: Makefile,v 1.38 2006/07/10 23:47:18 abs Exp $
 
-DISTNAME=      pkg_chk-1.75
-PKGREVISION=   1
+DISTNAME=      pkg_chk-1.76
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r 25ba5649a6e6 -r 7872c2302a12 pkgtools/pkg_chk/files/pkg_chk.sh
--- a/pkgtools/pkg_chk/files/pkg_chk.sh Mon Jul 10 22:59:26 2006 +0000
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh Mon Jul 10 23:47:18 2006 +0000
@@ -1,6 +1,6 @@
 #!@SH@ -e
 #
-# $Id: pkg_chk.sh,v 1.36 2006/06/09 16:43:33 abs Exp $
+# $Id: pkg_chk.sh,v 1.37 2006/07/10 23:47:18 abs Exp $
 #
 # TODO: Make -g check dependencies and tsort
 # TODO: Variation of -g which only lists top level packages
@@ -48,15 +48,15 @@
            continue
        fi
        if [ ! -d $PKG_DBDIR/$PKGNAME ];then
-           msg_n "$PKGNAME: "
+           msg_n "$pkgdir - "
            pkg=$(echo $PKGNAME | ${SED} 's/-[0-9].*//')
            pkginstalled=$(sh -c "${PKG_INFO} -e $pkg" || true)
            INSTALL=
            if [ -n "$pkginstalled" ];then
-               msg_n "version mismatch - $pkginstalled"
+               msg_n "$pkginstalled < $PKGNAME"
                MISMATCH_TODO="$MISMATCH_TODO $pkginstalled"
            else
-               msg_n "missing"
+               msg_n "$PKGNAME missing"
                MISSING_TODO="$MISSING_TODO $PKGNAME $pkgdir"
            fi
            if is_binary_available $PKGNAME ;then
@@ -69,7 +69,7 @@
                current_build_ver=$(get_build_ver | ${SED} 's|.*\$NetBSD\: ||' | ${SORT} -u)
                installed_build_ver=$(${SED} 's|.*\$NetBSD\: ||' $PKG_DBDIR/$PKGNAME/+BUILD_VERSION | ${SORT} -u)
                if [ x"$current_build_ver" != x"$installed_build_ver" ];then
-                   msg "$PKGNAME: build-version mismatch"
+                   msg "$pkgdir - $PKGNAME build_version mismatch"
                    verbose "--current--"
                    verbose "$current_build_ver"
                    verbose "--installed--"