diff options
| author | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-05-17 22:07:18 +0000 |
|---|---|---|
| committer | Baptiste Daroussin <bapt@FreeBSD.org> | 2012-05-17 22:07:18 +0000 |
| commit | 05659b40509ead6a63db5d69d5b6c5268001d58a (patch) | |
| tree | 1a3feeb18fd2ea477a4ee4af4ea831be59428d06 /Mk/bsd.pkgng.mk | |
| parent | 4c1f4420d81abf30cc7e706cbf895393f9bdb9de (diff) | |
| download | ports-05659b40509ead6a63db5d69d5b6c5268001d58a.tar.gz ports-05659b40509ead6a63db5d69d5b6c5268001d58a.zip | |
Fix conflict handling when pkgng is used.
Submitted by: Garrett Cooper <yanegomi@gmail.com>
Notes
Notes:
svn path=/head/; revision=296867
Diffstat (limited to 'Mk/bsd.pkgng.mk')
| -rw-r--r-- | Mk/bsd.pkgng.mk | 24 |
1 files changed, 12 insertions, 12 deletions
diff --git a/Mk/bsd.pkgng.mk b/Mk/bsd.pkgng.mk index 596d50ef4a84..9062a541e8fa 100644 --- a/Mk/bsd.pkgng.mk +++ b/Mk/bsd.pkgng.mk @@ -119,13 +119,13 @@ fake-pkg: .if !target(check-build-conflicts) check-build-conflicts: .if ( defined(CONFLICTS) || defined(CONFLICTS_BUILD) ) && !defined(DISABLE_CONFLICTS) && !defined(DEFER_CONFLICTS_CHECK) - @conflicts_with=; \ + @conflicts_with=$$( \ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ - conflicts_with="$${conflicts_with} $${pkgname}"; \ + ${ECHO_CMD} -n " $${pkgname}"; \ fi; \ - done; \ + done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ @@ -143,13 +143,13 @@ check-build-conflicts: .if !target(identify-install-conflicts) identify-install-conflicts: .if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS) - @conflicts_with=; \ + @conflicts_with=$$( \ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ - conflicts_with="$${conflicts_with} $${pkgname}"; \ + ${ECHO_CMD} -n " $${pkgname}"; \ fi; \ - done; \ + done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ @@ -168,13 +168,13 @@ identify-install-conflicts: check-install-conflicts: .if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) || ( defined(CONFLICTS_BUILD) && defined(DEFER_CONFLICTS_CHECK) ) ) && !defined(DISABLE_CONFLICTS) .if defined(DEFER_CONFLICTS_CHECK) - @conflicts_with; \ + @conflicts_with=$$( \ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ - conflicts_with="$${conflicts_with} $${pkgname}"; \ + ${ECHO_CMD} -n " $${pkgname}"; \ fi; \ - done; \ + done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ @@ -186,13 +186,13 @@ check-install-conflicts: exit 1; \ fi .else - @conflicts_with=; \ + @conflicts_with=$$( \ ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ - conflicts_with="$${conflicts_with} $${pkgname}"; \ + ${ECHO_CMD} -n " $${pkgname}"; \ fi; \ - done; \ + done); \ if [ -n "$${conflicts_with}" ]; then \ ${ECHO_MSG}; \ ${ECHO_MSG} "===> ${PKGNAME} conflicts with installed package(s): "; \ |