Ticket #2452: portdep.diff

base/src/darwinports1.0/darwinports.tcl

@@ -621 +621 @@
         return [_dportsearchpath $depregex $search_path]
 }
 
+### _porttest is private; subject to change without notice
+
+proc _porttest {dport depspec} {
+        # We don't actually look for the port, but just return false
+        # in order to let the dportdepends handle the dependency
+        return 0
+}
+
 ### _dportinstalled is private; may change without notice
 
 # Determine if a port is already *installed*, as in "in the registry".
@@ -636 +644 @@
         }
 }
 
-### _dporispresent is private; may change without notice
+### _dportispresent is private; may change without notice
 
 # Determine if some depspec is satisfied or if the given port is installed.
 # We actually start with the registry (faster?)
@@ -663 +671 @@
                         lib { return [_libtest $dport $depspec] }
                         bin { return [_bintest $dport $depspec] }
                         path { return [_pathtest $dport $depspec] }
+                        port { return [_porttest $dport $depspec] }
                         default {return -code error "unknown depspec type: $type"}
                 }
                 return 0

base/src/port1.0/portdepends.tcl

@@ -46 +46 @@
     switch -regex $action {
         set|append|delete {
             foreach depspec $args {
-                if {[regexp {([A-Za-z\./0-9]+):([A-Za-z0-9_/\-\.$^\?\+\(\)\|\\]+):([-A-Za-z\./0-9_]+)} "$depspec" match deppath depregex portname]} {
-                    switch $deppath {
-                        lib {}
-                        bin {}
-                        path {}
+                if {[regexp {([A-Za-z\./0-9]+):([A-Za-z0-9_/\-\.$^\?\+\(\)\|\\]*):([-A-Za-z\./0-9_]+)} "$depspec" match deppath depregex portname]} {
+                        switch -regex $deppath {
+                        lib|bin|path {
+                                if {[string length $depregex] == 0} {
+                                        return -code error [format [msgcat::mc "invalid depspec: %s (missing regex component)"] $depspec]
+                                }
+                        }
+                        port {}
                         default {return -code error [format [msgcat::mc "unknown depspec type: %s"] $deppath]}
                     }
                 } else {