[49059] trunk/base
toby at macports.org
toby at macports.org
Thu Apr 2 10:28:02 PDT 2009
Revision: 49059
http://trac.macports.org/changeset/49059
Author: toby at macports.org
Date: 2009-04-02 10:28:01 -0700 (Thu, 02 Apr 2009)
Log Message:
-----------
Remove the deprecated dport* procs. Not sure if the portmgr stuff even still works, just did a basic search and replace.
Modified Paths:
--------------
trunk/base/portmgr/packaging/dpkgall.tcl
trunk/base/portmgr/packaging/mpkgall.tcl
trunk/base/portmgr/packaging/packageall.tcl
trunk/base/portmgr/packaging/rpmall.tcl
trunk/base/src/macports1.0/macports.tcl
Modified: trunk/base/portmgr/packaging/dpkgall.tcl
===================================================================
--- trunk/base/portmgr/packaging/dpkgall.tcl 2009-04-02 16:43:21 UTC (rev 49058)
+++ trunk/base/portmgr/packaging/dpkgall.tcl 2009-04-02 17:28:01 UTC (rev 49059)
@@ -293,7 +293,7 @@
array set ui_options {}
array set options {}
array set variations {}
- dportinit ui_options options variations
+ mportinit ui_options options variations
# If -i was specified, install base system and exit
if {$initialize_flag == "true"} {
@@ -347,7 +347,7 @@
# If no portlist file was specified, create a portlist that includes all ports
if {[llength $portlist] == 0 || "$buildall_flag" == "true"} {
- set res [dportsearch {.*}]
+ set res [mportsearch {.*}]
foreach {name array} $res {
lappend portlist $name
}
@@ -494,14 +494,14 @@
install_binary_if_available $dep
}
- if {[catch {set workername [dportopen $portinfo(porturl) [array get options] [array get variations] yes]} result] || $result == 1} {
+ if {[catch {set workername [mportopen $portinfo(porturl) [array get options] [array get variations] yes]} result] || $result == 1} {
global errorInfo
ui_debug "$errorInfo"
ui_noisy_error "Internal error: unable to open port: $result"
exit 1
}
- if {[catch {set result [dportexec $workername clean]} result] || $result == 1} {
+ if {[catch {set result [mportexec $workername clean]} result] || $result == 1} {
ui_noisy_error "Cleaning $portinfo(name) failed, consult build log"
# Close the log
@@ -511,28 +511,28 @@
copy_failure_log $portinfo(name)
# Close the port
- dportclose $workername
+ mportclose $workername
continue
}
# Re-open the port. MacPorts doesn't play well with multiple targets, apparently
- dportclose $workername
- if {[catch {set workername [dportopen $portinfo(porturl) [array get options] [array get variations] yes]} result] || $result == 1} {
+ mportclose $workername
+ if {[catch {set workername [mportopen $portinfo(porturl) [array get options] [array get variations] yes]} result] || $result == 1} {
global errorInfo
ui_debug "$errorInfo"
ui_noisy_error "Internal error: unable to open port: $result"
exit 1
}
- if {[catch {set result [dportexec $workername dpkg]} result] || $result == 1} {
+ if {[catch {set result [mportexec $workername dpkg]} result] || $result == 1} {
ui_noisy_error "Packaging $portinfo(name) failed, consult build log"
# Copy the log to the failure directory
copy_failure_log $portinfo(name)
# Close the port
- dportclose $workername
+ mportclose $workername
# Close the log
close $logfd
@@ -566,7 +566,7 @@
delete_failure_log $portinfo(name)
# Close the port
- dportclose $workername
+ mportclose $workername
}
open_default_log
@@ -740,15 +740,15 @@
array set portinfo [lindex [get_portinfo $port] 1]
- if {[catch {set workername [dportopen $portinfo(porturl) $options $variants yes]} result] || $result == 1} {
+ if {[catch {set workername [mportopen $portinfo(porturl) $options $variants yes]} result] || $result == 1} {
return -code error "Internal error: unable to open port: $result"
exit 1
}
- if {[catch {set result [dportexec $workername install]} result] || $result == 1} {
+ if {[catch {set result [mportexec $workername install]} result] || $result == 1} {
# Close the port
- dportclose $workername
+ mportclose $workername
# Return error
return -code error "Executing target $target on $portinfo(name) failed."
@@ -757,7 +757,7 @@
proc get_portinfo {port} {
set searchstring [regex_escape_portname $port]
- set res [dportsearch "^${searchstring}\$"]
+ set res [mportsearch "^${searchstring}\$"]
if {[llength $res] < 2} {
return -code error "Port \"$port\" not found in index."
Modified: trunk/base/portmgr/packaging/mpkgall.tcl
===================================================================
--- trunk/base/portmgr/packaging/mpkgall.tcl 2009-04-02 16:43:21 UTC (rev 49058)
+++ trunk/base/portmgr/packaging/mpkgall.tcl 2009-04-02 17:28:01 UTC (rev 49059)
@@ -54,7 +54,7 @@
# XXX: probably should exclude KDE here too
if {$portname == "XFree86"} { return {} }
- if {[catch {set res [dportsearch "^$portname\$"]} error]} {
+ if {[catch {set res [mportsearch "^$portname\$"]} error]} {
puts stderr "Internal error: port search failed: $error"
return
}
@@ -216,7 +216,7 @@
array set variations [list]
# set ui_options(ports_verbose) yes
-if {[catch {dportinit ui_options options variations} result]} {
+if {[catch {mportinit ui_options options variations} result]} {
puts "Failed to initialize ports system, $result"
exit 1
}
@@ -230,7 +230,7 @@
foreach pname $argv {
-if {[catch {set res [dportsearch "^${pname}\$"]} result]} {
+if {[catch {set res [mportsearch "^${pname}\$"]} result]} {
puts "port search failed: $result"
exit 1
}
Modified: trunk/base/portmgr/packaging/packageall.tcl
===================================================================
--- trunk/base/portmgr/packaging/packageall.tcl 2009-04-02 16:43:21 UTC (rev 49058)
+++ trunk/base/portmgr/packaging/packageall.tcl 2009-04-02 17:28:01 UTC (rev 49059)
@@ -119,7 +119,7 @@
proc get_dependencies {portname includeBuildDeps} {
set result {}
- if {[catch {set res [dportsearch "^$portname\$"]} error]} {
+ if {[catch {set res [mportsearch "^$portname\$"]} error]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Internal error: port search failed: $error"
@@ -200,7 +200,7 @@
array set variations [list]
# set ui_options(ports_verbose) yes
-if {[catch {dportinit ui_options options variations} result]} {
+if {[catch {mportinit ui_options options variations} result]} {
puts "Failed to initialize ports system, $result"
exit 1
}
@@ -214,7 +214,7 @@
foreach pname $argv {
-if {[catch {set res [dportsearch "^${pname}\$"]} result]} {
+if {[catch {set res [mportsearch "^${pname}\$"]} result]} {
puts "port search failed: $result"
exit 1
}
@@ -391,25 +391,25 @@
# Turn on verbose output for the build
set ui_options(ports_verbose) yes
- if {[catch {set workername [dportopen $porturl [array get options] [array get variations] yes]} result] ||
+ if {[catch {set workername [mportopen $porturl [array get options] [array get variations] yes]} result] ||
$result == 1} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Internal error: unable to open port: $result"
continue
}
- if {[catch {set result [dportexec $workername pkg]} result] ||
+ if {[catch {set result [mportexec $workername pkg]} result] ||
$result == 1} {
global errorInfo
ui_debug "$errorInfo"
ui_error "port package failed: $result"
- dportclose $workername
+ mportclose $workername
continue
}
set ui_options(ports_verbose) no
# Turn verbose output off after the build
- dportclose $workername
+ mportclose $workername
# We made it to the end. We can delete the log file.
close $logfd
Modified: trunk/base/portmgr/packaging/rpmall.tcl
===================================================================
--- trunk/base/portmgr/packaging/rpmall.tcl 2009-04-02 16:43:21 UTC (rev 49058)
+++ trunk/base/portmgr/packaging/rpmall.tcl 2009-04-02 17:28:01 UTC (rev 49059)
@@ -122,7 +122,7 @@
proc get_dependencies {portname includeBuildDeps} {
set result {}
- if {[catch {set search [dportsearch "^$portname\$"]} error]} {
+ if {[catch {set search [mportsearch "^$portname\$"]} error]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Internal error: port search failed: $error"
@@ -209,7 +209,7 @@
set variations(puredarwin) "+"
}
-if {[catch {dportinit ui_options options variations} result]} {
+if {[catch {mportinit ui_options options variations} result]} {
puts "Failed to initialize ports system, $result"
exit 1
}
@@ -223,7 +223,7 @@
foreach pname $argv {
-if {[catch {set allpackages [dportsearch "^${pname}\$"]} result]} {
+if {[catch {set allpackages [mportsearch "^${pname}\$"]} result]} {
puts "port search failed: $result"
exit 1
}
@@ -437,26 +437,26 @@
foreach prebuild {"ccache" "rpm" "unzip"} {
if {![file exists /bin/${prebuild}] && ![file exists /usr/bin/${prebuild}]} {
ui_msg "---> Pre-installing ${prebuild}"
- if {[catch {set search [dportsearch "^${prebuild}\$"]} error]} {
+ if {[catch {set search [mportsearch "^${prebuild}\$"]} error]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Internal error: port search ${prebuild} failed: $error"
}
array set prebuildinfo [lindex $search 1]
set ui_options(ports_verbose) yes
- if {[catch {set workername [dportopen $prebuildinfo(porturl) [array get options] [array get variations] yes]} result] ||
+ if {[catch {set workername [mportopen $prebuildinfo(porturl) [array get options] [array get variations] yes]} result] ||
$result == 1} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Internal error: unable to install ${prebuild}... exiting"
exit 1
}
- if {[catch {set result [dportexec $workername install]} result] ||
+ if {[catch {set result [mportexec $workername install]} result] ||
$result == 1} {
global errorInfo
ui_debug "$errorInfo"
ui_error "installation of ${prebuild} failed: $result"
- dportclose $workername
+ mportclose $workername
exit 1
}
}
@@ -464,25 +464,25 @@
# Turn on verbose output for the build
set ui_options(ports_verbose) yes
- if {[catch {set workername [dportopen $porturl [array get options] [array get variations]]} result] ||
+ if {[catch {set workername [mportopen $porturl [array get options] [array get variations]]} result] ||
$result == 1} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Internal error: unable to open port: $result"
continue
}
- if {[catch {set result [dportexec $workername rpmpackage]} result] ||
+ if {[catch {set result [mportexec $workername rpmpackage]} result] ||
$result == 1} {
global errorInfo
ui_debug "$errorInfo"
ui_error "port package failed: $result"
- dportclose $workername
+ mportclose $workername
continue
}
set ui_options(ports_verbose) no
# Turn verbose output off after the build
- dportclose $workername
+ mportclose $workername
# We made it to the end. We can delete the log file.
close $logfd
Modified: trunk/base/src/macports1.0/macports.tcl
===================================================================
--- trunk/base/src/macports1.0/macports.tcl 2009-04-02 16:43:21 UTC (rev 49058)
+++ trunk/base/src/macports1.0/macports.tcl 2009-04-02 17:28:01 UTC (rev 49059)
@@ -300,14 +300,6 @@
}
}
-# dportinit
-# Deprecated version of the new mportinit proc, listed here as backwards
-# compatibility glue for API clients that haven't updated to the new naming
-proc dportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
- ui_warn "The dportinit proc is deprecated and will be going away soon, please use mportinit in the future!"
- mportinit $up_ui_options $up_options $up_variations
-}
-
proc mportinit {{up_ui_options {}} {up_options {}} {up_variations {}}} {
if {$up_ui_options eq ""} {
array set macports::ui_options {}
@@ -1013,14 +1005,6 @@
return $proposedpath
}
-# dportopen
-# Deprecated version of the new mportopen proc, listed here as backwards
-# compatibility glue for API clients that haven't updated to the new naming
-proc dportopen {porturl {options ""} {variations ""} {nocache ""}} {
- ui_warn "The dportopen proc is deprecated and will be going away soon, please use mportopen in the future!"
- mportopen $porturl $options $variations $nocache
-}
-
# mportopen
# Opens a MacPorts portfile specified by a URL. The Portfile is
# opened with the given list of options and variations. The result
@@ -1359,14 +1343,6 @@
}
}
-# dportexec
-# Deprecated version of the new mportexec proc, listed here as backwards
-# compatibility glue for API clients that haven't updated to the new naming
-proc dportexec {mport target} {
- ui_warn "The dportexec proc is deprecated and will be going away soon, please use mportexec in the future!"
- mportexec $mport $target
-}
-
# mportexec
# Execute the specified target of the given mport.
proc mportexec {mport target} {
@@ -1651,14 +1627,6 @@
}
}
-# dportsearch
-# Deprecated version of the new mportsearch proc, listed here as backwards
-# compatibility glue for API clients that haven't updated to the new naming
-proc dportsearch {pattern {case_sensitive yes} {matchstyle regexp} {field name}} {
- ui_warn "The dportsearch proc is deprecated and will be going away soon, please use mportsearch in the future!"
- mportsearch $pattern $case_sensitive $matchstyle $field
-}
-
proc mportsearch {pattern {case_sensitive yes} {matchstyle regexp} {field name}} {
global macports::portdbpath macports::sources
set matches [list]
@@ -1927,14 +1895,6 @@
return [$workername eval array get PortInfo]
}
-# dportclose
-# Deprecated version of the new mportclose proc, listed here as backwards
-# compatibility glue for API clients that haven't updated to the new naming
-proc dportclose {mport} {
- ui_warn "The dportclose proc is deprecated and will be going away soon, please use mportclose in the future!"
- mportclose $mport
-}
-
proc mportclose {mport} {
global macports::open_mports
set refcnt [ditem_key $mport refcnt]
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090402/b12215ed/attachment-0001.html>
More information about the macports-changes
mailing list