diff options
| author | joerg <joerg@pkgsrc.org> | 2009-10-25 23:08:02 +0000 |
|---|---|---|
| committer | joerg <joerg@pkgsrc.org> | 2009-10-25 23:08:02 +0000 |
| commit | 0f19c1cc66b180429928cd3ca425fcc618504974 (patch) | |
| tree | c7e700ff1595492ae5de8cabcb3d7158b8d99179 /pkgtools | |
| parent | caa169b5f52eb208ee863c5ab9be236086330c26 (diff) | |
| download | pkgsrc-0f19c1cc66b180429928cd3ca425fcc618504974.tar.gz | |
pbulk-0.41:
- Consider packages silently outdated if recorded files are missing.
- Explicitly pass down tar to pbulk-save-wrkdir, TAR is unset at that
point.
Diffstat (limited to 'pkgtools')
| -rw-r--r-- | pkgtools/pbulk/Makefile | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-build | 4 | ||||
| -rwxr-xr-x | pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date | 3 |
3 files changed, 6 insertions, 5 deletions
diff --git a/pkgtools/pbulk/Makefile b/pkgtools/pbulk/Makefile index 6165a86bfaf..a5bb728fcfb 100644 --- a/pkgtools/pbulk/Makefile +++ b/pkgtools/pbulk/Makefile @@ -1,6 +1,6 @@ -# $NetBSD: Makefile,v 1.55 2009/09/04 22:06:18 joerg Exp $ +# $NetBSD: Makefile,v 1.56 2009/10/25 23:08:02 joerg Exp $ -DISTNAME= pbulk-0.41 +DISTNAME= pbulk-0.42 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 340e5d6437d..10f3415e28d 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.18 2009/09/04 22:06:18 joerg Exp $ +# $NetBSD: pkg-build,v 1.19 2009/10/25 23:08:02 joerg Exp $ # # Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -40,7 +40,7 @@ fi cleanup() { if [ "$keep_wrkdir" = yes ]; then - ${make} pbulk-save-wrkdir INTO=${bulklog}/${pkgname}/wrkdir.tar.gz + ${make} pbulk-save-wrkdir INTO=${bulklog}/${pkgname}/wrkdir.tar.gz TAR="${tar}" fi if [ "$keep_prefix" = yes ] && [ -f ${bulklog}/${pkgname}/install.log ]; then if [ "$cross_compile" != "no" ]; then diff --git a/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date b/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date index 7e77c448762..d5bc99d2cfc 100755 --- a/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date +++ b/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date @@ -1,5 +1,5 @@ #!@SH@ -# $NetBSD: pkg-up-to-date,v 1.7 2009/06/08 16:02:53 joerg Exp $ +# $NetBSD: pkg-up-to-date,v 1.8 2009/10/25 23:08:02 joerg Exp $ # # Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. # All rights reserved. @@ -45,6 +45,7 @@ pkg="${packages}/All/$1.tgz" ${pkg_info} -qb ${pkg} | sed 's/:/ /' | while read file file_id; do [ -z "$file" ] && continue + [ -e "${pkgsrc}/${file}" ] id=`@SED@ -e '/[$]NetBSD/!d' -e 's/^.*\([$]NetBSD[^$]*[$]\).*$/\1/;q' ${pkgsrc}/${file}` [ "$id" = "$file_id" ] |