diff options
| author | wiz <wiz> | 2005-02-01 20:44:48 +0000 |
|---|---|---|
| committer | wiz <wiz> | 2005-02-01 20:44:48 +0000 |
| commit | 1977badebf155c5da7c36df0f657fedb767c41ee (patch) | |
| tree | 1d29f549f7a44ee6b2c581238eefbd8804aac53d /pkgtools | |
| parent | c57dee2e7ffe1aff28dbc163a2cd3b0affd85955 (diff) | |
| download | pkgsrc-1977badebf155c5da7c36df0f657fedb767c41ee.tar.gz | |
Make it work with pkg_install tools that do not search
the file system by default. Replace one pkg_info with ${PKG_INFO}.
Welcome to 1.54!
Okayed by abs@.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 6 |
2 files changed, 5 insertions, 5 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index e67bbba0cdc..443f380ca1d 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.10 2005/01/29 15:36:30 abs Exp $ +# $NetBSD: Makefile,v 1.11 2005/02/01 20:44:48 wiz Exp $ -DISTNAME= pkg_chk-1.53 +DISTNAME= pkg_chk-1.54 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index 467f0d52466..54fda8deba4 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.10 2005/01/29 15:36:30 abs Exp $ +# $Id: pkg_chk.sh,v 1.11 2005/02/01 20:44:48 wiz Exp $ # # TODO: Handle updates with dependencies via binary packages @@ -215,7 +215,7 @@ list_packages() fatal_maybe " ** $PKGNAME - binary package (dependency) missing" continue fi - for dep in $(pkg_info -N $PACKAGES/$pkg.tgz | ${SED} '1,/Built using:/d' | ${GREP} ..) ; do + for dep in $(${PKG_INFO} -. -N $PACKAGES/$pkg.tgz | ${SED} '1,/Built using:/d' | ${GREP} ..) ; do case "$PKGLIST$NEXTCHECK" in *\ $dep\ *) verbose "$pkg: Duplicate depend $dep" @@ -495,7 +495,7 @@ if [ -n "$opt_b" -a -z "$opt_s" -a -d $PACKAGES ] ; then msg_progress Scan $PACKAGES cd $PACKAGES for f in `ls -t *.tgz` ; do # Sort by time to pick up newest first - PKGDIR=`${PKG_INFO} -B $PACKAGES/$f|${AWK} -F= '$1=="PKGPATH"{print $2}'` + PKGDIR=`${PKG_INFO} -. -B $PACKAGES/$f|${AWK} -F= '$1=="PKGPATH"{print $2}'` PKGNAME=`echo $f | ${SED} 's/\.tgz$//'` PKGDB="${PKGDB} $PKGDIR:$PKGNAME" done |