summaryrefslogtreecommitdiff
path: root/pkgtools
diff options
context:
space:
mode:
authorjoerg <joerg@pkgsrc.org>2009-09-04 22:06:18 +0000
committerjoerg <joerg@pkgsrc.org>2009-09-04 22:06:18 +0000
commitd4a25a3252dcdc4402f5deea7c22b150aafb0711 (patch)
tree88cd8c298def814cd2879583df5f4b525c703d8d /pkgtools
parentddf0fcb29648e3f4af9140671eb54b11a21ac5a2 (diff)
downloadpkgsrc-d4a25a3252dcdc4402f5deea7c22b150aafb0711.tar.gz
pbulk-0.41:
Create & chown work.log for destdir builds too, as the normal build is run unprivileged.
Diffstat (limited to 'pkgtools')
-rw-r--r--pkgtools/pbulk/Makefile4
-rwxr-xr-xpkgtools/pbulk/files/pbulk/scripts/pkg-build4
2 files changed, 4 insertions, 4 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile
index 8d306c1d38e..6165a86bfaf 100644
--- a/pkgtools/pbulk/Makefile
+++ b/pkgtools/pbulk/Makefile
@@ -1,6 +1,6 @@
-# $NetBSD: Makefile,v 1.54 2009/06/08 16:02:52 joerg Exp $
+# $NetBSD: Makefile,v 1.55 2009/09/04 22:06:18 joerg Exp $
-DISTNAME= pbulk-0.40
+DISTNAME= pbulk-0.41
COMMENT= Modular bulk build framework
PKG_DESTDIR_SUPPORT= user-destdir
diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-build b/pkgtools/pbulk/files/pbulk/scripts/pkg-build
index 5489e215d3a..340e5d6437d 100755
--- a/pkgtools/pbulk/files/pbulk/scripts/pkg-build
+++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-build
@@ -1,5 +1,5 @@
#!@SH@
-# $NetBSD: pkg-build,v 1.17 2008/09/16 18:21:30 joerg Exp $
+# $NetBSD: pkg-build,v 1.18 2009/09/04 22:06:18 joerg Exp $
#
# Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
# All rights reserved.
@@ -117,7 +117,7 @@ set -e
mkdir -p ${bulklog}/${pkgname}
rm -f ${bulklog}/${pkgname}/*
-if [ "$use_destdir" = "user-destdir" ]; then
+if [ "$use_destdir" = "destdir" -o "$use_destdir" = "user-destdir" ]; then
touch ${bulklog}/${pkgname}/work.log
@CHOWN@ ${unprivileged_user} ${bulklog}/${pkgname}/work.log
fi