[pkgsrc/trunk]: pkgsrc/mk/bulk Replaced ${ECHO_MSG} with ${ECHO} where approp...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/d33875f9b76f
branches:  trunk
changeset: 503355:d33875f9b76f
user:      rillig <rillig%pkgsrc.org@localhost>
date:      Sat Nov 19 03:53:50 2005 +0000

description:
Replaced ${ECHO_MSG} with ${ECHO} where appropriate. While there, quoted
the filename of the toplevel BROKENFILE correctly.

diffstat:

 mk/bulk/bsd.bulk-pkg.mk |  38 +++++++++++++++++++-------------------
 1 files changed, 19 insertions(+), 19 deletions(-)

diffs (78 lines):

diff -r 1c4b2b9c60a9 -r d33875f9b76f mk/bulk/bsd.bulk-pkg.mk
--- a/mk/bulk/bsd.bulk-pkg.mk   Sat Nov 19 01:04:19 2005 +0000
+++ b/mk/bulk/bsd.bulk-pkg.mk   Sat Nov 19 03:53:50 2005 +0000
@@ -1,4 +1,4 @@
-#      $NetBSD: bsd.bulk-pkg.mk,v 1.102 2005/11/18 08:48:09 rillig Exp $
+#      $NetBSD: bsd.bulk-pkg.mk,v 1.103 2005/11/19 03:53:50 rillig Exp $
 
 #
 # Copyright (c) 1999, 2000 Hubert Feyrer <hubertf%NetBSD.org@localhost>
@@ -301,7 +301,7 @@
                        fi; \
                done) || uptodate=0; \
        fi; \
-       ${ECHO_MSG} $$uptodate
+       ${ECHO} $$uptodate
 
 # rebuild binpkg if any of the pkg files is newer than the binary archive
 # set DO to ":" to not actually do anything (debugging, ...)
@@ -314,13 +314,13 @@
        fi
        @( \
        if [ "${PRECLEAN}" = "yes" ]; then \
-               ${ECHO_MSG} '<pre>' ; \
-               ${ECHO_MSG} '' ; \
-               ${ECHO_MSG} '###' ; \
-               ${ECHO_MSG} '###' `date`: ; \
-               ${ECHO_MSG} '### ${MAKE} ${.TARGET} for ${PKGNAME}' ; \
-               ${ECHO_MSG} '### Current pkg count: ' `${LS} -l ${PKG_DBDIR} | ${GREP} '^d' | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \
-               ${ECHO_MSG} '###' ; \
+               ${ECHO} '<pre>' ; \
+               ${ECHO} '' ; \
+               ${ECHO} '###' ; \
+               ${ECHO} '###' `date`: ; \
+               ${ECHO} '### ${MAKE} ${.TARGET} for ${PKGNAME}' ; \
+               ${ECHO} '### Current pkg count: ' `${LS} -l ${PKG_DBDIR} | ${GREP} '^d' | ${WC} -l` installed packages: `${LS} ${PKG_DBDIR} | ${GREP} -v pkgdb.byfile.db`; \
+               ${ECHO} '###' ; \
        fi \
        ) 2>&1 | ${TEE} -a ${_BUILDLOG:Q}
        @uptodate=`${MAKE} ${MAKEFLAGS} bulk-check-uptodate REF=${PKGFILE}` ; \
@@ -430,20 +430,20 @@
                else \
                        ${MV} ${_BUILDLOG:Q} ${_BROKENFILE:Q} ;\
                        if [ -f "${WRKLOG}" ]; then \
-                               (${ECHO_MSG} "<pre>"; \
-                               ${ECHO_MSG} ""; \
+                               (${ECHO} "<pre>"; \
+                               ${ECHO} ""; \
                                ${TO_HTML} ${WRKLOG}; \
-                               ${ECHO_MSG} "</pre>"; \
+                               ${ECHO} "</pre>"; \
                                ) >> ${_BROKENWRKLOG:Q}; \
                        fi; \
                        ( \
                        if [ -f "${_BROKENWRKLOG:Q}" ]; then \
-                               ${ECHO_MSG} "</pre>"; \
-                               ${ECHO_MSG} "<p>"; \
-                               ${ECHO_MSG} "Please view the <a href=\"../../${PKGPATH}/${BROKENWRKLOG}\">work log for ${PKGNAME}</a>"; \
-                               ${ECHO_MSG} "</p>"; \
-                               ${ECHO_MSG} "<pre>"; \
-                               ${ECHO_MSG} ""; \
+                               ${ECHO} "</pre>"; \
+                               ${ECHO} "<p>"; \
+                               ${ECHO} "Please view the <a href=\"../../${PKGPATH}/${BROKENWRKLOG}\">work log for ${PKGNAME}</a>"; \
+                               ${ECHO} "</p>"; \
+                               ${ECHO} "<pre>"; \
+                               ${ECHO} ""; \
                        fi ; \
                        ${BULK_MSG} "${PKGNAME} was marked as broken:" ; \
                        ${LS} -la ${_BROKENFILE:Q} ; \
@@ -494,7 +494,7 @@
                        if [ -f ${_INTERACTIVE_COOKIE} ]; then \
                                nerrors="0"; \
                        fi; \
-                       ${ECHO_MSG} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${BULKFILESDIR}/${BROKENFILE} \
+                       ${ECHO} " $$nerrors ${PKGPATH}/${BROKENFILE} $$nbrokenby " >> ${BULKFILESDIR:Q}/${BROKENFILE:Q} \
                        ) 2>&1 | ${TEE} -a ${_BROKENFILE:Q}; \
                fi ; \
                case ${_PRESERVE_WRKDIR} in                             \