diff -rup src/darwinports1.0/darwinports.tcl /opt/mpq/share/darwinports/Tcl/darwinports1.0/darwinports.tcl
old
|
new
|
proc _dportexec {target dport} { |
957 | 957 | if {![catch {$workername eval eval_variants variations $target} result] && $result == 0 && |
958 | 958 | ![catch {$workername eval eval_targets $target} result] && $result == 0} { |
959 | 959 | # If auto-clean mode, clean-up after dependency install |
960 | | if {[string equal ${darwinports::portautoclean} "yes"]} { |
| 960 | if {$target != "dry" && [string equal ${darwinports::portautoclean} "yes"]} { |
961 | 961 | # Make sure we are back in the port path before clean |
962 | 962 | # otherwise if the current directory had been changed to |
963 | 963 | # inside the port, the next port may fail when trying to |
… |
… |
proc _dportexec {target dport} { |
977 | 977 | # dportexec |
978 | 978 | # Execute the specified target of the given dport. |
979 | 979 | |
| 980 | proc false {args} { |
| 981 | return 0 |
| 982 | } |
| 983 | |
980 | 984 | proc dportexec {dport target} { |
981 | 985 | global darwinports::registry.installtype |
982 | 986 | |
… |
… |
proc dportexec {dport target} { |
997 | 1001 | if {$target == "configure" || $target == "build" |
998 | 1002 | || $target == "test" |
999 | 1003 | || $target == "destroot" || $target == "install" |
1000 | | || $target == "archive" |
| 1004 | || $target == "archive" || $target == "dry" |
1001 | 1005 | || $target == "pkg" || $target == "mpkg" |
1002 | 1006 | || $target == "rpmpackage" || $target == "dpkg" } { |
1003 | 1007 | |
… |
… |
proc dportexec {dport target} { |
1014 | 1018 | # install them |
1015 | 1019 | # xxx: as with below, this is ugly. and deps need to be fixed to |
1016 | 1020 | # understand Port Images before this can get prettier |
1017 | | if { [string equal ${darwinports::registry.installtype} "image"] } { |
| 1021 | if { $target == "dry" } { # if this is a dry run, then run all dependencies dry |
| 1022 | set result [dlist_eval $dlist false [list _dportexec "dry"]] |
| 1023 | } elseif { [string equal ${darwinports::registry.installtype} "image"] } { |
1018 | 1024 | set result [dlist_eval $dlist _dportinstalled [list _dportexec "activate"]] |
1019 | 1025 | } else { |
1020 | 1026 | set result [dlist_eval $dlist _dportinstalled [list _dportexec "install"]] |
1021 | 1027 | } |
1022 | | |
| 1028 | |
1023 | 1029 | if {$result != {}} { |
1024 | 1030 | set errstring "The following dependencies failed to build:" |
1025 | 1031 | foreach ditem $result { |
… |
… |
proc dportdepends {dport {target ""} {re |
1282 | 1288 | mpkg - |
1283 | 1289 | rpmpackage - |
1284 | 1290 | dpkg - |
| 1291 | dry { set deptypes "depends_lib depends_build depends_run" } |
1285 | 1292 | "" { set deptypes "depends_lib depends_build depends_run" } |
1286 | 1293 | } |
1287 | 1294 | |
diff -rup src/port1.0/port.tcl /opt/mpq/share/darwinports/Tcl/port1.0/port.tcl
old
|
new
|
package require porttrace 1.0 |
51 | 51 | package require portdistcheck 1.0 |
52 | 52 | package require portlivecheck 1.0 |
53 | 53 | package require portmirror 1.0 |
| 54 | package require portdry 1.0 |