[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_chk Use gzcat for the pkg_summary file, f...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/9201739fae23
branches:  trunk
changeset: 396380:9201739fae23
user:      sketch <sketch%pkgsrc.org@localhost>
date:      Wed Jul 22 21:56:13 2009 +0000

description:
Use gzcat for the pkg_summary file, fixes Solaris.

diffstat:

 pkgtools/pkg_chk/Makefile         |  7 ++++---
 pkgtools/pkg_chk/files/pkg_chk.sh |  7 ++++---
 2 files changed, 8 insertions(+), 6 deletions(-)

diffs (66 lines):

diff -r 2ed75def4b15 -r 9201739fae23 pkgtools/pkg_chk/Makefile
--- a/pkgtools/pkg_chk/Makefile Wed Jul 22 21:28:19 2009 +0000
+++ b/pkgtools/pkg_chk/Makefile Wed Jul 22 21:56:13 2009 +0000
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.73 2009/05/04 22:45:16 abs Exp $
+# $NetBSD: Makefile,v 1.74 2009/07/22 21:56:13 sketch Exp $
 
-DISTNAME=      pkg_chk-1.99
+DISTNAME=      pkg_chk-2.0
 CATEGORIES=    pkgtools
 MASTER_SITES=  # empty
 DISTFILES=     # empty
@@ -15,6 +15,7 @@
 WRKSRC=                ${WRKDIR}
 USE_LANGUAGES= # empty
 USE_TOOLS+=    mktemp:run
+USE_TOOLS+=    gzcat:run
 USE_TOOLS+=    gzip:run
 NO_BUILD=      yes
 
@@ -28,7 +29,7 @@
 SUBST_STAGE.vars=      pre-configure
 SUBST_MESSAGE.vars=    Configuring sources.
 SUBST_FILES.vars=      pkg_chk.sh pkg_chk.8
-SUBST_VARS.vars=       AWK GREP GZIP_CMD ID MAKE MAKECONF MKTEMP \
+SUBST_VARS.vars=       AWK GREP GZCAT GZIP_CMD ID MAKE MAKECONF MKTEMP \
                        PKG_ADD PKG_ADMIN PKG_DELETE PKG_INFO \
                        SED SH SORT TSORT PREFIX PKG_DBDIR XARGS
 
diff -r 2ed75def4b15 -r 9201739fae23 pkgtools/pkg_chk/files/pkg_chk.sh
--- a/pkgtools/pkg_chk/files/pkg_chk.sh Wed Jul 22 21:28:19 2009 +0000
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh Wed Jul 22 21:56:13 2009 +0000
@@ -1,6 +1,6 @@
 #!@SH@ -e
 #
-# $Id: pkg_chk.sh,v 1.64 2009/05/04 22:45:16 abs Exp $
+# $Id: pkg_chk.sh,v 1.65 2009/07/22 21:56:13 sketch Exp $
 #
 # TODO: Make -g check dependencies and tsort
 # TODO: Make -g list user-installed packages first, followed by commented
@@ -184,7 +184,7 @@
            then
            cd $PKGSRCDIR/pkgtools/pkg_chk
            extract_make_vars Makefile \
-                   AWK GREP GZIP_CMD ID PACKAGES PKGCHK_CONF PKGCHK_NOTAGS \
+                   AWK GREP GZCAT GZIP_CMD ID PACKAGES PKGCHK_CONF PKGCHK_NOTAGS \
                    PKGCHK_TAGS PKGCHK_UPDATE_CONF PKG_ADD PKG_DBDIR \
                    PKG_DELETE PKG_ADMIN PKG_INFO PKG_SUFX SED SORT SU_CMD TSORT
            if [ -z "$PACKAGES" ];then
@@ -258,7 +258,7 @@
     if [ -f $summary_file ] ; then
        if [ -z "$(find $PACKAGES -type f -newer $summary_file -name '*.t[bg]z')" ] ; then
            msg_progress Reading $summary_file
-           zcat $summary_file
+           ${GZCAT} $summary_file
            return;
        fi
        echo "*** Ignoring $SUMMARY_FILE as PACKAGES contains newer files" >&2
@@ -746,6 +746,7 @@
 
 test -n "$AWK"        || AWK="@AWK@"
 test -n "$GREP"       || GREP="@GREP@"
+test -n "$GZCAT"      || GZCAT="@GZCAT@"
 test -n "$GZIP_CMD"   || GZIP_CMD="@GZIP_CMD@"
 export GZIP_CMD
 test -n "$ID"         || ID="@ID@"