Sun Oct 25 23:08:02 2009 UTC ()
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.


(joerg)
diff -r1.55 -r1.56 pkgsrc/pkgtools/pbulk/Makefile
diff -r1.18 -r1.19 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build
diff -r1.7 -r1.8 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date
cvs diff -r1.55 -r1.56 pkgsrc/pkgtools/pbulk/Makefile (expand / switch to unified diff)

--- pkgsrc/pkgtools/pbulk/Makefile 2009/09/04 22:06:18 1.55
+++ pkgsrc/pkgtools/pbulk/Makefile 2009/10/25 23:08:02 1.56
@@ -1,16 +1,16 @@ @@ -1,16 +1,16 @@
1# $NetBSD: Makefile,v 1.55 2009/09/04 22:06:18 joerg Exp $ 1# $NetBSD: Makefile,v 1.56 2009/10/25 23:08:02 joerg Exp $
2 2
3DISTNAME= pbulk-0.41 3DISTNAME= pbulk-0.42
4COMMENT= Modular bulk build framework 4COMMENT= Modular bulk build framework
5 5
6PKG_DESTDIR_SUPPORT= user-destdir 6PKG_DESTDIR_SUPPORT= user-destdir
7 7
8.include "../../pkgtools/pbulk/Makefile.common" 8.include "../../pkgtools/pbulk/Makefile.common"
9 9
10USE_TOOLS+= awk:run bzip2:run digest:run gzip:run make:run \ 10USE_TOOLS+= awk:run bzip2:run digest:run gzip:run make:run \
11 mail:run sed:run tar:run 11 mail:run sed:run tar:run
12DEPENDS+= rsync-[0-9]*:../../net/rsync 12DEPENDS+= rsync-[0-9]*:../../net/rsync
13DEPENDS+= pbulk-base>=0.38:../../pkgtools/pbulk-base 13DEPENDS+= pbulk-base>=0.38:../../pkgtools/pbulk-base
14 14
15.include "../../mk/bsd.prefs.mk" 15.include "../../mk/bsd.prefs.mk"
16 16
cvs diff -r1.18 -r1.19 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build (expand / switch to unified diff)

--- pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build 2009/09/04 22:06:18 1.18
+++ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-build 2009/10/25 23:08:02 1.19
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!@SH@ 1#!@SH@
2# $NetBSD: pkg-build,v 1.18 2009/09/04 22:06:18 joerg Exp $ 2# $NetBSD: pkg-build,v 1.19 2009/10/25 23:08:02 joerg Exp $
3# 3#
4# Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>. 4# Copyright (c) 2007, 2008 Joerg Sonnenberger <joerg@NetBSD.org>.
5# All rights reserved. 5# All rights reserved.
6# 6#
7# This code was developed as part of Google's Summer of Code 2007 program. 7# This code was developed as part of Google's Summer of Code 2007 program.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 12#
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
@@ -30,27 +30,27 @@ @@ -30,27 +30,27 @@
30# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 30# OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
31# SUCH DAMAGE. 31# SUCH DAMAGE.
32 32
33. @PBULK_CONFIG@ 33. @PBULK_CONFIG@
34 34
35if [ "${config_version}" != "@PBULK_CONFIG_VERSION@" ]; then 35if [ "${config_version}" != "@PBULK_CONFIG_VERSION@" ]; then
36 echo "Your configuration has version ${config_version}." 36 echo "Your configuration has version ${config_version}."
37 echo "This version of pbulk expects version @PBULK_CONFIG_VERSION@." 37 echo "This version of pbulk expects version @PBULK_CONFIG_VERSION@."
38 exit 1 38 exit 1
39fi 39fi
40 40
41cleanup() { 41cleanup() {
42 if [ "$keep_wrkdir" = yes ]; then 42 if [ "$keep_wrkdir" = yes ]; then
43 ${make} pbulk-save-wrkdir INTO=${bulklog}/${pkgname}/wrkdir.tar.gz 43 ${make} pbulk-save-wrkdir INTO=${bulklog}/${pkgname}/wrkdir.tar.gz TAR="${tar}"
44 fi 44 fi
45 if [ "$keep_prefix" = yes ] && [ -f ${bulklog}/${pkgname}/install.log ]; then 45 if [ "$keep_prefix" = yes ] && [ -f ${bulklog}/${pkgname}/install.log ]; then
46 if [ "$cross_compile" != "no" ]; then 46 if [ "$cross_compile" != "no" ]; then
47 cur_destdir=${target_destdir} 47 cur_destdir=${target_destdir}
48 else 48 else
49 cur_destdir= 49 cur_destdir=
50 fi 50 fi
51 ${tar} -czf ${bulklog}/${pkgname}/prefix.tar.gz ${cur_destdir}${prefix} 51 ${tar} -czf ${bulklog}/${pkgname}/prefix.tar.gz ${cur_destdir}${prefix}
52 fi 52 fi
53 ${make} clean > /dev/null 2>&1 || true 53 ${make} clean > /dev/null 2>&1 || true
54 exit 1 54 exit 1
55} 55}
56 56
cvs diff -r1.7 -r1.8 pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date (expand / switch to unified diff)

--- pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date 2009/06/08 16:02:53 1.7
+++ pkgsrc/pkgtools/pbulk/files/pbulk/scripts/pkg-up-to-date 2009/10/25 23:08:02 1.8
@@ -1,15 +1,15 @@ @@ -1,15 +1,15 @@
1#!@SH@ 1#!@SH@
2# $NetBSD: pkg-up-to-date,v 1.7 2009/06/08 16:02:53 joerg Exp $ 2# $NetBSD: pkg-up-to-date,v 1.8 2009/10/25 23:08:02 joerg Exp $
3# 3#
4# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>. 4# Copyright (c) 2007 Joerg Sonnenberger <joerg@NetBSD.org>.
5# All rights reserved. 5# All rights reserved.
6# 6#
7# This code was developed as part of Google's Summer of Code 2007 program. 7# This code was developed as part of Google's Summer of Code 2007 program.
8# 8#
9# Redistribution and use in source and binary forms, with or without 9# Redistribution and use in source and binary forms, with or without
10# modification, are permitted provided that the following conditions 10# modification, are permitted provided that the following conditions
11# are met: 11# are met:
12# 12#
13# 1. Redistributions of source code must retain the above copyright 13# 1. Redistributions of source code must retain the above copyright
14# notice, this list of conditions and the following disclaimer. 14# notice, this list of conditions and the following disclaimer.
15# 2. Redistributions in binary form must reproduce the above copyright 15# 2. Redistributions in binary form must reproduce the above copyright
@@ -35,26 +35,27 @@ @@ -35,26 +35,27 @@
35set -e 35set -e
36 36
37if [ "${config_version}" != "@PBULK_CONFIG_VERSION@" ]; then 37if [ "${config_version}" != "@PBULK_CONFIG_VERSION@" ]; then
38 echo "Your configuration has version ${config_version}." 38 echo "Your configuration has version ${config_version}."
39 echo "This version of pbulk expects version @PBULK_CONFIG_VERSION@." 39 echo "This version of pbulk expects version @PBULK_CONFIG_VERSION@."
40 exit 1 40 exit 1
41fi 41fi
42 42
43pkg="${packages}/All/$1.tgz" 43pkg="${packages}/All/$1.tgz"
44[ -f ${pkg} ] 44[ -f ${pkg} ]
45 45
46${pkg_info} -qb ${pkg} | sed 's/:/ /' | while read file file_id; do 46${pkg_info} -qb ${pkg} | sed 's/:/ /' | while read file file_id; do
47 [ -z "$file" ] && continue 47 [ -z "$file" ] && continue
 48 [ -e "${pkgsrc}/${file}" ]
48 49
49 id=`@SED@ -e '/[$]NetBSD/!d' -e 's/^.*\([$]NetBSD[^$]*[$]\).*$/\1/;q' ${pkgsrc}/${file}` 50 id=`@SED@ -e '/[$]NetBSD/!d' -e 's/^.*\([$]NetBSD[^$]*[$]\).*$/\1/;q' ${pkgsrc}/${file}`
50 [ "$id" = "$file_id" ] 51 [ "$id" = "$file_id" ]
51done 52done
52 53
53# TODO: compare build options 54# TODO: compare build options
54 55
55# Remove current package, so that only dependencies are in $* now. 56# Remove current package, so that only dependencies are in $* now.
56shift 57shift
57 58
58${pkg_info} -qN ${pkg} | while read dep; do 59${pkg_info} -qN ${pkg} | while read dep; do
59 # pkg_info prints a trailing newline, ignore that 60 # pkg_info prints a trailing newline, ignore that
60 [ -z "${dep}" ] && continue 61 [ -z "${dep}" ] && continue