Page MenuHomeFreeBSD
Files F157342348

D32694.id101368.diff
No OneTemporary
Actions

D32694.id101368.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
@@ -3298,9 +3298,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}" -a "/$${pkgname%-*}" != "/${PKGBASE}" ]; then \
${ECHO_CMD} -n " $${pkgname}"; \
fi; \
done); \
@@ -3323,9 +3323,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}" -a "/$${pkgname%-*}" != "/${PKGBASE}" ]; then \
${ECHO_CMD} -n " $${pkgname}"; \
fi; \
done); \
@@ -3348,9 +3348,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}" -a "/$${pkgname%-*}" != "/${PKGBASE}" ]; then \
${ECHO_CMD} -n " $${pkgname}"; \
fi; \
done); \
@@ -3366,9 +3366,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}" -a "/$${pkgname%-*}" != "/${PKGBASE}" ]; then \
${ECHO_CMD} -n " $${pkgname}"; \
fi; \
done); \

File Metadata

Mime Type
text/plain
Expires
Thu, May 21, 11:42 AM (3 h, 26 m)
Storage Engine
blob
Storage Format
Raw Data
Storage Handle
33346586
Default Alt Text
D32694.id101368.diff (2 KB)

Event Timeline