diff options
| author | abs <abs> | 2002-10-08 15:44:13 +0000 |
|---|---|---|
| committer | abs <abs> | 2002-10-08 15:44:13 +0000 |
| commit | 4feff9bfb7a34203da77a91e9fecafac2744a5d0 (patch) | |
| tree | d7d5f6079515dcf8b83531a154e551cad01daf4d /pkgtools | |
| parent | 1ac2fd9b61a219bfc10347a80a88e4092c224272 (diff) | |
| download | pkgsrc-4feff9bfb7a34203da77a91e9fecafac2744a5d0.tar.gz | |
Update pkgchk to 1.34:
Actually work around 1.6 pkg_tools PKG_PATH problems, rather than
just making matters worse.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkgchk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkgchk/files/pkgchk.sh | 10 |
2 files changed, 9 insertions, 5 deletions
diff --git a/pkgtools/pkgchk/Makefile b/pkgtools/pkgchk/Makefile index 85751f7a8a7..8d4505a37b7 100644 --- a/pkgtools/pkgchk/Makefile +++ b/pkgtools/pkgchk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.35 2002/10/08 11:43:33 abs Exp $ +# $NetBSD: Makefile,v 1.36 2002/10/08 15:44:13 abs Exp $ -DISTNAME= pkgchk-1.33 +DISTNAME= pkgchk-1.34 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkgchk/files/pkgchk.sh b/pkgtools/pkgchk/files/pkgchk.sh index 20fae542056..48430062964 100755 --- a/pkgtools/pkgchk/files/pkgchk.sh +++ b/pkgtools/pkgchk/files/pkgchk.sh @@ -1,6 +1,6 @@ #!/bin/sh -e # -# $Id: pkgchk.sh,v 1.36 2002/10/08 11:43:34 abs Exp $ +# $Id: pkgchk.sh,v 1.37 2002/10/08 15:44:14 abs Exp $ # # TODO: Handle updates with dependencies via binary packages @@ -173,9 +173,13 @@ pkg_install() exit 1 fi fi - export PKG_PATH=$saved_PKG_PATH + if [ -n "$saved_PKG_PATH" ] ; then + export PKG_PATH=$saved_PKG_PATH + fi run_cmd "cd $PACKAGES/All && ${PKG_ADD} $PKGNAME.tgz" - unset PKG_PATH + if [ -n "$saved_PKG_PATH" ] ; then + unset PKG_PATH + fi elif [ -n "$opt_s" ]; then run_cmd "cd $PKGSRCDIR/$PKGDIR && ${MAKE} update" fi |