diff options
| author | sketch <sketch> | 2009-07-22 21:56:13 +0000 |
|---|---|---|
| committer | sketch <sketch> | 2009-07-22 21:56:13 +0000 |
| commit | e0c2261e04d503a440714913b5fe650f097177e1 (patch) | |
| tree | a8c0f6c6b8ed10edd35be793285719fc436fca05 | |
| parent | ecb64c9b1ec9e4a77bcc2773d0592062922c033e (diff) | |
| download | pkgsrc-e0c2261e04d503a440714913b5fe650f097177e1.tar.gz | |
Use gzcat for the pkg_summary file, fixes Solaris.
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 7 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 7 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index 50e02b2b704..53f60d55af6 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -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 @@ PKG_DESTDIR_SUPPORT= user-destdir 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_CLASSES+= vars 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 --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index d8948b8ff22..b02deed1c78 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.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 @@ extract_variables() 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 @@ get_bin_pkg_info() 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 @@ unset PKG_PATH || true 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@" |