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

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/78c43bed026b
branches:  trunk
changeset: 516542:78c43bed026b
user:      abs <abs%pkgsrc.org@localhost>
date:      Sat Jul 22 20:41:20 2006 +0000

description:
Update pkg_chk to 1.77:
- Resolve PR/31909 - use tr rather than fmt to avoid issue on Solaris
- Resolve PR/33370 - always show fatal messages to STDERR
- Resolve PR/32326 - Correctly extract PKG_DBDIR
Also, when -v is used display the state of all extracted variables at the
start of the run

diffstat:

 doc/CHANGES-2006                  |   3 +-
 pkgtools/pkg_chk/Makefile         |   4 +-
 pkgtools/pkg_chk/files/pkg_chk.sh |  45 ++++++++++++++++++++++++++------------
 3 files changed, 35 insertions(+), 17 deletions(-)

diffs (160 lines):

diff -r e4f9dc5c9484 -r 78c43bed026b doc/CHANGES-2006
--- a/doc/CHANGES-2006  Sat Jul 22 19:49:11 2006 +0000
+++ b/doc/CHANGES-2006  Sat Jul 22 20:41:20 2006 +0000
@@ -1,4 +1,4 @@
-$NetBSD: CHANGES-2006,v 1.795 2006/07/22 19:46:51 abs Exp $
+$NetBSD: CHANGES-2006,v 1.796 2006/07/22 20:42:14 abs Exp $
 
 Changes to the packages collection and infrastructure in 2006:
 
@@ -3493,3 +3493,4 @@
        Updated net/vncviewer to 4.1.2 [abs 2006-07-22]
        Added www/ap2-jk version 1.2.15 [abs 2006-07-22]
        Updated www/apache-tomcat55 to 5.5.17 [abs 2006-07-22]
+       Updated pkgtools/pkg_chk to 1.77 [abs 2006-07-22]
diff -r e4f9dc5c9484 -r 78c43bed026b pkgtools/pkg_chk/Makefile
--- a/pkgtools/pkg_chk/Makefile Sat Jul 22 19:49:11 2006 +0000
+++ b/pkgtools/pkg_chk/Makefile Sat Jul 22 20:41:20 2006 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.38 2006/07/10 23:47:18 abs Exp $
+# $NetBSD: Makefile,v 1.39 2006/07/22 20:41:20 abs Exp $
 
-DISTNAME=      pkg_chk-1.76
+DISTNAME=      pkg_chk-1.77
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
diff -r e4f9dc5c9484 -r 78c43bed026b pkgtools/pkg_chk/files/pkg_chk.sh
--- a/pkgtools/pkg_chk/files/pkg_chk.sh Sat Jul 22 19:49:11 2006 +0000
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh Sat Jul 22 20:41:20 2006 +0000
@@ -1,6 +1,6 @@
 #!@SH@ -e
 #
-# $Id: pkg_chk.sh,v 1.37 2006/07/10 23:47:18 abs Exp $
+# $Id: pkg_chk.sh,v 1.38 2006/07/22 20:41:20 abs Exp $
 #
 # TODO: Make -g check dependencies and tsort
 # TODO: Variation of -g which only lists top level packages
@@ -106,13 +106,15 @@
     {
     MAKEFILE=$1
     shift
-    verbose "Extract $@ from $MAKEFILE"
     MAKEDATA=".PHONY: x\nx:\n";
     for var in $* ; do
        MAKEDATA=$MAKEDATA"\t@echo $var=\${$var}\n"
     done
     eval $(printf "$MAKEDATA" | ${MAKE} -f - -f $MAKEFILE x | \
                                        ${SED} -e 's/[^=]*=/&"/' -e 's/$/"/')
+    for var in $* ; do
+       verbose_var $var
+    done
     }
 
 # $1 = name of variable
@@ -123,6 +125,9 @@
        eval $(printf "BSD_PKG_MK=1\n.PHONY: x\nx:\n\t@echo $1="'$'"{$1}\n" | ${MAKE} -f - -f $MAKECONF x)
        if [ -z "`eval echo \\$$1`" ]; then
            eval "$1=$2"
+           verbose_var $1 '(using default)'
+       else
+           verbose_var $1
        fi
     fi
     }
@@ -161,10 +166,6 @@
     if [ ! -d $PKGSRCDIR -a -z "$opt_b" ] ; then
        fatal "Unable to locate PKGSRCDIR ($PKGSRCDIR)"
     fi
-    extract_mk_var PKG_DBDIR /var/db/pkg
-    if [ ! -d $PKG_DBDIR ] ; then
-       fatal "Unable to locate PKG_DBDIR ($PKG_DBDIR)"
-    fi
 
     # Now we have PKGSRCDIR, use it to determine PACKAGES, and PKGCHK_CONF
     # as well as AWK, GREP, SED, PKGCHK_TAGS and PKGCHK_NOTAGS
@@ -172,8 +173,8 @@
 
     if [ -z "$opt_b" -o -n "$opt_s" -o -d $PKGSRCDIR/pkgtools/pkg_chk ] ; then
        cd $PKGSRCDIR/pkgtools/pkg_chk
-       extract_make_vars Makefile AWK GREP GZIP_CMD SED TSORT SORT PACKAGES \
-                       PKG_INFO PKG_ADD PKG_DELETE PKGCHK_CONF \
+       extract_make_vars Makefile AWK GREP GZIP_CMD SED SORT TSORT PACKAGES \
+                       PKG_ADD PKG_DELETE PKG_INFO PKG_DBDIR PKGCHK_CONF \
                        PKGCHK_UPDATE_CONF PKGCHK_TAGS PKGCHK_NOTAGS
        if [ -z "$PACKAGES" ];then
            PACKAGES=$PKGSRCDIR/packages
@@ -186,6 +187,10 @@
        fi
     fi
 
+    if [ ! -d $PKG_DBDIR ] ; then
+       fatal "Unable to access PKG_DBDIR ($PKG_DBDIR)"
+    fi
+
     if [ -z "$PKGCHK_CONF" ];then
        PKGCHK_CONF=$PKGSRCDIR/pkgchk.conf
     fi
@@ -196,7 +201,7 @@
 
 fatal()
     {
-    msg "*** $@"
+    msg "*** $@" >&2
     cleanup_and_exit 1
     }
 
@@ -216,7 +221,7 @@
        mv $FILE ${FILE}.old
     fi
     echo "# Generated automatically at $(date)" > $FILE
-    echo $(pkgdirs_from_installed) | fmt -1    >> $FILE
+    echo $(pkgdirs_from_installed) | tr ' ' '\n' >> $FILE
     }
 
 get_build_ver()
@@ -578,6 +583,15 @@
     fi
     }
 
+verbose_var()
+    {
+    if [ -n "$opt_v" ] ; then
+       var=$1
+       shift
+       verbose Variable $var = $(eval echo \$$var) $@
+    fi
+    }
+
 args=$(getopt BC:D:L:P:U:abcfghiklNnqrsSuv $*)
 if [ $? != 0 ]; then
     opt_h=1
@@ -654,6 +668,7 @@
        MAKECONF=/dev/null
     fi
 fi
+verbose_var MAKECONF
 
 # grabbed from GNU configure
 if (echo "testing\c"; echo 1,2,3) | grep c >/dev/null; then
@@ -756,14 +771,16 @@
     if [ -n "$opt_u" ] ; then           # Save current installed list
        if [ -f $PKGCHK_UPDATE_CONF ] ; then
            msg "Merging in previous $PKGCHK_UPDATE_CONF"
-           tmp=$(cat $PKGCHK_UPDATE_CONF;echo $(pkgdirs_from_installed)|fmt -1)
            if [ -z "$opt_n" -a -z "$opt_q" ] ; then
-               echo $tmp | fmt -1 | ${SORT} -u > $PKGCHK_UPDATE_CONF
+               tmp=$(cat $PKGCHK_UPDATE_CONF)
+               echo $tmp $(pkgdirs_from_installed) | tr ' ' '\n' | ${SORT} -u \
+                                                       > $PKGCHK_UPDATE_CONF
+               tmp=
            fi
-           tmp=
        else
            if [ -z "$opt_n" -a -z "$opt_q" ] ; then
-               echo $(pkgdirs_from_installed) | fmt -1 > $PKGCHK_UPDATE_CONF
+               echo $(pkgdirs_from_installed) | tr ' ' '\n' \
+                                                       > $PKGCHK_UPDATE_CONF
            fi
        fi
     fi