pkgsrc-Changes-HG archive
[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]
[pkgsrc/trunk]: pkgsrc/pkgtools/pkg_chk pkg_chk-1.88: add mktemp to the list ...
details: https://anonhg.NetBSD.org/pkgsrc/rev/e2dc57213aa4
branches: trunk
changeset: 537857:e2dc57213aa4
user: tnn <tnn%pkgsrc.org@localhost>
date: Fri Jan 18 07:50:03 2008 +0000
description:
pkg_chk-1.88: add mktemp to the list of substituted commands.
diffstat:
pkgtools/pkg_chk/Makefile | 5 +++--
pkgtools/pkg_chk/files/pkg_chk.sh | 9 +++++----
2 files changed, 8 insertions(+), 6 deletions(-)
diffs (59 lines):
diff -r 65ae01ab511a -r e2dc57213aa4 pkgtools/pkg_chk/Makefile
--- a/pkgtools/pkg_chk/Makefile Fri Jan 18 05:47:30 2008 +0000
+++ b/pkgtools/pkg_chk/Makefile Fri Jan 18 07:50:03 2008 +0000
@@ -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 @@
-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 -r 65ae01ab511a -r e2dc57213aa4 pkgtools/pkg_chk/files/pkg_chk.sh
--- a/pkgtools/pkg_chk/files/pkg_chk.sh Fri Jan 18 05:47:30 2008 +0000
+++ b/pkgtools/pkg_chk/files/pkg_chk.sh Fri Jan 18 07:50:03 2008 +0000
@@ -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 @@
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 @@
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 "$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
Home |
Main Index |
Thread Index |
Old Index