diff options
| author | tnn <tnn@pkgsrc.org> | 2008-01-18 07:50:03 +0000 |
|---|---|---|
| committer | tnn <tnn@pkgsrc.org> | 2008-01-18 07:50:03 +0000 |
| commit | c722fc090529702f274906afd3b0c0199f6c99a2 (patch) | |
| tree | 8156065b4d762205b82e64c68b35e79730b9bba6 /pkgtools | |
| parent | 38bf718974aedf5710972a8c47f5c00a9c92d3d2 (diff) | |
| download | pkgsrc-c722fc090529702f274906afd3b0c0199f6c99a2.tar.gz | |
pkg_chk-1.88: add mktemp to the list of substituted commands.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pkg_chk/Makefile | 5 | ||||
| -rwxr-xr-x | pkgtools/pkg_chk/files/pkg_chk.sh | 9 |
2 files changed, 8 insertions, 6 deletions
diff --git a/pkgtools/pkg_chk/Makefile b/pkgtools/pkg_chk/Makefile index 2167d7654e6..1cc3e4d5052 100644 --- a/pkgtools/pkg_chk/Makefile +++ b/pkgtools/pkg_chk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.56 2007/09/20 08:18:13 abs Exp $ +# $NetBSD: Makefile,v 1.57 2008/01/18 07:50:03 tnn Exp $ -DISTNAME= pkg_chk-1.87 +DISTNAME= pkg_chk-1.88 CATEGORIES= pkgtools MASTER_SITES= # empty DISTFILES= # empty @@ -34,6 +34,7 @@ do-build: -e 's#@ID@#${ID}#g' \ -e 's#@MAKE@#${MAKE}#g' \ -e 's#@MAKECONF@#${TMP_MAKECONF}#g' \ + -e 's#@MKTEMP@#${MKTEMP}#g' \ -e 's#@PKG_ADD@#${PKG_ADD}#g' \ -e 's#@PKG_ADMIN@#${PKG_ADMIN}#g' \ -e 's#@PKG_DELETE@#${PKG_DELETE}#g' \ diff --git a/pkgtools/pkg_chk/files/pkg_chk.sh b/pkgtools/pkg_chk/files/pkg_chk.sh index 33917a4f1f6..e64780bedc3 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.51 2007/09/20 08:18:13 abs Exp $ +# $Id: pkg_chk.sh,v 1.52 2008/01/18 07:50:03 tnn Exp $ # # TODO: Make -g check dependencies and tsort # TODO: Variation of -g which only lists top level packages @@ -698,9 +698,6 @@ if [ $# != 0 ];then usage "Additional argument ($*) given" fi -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 unset PKG_PATH || true @@ -712,6 +709,7 @@ export GZIP_CMD test -n "$ID" || ID="@ID@" test -n "$MAKE" || MAKE="@MAKE@" test -n "$MAKECONF" || MAKECONF="@MAKECONF@" +test -n "$MKTEMP" || MKTEMP="@MKTEMP@" test -n "$PKG_ADD" || PKG_ADD="@PKG_ADD@" test -n "$PKG_ADMIN" || PKG_ADMIN="@PKG_ADMIN@" test -n "$PKG_DBDIR" || PKG_DBDIR="@PKG_DBDIR@" @@ -721,6 +719,9 @@ test -n "$SED" || SED="@SED@" test -n "$SORT" || SORT="@SORT@" test -n "$TSORT" || TSORT="@TSORT@" +MY_TMPDIR=`${MKTEMP} -d ${TMPDIR-/tmp}/${0##*/}.XXXXXX` +MY_TMPFILE=$MY_TMPDIR/tmp + if [ -z "$MAKECONF" -o ! -f "$MAKECONF" ] ; then if [ -f @PREFIX@/etc/mk.conf ] ; then MAKECONF=@PREFIX@/etc/mk.conf |