Page MenuHomeFreeBSD
Files F144921983

D30891.1776924101.diff
No OneTemporary
Actions

Size
2 KB
Referenced Files
None
Subscribers
None

D30891.1776924101.diff
View Options

diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk
--- a/Mk/bsd.port.mk
+++ b/Mk/bsd.port.mk
@@ -3312,9 +3312,9 @@
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 || : ; } \
- | while read pkgname prfx orgn; do \
- if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \
+ { ${PKG_QUERY} -g "%n-%v %p" ${CONFLICTS:C/.+/'&'/}} ${CONFLICTS_BUILD:C/.+/'&'/}} 2>/dev/null || : ; } \
+ | while read pkgname prfx; do \
+ if [ "/${PREFIX}" = "/$${prfx}" ]; then \
${ECHO_CMD} -n " $${pkgname}"; \
fi; \
done); \
@@ -3336,9 +3336,9 @@
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 || : ; } \
- | while read pkgname prfx orgn; do \
- if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \
+ { ${PKG_QUERY} -g "%n-%v %p" ${CONFLICTS:C/.+/'&'/}} ${CONFLICTS_INSTALL:C/.+/'&'/}} 2>/dev/null || : ; } \
+ | while read pkgname prfx; do \
+ if [ "/${PREFIX}" = "/$${prfx}" ]; then \
${ECHO_CMD} -n " $${pkgname}"; \
fi; \
done); \
@@ -3361,9 +3361,9 @@
.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 || : ; } \
- | while read pkgname prfx orgn; do \
- if [ "/${PREFIX}" = "/$${prfx}" -a "/${PKGORIGIN}" != "/$${orgn}" ]; then \
+ { ${PKG_QUERY} -g "%n-%v %p" ${CONFLICTS:C/.+/'&'/}} ${CONFLICTS_BUILD:C/.+/'&'/}} ${CONFLICTS_INSTALL:C/.+/'&'/}} 2>/dev/null || : ; } \
+ | while read pkgname prfx; do \
+ if [ "/${PREFIX}" = "/$${prfx}" ]; then \
${ECHO_CMD} -n " $${pkgname}"; \
fi; \
done); \
@@ -3379,9 +3379,9 @@
fi
.else
@conflicts_with=$$( \
- { ${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 \
+ { ${PKG_QUERY} -g "%n-%v %p" ${CONFLICTS:C/.+/'&'/}} ${CONFLICTS_INSTALL:C/.+/'&'/}} 2>/dev/null || : ; } \
+ | while read pkgname prfx; do \
+ if [ "/${PREFIX}" = "/$${prfx}" ]; then \
${ECHO_CMD} -n " $${pkgname}"; \
fi; \
done); \

File Metadata

Mime Type
text/plain
Expires
Thu, Apr 23, 6:01 AM (5 h, 54 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
28414642
Default Alt Text
D30891.1776924101.diff (2 KB)

Event Timeline