[24633] branches/dp2mp-move/base/src/port
source_changes at macosforge.org
source_changes at macosforge.org
Sat Apr 28 22:53:20 PDT 2007
Revision: 24633
http://trac.macosforge.org/projects/macports/changeset/24633
Author: jmpp at macports.org
Date: 2007-04-28 22:53:19 -0700 (Sat, 28 Apr 2007)
Log Message:
-----------
Moving all of base/src/port to the MacPorts namespace.
Modified Paths:
--------------
branches/dp2mp-move/base/src/port/port.1
branches/dp2mp-move/base/src/port/port.tcl
branches/dp2mp-move/base/src/port/portindex.tcl
branches/dp2mp-move/base/src/port/portmirror.tcl
Property Changed:
----------------
branches/dp2mp-move/base/src/port/port.tcl
branches/dp2mp-move/base/src/port/portindex.tcl
branches/dp2mp-move/base/src/port/portmirror.tcl
Modified: branches/dp2mp-move/base/src/port/port.1
===================================================================
--- branches/dp2mp-move/base/src/port/port.1 2007-04-29 05:48:24 UTC (rev 24632)
+++ branches/dp2mp-move/base/src/port/port.1 2007-04-29 05:53:19 UTC (rev 24633)
@@ -27,8 +27,8 @@
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
.\" POSSIBILITY OF SUCH DAMAGE.
.\"
-.Dd December 13, 2005
-.Dt PORT 1 "Apple Computer, Inc."
+.Dd April 29, 2007
+.Dt PORT 1 "MacPorts"
.Os
.Sh NAME
.Nm port
@@ -81,14 +81,14 @@
.Nm
command knows various
.Ar pseudo-portnames
-that will expand to the specified set of ports from the available dports tree(s). These may be used in place of a
+that will expand to the specified set of ports from the available ports tree(s). These may be used in place of a
.Ar portname .
Common options are:
.Pp
.Bl -bullet -offset indent -compact
.It
.Ar all :
-all the ports in each dports tree listed in
+all the ports in each ports tree listed in
.Ar sources.conf
.Pp
.It
@@ -109,11 +109,11 @@
.Pp
.It
.Ar uninstalled :
-ports in the dports tree(s) that aren't installed.
+ports in the ports tree(s) that aren't installed.
.Pp
.It
.Ar outdated :
-installed ports that are out of date with respect to their current version/revision in the dports tree(s)
+installed ports that are out of date with respect to their current version/revision in the ports tree(s)
.Pp
.El
Other options, also known as
@@ -252,7 +252,7 @@
.Fl -maintainer
or
.Fl -category
-(recognized field names are those from the portindex). If the global option
+(recognized field names are those from the PortIndex). If the global option
.Fl q
is in effect, the meta-info fields will not be labeled; if the option
.Fl -line
@@ -303,7 +303,7 @@
.Dl "port provides /opt/local/etc/irssi.conf"
.Dl "port provides include/tiff.h"
.Ss sync
-Performs a sync operation only on the dports tree of a MacPorts installation, pulling in the latest
+Performs a sync operation only on the ports tree of a MacPorts installation, pulling in the latest
revision available of the
.Ar Portfiles
from the MacPorts rsync server. To update you would normally do:
@@ -390,7 +390,7 @@
.Ss version
Display the release number of the installed MacPorts infrastructure.
.Ss selfupdate
-Updates the MacPorts system, dports tree(s) and base tools if needed, from the MacPorts rsync server,
+Updates the MacPorts system, ports tree(s) and base tools if needed, from the MacPorts rsync server,
installing the newest infrastructure available. To update you would typically do:
.Pp
.Dl "sudo port -d selfupdate"
@@ -484,13 +484,13 @@
.Pp
.Sh FILES
.Bl -tag -width
-.It Va ${prefix}/etc/ports/ports.conf
+.It Va ${prefix}/etc/macports/macports.conf
Global configuration file for the MacPorts system.
-.It Va ${prefix}/etc/ports/sources.conf
-Global listing of the dports/ trees used by MacPorts. This file also enables rsync synchronization.
-.It Va ${prefix}/etc/ports/variants.conf
+.It Va ${prefix}/etc/macports/sources.conf
+Global listing of the ports/ trees used by MacPorts. This file also enables rsync synchronization.
+.It Va ${prefix}/etc/macports/variants.conf
Global variants used when a port is installed.
-.It Va ~/.portsrc
+.It Va ~/.macports/macports.conf
User configuration file for the MacPorts system. It overrides the global
.Ar ports.conf
file.
@@ -498,7 +498,7 @@
.Sh DIAGNOSTICS
.Ex -std
.Sh SEE ALSO
-.Xr ports.conf 5 ,
+.Xr macports.conf 5 ,
.Xr portfile 7 ,
.Xr portgroup 7 ,
.Xr portstyle 7 ,
Modified: branches/dp2mp-move/base/src/port/port.tcl
===================================================================
--- branches/dp2mp-move/base/src/port/port.tcl 2007-04-29 05:48:24 UTC (rev 24632)
+++ branches/dp2mp-move/base/src/port/port.tcl 2007-04-29 05:53:19 UTC (rev 24633)
@@ -4,7 +4,7 @@
# port.tcl
# $Id$
#
-# Copyright (c) 2002-2006 DarwinPorts organization
+# Copyright (c) 2002-2006 MacPorts organization
# Copyright (c) 2004 Robert Shaw <rshaw at opendarwin.org>
# Copyright (c) 2002 Apple Computer, Inc.
# All rights reserved.
@@ -38,8 +38,8 @@
#
catch {source \
- [file join "@TCL_PACKAGE_DIR@" darwinports1.0 darwinports_fastload.tcl]}
-package require darwinports
+ [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
+package require macports
# UI Instantiations
# ui_options(ports_debug) - If set, output debugging messages.
@@ -362,18 +362,18 @@
proc url_to_portname { url {quiet 0} } {
- # Save directory and restore the directory, since dportopen changes it
+ # Save directory and restore the directory, since mportopen changes it
set savedir [pwd]
set portname ""
- if {[catch {set ctx [dportopen $url]} result]} {
+ if {[catch {set ctx [mportopen $url]} result]} {
if {!$quiet} {
ui_msg "Can't map the URL '$url' to a port description file (\"${result}\")."
ui_msg "Please verify that the directory and portfile syntax are correct."
}
} else {
- array set portinfo [dportinfo $ctx]
+ array set portinfo [mportinfo $ctx]
set portname $portinfo(name)
- dportclose $ctx
+ mportclose $ctx
}
cd $savedir
return $portname
@@ -394,7 +394,7 @@
# When the block is entered, the variables portname, portversion, options, and variations
# will have been set
proc foreachport {portlist block} {
- # Restore cwd after each port, since dportopen changes it, and relative
+ # Restore cwd after each port, since mportopen changes it, and relative
# urls will break on subsequent passes
set savedir [pwd]
foreach portspec $portlist {
@@ -436,7 +436,7 @@
# Port selection
##########################################
proc get_matching_ports {pattern {casesensitive no} {matchstyle glob} {field name}} {
- if {[catch {set res [dportsearch $pattern $casesensitive $matchstyle $field]} result]} {
+ if {[catch {set res [mportsearch $pattern $casesensitive $matchstyle $field]} result]} {
global errorInfo
ui_debug "$errorInfo"
fatal "search for portname $pattern failed: $result"
@@ -543,8 +543,8 @@
proc get_outdated_ports {} {
- global darwinports::registry.installtype
- set is_image_mode [expr 0 == [string compare "image" ${darwinports::registry.installtype}]]
+ global macports::registry.installtype
+ set is_image_mode [expr 0 == [string compare "image" ${macports::registry.installtype}]]
# Get the list of installed ports
set ilist {}
@@ -574,7 +574,7 @@
set installed_epoch [lindex $i 5]
# Get info about the port from the index
- if {[catch {set res [dportsearch $portname no exact]} result]} {
+ if {[catch {set res [mportsearch $portname no exact]} result]} {
global errorInfo
ui_debug "$errorInfo"
fatal "search for portname $portname failed: $result"
@@ -1137,7 +1137,7 @@
require_portlist portlist
foreachport $portlist {
# Get information about the named port
- if {[catch {dportsearch $portname no exact} result]} {
+ if {[catch {mportsearch $portname no exact} result]} {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "search for portname $portname failed: $result" 1 status
@@ -1389,7 +1389,7 @@
proc action_selfupdate { action portlist opts } {
global global_options
- if { [catch {darwinports::selfupdate [array get global_options]} result ] } {
+ if { [catch {macports::selfupdate [array get global_options]} result ] } {
global errorInfo
ui_debug "$errorInfo"
fatal "selfupdate failed: $result"
@@ -1410,7 +1410,7 @@
}
}
- darwinports::upgrade $portname "port:$portname" [array get variations] [array get options]
+ macports::upgrade $portname "port:$portname" [array get variations] [array get options]
}
return 0
@@ -1418,7 +1418,7 @@
proc action_version { action portlist opts } {
- puts "Version: [darwinports::version]"
+ puts "Version: [macports::version]"
return 0
}
@@ -1549,8 +1549,8 @@
proc action_outdated { action portlist opts } {
- global darwinports::registry.installtype
- set is_image_mode [expr 0 == [string compare "image" ${darwinports::registry.installtype}]]
+ global macports::registry.installtype
+ set is_image_mode [expr 0 == [string compare "image" ${macports::registry.installtype}]]
set status 0
@@ -1599,7 +1599,7 @@
set installed_epoch [lindex $i 5]
# Get info about the port from the index
- if {[catch {set res [dportsearch $portname no exact]} result]} {
+ if {[catch {set res [mportsearch $portname no exact]} result]} {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "search for portname $portname failed: $result" 1 status
@@ -1698,7 +1698,7 @@
require_portlist portlist
foreachport $portlist {
# Get info about the port
- if {[catch {dportsearch $portname no exact} result]} {
+ if {[catch {mportsearch $portname no exact} result]} {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "search for portname $portname failed: $result" 1 status
@@ -1741,7 +1741,7 @@
require_portlist portlist
foreachport $portlist {
# search for port
- if {[catch {dportsearch $portname no exact} result]} {
+ if {[catch {mportsearch $portname no exact} result]} {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "search for portname $portname failed: $result" 1 status
@@ -1779,7 +1779,7 @@
foreachport $portlist {
set portfound 0
- if {[catch {set res [dportsearch $portname no]} result]} {
+ if {[catch {set res [mportsearch $portname no]} result]} {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "search for portname $portname failed: $result" 1 status
@@ -1833,7 +1833,7 @@
set search_string [regex_pat_sanitize $portname]
}
- if {[catch {set res [dportsearch ^$search_string\$ no]} result]} {
+ if {[catch {set res [mportsearch ^$search_string\$ no]} result]} {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "search for portname $search_string failed: $result" 1 status
@@ -1884,7 +1884,7 @@
require_portlist portlist
foreachport $portlist {
# Verify the portname, getting portinfo to map to a porturl
- if {[catch {set res [dportsearch $portname no exact]} result]} {
+ if {[catch {set res [mportsearch $portname no exact]} result]} {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "search for portname $portname failed: $result" 1 status
@@ -1900,7 +1900,7 @@
set porturl $portinfo(porturl)
}
- set portdir [file normalize [darwinports::getportdir $porturl]]
+ set portdir [file normalize [macports::getportdir $porturl]]
set porturl "file://${portdir}"; # Rebuild url so it's fully qualified
set portfile "${portdir}/Portfile"
@@ -1991,7 +1991,7 @@
proc action_sync { action portlist opts } {
set status 0
- if {[catch {dportsync} result]} {
+ if {[catch {mportsync} result]} {
global errorInfo
ui_debug "$errorInfo"
ui_msg "port sync failed: $result"
@@ -2013,7 +2013,7 @@
# otherwise try to map the portname to a url
if {$porturl == ""} {
# Verify the portname, getting portinfo to map to a porturl
- if {[catch {set res [dportsearch $portname no exact]} result]} {
+ if {[catch {set res [mportsearch $portname no exact]} result]} {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "search for portname $portname failed: $result" 1 status
@@ -2041,19 +2041,19 @@
if {[string length $portversion]} {
set options(ports_version_glob) $portversion
}
- 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]} {
global errorInfo
ui_debug "$errorInfo"
break_softcontinue "Unable to open port: $result" 1 status
}
- if {[catch {set result [dportexec $workername $target]} result]} {
+ if {[catch {set result [mportexec $workername $target]} result]} {
global errorInfo
- dportclose $workername
+ mportclose $workername
ui_debug "$errorInfo"
break_softcontinue "Unable to execute port: $result" 1 status
}
- dportclose $workername
+ mportclose $workername
# Process any error that wasn't thrown and handled already
if {$result} {
@@ -2351,7 +2351,7 @@
set complete_choices {}
# Build a list of ports with text as their prefix
- if {[catch {set res [dportsearch "${text}*" false glob]} result]} {
+ if {[catch {set res [mportsearch "${text}*" false glob]} result]} {
global errorInfo
ui_debug "$errorInfo"
fatal "search for portname $pattern failed: $result"
@@ -2452,7 +2452,7 @@
# Be noisy, if appropriate
set noisy [expr $isstdin && ![ui_isset ports_quiet]]
if { $noisy } {
- puts "MacPorts [darwinports::version]"
+ puts "MacPorts [macports::version]"
puts "Entering interactive mode... (\"help\" for help, \"quit\" to quit)"
}
@@ -2547,7 +2547,7 @@
array set global_options {}
array set global_variations {}
-# Save off a copy of the environment before dportinit monkeys with it
+# Save off a copy of the environment before mportinit monkeys with it
global env boot_env
array set boot_env [array get env]
@@ -2576,10 +2576,10 @@
# Get arguments remaining after option processing
set remaining_args [lrange $cmd_argv $cmd_argn end]
-# Initialize dport
+# Initialize mport
# This must be done following parse of global options, as some options are
-# evaluated by dportinit.
-if {[catch {dportinit ui_options global_options global_variations} result]} {
+# evaluated by mportinit.
+if {[catch {mportinit ui_options global_options global_variations} result]} {
global errorInfo
puts "$errorInfo"
fatal "Failed to initialize ports system, $result"
Property changes on: branches/dp2mp-move/base/src/port/port.tcl
___________________________________________________________________
Name: svn:executable
- *
Modified: branches/dp2mp-move/base/src/port/portindex.tcl
===================================================================
--- branches/dp2mp-move/base/src/port/portindex.tcl 2007-04-29 05:48:24 UTC (rev 24632)
+++ branches/dp2mp-move/base/src/port/portindex.tcl 2007-04-29 05:53:19 UTC (rev 24633)
@@ -7,8 +7,8 @@
# $Id$
catch {source \
- [file join "@TCL_PACKAGE_DIR@" darwinports1.0 darwinports_fastload.tcl]}
-package require darwinports
+ [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
+package require macports
package require Pextlib
# Globals
@@ -19,8 +19,8 @@
array set global_options [list]
array set global_variations [list]
-# Pass global options into dportinit
-dportinit ui_options global_options global_variations
+# Pass global options into mportinit
+mportinit ui_options global_options global_variations
@@ -102,10 +102,10 @@
proc pindex {portdir} {
global target fd directory archive outdir stats
incr stats(total)
- global darwinports::prefix
+ global macports::prefix
set save_prefix $prefix
set prefix {\${prefix}}
- if {[catch {set interp [dportopen file://[file join $directory $portdir]]} result]} {
+ if {[catch {set interp [mportopen file://[file join $directory $portdir]]} result]} {
puts "Failed to parse file $portdir/Portfile: $result"
# revert the prefix.
set prefix $save_prefix
@@ -113,8 +113,8 @@
} else {
# revert the prefix.
set prefix $save_prefix
- array set portinfo [dportinfo $interp]
- dportclose $interp
+ array set portinfo [mportinfo $interp]
+ mportclose $interp
set portinfo(portdir) $portdir
puts "Adding port $portdir"
if {$archive == "1"} {
@@ -202,7 +202,7 @@
puts "Creating software index in $outdir"
set fd [open [file join $outdir PortIndex] w]
-dporttraverse pindex $directory
+mporttraverse pindex $directory
close $fd
puts "\nTotal number of ports parsed:\t$stats(total)\
\nPorts successfully parsed:\t[expr $stats(total) - $stats(failed)]\t\
Property changes on: branches/dp2mp-move/base/src/port/portindex.tcl
___________________________________________________________________
Name: svn:executable
- *
Modified: branches/dp2mp-move/base/src/port/portmirror.tcl
===================================================================
--- branches/dp2mp-move/base/src/port/portmirror.tcl 2007-04-29 05:48:24 UTC (rev 24632)
+++ branches/dp2mp-move/base/src/port/portmirror.tcl 2007-04-29 05:53:19 UTC (rev 24633)
@@ -7,8 +7,8 @@
# $Id$
catch {source \
- [file join "@TCL_PACKAGE_DIR@" darwinports1.0 darwinports_fastload.tcl]}
-package require darwinports
+ [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
+package require macports
package require Pextlib
# Globals
@@ -17,8 +17,8 @@
array set global_options [list]
array set global_variations [list]
-# Pass global options into dportinit
-dportinit ui_options global_options global_variations
+# Pass global options into mportinit
+mportinit ui_options global_options global_variations
# UI Instantiations
# ui_options(ports_debug) - If set, output debugging messages.
@@ -107,8 +107,8 @@
# func: function to call on every dist file (it is passed
# the path as its parameter)
proc iterate_distfiles {func} {
- global darwinports::portdbpath
- iterate_distfiles_r $func [file join ${darwinports::portdbpath} distfiles]
+ global macports::portdbpath
+ iterate_distfiles_r $func [file join ${macports::portdbpath} distfiles]
}
# Check if the file is in the map and delete it otherwise.
@@ -122,8 +122,8 @@
# Open the database
proc open_database args {
- global darwinports::portdbpath distfiles_filemap
- set path [file join ${darwinports::portdbpath} distfiles_mirror.db]
+ global macports::portdbpath distfiles_filemap
+ set path [file join ${macports::portdbpath} distfiles_mirror.db]
if {[file exists $path]} {
filemap open distfiles_filemap $path readonly
} else {
@@ -155,4 +155,4 @@
iterate_distfiles iterate_walker
# Close the database
-close_database
\ No newline at end of file
+close_database
Property changes on: branches/dp2mp-move/base/src/port/portmirror.tcl
___________________________________________________________________
Name: svn:executable
- *
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070428/d47258d0/attachment.html
More information about the macports-changes
mailing list