Revision: 103400 https://trac.macports.org/changeset/103400 Author: cal@macports.org Date: 2013-02-24 12:49:40 -0800 (Sun, 24 Feb 2013) Log Message: ----------- base: remove portsubmit and its dependencies. See https://lists.macosforge.org/pipermail/macports-dev/2013-February/021981.htm... and following. Modified Paths: -------------- trunk/base/src/macports1.0/macports.tcl trunk/base/src/macports1.0/macports_index.tcl trunk/base/src/package1.0/Makefile trunk/base/src/package1.0/package.tcl trunk/base/src/port/port-help.tcl trunk/base/src/port/port.tcl trunk/base/src/port1.0/Makefile trunk/base/src/port1.0/port.tcl trunk/base/src/port1.0/portload.tcl trunk/base/src/port1.0/portunload.tcl Removed Paths: ------------- trunk/base/src/package1.0/portportpkg.tcl trunk/base/src/port1.0/portsubmit.tcl trunk/base/src/portindex/ Modified: trunk/base/src/macports1.0/macports.tcl =================================================================== --- trunk/base/src/macports1.0/macports.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/macports1.0/macports.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -45,20 +45,20 @@ portarchivetype portautoclean \ porttrace portverbose keeplogs destroot_umask variants_conf rsync_server rsync_options \ rsync_dir startupitem_type startupitem_install place_worksymlink xcodeversion xcodebuildcmd \ - mp_remote_url mp_remote_submit_url configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ + configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ applications_dir frameworks_dir developer_dir universal_archs build_arch macosx_deployment_target \ macportsuser proxy_override_env proxy_http proxy_https proxy_ftp proxy_rsync proxy_skip \ master_site_local patch_site_local archive_site_local buildfromsource \ revupgrade_autorun revupgrade_mode revupgrade_check_id_loadcmds \ host_blacklist preferred_hosts\ packagemaker_path default_compilers" - variable user_options "submitter_name submitter_email submitter_key" + variable user_options "" variable portinterp_options "\ portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen portsharepath \ registry.path registry.format user_home \ portarchivetype archivefetch_pubkeys portautoclean porttrace keeplogs portverbose destroot_umask \ rsync_server rsync_options rsync_dir startupitem_type startupitem_install place_worksymlink macportsuser \ - mp_remote_url mp_remote_submit_url configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ + configureccache ccache_dir ccache_size configuredistcc configurepipe buildnicevalue buildmakejobs \ applications_dir current_phase frameworks_dir developer_dir universal_archs build_arch \ os_arch os_endian os_version os_major os_platform macosx_version macosx_deployment_target \ packagemaker_path default_compilers $user_options" @@ -887,14 +887,6 @@ set macports::place_worksymlink yes } - # Default mp remote options - if {![info exists macports::mp_remote_url]} { - set macports::mp_remote_url "http://db.macports.org" - } - if {![info exists macports::mp_remote_submit_url]} { - set macports::mp_remote_submit_url "${macports::mp_remote_url}/submit" - } - # Default mp configure options if {![info exists macports::configureccache]} { set macports::configureccache no Modified: trunk/base/src/macports1.0/macports_index.tcl =================================================================== --- trunk/base/src/macports1.0/macports_index.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/macports1.0/macports_index.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -278,8 +278,7 @@ # Checks for a locally cached copy of the port, or downloads the port # from the specified URL. The port is extracted into the current working # directory along with a .mports_source file containing the url of the -# source the port came from. (This can be later used as a default for -# "port submit") +# source the port came from. # # The cached portfiles are in the same directory as the cached remote index. # Modified: trunk/base/src/package1.0/Makefile =================================================================== --- trunk/base/src/package1.0/Makefile 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/package1.0/Makefile 2013-02-24 20:49:40 UTC (rev 103400) @@ -1,6 +1,6 @@ INSTALLDIR= ${DESTDIR}${datadir}/macports/Tcl/package1.0 -SRCS= package.tcl portdmg.tcl portmdmg.tcl portmpkg.tcl portpkg.tcl portportpkg.tcl \ +SRCS= package.tcl portdmg.tcl portmdmg.tcl portmpkg.tcl portpkg.tcl \ portrpm.tcl portsrpm.tcl portdpkg.tcl portunarchive.tcl \ portarchivefetch.tcl Modified: trunk/base/src/package1.0/package.tcl =================================================================== --- trunk/base/src/package1.0/package.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/package1.0/package.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -40,6 +40,5 @@ package require portdmg 1.0 package require portmdmg 1.0 package require portdpkg 1.0 -package require portportpkg 1.0 package require portarchivefetch 1.0 package require portunarchive 1.0 Deleted: trunk/base/src/package1.0/portportpkg.tcl =================================================================== --- trunk/base/src/package1.0/portportpkg.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/package1.0/portportpkg.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -1,209 +0,0 @@ -# et:ts=4 -# portportpkg.tcl -# $Id$ -# -# Copyright (c) 2002 - 2004 Apple Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of Apple Inc. nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# - -package provide portportpkg 1.0 -package require portutil 1.0 - -set org.macports.portpkg [target_new org.macports.portpkg portportpkg::portpkg_main] -target_runtype ${org.macports.portpkg} always -target_provides ${org.macports.portpkg} portpkg -target_requires ${org.macports.portpkg} main - -namespace eval portportpkg { -} - -set_ui_prefix - - -proc portportpkg::xar_path {args} { - global prefix_frozen - set xar "" - foreach path "${portutil::autoconf::xar_path} ${prefix_frozen}/bin/xar xar" { - if { [file executable ${path}] } { - set xar $path - break; - } - } - if { "${xar}" == "" } { - ui_error "The xar tool is required to make portpkgs" - ui_error "Please install the xar port before proceeding." - return -code error [msgcat::mc "Portpkg failed"] - } - - return $xar -} - - -# escape quotes, and things that make the shell cry -proc portportpkg::shell_escape {str} { - regsub -all -- {\\} $str {\\\\} str - regsub -all -- {"} $str {\"} str - regsub -all -- {'} $str {\'} str - return $str -} - - -proc portportpkg::putel { fd el data } { - # Quote xml data - set quoted [string map { & & < < > > } $data] - # Write the element - puts $fd "<${el}>${quoted}</${el}>" -} - - -proc portportpkg::putlist { fd listel itemel list } { - puts $fd "<$listel>" - foreach item $list { - putel $fd $itemel $item - } - puts $fd "</$listel>" -} - - -proc portportpkg::create_portpkg {} { - global name prefix UI_PREFIX workpath portpath - - set xar [xar_path] - - set dirname "portpkg" - set dirpath "${workpath}/${dirname}" - set pkgpath "${workpath}/${name}.portpkg" - set metaname "portpkg_meta.xml" - set metapath "${workpath}/${metaname}" - - # Expose and default some global variables - set vars " maintainers categories description \ - long_description master_sites homepage epoch version revision \ - PortInfo \ - submitter_name submitter_email submitter_key \ - " - eval "global $vars" - foreach var $vars { - if {![info exists $var]} { set $var {} } - } - - # Unobscure the maintainer addresses - set maintainers [unobscure_maintainers $maintainers] - - # Make sure our workpath is clean - file delete -force $dirpath $metapath $pkgpath - - # Create the portpkg directory - file mkdir $dirpath - - # Move in the Portfile - file copy Portfile ${dirpath} - - # Move in files - if {[file isdirectory "files"]} { - file copy files ${dirpath} - } - - # Create the metadata subdoc - set sd [open ${metapath} w] - puts $sd "<portpkg version='1'>" - - puts $sd "<submitter>" - putel $sd name $submitter_name - putel $sd email $submitter_email - - # TODO provide means to set notes? - putel $sd notes "" - puts $sd "</submitter>" - - puts $sd "<package>" - putel $sd name $name - putel $sd homepage $homepage - putlist $sd categories category $categories - putlist $sd maintainers maintainer $maintainers - - putel $sd epoch $epoch - putel $sd version $version - putel $sd revision $revision - - putel $sd description [join $description] - putel $sd long_description [join $long_description] - - # TODO: variants has platforms in it - if {[info exists PortInfo(variants)]} { - if {[info exists PortInfo(variant_desc)]} { - array set descs $PortInfo(variant_desc) - } else { - array set descs "" - } - - puts $sd "<variants>" - foreach v $PortInfo(variants) { - puts $sd "<variant>" - putel $sd name $v - if {[info exists descs($v)]} { - putel $sd description $descs($v) - } - puts $sd "</variant>" - } - puts $sd "</variants>" - } else { - putel $sd variants "" - } - - # TODO: Dependencies and platforms - #putel $sd dependencies "" - #putel $sd platforms "" - - puts $sd "</package>" - - puts $sd "</portpkg>" - close $sd - - # Create portpkg.xar, including the metadata and the portpkg directory contents - set cmd "cd ${workpath}; ${xar} -cf ${pkgpath} --exclude \\.DSStore --exclude \\.svn ${dirname} -s ${metapath} -n ${metaname}" - if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failed to create portpkg for port : %s"] $name] - } - - return ${pkgpath} -} - - -proc portportpkg::portpkg_main {args} { - global name version portverbose prefix UI_PREFIX workpath portpath - - ui_msg "$UI_PREFIX [format [msgcat::mc "Creating portpkg for %s-%s"] ${name} ${version}]" - - # Make sure we have a work directory - file mkdir ${workpath} - - # Create portpkg.xar in the work directory - set pkgpath [create_portpkg] - - return 0 -} Modified: trunk/base/src/port/port-help.tcl =================================================================== --- trunk/base/src/port/port-help.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/port/port-help.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -329,10 +329,6 @@ Marks each of the given ports as unrequested } -set porthelp(submit) { -Submit a port to the MacPorts Web Application (unimplemented) -} - set porthelp(sync) { Synchronize the set of Portfiles } Modified: trunk/base/src/port/port.tcl =================================================================== --- trunk/base/src/port/port.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/port/port.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -4138,7 +4138,6 @@ clean [list action_target [ACTION_ARGS_PORTS]] \ test [list action_target [ACTION_ARGS_PORTS]] \ lint [list action_target [ACTION_ARGS_PORTS]] \ - submit [list action_target [ACTION_ARGS_PORTS]] \ livecheck [list action_target [ACTION_ARGS_PORTS]] \ distcheck [list action_target [ACTION_ARGS_PORTS]] \ mirror [list action_target [ACTION_ARGS_PORTS]] \ Modified: trunk/base/src/port1.0/Makefile =================================================================== --- trunk/base/src/port1.0/Makefile 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/port1.0/Makefile 2013-02-24 20:49:40 UTC (rev 103400) @@ -4,7 +4,7 @@ portfetch.tcl portmain.tcl portbuild.tcl portpatch.tcl portutil.tcl \ portinstall.tcl portuninstall.tcl portdepends.tcl portdestroot.tcl \ portlint.tcl portclean.tcl porttest.tcl portactivate.tcl \ - portdeactivate.tcl portsubmit.tcl port_autoconf.tcl portstartupitem.tcl \ + portdeactivate.tcl port_autoconf.tcl portstartupitem.tcl \ porttrace.tcl portlivecheck.tcl portdistcheck.tcl portmirror.tcl \ portload.tcl portunload.tcl portdistfiles.tcl fetch_common.tcl \ portsandbox.tcl Modified: trunk/base/src/port1.0/port.tcl =================================================================== --- trunk/base/src/port1.0/port.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/port1.0/port.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -76,7 +76,6 @@ package require portclean 1.0 package require porttest 1.0 package require portlint 1.0 -package require portsubmit 1.0 package require porttrace 1.0 package require portdistcheck 1.0 package require portlivecheck 1.0 Modified: trunk/base/src/port1.0/portload.tcl =================================================================== --- trunk/base/src/port1.0/portload.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/port1.0/portload.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -1,5 +1,5 @@ # et:ts=4 -# portsubmit.tcl +# portload.tcl # $Id$ # # Copyright (c) 2007, 2009, 2011 The MacPorts Project Deleted: trunk/base/src/port1.0/portsubmit.tcl =================================================================== --- trunk/base/src/port1.0/portsubmit.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/port1.0/portsubmit.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -1,264 +0,0 @@ -# et:ts=4 -# portsubmit.tcl -# $Id$ -# -# Copyright (c) 2007 - 2011 The MacPorts Project -# Copyright (c) 2002 - 2004 Apple Inc. -# All rights reserved. -# -# Redistribution and use in source and binary forms, with or without -# modification, are permitted provided that the following conditions -# are met: -# 1. Redistributions of source code must retain the above copyright -# notice, this list of conditions and the following disclaimer. -# 2. Redistributions in binary form must reproduce the above copyright -# notice, this list of conditions and the following disclaimer in the -# documentation and/or other materials provided with the distribution. -# 3. Neither the name of Apple Inc. nor the names of its contributors -# may be used to endorse or promote products derived from this software -# without specific prior written permission. -# -# THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS" -# AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE -# IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE -# ARE DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT OWNER OR CONTRIBUTORS BE -# LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR -# CONSEQUENTIAL DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF -# SUBSTITUTE GOODS OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS -# INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN -# CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) -# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE -# POSSIBILITY OF SUCH DAMAGE. -# - -package provide portsubmit 1.0 -package require portutil 1.0 -package require portportpkg 1.0 - -set org.macports.submit [target_new org.macports.submit portsubmit::submit_main] -target_runtype ${org.macports.submit} always -target_provides ${org.macports.submit} submit -target_requires ${org.macports.submit} portpkg - -namespace eval portsubmit { -} - -set_ui_prefix - - -# escape quotes, and things that make the shell cry -proc portsubmit::shell_escape {str} { - regsub -all -- {\\} $str {\\\\} str - regsub -all -- {"} $str {\"} str - regsub -all -- {'} $str {\'} str - return $str -} - - -proc portsubmit::submit_main {args} { - global mp_remote_submit_url name version portverbose prefix UI_PREFIX workpath portpath - - set submiturl $mp_remote_submit_url - - # Preconditions for submit - if {$submitter_email == ""} { - return -code error [format [msgcat::mc "Submitter email is required to submit a port"]] - } - - # Make sure we have a work directory - file mkdir ${workpath} - - # Create portpkg.xar in the work directory - set pkgpath "${workpath}/${name}.portpkg" - - # TODO: If a private key was provided, create a signed digest of the submission - - # Submit to the submit url - set args "curl" - lappend args "--silent" - lappend args "--url ${submiturl}" - lappend args "--output ${workpath}/.portsubmit.out" - lappend args "-F machine=true" - lappend args "-F portpkg=@${pkgpath}" - #lappend args "-F signeddigest=${digest}" - set cmd [join $args] - - if {[tbool portverbose]} { - ui_notice "Submitting portpkg $pkgpath for $name to $submiturl" - } - - # Invoke curl to do the submit - ui_debug $cmd - if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failure during submit of port %s"] $name] - } - - # Parse the result - set fd [open ${workpath}/.portsubmit.out r] - array set result [list] - while {[gets $fd line] != -1} { - if {0 != [regexp -- {^([^:]+):\s*(.*)$} $line unused key value]} { - set result($key) $value - } - } - close $fd - - # Interpret and act on the result - if {[info exists result(MESSAGE)] && [tbool portverbose]} { - ui_notice $result(MESSAGE) - } - if {[info exists result(STATUS)]} { - if { $result(STATUS) == 0 } { - ui_notice "Submitted portpkg for $name" - if {[info exists result(DOWNLOAD_URL)]} { - ui_notice " download URL => $result(DOWNLOAD_URL)" - } - if {[info exists result(HUMAN_URL)]} { - ui_notice " human readable URL => $result(HUMAN_URL)" - } - } else { - return -code error [format [msgcat::mc "Status %d reported during submit of port %s"] $result(STATUS) $name] - } - } else { - return -code error [format [msgcat::mc "Status not received during submit of port %s"] $name] - } - - return - - # REMNANTS OF KEVIN'S CODE - - # start with the Portfile, and add the files directory if it exists. - # don't pick up any CVS directories, or .DS_Store turds - set cmd "tar czvf ${workpath}/Portfile.tar.gz " - append cmd "--exclude CVS --exclude .DS_Store " - append cmd "Portfile " - if {[file isdirectory "files"]} { - append cmd "files " - } - - if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failed to archive port %s"] $name] - } - - set portsource "" - set base_rev "" - if {![catch {set fd [open ".mports_source" r]}]} { - while {[gets $fd line] != -1} { - regexp -- {^(.*): (.*)$} $line unused key value - switch -- $key { - source { set portsource $value } - revision { set base_rev $value } - } - } - close $fd - } - if {$portsource == ""} { - ui_notice "$UI_PREFIX Submitting $name-$version" - puts -nonewline "URL: " - flush stdout - gets stdin portsource - } - - ui_notice "$UI_PREFIX Submitting $name-$version to $portsource" - - puts -nonewline "Username: " - flush stdout - gets stdin username - puts -nonewline "Password: " - flush stdout - exec stty -echo - gets stdin password - puts "" - exec stty echo - - set vars {name version maintainers categories description \ - long_description master_sites} - eval "global $vars" - foreach var $vars { - if {![info exists $var]} { set $var {} } - } - - set cmd "curl " - append cmd "--silent " - append cmd "--url [regsub -- {^mports} $portsource {http}]/cgi-bin/portsubmit.cgi " - append cmd "--output ${workpath}/.portsubmit.out " - append cmd "-F name=${name} " - append cmd "-F version=${version} " - append cmd "-F base_rev=${base_rev} " - append cmd "-F md5=[md5 file ${workpath}/Portfile.tar.gz] " - append cmd "-F attachment=@${workpath}/Portfile.tar.gz " - append cmd "-F \"submitted_by=[shell_escape $username]\" " - append cmd "-F \"password=[shell_escape $password]\" " - append cmd "-F \"maintainers=[shell_escape $maintainers]\" " - append cmd "-F \"categories=[shell_escape $categories]\" " - append cmd "-F \"description=[shell_escape $description]\" " - append cmd "-F \"long_description=[shell_escape $long_description]\" " - append cmd "-F \"master_sites=[shell_escape $master_sites]\" " - - ui_debug $cmd - if {[system $cmd] != ""} { - return -code error [format [msgcat::mc "Failed to submit port %s"] $name] - } - - # - # Parse the result from the remote index - # if ERROR: print the error message - # if OK: store the revision info - # if CONFLICT: attempt to merge the conflict - # - - set fd [open ${workpath}/.portsubmit.out r] - array set result [list] - while {[gets $fd line] != -1} { - regexp -- {^(.*): (.*)$} $line unused key value - set result($key) $value - } - close $fd - - if {[info exists result(OK)]} { - set fd [open ".mports_source" w] - puts $fd "source: $portsource" - puts $fd "port: $name" - puts $fd "version: $version" - puts $fd "revision: $result(revision)" - close $fd - - ui_notice "$name-$version submitted successfully." - ui_notice "New revision: $result(revision)" - } elseif {[info exists result(ERROR)]} { - return -code error $result(ERROR) - } 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/mports.XXXXXXXX"] - file mkdir $tmpdir/new - file mkdir $tmpdir/old - set worker [mport_open $portsource/files/$name/$version/$result(revision)/Portfile.tar.gz [list portdir $tmpdir/new subport $name]] - if {$base_rev != ""} { - set worker2 [mport_open $portsource/files/$name/$version/$base_rev/Portfile.tar.gz [list portdir $tmpdir/old subport $name]] - catch {system "diff3 -m -E -- $portpath/Portfile $tmpdir/old/$name-$version/Portfile $tmpdir/new/$name-$version/Portfile > $tmpdir/Portfile"} - file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" - mport_close $worker2 - } else { - catch {system "diff3 -m -E -- $portpath/Portfile $portpath/Portfile $tmpdir/new/$name-$version/Portfile > $tmpdir/Portfile"} - file rename -force "${tmpdir}/Portfile" "${portpath}/Portfile" - } - mport_close $worker - catch {delete "${tmpdir}"} - - set fd [open [file join "$portpath" ".mports_source"] w] - puts $fd "source: $portsource" - puts $fd "port: $name" - puts $fd "version: $version" - puts $fd "revision: $result(revision)" - close $fd - - ui_error "A newer revision of this port has already been submitted." - ui_error "Portfile: $name-$version" - ui_error "Base revision: $base_rev" - ui_error "Current revision: $result(revision)" - ui_error "Please edit the Portfile to resolve any conflicts and resubmit." - } - - return 0 -} Modified: trunk/base/src/port1.0/portunload.tcl =================================================================== --- trunk/base/src/port1.0/portunload.tcl 2013-02-24 20:42:36 UTC (rev 103399) +++ trunk/base/src/port1.0/portunload.tcl 2013-02-24 20:49:40 UTC (rev 103400) @@ -1,5 +1,5 @@ # et:ts=4 -# portsubmit.tcl +# portunload.tcl # $Id$ # # Copyright (c) 2007, 2009, 2011 The MacPorts Project