Modified: trunk/base/portmgr/jobs/port_binary_distributable.tcl (99278 => 99279)
--- trunk/base/portmgr/jobs/port_binary_distributable.tcl 2012-10-31 00:38:21 UTC (rev 99278)
+++ trunk/base/portmgr/jobs/port_binary_distributable.tcl 2012-10-31 00:51:14 UTC (rev 99279)
@@ -255,9 +255,14 @@
}
}
+ # skip deps that are explicitly stated to not conflict
+ array unset aPort_noconflict_ports
+ foreach noconflict_port [lindex $aPortInfo 3] {
+ set aPort_noconflict_ports($noconflict_port) 1
+ }
# add its deps to the list
foreach possiblyNewPort [lindex $aPortInfo 0] {
- if {![info exists portSeen($possiblyNewPort)]} {
+ if {![info exists portSeen($possiblyNewPort)] && ![info exists aPort_noconflict_ports($possiblyNewPort)]} {
lappend portList $possiblyNewPort
}
}