diff options
| author | tv <tv> | 2005-01-19 22:12:27 +0000 |
|---|---|---|
| committer | tv <tv> | 2005-01-19 22:12:27 +0000 |
| commit | 93787f214ebe80193b3d20e7f6e19baf27b7d696 (patch) | |
| tree | 14eeeba8bdd43193ada76210e5754e29e457c7e8 /mk/bulk | |
| parent | 3cbeda5863ecdc788f0c805994836fffc71a4707 (diff) | |
| download | pkgsrc-93787f214ebe80193b3d20e7f6e19baf27b7d696.tar.gz | |
Fix error in previous; add explicit version check first, then the optionally
excluded timestamp check.
Diffstat (limited to 'mk/bulk')
| -rw-r--r-- | mk/bulk/bsd.bulk-pkg.mk | 15 |
1 files changed, 10 insertions, 5 deletions
diff --git a/mk/bulk/bsd.bulk-pkg.mk b/mk/bulk/bsd.bulk-pkg.mk index 3db7468c16c..ce22f7c3f31 100644 --- a/mk/bulk/bsd.bulk-pkg.mk +++ b/mk/bulk/bsd.bulk-pkg.mk @@ -1,4 +1,4 @@ -# $NetBSD: bsd.bulk-pkg.mk,v 1.70 2005/01/19 20:58:00 tv Exp $ +# $NetBSD: bsd.bulk-pkg.mk,v 1.71 2005/01/19 22:12:27 tv Exp $ # # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf@NetBSD.org> @@ -201,8 +201,11 @@ clean-bulk-cache: # the pkg files; prints "1" if upto date, "0" if not. bulk-check-uptodate: @uptodate=1; \ - if [ "$USE_BULK_TIMESTAMPS" = "yes" ]; then \ - if [ -f "${REF}" ]; then \ + if [ -f "${REF}" ]; then \ + if [ "${REF:T}" != "${PKGFILE:T}" ]; then \ + ${ECHO_MSG} >&2 "BULK> ${REF} is out of date (new version ${PKGNAME}); rebuilding..."; \ + uptodate=0; \ + elif [ "$USE_BULK_TIMESTAMPS" = "yes" ]; then \ ${SHCOMMENT} "Check files of this package"; \ newfiles="`${FIND} . -type f -newer "${REF}" -print | ${EGREP} -v -e ./work -e COMMENT -e DESCR -e README.html -e CVS -e '^\./\.' || ${TRUE}`"; \ nnewfiles="`${FIND} . -type f -newer "${REF}" -print | ${EGREP} -v -e ./work -e COMMENT -e DESCR -e README.html -e CVS -e '^\./\.' | ${WC} -l`"; \ @@ -213,9 +216,11 @@ bulk-check-uptodate: ${ECHO_MSG} >&2 "BULK> ${REF} is up to date."; \ fi; \ else \ - ${ECHO_MSG} >&2 "BULK> Package ${PKGNAME} not built yet, packaging..."; \ - uptodate=0; \ + ${ECHO_MSG} >&2 "BULK> ${REF} is up to date."; \ fi; \ + else \ + ${ECHO_MSG} >&2 "BULK> Package ${PKGNAME} not built yet, packaging..."; \ + uptodate=0; \ fi; \ if [ "$$uptodate" = "1" ]; then \ ${SHCOMMENT} "Check required binary packages"; \ |