[pkgsrc/trunk]: pkgsrc/mk/flavor/pkg Make use of ERROR_CAT to print the list ...

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

details:   https://anonhg.NetBSD.org/pkgsrc/rev/560470da14c7
branches:  trunk
changeset: 514094:560470da14c7
user:      jlam <jlam%pkgsrc.org@localhost>
date:      Wed Jun 07 17:21:23 2006 +0000

description:
Make use of ERROR_CAT to print the list of conflicting packages.

diffstat:

 mk/flavor/pkg/install.mk |  5 ++---
 1 files changed, 2 insertions(+), 3 deletions(-)

diffs (19 lines):

diff -r adaf40e44317 -r 560470da14c7 mk/flavor/pkg/install.mk
--- a/mk/flavor/pkg/install.mk  Wed Jun 07 17:09:52 2006 +0000
+++ b/mk/flavor/pkg/install.mk  Wed Jun 07 17:21:23 2006 +0000
@@ -1,4 +1,4 @@
-# $NetBSD: install.mk,v 1.4 2006/06/07 17:09:52 ghen Exp $
+# $NetBSD: install.mk,v 1.5 2006/06/07 17:21:23 jlam Exp $
 
 ######################################################################
 ### install-check-conflicts (PRIVATE, pkgsrc/mk/install/install.mk)
@@ -20,8 +20,7 @@
        ${_PKG_SILENT}${_PKG_DEBUG}                                     \
        ${TEST} -f ${WRKDIR}/.CONFLICTS || exit 0;                      \
        ${ERROR_MSG} "${PKGNAME} conflicts with installed package(s):"; \
-       while read line; do ${ERROR_MSG} "      $$line";        done    \
-               < ${WRKDIR}/.CONFLICTS;                                 \
+       ${CAT} ${WRKDIR}/.CONFLICTS | ${SED} -e "s|^|    |" | ${ERROR_CAT}; \
        ${ERROR_MSG} "They install the same files into the same place."; \
        ${ERROR_MSG} "Please remove conflicts first with pkg_delete(1)."; \
        ${RM} -f ${WRKDIR}/.CONFLICTS;                                  \