[24648] branches/dp2mp-move/base/src/port1.0
source_changes at macosforge.org
source_changes at macosforge.org
Sun Apr 29 10:15:03 PDT 2007
Revision: 24648
http://trac.macosforge.org/projects/macports/changeset/24648
Author: jmpp at macports.org
Date: 2007-04-29 10:15:03 -0700 (Sun, 29 Apr 2007)
Log Message:
-----------
port1.0 is now in the MacPorts namespace.
Modified Paths:
--------------
branches/dp2mp-move/base/src/port1.0/port.tcl
branches/dp2mp-move/base/src/port1.0/portfetch.tcl
branches/dp2mp-move/base/src/port1.0/portstartupitem.tcl
branches/dp2mp-move/base/src/port1.0/portsubmit.tcl
branches/dp2mp-move/base/src/port1.0/porttrace.tcl
branches/dp2mp-move/base/src/port1.0/portutil.tcl
branches/dp2mp-move/base/src/port1.0/resources/group/gnustep-1.0.tcl
branches/dp2mp-move/base/src/port1.0/resources/group/python-1.0.tcl
branches/dp2mp-move/base/src/port1.0/resources/group/python24-1.0.tcl
branches/dp2mp-move/base/src/port1.0/tests/portutil.tcl
Modified: branches/dp2mp-move/base/src/port1.0/port.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/port.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/port.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -32,7 +32,7 @@
# standard package load
package provide port 1.0
-package require dp_package 1.0
+package require mp_package 1.0
package require portmain 1.0
package require portdepends 1.0
package require portfetch 1.0
Modified: branches/dp2mp-move/base/src/port1.0/portfetch.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/portfetch.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/portfetch.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -87,7 +87,7 @@
# Ignore SSL certificate
default fetch.ignore_sslcert "no"
-default fallback_mirror_site "opendarwin"
+default fallback_mirror_site "macports"
default mirror_sites.listfile {"mirror_sites.tcl"}
default mirror_sites.listpath {"${portresourcepath}/fetch/"}
Modified: branches/dp2mp-move/base/src/port1.0/portstartupitem.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/portstartupitem.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/portstartupitem.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -3,7 +3,7 @@
#
# $Id$
#
-# Copyright (c) 2004, 2005 Markus W. Weissman <mww at opendarwin.org>,
+# Copyright (c) 2004, 2005 Markus W. Weissman <mww at macports.org>,
# Copyright (c) 2005 Robert Shaw <rshaw at opendarwin.org>,
# All rights reserved.
#
@@ -204,7 +204,7 @@
}
puts ${item} "prefix=$prefix"
- # Source the utilities package and the darwinports config file
+ # Source the utilities package and the MacPorts config file
puts ${item} {[ -r "/etc/rc.common" ] && . "/etc/rc.common"}
puts ${item} {[ -r "${prefix}/etc/rc.conf" ] && . "${prefix}/etc/rc.conf"}
Modified: branches/dp2mp-move/base/src/port1.0/portsubmit.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/portsubmit.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/portsubmit.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -200,7 +200,7 @@
set portsource ""
set base_rev ""
- if {![catch {set fd [open ".dports_source" r]}]} {
+ if {![catch {set fd [open ".mports_source" r]}]} {
while {[gets $fd line] != -1} {
regexp -- {^(.*): (.*)$} $line unused key value
switch -- $key {
@@ -238,7 +238,7 @@
set cmd "curl "
append cmd "--silent "
- append cmd "--url [regsub -- {^dports} $portsource {http}]/cgi-bin/portsubmit.cgi "
+ append cmd "--url [regsub -- {^ports} $portsource {http}]/cgi-bin/portsubmit.cgi "
append cmd "--output ${workpath}/.portsubmit.out "
append cmd "-F name=${portname} "
append cmd "-F version=${portversion} "
@@ -274,7 +274,7 @@
close $fd
if {[info exists result(OK)]} {
- set fd [open ".dports_source" w]
+ set fd [open ".mports_source" w]
puts $fd "source: $portsource"
puts $fd "port: $portname"
puts $fd "version: $portversion"
@@ -288,24 +288,24 @@
} elseif {[info exists result(CONFLICT)]} {
# Fetch the newer revision from the index.
# XXX: many gross hacks here regarding paths, urls, etc.
- set tmpdir [mktemp "/tmp/dports.XXXXXXXX"]
+ set tmpdir [mktemp "/tmp/mports.XXXXXXXX"]
file mkdir $tmpdir/new
file mkdir $tmpdir/old
- set worker [dport_open $portsource/files/$portname/$portversion/$result(revision)/Portfile.tar.gz [list portdir $tmpdir/new]]
+ set worker [mport_open $portsource/files/$portname/$portversion/$result(revision)/Portfile.tar.gz [list portdir $tmpdir/new]]
if {$base_rev != ""} {
- set worker2 [dport_open $portsource/files/$portname/$portversion/$base_rev/Portfile.tar.gz [list portdir $tmpdir/old]]
+ set worker2 [mport_open $portsource/files/$portname/$portversion/$base_rev/Portfile.tar.gz [list portdir $tmpdir/old]]
catch {system "diff3 -m -E -- $portpath/Portfile $tmpdir/old/$portname-$portversion/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"}
system "mv $tmpdir/Portfile $portpath/Portfile"
- dport_close $worker2
+ mport_close $worker2
} else {
catch {system "diff3 -m -E -- $portpath/Portfile $portpath/Portfile $tmpdir/new/$portname-$portversion/Portfile > $tmpdir/Portfile"}
system "mv $tmpdir/Portfile $portpath/Portfile"
}
- dport_close $worker
+ mport_close $worker
catch {system "rm -Rf $tmpdir"}
catch {system "rm -Rf $tmpdir"}
- set fd [open [file join "$portpath" ".dports_source"] w]
+ set fd [open [file join "$portpath" ".mports_source"] w]
puts $fd "source: $portsource"
puts $fd "port: $portname"
puts $fd "version: $portversion"
Modified: branches/dp2mp-move/base/src/port1.0/porttrace.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/porttrace.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/porttrace.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -52,7 +52,7 @@
# Launch darwintrace.dylib.
- set tracelib_path [file join ${portutil::autoconf::prefix} share darwinports Tcl darwintrace1.0 darwintrace.dylib]
+ set tracelib_path [file join ${portutil::autoconf::prefix} share macports Tcl darwintrace1.0 darwintrace.dylib]
if {[info exists env(DYLD_INSERT_LIBRARIES)]} {
set env(DYLD_INSERT_LIBRARIES) "${env(DYLD_INSERT_LIBRARIES)}:${tracelib_path}"
@@ -157,7 +157,7 @@
proc create_slave {workpath trace_fifo} {
global trace_thread
# Create the thread.
- set trace_thread [darwinports_create_thread]
+ set trace_thread [macports_create_thread]
# The slave thread requires the registry package.
thread::send -async $trace_thread "package require registry 1.0"
Modified: branches/dp2mp-move/base/src/port1.0/portutil.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/portutil.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/portutil.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -4,7 +4,7 @@
#
# Copyright (c) 2004 Robert Shaw <rshaw at opendarwin.org>
# Copyright (c) 2002 Apple Computer, Inc.
-# Copyright (c) 2006 Markus W. Weissmann <mww at opendarwin.org>
+# Copyright (c) 2006 Markus W. Weissmann <mww at macports.org>
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -34,7 +34,7 @@
package provide portutil 1.0
package require Pextlib 1.0
-package require darwinports_dlist 1.0
+package require macports_dlist 1.0
package require msgcat
package require porttrace 1.0
@@ -1214,7 +1214,7 @@
file mkdir $workpath
}
# flock Portfile
- set statefile [file join $workpath .darwinports.${portname}.state]
+ set statefile [file join $workpath .macports.${portname}.state]
if {[file exists $statefile]} {
if {![file writable $statefile]} {
return -code error "$statefile is not writable - check permission on port directory"
@@ -1567,7 +1567,7 @@
# Escape regex special characters
regsub -all "(\\(){1}|(\\)){1}|(\\{1}){1}|(\\+){1}|(\\{1}){1}|(\\{){1}|(\\}){1}|(\\^){1}|(\\$){1}|(\\.){1}|(\\\\){1}" $portname "\\\\&" search_string
- set res [dport_search ^$search_string\$]
+ set res [mport_search ^$search_string\$]
if {[llength $res] < 2} {
ui_error "Dependency $portname not found"
return -1
@@ -1575,20 +1575,20 @@
array set portinfo [lindex $res 1]
set porturl $portinfo(porturl)
- if {[catch {set worker [dport_open $porturl [array get options] $variations]} result]} {
+ if {[catch {set worker [mport_open $porturl [array get options] $variations]} result]} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Opening $portname $target failed: $result"
return -1
}
- if {[catch {dport_exec $worker $target} result] || $result != 0} {
+ if {[catch {mport_exec $worker $target} result] || $result != 0} {
global errorInfo
ui_debug "$errorInfo"
ui_error "Execution $portname $target failed: $result"
- dport_close $worker
+ mport_close $worker
return -1
}
- dport_close $worker
+ mport_close $worker
return 0
}
Modified: branches/dp2mp-move/base/src/port1.0/resources/group/gnustep-1.0.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/resources/group/gnustep-1.0.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/resources/group/gnustep-1.0.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -3,7 +3,7 @@
#
# $Id$
#
-# Copyright (c) 2006 Yves de Champlain <yves at opendarwin.org>,
+# Copyright (c) 2006 Yves de Champlain <yves at macports.org>,
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
@@ -54,7 +54,7 @@
# }
#
# default use_configure no
-# default configure.args CC=gcc-dp-4.1
+# default configure.args CC=gcc-mp-4.1
#
# default build.type gnu
# default build.args messages=yes
@@ -82,7 +82,7 @@
default depends_lib port:gnustep-back
default use_configure no
-default configure.args CC=gcc-dp-4.1
+default configure.args CC=gcc-mp-4.1
default build.type gnu
default build.args messages=yes
Modified: branches/dp2mp-move/base/src/port1.0/resources/group/python-1.0.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/resources/group/python-1.0.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/resources/group/python-1.0.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -3,7 +3,7 @@
#
# $Id$
#
-# Copyright (c) 2004 Markus W. Weissman <mww at opendarwin.org>,
+# Copyright (c) 2004 Markus W. Weissman <mww at macports.org>,
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: branches/dp2mp-move/base/src/port1.0/resources/group/python24-1.0.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/resources/group/python24-1.0.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/resources/group/python24-1.0.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -3,7 +3,7 @@
#
# $Id$
#
-# Copyright (c) 2004 Markus W. Weissman <mww at opendarwin.org>,
+# Copyright (c) 2004 Markus W. Weissman <mww at macports.org>,
# All rights reserved.
#
# Redistribution and use in source and binary forms, with or without
Modified: branches/dp2mp-move/base/src/port1.0/tests/portutil.tcl
===================================================================
--- branches/dp2mp-move/base/src/port1.0/tests/portutil.tcl 2007-04-29 16:09:56 UTC (rev 24647)
+++ branches/dp2mp-move/base/src/port1.0/tests/portutil.tcl 2007-04-29 17:15:03 UTC (rev 24648)
@@ -2,12 +2,13 @@
# Requires r/w access to /tmp
# MacPorts must be installed for this to work
-catch {source /Library/Tcl/darwinports1.0/darwinports_fastload.tcl}
+#I'm sure there's a way to abstract the path to the MacPorts Tcl package dir, but I can't remember it at the moment...
+catch {source [file join /Library Tcl macports1.0 macports_fastload.tcl]}
# load the current copy of portutil instead of the installed one
source [file dirname [info script]]/../portutil.tcl
-package require darwinports
+package require macports
-dportinit
+mportinit
# end boilerplate
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070429/340b4a0e/attachment.html
More information about the macports-changes
mailing list