FreeBSD Bugzilla – Attachment 225451 Details for
Bug 250335
ports-mgmt/portmaster: tries to build devel/git@lite even if devel/git@default is already installed
Home
|
New
|
Browse
|
Search
|
[?]
|
Reports
|
Help
|
New Account
|
Log In
Remember
[x]
|
Forgot Password
Login:
[x]
[patch]
Patch to make conflicts check not ignore same origin packages
bsd.port.mk.diff (text/plain), 1.73 KB, created by
Stefan Eßer
on 2021-06-01 13:28:19 UTC
(
hide
)
Description:
Patch to make conflicts check not ignore same origin packages
Filename:
MIME Type:
Creator:
Stefan Eßer
Created:
2021-06-01 13:28:19 UTC
Size:
1.73 KB
patch
obsolete
>diff --git a/Mk/bsd.port.mk b/Mk/bsd.port.mk >index e514bb7ffec1..655bade68f62 100644 >--- a/Mk/bsd.port.mk >+++ b/Mk/bsd.port.mk >@@ -3314,7 +3314,7 @@ check-build-conflicts: > @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 \ >+ if [ "/${PREFIX}" = "/$${prfx}" ]; then \ > ${ECHO_CMD} -n " $${pkgname}"; \ > fi; \ > done); \ >@@ -3338,7 +3338,7 @@ identify-install-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 \ >+ if [ "/${PREFIX}" = "/$${prfx}" ]; then \ > ${ECHO_CMD} -n " $${pkgname}"; \ > fi; \ > done); \ >@@ -3363,7 +3363,7 @@ check-install-conflicts: > @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 \ >+ if [ "/${PREFIX}" = "/$${prfx}" ]; then \ > ${ECHO_CMD} -n " $${pkgname}"; \ > fi; \ > done); \ >@@ -3381,7 +3381,7 @@ check-install-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 \ >+ if [ "/${PREFIX}" = "/$${prfx}" ]; then \ > ${ECHO_CMD} -n " $${pkgname}"; \ > fi; \ > done); \
<b>You cannot view the attachment while viewing its details because your browser does not support IFRAMEs. <a href="attachment.cgi?id=225451">View the attachment on a separate page</a>.</b>
View Attachment As Diff
View Attachment As Raw
Actions:
View
|
Diff
Attachments on
bug 250335
:
218750
|
224691
| 225451