diff options
| author | bdrewery <bdrewery@FreeBSD.org> | 2013-03-09 22:14:40 +0800 |
|---|---|---|
| committer | bdrewery <bdrewery@FreeBSD.org> | 2013-03-09 22:14:40 +0800 |
| commit | 5d6bde4af3c6d434381baf8056cf75b3546bf371 (patch) | |
| tree | 7d8071644c4e8c8c156078fa3c5b36c53aaf975b /Mk | |
| parent | 247a57f48344c08ed64bb9a8bd82e33e5ac68212 (diff) | |
| download | freebsd-ports-gnome-5d6bde4af3c6d434381baf8056cf75b3546bf371.tar.gz freebsd-ports-gnome-5d6bde4af3c6d434381baf8056cf75b3546bf371.tar.zst freebsd-ports-gnome-5d6bde4af3c6d434381baf8056cf75b3546bf371.zip | |
- pkg-query(8) in pkg-1.1.x returns non-zero exit status when
no matching packages are found. Fix cases that
expect to potentially find no matches.
PR: ports/176783
Approved by: portmgr (bapt)
Diffstat (limited to 'Mk')
| -rw-r--r-- | Mk/bsd.pkgng.mk | 12 |
1 files changed, 6 insertions, 6 deletions
diff --git a/Mk/bsd.pkgng.mk b/Mk/bsd.pkgng.mk index 26f5679a7135..cef9a927f9b8 100644 --- a/Mk/bsd.pkgng.mk +++ b/Mk/bsd.pkgng.mk @@ -22,8 +22,8 @@ PLIST_REINPLACE:= ${PLIST_REINPLACE:Nstopdaemon} ACTUAL-PACKAGE-DEPENDS?= \ if [ "${_LIB_RUN_DEPENDS}" != " " ]; then \ - ${PKG_QUERY} "%n: {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \ - ${PKG_QUERY} "%dn: {origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} ; \ + ${PKG_QUERY} "%n: {origin: %o, version: \"%v\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \ + ${PKG_QUERY} "%dn: {origin: %do, version: \"%dv\"}" " " ${_LIB_RUN_DEPENDS:C,[^:]*:([^:]*):?.*,\1,:C,${PORTSDIR}/,,} 2>/dev/null || : ; \ fi @@ -153,7 +153,7 @@ fake-pkg: check-build-conflicts: .if ( defined(CONFLICTS) || defined(CONFLICTS_BUILD) ) && !defined(DISABLE_CONFLICTS) && !defined(DEFER_CONFLICTS_CHECK) @conflicts_with=$$( \ - ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null \ + ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} 2>/dev/null || : \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ ${ECHO_CMD} -n " $${pkgname}"; \ @@ -177,7 +177,7 @@ check-build-conflicts: identify-install-conflicts: .if ( defined(CONFLICTS) || defined(CONFLICTS_INSTALL) ) && !defined(DISABLE_CONFLICTS) @conflicts_with=$$( \ - ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null \ + ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ ${ECHO_CMD} -n " $${pkgname}"; \ @@ -202,7 +202,7 @@ 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=$$( \ - ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null \ + ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_BUILD:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ ${ECHO_CMD} -n " $${pkgname}"; \ @@ -220,7 +220,7 @@ check-install-conflicts: fi .else @conflicts_with=$$( \ - ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null \ + ${PKG_QUERY} -g "%n-%v %p %o" ${CONFLICTS:C/.+/'&'/} ${CONFLICTS_INSTALL:C/.+/'&'/} 2>/dev/null || : \ | while read pkgname prfx orgn; do \ if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \ ${ECHO_CMD} -n " $${pkgname}"; \ |