<!DOCTYPE html PUBLIC "-//W3C//DTD XHTML 1.1//EN"
"http://www.w3.org/TR/xhtml11/DTD/xhtml11.dtd">
<html xmlns="http://www.w3.org/1999/xhtml">
<head><meta http-equiv="content-type" content="text/html; charset=utf-8" />
<title>[49089] trunk/base/src/package1.0</title>
</head>
<body>
<style type="text/css"><!--
#msg dl.meta { border: 1px #006 solid; background: #369; padding: 6px; color: #fff; }
#msg dl.meta dt { float: left; width: 6em; font-weight: bold; }
#msg dt:after { content:':';}
#msg dl, #msg dt, #msg ul, #msg li, #header, #footer, #logmsg { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; }
#msg dl a { font-weight: bold}
#msg dl a:link { color:#fc3; }
#msg dl a:active { color:#ff0; }
#msg dl a:visited { color:#cc6; }
h3 { font-family: verdana,arial,helvetica,sans-serif; font-size: 10pt; font-weight: bold; }
#msg pre { overflow: auto; background: #ffc; border: 1px #fa0 solid; padding: 6px; }
#logmsg { background: #ffc; border: 1px #fa0 solid; padding: 1em 1em 0 1em; }
#logmsg p, #logmsg pre, #logmsg blockquote { margin: 0 0 1em 0; }
#logmsg p, #logmsg li, #logmsg dt, #logmsg dd { line-height: 14pt; }
#logmsg h1, #logmsg h2, #logmsg h3, #logmsg h4, #logmsg h5, #logmsg h6 { margin: .5em 0; }
#logmsg h1:first-child, #logmsg h2:first-child, #logmsg h3:first-child, #logmsg h4:first-child, #logmsg h5:first-child, #logmsg h6:first-child { margin-top: 0; }
#logmsg ul, #logmsg ol { padding: 0; list-style-position: inside; margin: 0 0 0 1em; }
#logmsg ul { text-indent: -1em; padding-left: 1em; }#logmsg ol { text-indent: -1.5em; padding-left: 1.5em; }
#logmsg > ul, #logmsg > ol { margin: 0 0 1em 0; }
#logmsg pre { background: #eee; padding: 1em; }
#logmsg blockquote { border: 1px solid #fa0; border-left-width: 10px; padding: 1em 1em 0 1em; background: white;}
#logmsg dl { margin: 0; }
#logmsg dt { font-weight: bold; }
#logmsg dd { margin: 0; padding: 0 0 0.5em 0; }
#logmsg dd:before { content:'\00bb';}
#logmsg table { border-spacing: 0px; border-collapse: collapse; border-top: 4px solid #fa0; border-bottom: 1px solid #fa0; background: #fff; }
#logmsg table th { text-align: left; font-weight: normal; padding: 0.2em 0.5em; border-top: 1px dotted #fa0; }
#logmsg table td { text-align: right; border-top: 1px dotted #fa0; padding: 0.2em 0.5em; }
#logmsg table thead th { text-align: center; border-bottom: 1px solid #fa0; }
#logmsg table th.Corner { text-align: left; }
#logmsg hr { border: none 0; border-top: 2px dashed #fa0; height: 1px; }
#header, #footer { color: #fff; background: #636; border: 1px #300 solid; padding: 6px; }
#patch { width: 100%; }
#patch h4 {font-family: verdana,arial,helvetica,sans-serif;font-size:10pt;padding:8px;background:#369;color:#fff;margin:0;}
#patch .propset h4, #patch .binary h4 {margin:0;}
#patch pre {padding:0;line-height:1.2em;margin:0;}
#patch .diff {width:100%;background:#eee;padding: 0 0 10px 0;overflow:auto;}
#patch .propset .diff, #patch .binary .diff {padding:10px 0;}
#patch span {display:block;padding:0 10px;}
#patch .modfile, #patch .addfile, #patch .delfile, #patch .propset, #patch .binary, #patch .copfile {border:1px solid #ccc;margin:10px 0;}
#patch ins {background:#dfd;text-decoration:none;display:block;padding:0 10px;}
#patch del {background:#fdd;text-decoration:none;display:block;padding:0 10px;}
#patch .lines, .info {color:#888;background:#fff;}
--></style>
<div id="msg">
<dl class="meta">
<dt>Revision</dt> <dd><a href="http://trac.macports.org/changeset/49089">49089</a></dd>
<dt>Author</dt> <dd>raimue@macports.org</dd>
<dt>Date</dt> <dd>2009-04-03 05:26:37 -0700 (Fri, 03 Apr 2009)</dd>
</dl>
<h3>Log Message</h3>
<pre>package1.0:
Create namespaces for the packages in package1.0, stop polluting the global
namespace with many local helper functions.</pre>
<h3>Modified Paths</h3>
<ul>
<li><a href="#trunkbasesrcpackage10portarchivetcl">trunk/base/src/package1.0/portarchive.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portdmgtcl">trunk/base/src/package1.0/portdmg.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portdpkgtcl">trunk/base/src/package1.0/portdpkg.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portmdmgtcl">trunk/base/src/package1.0/portmdmg.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portmpkgtcl">trunk/base/src/package1.0/portmpkg.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portpkgtcl">trunk/base/src/package1.0/portpkg.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portportpkgtcl">trunk/base/src/package1.0/portportpkg.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portrpmtcl">trunk/base/src/package1.0/portrpm.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portsrpmtcl">trunk/base/src/package1.0/portsrpm.tcl</a></li>
<li><a href="#trunkbasesrcpackage10portunarchivetcl">trunk/base/src/package1.0/portunarchive.tcl</a></li>
</ul>
</div>
<div id="patch">
<h3>Diff</h3>
<a id="trunkbasesrcpackage10portarchivetcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portarchive.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portarchive.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portarchive.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -34,13 +34,16 @@
</span><span class="cx"> package provide portarchive 1.0
</span><span class="cx"> package require portutil 1.0
</span><span class="cx">
</span><del>-set org.macports.archive [target_new org.macports.archive archive_main]
-target_init ${org.macports.archive} archive_init
</del><ins>+set org.macports.archive [target_new org.macports.archive portarchive::archive_main]
+target_init ${org.macports.archive} portarchive::archive_init
</ins><span class="cx"> target_provides ${org.macports.archive} archive
</span><span class="cx"> target_requires ${org.macports.archive} main fetch extract checksum patch configure build destroot
</span><del>-target_prerun ${org.macports.archive} archive_start
-target_postrun ${org.macports.archive} archive_finish
</del><ins>+target_prerun ${org.macports.archive} portarchive::archive_start
+target_postrun ${org.macports.archive} portarchive::archive_finish
</ins><span class="cx">
</span><ins>+namespace eval portarchive {
+}
+
</ins><span class="cx"> # defaults
</span><span class="cx"> default archive.dir {${destpath}}
</span><span class="cx"> default archive.env {}
</span><span class="lines">@@ -60,7 +63,7 @@
</span><span class="cx">
</span><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><del>-proc archive_init {args} {
</del><ins>+proc portarchive::archive_init {args} {
</ins><span class="cx"> global UI_PREFIX target_state_fd
</span><span class="cx"> global variations package.destpath workpath
</span><span class="cx"> global ports_force ports_source_only ports_binary_only
</span><span class="lines">@@ -129,7 +132,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc archive_start {args} {
</del><ins>+proc portarchive::archive_start {args} {
</ins><span class="cx"> global UI_PREFIX
</span><span class="cx"> global portname portversion portrevision portvariants
</span><span class="cx">
</span><span class="lines">@@ -142,7 +145,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc archive_command_setup {args} {
</del><ins>+proc portarchive::archive_command_setup {args} {
</ins><span class="cx"> global archive.env archive.cmd
</span><span class="cx"> global archive.pre_args archive.args archive.post_args
</span><span class="cx"> global archive.type archive.path
</span><span class="lines">@@ -258,14 +261,14 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc putel { fd el data } {
</del><ins>+proc portarchive::putel { fd el data } {
</ins><span class="cx"> # Quote xml data
</span><span class="cx"> set quoted [string map { & &amp; < &lt; > &gt; } $data]
</span><span class="cx"> # Write the element
</span><span class="cx"> puts $fd "<${el}>${quoted}</${el}>"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc putlist { fd listel itemel list } {
</del><ins>+proc portarchive::putlist { fd listel itemel list } {
</ins><span class="cx"> puts $fd "<$listel>"
</span><span class="cx"> foreach item $list {
</span><span class="cx"> putel $fd $itemel $item
</span><span class="lines">@@ -273,7 +276,7 @@
</span><span class="cx"> puts $fd "</$listel>"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc archive_main {args} {
</del><ins>+proc portarchive::archive_main {args} {
</ins><span class="cx"> global UI_PREFIX variations
</span><span class="cx"> global workpath destpath portpath ports_force
</span><span class="cx"> global portname portepoch portversion portrevision portvariants
</span><span class="lines">@@ -459,7 +462,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc archive_finish {args} {
</del><ins>+proc portarchive::archive_finish {args} {
</ins><span class="cx"> global UI_PREFIX
</span><span class="cx"> global portname portversion portrevision portvariants
</span><span class="cx"> global destpath
</span></span></pre></div>
<a id="trunkbasesrcpackage10portdmgtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portdmg.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portdmg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portdmg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -33,14 +33,17 @@
</span><span class="cx"> package provide portdmg 1.0
</span><span class="cx"> package require portutil 1.0
</span><span class="cx">
</span><del>-set org.macports.dmg [target_new org.macports.dmg dmg_main]
</del><ins>+set org.macports.dmg [target_new org.macports.dmg portdmg::dmg_main]
</ins><span class="cx"> target_runtype ${org.macports.dmg} always
</span><span class="cx"> target_provides ${org.macports.dmg} dmg
</span><span class="cx"> target_requires ${org.macports.dmg} pkg
</span><span class="cx">
</span><ins>+namespace eval portdmg {
+}
+
</ins><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><del>-proc dmg_main {args} {
</del><ins>+proc portdmg::dmg_main {args} {
</ins><span class="cx"> global portname portversion portrevision package.destpath UI_PREFIX
</span><span class="cx">
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "Creating disk image for %s-%s"] ${portname} ${portversion}]"
</span><span class="lines">@@ -48,7 +51,7 @@
</span><span class="cx"> return [package_dmg $portname $portversion $portrevision]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc package_dmg {portname portversion portrevision} {
</del><ins>+proc portdmg::package_dmg {portname portversion portrevision} {
</ins><span class="cx"> global UI_PREFIX package.destpath portpath
</span><span class="cx"> global os.platform os.arch os.version os.major
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbasesrcpackage10portdpkgtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portdpkg.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portdpkg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portdpkg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -34,13 +34,12 @@
</span><span class="cx"> package provide portdpkg 1.0
</span><span class="cx"> package require portutil 1.0
</span><span class="cx">
</span><del>-set org.macports.dpkg [target_new org.macports.dpkg org.macports.dpkg::main]
</del><ins>+set org.macports.dpkg [target_new org.macports.dpkg portdpkg::main]
</ins><span class="cx"> target_runtype ${org.macports.dpkg} always
</span><span class="cx"> target_provides ${org.macports.dpkg} dpkg
</span><span class="cx"> target_requires ${org.macports.dpkg} destroot
</span><span class="cx">
</span><del>-# Target Namespace
-namespace eval org.macports.dpkg {
</del><ins>+namespace eval portdpkg {
</ins><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # Options
</span><span class="lines">@@ -48,7 +47,7 @@
</span><span class="cx">
</span><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><del>-proc org.macports.dpkg::main {args} {
</del><ins>+proc portdpkg::main {args} {
</ins><span class="cx"> global UI_PREFIX destpath os.arch os.platform
</span><span class="cx">
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "Creating dpkg for %s-%s"] [option portname] [option portversion]]"
</span><span class="lines">@@ -160,7 +159,7 @@
</span><span class="cx"> delete "${controlpath}"
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc org.macports.dpkg::make_dependency_list {portname} {
</del><ins>+proc portdpkg::make_dependency_list {portname} {
</ins><span class="cx"> set result {}
</span><span class="cx"> if {[catch {set res [mport_search "^$portname\$"]} error]} {
</span><span class="cx"> global errorInfo
</span></span></pre></div>
<a id="trunkbasesrcpackage10portmdmgtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portmdmg.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portmdmg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portmdmg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -33,14 +33,17 @@
</span><span class="cx"> package provide portmdmg 1.0
</span><span class="cx"> package require portutil 1.0
</span><span class="cx">
</span><del>-set org.macports.mdmg [target_new org.macports.mdmg mdmg_main]
</del><ins>+set org.macports.mdmg [target_new org.macports.mdmg portmdmg::mdmg_main]
</ins><span class="cx"> target_runtype ${org.macports.mdmg} always
</span><span class="cx"> target_provides ${org.macports.mdmg} mdmg
</span><span class="cx"> target_requires ${org.macports.mdmg} mpkg
</span><span class="cx">
</span><ins>+namespace eval portmdmg {
+}
+
</ins><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><del>-proc mdmg_main {args} {
</del><ins>+proc portmdmg::mdmg_main {args} {
</ins><span class="cx"> global portname portversion portrevision package.destpath UI_PREFIX
</span><span class="cx">
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "Creating disk image for %s-%s"] ${portname} ${portversion}]"
</span><span class="lines">@@ -48,7 +51,7 @@
</span><span class="cx"> return [package_mdmg $portname $portversion $portrevision]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc package_mdmg {portname portversion portrevision} {
</del><ins>+proc portmdmg::package_mdmg {portname portversion portrevision} {
</ins><span class="cx"> global UI_PREFIX package.destpath portpath
</span><span class="cx"> global os.platform os.arch os.version os.major
</span><span class="cx">
</span></span></pre></div>
<a id="trunkbasesrcpackage10portmpkgtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portmpkg.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portmpkg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portmpkg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -33,17 +33,20 @@
</span><span class="cx"> package provide portmpkg 1.0
</span><span class="cx"> package require portutil 1.0
</span><span class="cx">
</span><del>-set org.macports.mpkg [target_new org.macports.mpkg mpkg_main]
</del><ins>+set org.macports.mpkg [target_new org.macports.mpkg portmpkg::mpkg_main]
</ins><span class="cx"> target_runtype ${org.macports.mpkg} always
</span><span class="cx"> target_provides ${org.macports.mpkg} mpkg
</span><span class="cx"> target_requires ${org.macports.mpkg} pkg
</span><span class="cx">
</span><ins>+namespace eval portmpkg {
+}
+
</ins><span class="cx"> # define options
</span><span class="cx"> options package.destpath package.flat
</span><span class="cx">
</span><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><del>-proc mpkg_main {args} {
</del><ins>+proc portmpkg::mpkg_main {args} {
</ins><span class="cx"> global portname portversion portrevision package.destpath package.flat UI_PREFIX
</span><span class="cx">
</span><span class="cx"> # Make sure the destination path exists.
</span><span class="lines">@@ -52,7 +55,7 @@
</span><span class="cx"> return [package_mpkg $portname $portversion $portrevision]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc make_dependency_list {portname} {
</del><ins>+proc portmpkg::make_dependency_list {portname} {
</ins><span class="cx"> set result {}
</span><span class="cx"> if {[catch {set res [mport_search "^$portname\$"]} error]} {
</span><span class="cx"> global errorInfo
</span><span class="lines">@@ -86,7 +89,7 @@
</span><span class="cx"> return $result
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc make_one_package {portname portversion destination} {
</del><ins>+proc portmpkg::make_one_package {portname portversion destination} {
</ins><span class="cx"> global prefix package.destpath package.flat
</span><span class="cx"> if {[catch {set res [mport_search "^$portname\$"]} result]} {
</span><span class="cx"> global errorInfo
</span><span class="lines">@@ -108,7 +111,7 @@
</span><span class="cx"> }
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc package_mpkg {portname portversion portrevision} {
</del><ins>+proc portmpkg::package_mpkg {portname portversion portrevision} {
</ins><span class="cx"> global portdbpath destpath workpath prefix porturl description package.destpath package.flat long_description homepage depends_run depends_lib
</span><span class="cx">
</span><span class="cx"> set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
</span><span class="lines">@@ -151,14 +154,14 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc xml_escape {s} {
</del><ins>+proc portmpkg::xml_escape {s} {
</ins><span class="cx"> regsub -all {&} $s {\&amp;} s
</span><span class="cx"> regsub -all {<} $s {\&lt;} s
</span><span class="cx"> regsub -all {>} $s {\&gt;} s
</span><span class="cx"> return $s
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc mpkg_write_info_plist {infofile portname portversion portrevision destination dependencies} {
</del><ins>+proc portmpkg::mpkg_write_info_plist {infofile portname portversion portrevision destination dependencies} {
</ins><span class="cx"> set vers [split $portversion "."]
</span><span class="cx">
</span><span class="cx"> if {[string index $destination end] != "/"} {
</span></span></pre></div>
<a id="trunkbasesrcpackage10portpkgtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portpkg.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portpkg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portpkg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -33,7 +33,7 @@
</span><span class="cx"> package provide portpkg 1.0
</span><span class="cx"> package require portutil 1.0
</span><span class="cx">
</span><del>-set org.macports.pkg [target_new org.macports.pkg pkg_main]
</del><ins>+set org.macports.pkg [target_new org.macports.pkg portpkg::pkg_main]
</ins><span class="cx"> target_runtype ${org.macports.pkg} always
</span><span class="cx"> target_provides ${org.macports.pkg} pkg
</span><span class="cx"> if {[option portarchivemode] == "yes"} {
</span><span class="lines">@@ -42,6 +42,9 @@
</span><span class="cx"> target_requires ${org.macports.pkg} destroot
</span><span class="cx"> }
</span><span class="cx">
</span><ins>+namespace eval portpkg {
+}
+
</ins><span class="cx"> # define options
</span><span class="cx"> options package.type package.destpath package.flat
</span><span class="cx">
</span><span class="lines">@@ -51,7 +54,7 @@
</span><span class="cx">
</span><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><del>-proc pkg_main {args} {
</del><ins>+proc portpkg::pkg_main {args} {
</ins><span class="cx"> global portname portversion portrevision package.type package.destpath package.flat UI_PREFIX
</span><span class="cx">
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "Creating pkg for %s-%s"] ${portname} ${portversion}]"
</span><span class="lines">@@ -59,7 +62,7 @@
</span><span class="cx"> return [package_pkg $portname $portversion $portrevision]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc package_pkg {portname portversion portrevision} {
</del><ins>+proc portpkg::package_pkg {portname portversion portrevision} {
</ins><span class="cx"> global UI_PREFIX portdbpath destpath workpath prefix description package.destpath package.flat long_description homepage portpath porturl
</span><span class="cx"> global os.version os.major
</span><span class="cx">
</span><span class="lines">@@ -150,14 +153,14 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc write_PkgInfo {infofile} {
</del><ins>+proc portpkg::write_PkgInfo {infofile} {
</ins><span class="cx"> set infofd [open ${infofile} w+]
</span><span class="cx"> puts $infofd "pmkrpkg1"
</span><span class="cx"> close $infofd
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx"> # XXX: deprecated
</span><del>-proc write_info_file {infofile portname portversion description} {
</del><ins>+proc portpkg::write_info_file {infofile portname portversion description} {
</ins><span class="cx"> set infofd [open ${infofile} w+]
</span><span class="cx"> puts $infofd "Title ${portname}
</span><span class="cx"> Version ${portversion}
</span><span class="lines">@@ -178,14 +181,14 @@
</span><span class="cx"> close $infofd
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc xml_escape {s} {
</del><ins>+proc portpkg::xml_escape {s} {
</ins><span class="cx"> regsub -all {&} $s {\&amp;} s
</span><span class="cx"> regsub -all {<} $s {\&lt;} s
</span><span class="cx"> regsub -all {>} $s {\&gt;} s
</span><span class="cx"> return $s
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc write_info_plist {infofile portname portversion portrevision} {
</del><ins>+proc portpkg::write_info_plist {infofile portname portversion portrevision} {
</ins><span class="cx"> set portname [xml_escape $portname]
</span><span class="cx"> set portversion [xml_escape $portversion]
</span><span class="cx"> set portrevision [xml_escape $portrevision]
</span><span class="lines">@@ -233,7 +236,7 @@
</span><span class="cx"> close $infofd
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc write_description_plist {infofile portname portversion description} {
</del><ins>+proc portpkg::write_description_plist {infofile portname portversion description} {
</ins><span class="cx"> set portname [xml_escape $portname]
</span><span class="cx"> set portversion [xml_escape $portversion]
</span><span class="cx"> set description [xml_escape $description]
</span><span class="lines">@@ -257,7 +260,7 @@
</span><span class="cx"> close $infofd
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc write_welcome_html {filename portname portversion long_description description homepage} {
</del><ins>+proc portpkg::write_welcome_html {filename portname portversion long_description description homepage} {
</ins><span class="cx"> set fd [open ${filename} w+]
</span><span class="cx"> if {$long_description == ""} {
</span><span class="cx"> set long_description $description
</span><span class="lines">@@ -292,7 +295,7 @@
</span><span class="cx"> close $fd
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc write_sizes_file {sizesfile portname portversion pkgpath destpath} {
</del><ins>+proc portpkg::write_sizes_file {sizesfile portname portversion pkgpath destpath} {
</ins><span class="cx">
</span><span class="cx"> if {[catch {set numFiles [exec lsbom -s ${pkgpath}/Contents/Archive.bom | wc -l]} result]} {
</span><span class="cx"> return -code error [format [msgcat::mc "Reading package bom failed: %s"] $result]
</span><span class="lines">@@ -319,7 +322,7 @@
</span><span class="cx"> close $fd
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc write_package_info {infofile portname portversion portrevision} {
</del><ins>+proc portpkg::write_package_info {infofile portname portversion portrevision} {
</ins><span class="cx"> set portname [xml_escape $portname]
</span><span class="cx"> set portversion [xml_escape $portversion]
</span><span class="cx"> set portrevision [xml_escape $portrevision]
</span></span></pre></div>
<a id="trunkbasesrcpackage10portportpkgtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portportpkg.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portportpkg.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portportpkg.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -33,15 +33,18 @@
</span><span class="cx"> package provide portportpkg 1.0
</span><span class="cx"> package require portutil 1.0
</span><span class="cx">
</span><del>-set org.macports.portpkg [target_new org.macports.portpkg portpkg_main]
</del><ins>+set org.macports.portpkg [target_new org.macports.portpkg portportpkg::portpkg_main]
</ins><span class="cx"> target_runtype ${org.macports.portpkg} always
</span><span class="cx"> target_provides ${org.macports.portpkg} portpkg
</span><span class="cx"> target_requires ${org.macports.portpkg} main
</span><span class="cx">
</span><ins>+namespace eval portportpkg {
+}
+
</ins><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><span class="cx">
</span><del>-proc xar_path {args} {
</del><ins>+proc portportpkg::xar_path {args} {
</ins><span class="cx"> global prefix_frozen
</span><span class="cx"> set xar ""
</span><span class="cx"> foreach path "${portutil::autoconf::xar_path} ${prefix_frozen}/bin/xar xar" {
</span><span class="lines">@@ -61,7 +64,7 @@
</span><span class="cx">
</span><span class="cx">
</span><span class="cx"> # escape quotes, and things that make the shell cry
</span><del>-proc shell_escape {str} {
</del><ins>+proc portportpkg::shell_escape {str} {
</ins><span class="cx"> regsub -all -- {\\} $str {\\\\} str
</span><span class="cx"> regsub -all -- {"} $str {\"} str
</span><span class="cx"> regsub -all -- {'} $str {\'} str
</span><span class="lines">@@ -69,7 +72,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-proc putel { fd el data } {
</del><ins>+proc portportpkg::putel { fd el data } {
</ins><span class="cx"> # Quote xml data
</span><span class="cx"> set quoted [string map { & &amp; < &lt; > &gt; } $data]
</span><span class="cx"> # Write the element
</span><span class="lines">@@ -77,7 +80,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-proc putlist { fd listel itemel list } {
</del><ins>+proc portportpkg::putlist { fd listel itemel list } {
</ins><span class="cx"> puts $fd "<$listel>"
</span><span class="cx"> foreach item $list {
</span><span class="cx"> putel $fd $itemel $item
</span><span class="lines">@@ -86,7 +89,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-proc create_portpkg {} {
</del><ins>+proc portportpkg::create_portpkg {} {
</ins><span class="cx"> global portname portversion prefix UI_PREFIX workpath portpath
</span><span class="cx">
</span><span class="cx"> set xar [xar_path]
</span><span class="lines">@@ -191,7 +194,7 @@
</span><span class="cx"> }
</span><span class="cx">
</span><span class="cx">
</span><del>-proc portpkg_main {args} {
</del><ins>+proc portportpkg::portpkg_main {args} {
</ins><span class="cx"> global portname portversion portverbose prefix UI_PREFIX workpath portpath
</span><span class="cx">
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "Creating portpkg for %s-%s"] ${portname} ${portversion}]"
</span></span></pre></div>
<a id="trunkbasesrcpackage10portrpmtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portrpm.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portrpm.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portrpm.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -33,16 +33,19 @@
</span><span class="cx"> package provide portrpm 1.0
</span><span class="cx"> package require portutil 1.0
</span><span class="cx">
</span><del>-set org.macports.rpm [target_new org.macports.rpm rpm_main]
</del><ins>+set org.macports.rpm [target_new org.macports.rpm portrpm::rpm_main]
</ins><span class="cx"> target_runtype ${org.macports.rpm} always
</span><span class="cx"> target_provides ${org.macports.rpm} rpm
</span><span class="cx"> target_requires ${org.macports.rpm} destroot
</span><span class="cx">
</span><ins>+namespace eval portrpm {
+}
+
</ins><span class="cx"> options package.destpath
</span><span class="cx">
</span><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><del>-proc rpm_main {args} {
</del><ins>+proc portrpm::rpm_main {args} {
</ins><span class="cx"> global portname portversion portrevision UI_PREFIX
</span><span class="cx">
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "Creating RPM package for %s-%s"] ${portname} ${portversion}]"
</span><span class="lines">@@ -50,7 +53,7 @@
</span><span class="cx"> return [rpm_pkg $portname $portversion $portrevision]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc rpm_pkg {portname portversion portrevision} {
</del><ins>+proc portrpm::rpm_pkg {portname portversion portrevision} {
</ins><span class="cx"> global UI_PREFIX package.destpath portdbpath destpath workpath prefix categories maintainers description long_description homepage epoch portpath
</span><span class="cx"> global os.platform os.arch os.version os.major
</span><span class="cx">
</span><span class="lines">@@ -124,7 +127,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc make_dependency_list {portname} {
</del><ins>+proc portrpm::make_dependency_list {portname} {
</ins><span class="cx"> set result {}
</span><span class="cx"> if {[catch {set res [mport_search "^$portname\$"]} error]} {
</span><span class="cx"> global errorInfo
</span><span class="lines">@@ -158,7 +161,7 @@
</span><span class="cx"> return $result
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc word_wrap {orig Length} {
</del><ins>+proc portrpm::word_wrap {orig Length} {
</ins><span class="cx"> set pos 0
</span><span class="cx"> set line ""
</span><span class="cx"> set text ""
</span><span class="lines">@@ -188,7 +191,7 @@
</span><span class="cx"> return $text
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc write_spec {specfile destroot filelist portname portversion portrevision description long_description homepage category license maintainer dependencies epoch} {
</del><ins>+proc portrpm::write_spec {specfile destroot filelist portname portversion portrevision description long_description homepage category license maintainer dependencies epoch} {
</ins><span class="cx"> set specfd [open ${specfile} w+]
</span><span class="cx"> set origportname ${portname}
</span><span class="cx"> regsub -all -- "\-" $portversion "_" portversion
</span></span></pre></div>
<a id="trunkbasesrcpackage10portsrpmtcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portsrpm.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portsrpm.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portsrpm.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -34,16 +34,19 @@
</span><span class="cx"> package require portutil 1.0
</span><span class="cx"> package require portfetch 1.0
</span><span class="cx">
</span><del>-set org.macports.srpm [target_new org.macports.srpm srpm_main]
</del><ins>+set org.macports.srpm [target_new org.macports.srpm portsrpm::srpm_main]
</ins><span class="cx"> target_runtype ${org.macports.srpm} always
</span><span class="cx"> target_provides ${org.macports.srpm} srpm
</span><span class="cx"> target_requires ${org.macports.srpm} checksum
</span><span class="cx">
</span><ins>+namespace eval portsrpm {
+}
+
</ins><span class="cx"> options package.destpath
</span><span class="cx">
</span><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><del>-proc srpm_main {args} {
</del><ins>+proc portsrpm::srpm_main {args} {
</ins><span class="cx"> global portname portversion portrevision UI_PREFIX
</span><span class="cx">
</span><span class="cx"> ui_msg "$UI_PREFIX [format [msgcat::mc "Creating SRPM package for %s-%s"] ${portname} ${portversion}]"
</span><span class="lines">@@ -51,7 +54,7 @@
</span><span class="cx"> return [srpm_pkg $portname $portversion $portrevision]
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc srpm_pkg {portname portversion portrevision} {
</del><ins>+proc portsrpm::srpm_pkg {portname portversion portrevision} {
</ins><span class="cx"> global UI_PREFIX package.destpath portdbpath destpath workpath distpath prefix categories maintainers description long_description homepage epoch portpath distfiles fetch_urls
</span><span class="cx"> global os.platform os.arch os.version os.major
</span><span class="cx">
</span><span class="lines">@@ -121,7 +124,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc make_dependency_list {portname} {
</del><ins>+proc portsrpm::make_dependency_list {portname} {
</ins><span class="cx"> set result {}
</span><span class="cx"> if {[catch {set res [mport_search "^$portname\$"]} error]} {
</span><span class="cx"> global errorInfo
</span><span class="lines">@@ -155,7 +158,7 @@
</span><span class="cx"> return $result
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc word_wrap {orig Length} {
</del><ins>+proc portsrpm::word_wrap {orig Length} {
</ins><span class="cx"> set pos 0
</span><span class="cx"> set line ""
</span><span class="cx"> set text ""
</span><span class="lines">@@ -185,7 +188,7 @@
</span><span class="cx"> return $text
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc write_port_spec {specfile portname portversion portrevision description long_description homepage category license maintainer distfiles fetch_urls dependencies epoch src} {
</del><ins>+proc portsrpm::write_port_spec {specfile portname portversion portrevision description long_description homepage category license maintainer distfiles fetch_urls dependencies epoch src} {
</ins><span class="cx"> set specfd [open ${specfile} w+]
</span><span class="cx"> set origportname ${portname}
</span><span class="cx"> regsub -all -- "\-" $portversion "_" portversion
</span></span></pre></div>
<a id="trunkbasesrcpackage10portunarchivetcl"></a>
<div class="modfile"><h4>Modified: trunk/base/src/package1.0/portunarchive.tcl (49088 => 49089)</h4>
<pre class="diff"><span>
<span class="info">--- trunk/base/src/package1.0/portunarchive.tcl 2009-04-03 12:02:46 UTC (rev 49088)
+++ trunk/base/src/package1.0/portunarchive.tcl 2009-04-03 12:26:37 UTC (rev 49089)
</span><span class="lines">@@ -34,14 +34,17 @@
</span><span class="cx"> package provide portunarchive 1.0
</span><span class="cx"> package require portutil 1.0
</span><span class="cx">
</span><del>-set org.macports.unarchive [target_new org.macports.unarchive unarchive_main]
</del><ins>+set org.macports.unarchive [target_new org.macports.unarchive portunarchive::unarchive_main]
</ins><span class="cx"> target_runtype ${org.macports.unarchive} always
</span><del>-target_init ${org.macports.unarchive} unarchive_init
</del><ins>+target_init ${org.macports.unarchive} portunarchive::unarchive_init
</ins><span class="cx"> target_provides ${org.macports.unarchive} unarchive
</span><span class="cx"> target_requires ${org.macports.unarchive} main
</span><del>-target_prerun ${org.macports.unarchive} unarchive_start
-target_postrun ${org.macports.unarchive} unarchive_finish
</del><ins>+target_prerun ${org.macports.unarchive} portunarchive::unarchive_start
+target_postrun ${org.macports.unarchive} portunarchive::unarchive_finish
</ins><span class="cx">
</span><ins>+namespace eval portunarchive {
+}
+
</ins><span class="cx"> # defaults
</span><span class="cx"> default unarchive.dir {${destpath}}
</span><span class="cx"> default unarchive.env {}
</span><span class="lines">@@ -57,7 +60,7 @@
</span><span class="cx">
</span><span class="cx"> set_ui_prefix
</span><span class="cx">
</span><del>-proc unarchive_init {args} {
</del><ins>+proc portunarchive::unarchive_init {args} {
</ins><span class="cx"> global UI_PREFIX target_state_fd variations workpath
</span><span class="cx"> global ports_force ports_source_only ports_binary_only
</span><span class="cx"> global portname portversion portrevision portvariants portpath
</span><span class="lines">@@ -141,7 +144,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc unarchive_start {args} {
</del><ins>+proc portunarchive::unarchive_start {args} {
</ins><span class="cx"> global UI_PREFIX portname portversion portrevision portvariants
</span><span class="cx"> global unarchive.type
</span><span class="cx">
</span><span class="lines">@@ -150,7 +153,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc unarchive_command_setup {args} {
</del><ins>+proc portunarchive::unarchive_command_setup {args} {
</ins><span class="cx"> global unarchive.env unarchive.cmd
</span><span class="cx"> global unarchive.pre_args unarchive.args unarchive.post_args
</span><span class="cx"> global unarchive.type unarchive.path
</span><span class="lines">@@ -259,7 +262,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc unarchive_main {args} {
</del><ins>+proc portunarchive::unarchive_main {args} {
</ins><span class="cx"> global UI_PREFIX
</span><span class="cx"> global portname portversion portrevision portvariants
</span><span class="cx"> global unarchive.dir unarchive.file unarchive.pipe_cmd
</span><span class="lines">@@ -283,7 +286,7 @@
</span><span class="cx"> return 0
</span><span class="cx"> }
</span><span class="cx">
</span><del>-proc unarchive_finish {args} {
</del><ins>+proc portunarchive::unarchive_finish {args} {
</ins><span class="cx"> global UI_PREFIX target_state_fd unarchive.file portname workpath destpath
</span><span class="cx">
</span><span class="cx"> # Reset state file with archive version
</span></span></pre>
</div>
</div>
</body>
</html>