Changeset 99115

Timestamp:

Oct 27, 2012, 6:02:38 AM (12 years ago)

Author:

ryandesign@…

Message:

conflicts_build-1.0.tcl: support subports; add custom message when the port a port conflicts with is itself (i.e. petsc)

File:

• trunk/dports/_resources/port1.0/group/conflicts_build-1.0.tcl (modified) (1 diff)

trunk/dports/_resources/port1.0/group/conflicts_build-1.0.tcl

@@ -48 +48 @@
 
 proc conflicts_build._check_for_conflicting_ports {} {
-    global conflicts_build name
+    global conflicts_build subport
     foreach badport ${conflicts_build} {
         if {![catch "registry_active ${badport}"]} {
-            ui_error "${name} cannot be built while ${badport} is active."
-            ui_error "Please deactivate ${badport} and try again."
-            ui_error "You can reactivate ${badport} again later."
+            if {${subport} == ${badport}} {
+                ui_error "${subport} cannot be built while another version of ${badport} is active."
+                ui_error "Please deactivate the existing copy of ${badport} and try again."
+            } else {
+                ui_error "${subport} cannot be built while ${badport} is active."
+                ui_error "Please deactivate ${badport} and try again."
+                ui_error "You can reactivate ${badport} again later."
+            }
             return -code error "${badport} is active"
         }