summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authortron <tron>2006-11-05 21:53:27 +0000
committertron <tron>2006-11-05 21:53:27 +0000
commit6e030ab32e7b509c612cd37241335c18d282f9da (patch)
tree4369c9b9aed5103b4dd4dc47e590601a5b2ccfed /pkgtools
parent1146b566a15b7a962113d5b473e31480b1089676 (diff)
downloadpkgsrc-6e030ab32e7b509c612cd37241335c18d282f9da.tar.gz
Update "pkg_chk" package to version 1.83:
Do *not* use "TMPDIR" variable. If the user has already set an environment variable "TMPDIR" it well be overwritten my the path to the directory created by the script and passed to "make". As a result it will get compiled into certain packages (e.g. "sysutils/dbus") which will no longer work after the directory has been removed.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pkg_chk/Makefile4
-rwxr-xr-xpkgtools/pkg_chk/files/pkg_chk.sh16
2 files changed, 10 insertions, 10 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile
index d560a35a6b2..9ab79852bf2 100644
--- a/pkgtools/pkg_chk/Makefile
+++ b/pkgtools/pkg_chk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.45 2006/10/02 07:33:38 abs Exp $
+# $NetBSD: Makefile,v 1.46 2006/11/05 21:53:27 tron Exp $
-DISTNAME= pkg_chk-1.82
+DISTNAME= pkg_chk-1.83
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 220ddde7837..4787f7d63fb 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.43 2006/10/02 07:33:38 abs Exp $
+# $Id: pkg_chk.sh,v 1.44 2006/11/05 21:53:27 tron Exp $
#
# TODO: Make -g check dependencies and tsort
# TODO: Variation of -g which only lists top level packages
@@ -88,8 +88,8 @@ check_packages_installed()
cleanup_and_exit()
{
- rm -f $TMPFILE
- rmdir $TMPDIR
+ rm -f $MY_TMPFILE
+ rmdir $MY_TMPDIR
exit "$@"
}
@@ -248,9 +248,9 @@ get_build_ver()
fi
# Unfortunately pkgsrc always outputs to a file, but it does helpfully
# allows # us to specify the name
- rm -f $TMPFILE
- ${MAKE} _BUILD_VERSION_FILE=$TMPFILE $TMPFILE
- cat $TMPFILE
+ rm -f $MY_TMPFILE
+ ${MAKE} _BUILD_VERSION_FILE=$MY_TMPFILE $MY_TMPFILE
+ cat $MY_TMPFILE
}
list_packages()
@@ -668,8 +668,8 @@ if [ $# != 0 ];then
usage "Additional argument ($*) given"
fi
-TMPDIR=`mktemp -d /tmp/${0##*/}.XXXXXX`
-TMPFILE=$TMPDIR/tmp
+MY_TMPDIR=`mktemp -d ${TMPDIR-/tmp}/${0##*/}.XXXXXX`
+MY_TMPFILE=$MY_TMPDIR/tmp
# Hide PKG_PATH to avoid breakage in 'make' calls
saved_PKG_PATH=$PKG_PATH