[pkgsrc/trunk]: pkgsrc/mk/bulk Fix error in previous; add explicit version ch...

[tv <tv%pkgsrc.org@localhost>]

details:   https://anonhg.NetBSD.org/pkgsrc/rev/8271dfa1e204
branches:  trunk
changeset: 487773:8271dfa1e204
user:      tv <tv%pkgsrc.org@localhost>
date:      Wed Jan 19 22:12:27 2005 +0000

description:
Fix error in previous; add explicit version check first, then the optionally
excluded timestamp check.

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  15 ++++++++++-----
 1 files changed, 10 insertions(+), 5 deletions(-)

diffs (37 lines):

diff -r e67b107a6d7d -r 8271dfa1e204 mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Wed Jan 19 22:00:44 2005 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Wed Jan 19 22:12:27 2005 +0000
@@ -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@localhost>
@@ -201,8 +201,11 @@
 # 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 @@
                                ${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"; \