diff options
| author | abs <abs@pkgsrc.org> | 2002-09-13 09:11:03 +0000 |
|---|---|---|
| committer | abs <abs@pkgsrc.org> | 2002-09-13 09:11:03 +0000 |
| commit | c8bc5382949e8fce337d5471342c2a0154afa951 (patch) | |
| tree | 3c8197beeeb29cbf0d6c4924a6bd653c8d70d6ab /pkgtools | |
| parent | 17cab845ea0c1b76e347fb28a3a5172b51b78d20 (diff) | |
| download | pkgsrc-c8bc5382949e8fce337d5471342c2a0154afa951.tar.gz | |
Updated pkgchk to 1.31:
Handle PKG_PATH being set - hide it from the 'make' calls, but use
it in pkg_add.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkgchk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pkgchk/files/pkgchk.sh | 8 |
2 files changed, 9 insertions, 3 deletions
diff --git a/pkgtools/pkgchk/Makefile b/pkgtools/pkgchk/Makefile index b588478b0bd..f58d85a4886 100644 --- a/pkgtools/pkgchk/Makefile +++ b/pkgtools/pkgchk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.32 2002/06/20 09:17:40 abs Exp $ +# $NetBSD: Makefile,v 1.33 2002/09/13 09:11:03 abs Exp $ -DISTNAME= pkgchk-1.30 +DISTNAME= pkgchk-1.31 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty diff --git a/pkgtools/pkgchk/files/pkgchk.sh b/pkgtools/pkgchk/files/pkgchk.sh index 0e33df1dd87..cc6daedcfca 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.33 2002/06/20 09:17:40 abs Exp $ +# $Id: pkgchk.sh,v 1.34 2002/09/13 09:11:03 abs Exp $ # # TODO: Handle updates with dependencies via binary packages @@ -173,7 +173,9 @@ pkg_install() exit 1 fi fi + export PKG_PATH=$saved_PKG_PATH run_cmd "${PKG_ADD} $PACKAGES/All/$PKGNAME.tgz" + unset PKG_PATH elif [ -n "$opt_s" ]; then run_cmd "cd $PKGSRCDIR/$PKGDIR && ${MAKE} update" fi @@ -296,6 +298,10 @@ on hostname and type, see pkg_chk(8). exit 1 fi +# Hide PKG_PATH to avoid breakage in 'make' calls +saved_PKG_PATH=$PKG_PATH +unset PKG_PATH + test -n "$MAKE" || MAKE="@MAKE@" test -n "$MAKECONF" || MAKECONF="@MAKECONF@" if [ ! -f $MAKECONF ] ; then |