Revision: 103403 https://trac.macports.org/changeset/103403 Author: cal@macports.org Date: 2013-02-24 13:10:34 -0800 (Sun, 24 Feb 2013) Log Message: ----------- Merge from trunk Modified Paths: -------------- users/cal/base-sqlite-portindex/ChangeLog users/cal/base-sqlite-portindex/configure.ac users/cal/base-sqlite-portindex/src/macports1.0/macports.tcl users/cal/base-sqlite-portindex/src/macports1.0/macports_index.tcl users/cal/base-sqlite-portindex/src/package1.0/Makefile users/cal/base-sqlite-portindex/src/package1.0/package.tcl users/cal/base-sqlite-portindex/src/package1.0/portarchivefetch.tcl users/cal/base-sqlite-portindex/src/port/port-help.tcl users/cal/base-sqlite-portindex/src/port/port.tcl users/cal/base-sqlite-portindex/src/port1.0/Makefile users/cal/base-sqlite-portindex/src/port1.0/port.tcl users/cal/base-sqlite-portindex/src/port1.0/portconfigure.tcl users/cal/base-sqlite-portindex/src/port1.0/portload.tcl users/cal/base-sqlite-portindex/src/port1.0/portunload.tcl users/cal/base-sqlite-portindex/src/port1.0/portutil.tcl Removed Paths: ------------- users/cal/base-sqlite-portindex/src/package1.0/portportpkg.tcl users/cal/base-sqlite-portindex/src/port1.0/portsubmit.tcl users/cal/base-sqlite-portindex/src/portindex/ Property Changed: ---------------- users/cal/base-sqlite-portindex/ Property changes on: users/cal/base-sqlite-portindex ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:103013-103052 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:103013-103402 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Modified: users/cal/base-sqlite-portindex/ChangeLog =================================================================== --- users/cal/base-sqlite-portindex/ChangeLog 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/ChangeLog 2013-02-24 21:10:34 UTC (rev 103403) @@ -4,6 +4,9 @@ ### Release 2.2.0 (unreleased) + - Remove unimplemented 'port submit'. + (cal in r103400) + - Add 'port space --total' which displays the grand total only. (raimue in r102248) Modified: users/cal/base-sqlite-portindex/configure.ac =================================================================== --- users/cal/base-sqlite-portindex/configure.ac 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/configure.ac 2013-02-24 21:10:34 UTC (rev 103403) @@ -347,7 +347,6 @@ SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX} AC_SUBST(INCLUDES) -AC_SUBST(PATHCONF) AC_SUBST(STLIB_LD) AC_SUBST(SHLIB_LD) AC_SUBST(SHLIB_CFLAGS) Modified: users/cal/base-sqlite-portindex/src/macports1.0/macports.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/macports1.0/macports.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/macports1.0/macports.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -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 @@ -4183,9 +4175,9 @@ set broken_files {}; set binaries [registry::file search active 1 binary 1] - ui_msg -nonewline "$macports::ui_prefix Scanning binaries for linking errors" set binary_count [llength $binaries] if {$binary_count > 0} { + ui_msg -nonewline "$macports::ui_prefix Scanning binaries for linking errors" set handle [machista::create_handle] if {$handle == "NULL"} { error "Error creating libmachista handle" Modified: users/cal/base-sqlite-portindex/src/macports1.0/macports_index.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/macports1.0/macports_index.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/macports1.0/macports_index.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -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: users/cal/base-sqlite-portindex/src/package1.0/Makefile =================================================================== --- users/cal/base-sqlite-portindex/src/package1.0/Makefile 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/package1.0/Makefile 2013-02-24 21:10:34 UTC (rev 103403) @@ -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: users/cal/base-sqlite-portindex/src/package1.0/package.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/package1.0/package.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/package1.0/package.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -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 Modified: users/cal/base-sqlite-portindex/src/package1.0/portarchivefetch.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/package1.0/portarchivefetch.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/package1.0/portarchivefetch.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -253,14 +253,16 @@ ui_debug "openssl output: $result" } } + file delete -force $signature if {!$verified} { - return -code error "Failed to verify signature for archive!" - } - if {[catch {file rename -force "${incoming_path}/${archive}.TMP" "${archivefetch.fulldestpath}/${archive}"} result]} { + # fall back to building from source (or error out later if binary only mode) + ui_warn "Failed to verify signature for archive!" + file delete -force "${incoming_path}/${archive}.TMP" + break + } elseif {[catch {file rename -force "${incoming_path}/${archive}.TMP" "${archivefetch.fulldestpath}/${archive}"} result]} { ui_debug "$::errorInfo" return -code error "Failed to move downloaded archive into place: $result" } - file delete -force $signature set archive_exists 1 break } Deleted: users/cal/base-sqlite-portindex/src/package1.0/portportpkg.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/package1.0/portportpkg.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/package1.0/portportpkg.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -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: users/cal/base-sqlite-portindex/src/port/port-help.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/port/port-help.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/port/port-help.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -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: users/cal/base-sqlite-portindex/src/port/port.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/port/port.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/port/port.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -4139,7 +4139,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: users/cal/base-sqlite-portindex/src/port1.0/Makefile =================================================================== --- users/cal/base-sqlite-portindex/src/port1.0/Makefile 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/port1.0/Makefile 2013-02-24 21:10:34 UTC (rev 103403) @@ -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: users/cal/base-sqlite-portindex/src/port1.0/port.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/port1.0/port.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/port1.0/port.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -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: users/cal/base-sqlite-portindex/src/port1.0/portconfigure.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/port1.0/portconfigure.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/port1.0/portconfigure.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -212,25 +212,19 @@ apple-gcc-4.0 { set name "MacPorts Apple gcc 4.0" } apple-gcc-4.2 { set name "MacPorts Apple gcc 4.2" } macports-gcc { set name "MacPorts gcc (port select)" } - macports-gcc-4.2 { set name "MacPorts gcc 4.2" } - macports-gcc-4.3 { set name "MacPorts gcc 4.3" } - macports-gcc-4.4 { set name "MacPorts gcc 4.4" } - macports-gcc-4.5 { set name "MacPorts gcc 4.5" } - macports-gcc-4.6 { set name "MacPorts gcc 4.6" } - macports-gcc-4.7 { set name "MacPorts gcc 4.7" } - macports-gcc-4.8 { set name "MacPorts gcc 4.8" } macports-llvm-gcc-4.2 { set name "MacPorts llvm-gcc 4.2" } macports-clang { set name "MacPorts clang (port select)" } - macports-clang-2.9 { set name "MacPorts clang 2.9" } - macports-clang-3.0 { set name "MacPorts clang 3.0" } - macports-clang-3.1 { set name "MacPorts clang 3.1" } - macports-clang-3.2 { set name "MacPorts clang 3.2" } - macports-clang-3.3 { set name "MacPorts clang 3.3" } - macports-dragonegg-3.0 { set name "MacPorts dragonegg 3.0" } - macports-dragonegg-3.1 { set name "MacPorts dragonegg 3.1" } - macports-dragonegg-3.2 { set name "MacPorts dragonegg 3.2" } - macports-dragonegg-3.3 { set name "MacPorts dragonegg 3.3" } - default { return -code error "Invalid value for configure.compiler: ${configure.compiler}" } + default { + if {[regexp {macports-clang-(.*)\.(.*)} ${configure.compiler} -> major minor]} { + set name "MacPorts clang ${major}.${minor}" + } elseif {[regexp {macports-dragonegg-(.*)\.(.*)} ${configure.compiler} -> major minor]} { + set name "MacPorts dragonegg ${major}.${minor}" + } elseif {[regexp {macports-gcc-(.*)\.(.*)} ${configure.compiler} -> major minor]} { + set name "MacPorts gcc ${major}.${minor}" + } else { + return -code error "Invalid value for configure.compiler: ${configure.compiler}" + } + } } ui_debug "Using compiler '$name'" @@ -366,34 +360,12 @@ # internal proc to determine if the compiler supports -arch proc portconfigure::arch_flag_supported {compiler} { - switch -exact ${compiler} { - gcc-4.0 - - gcc-4.2 - - llvm-gcc-4.2 - - clang - - apple-gcc-4.0 - - apple-gcc-4.2 - - macports-llvm-gcc-4.2 - - macports-clang-2.9 - - macports-clang-3.0 - - macports-clang-3.1 - - macports-clang-3.2 - - macports-clang-3.3 - - macports-clang { - return yes - } - default { - return no - } - } + return [expr {[string first "macports-gcc-" $compiler] != 0 && + [string first "macports-dragonegg-" $compiler] != 0}] } -# check if a compiler comes from a port -proc portconfigure::compiler_is_port {compiler} { - return [info exists portconfigure::compiler_name_map($compiler)] -} - # maps compiler names to the port that provides them +# TODO: Remove this after 2.2 is released and ports aren't referring to it. array set portconfigure::compiler_name_map { apple-gcc-4.0 apple-gcc40 apple-gcc-4.2 apple-gcc42 @@ -416,6 +388,26 @@ macports-dragonegg-3.3 dragonegg-3.3 } +proc portconfigure::compiler_port_name {compiler} { + if {[regexp {apple-gcc-(.*)\.(.*)} ${compiler} -> major minor]} { + return "apple-gcc${major}${minor}" + } elseif {[regexp {macports-clang-(.*)\.(.*)} ${compiler} -> major minor]} { + return "clang-${major}.${minor}" + } elseif {[regexp {macports-dragonegg-(.*)\.(.*)} ${compiler} -> major minor]} { + return "dragonegg-${major}.${minor}" + } elseif {[regexp {macports-gcc-(.*)\.(.*)} ${compiler} -> major minor]} { + return "gcc${major}${minor}" + } elseif {[regexp {macports-llvm-gcc-(.*)\.(.*)} ${compiler} -> major minor]} { + return "llvm-gcc${major}${minor}" + } + + return "" +} + +proc portconfigure::compiler_is_port {compiler} { + return [expr {[portconfigure::compiler_port_name ${compiler}] != ""}] +} + # internal function to determine the default compiler proc portconfigure::configure_get_default_compiler {args} { global compiler.blacklist compiler.whitelist compiler.fallback @@ -497,7 +489,7 @@ # Set defaults switch -exact ${type} { - cc { set ret [find_developer_tool cc] } + cc - objc { set ret [find_developer_tool cc] } cxx { set ret [find_developer_tool c++] } cpp { set ret [find_developer_tool cpp] } @@ -506,7 +498,7 @@ switch -exact ${compiler} { gcc { switch -exact ${type} { - cc { set ret [find_developer_tool gcc] } + cc - objc { set ret [find_developer_tool gcc] } cxx { set ret [find_developer_tool g++] } cpp { set ret [find_developer_tool cpp] } @@ -514,7 +506,7 @@ } gcc-3.3 { switch -exact ${type} { - cc { set ret [find_developer_tool gcc-3.3] } + cc - objc { set ret [find_developer_tool gcc-3.3] } cxx { set ret [find_developer_tool g++-3.3] } cpp { set ret [find_developer_tool cpp-3.3] } @@ -522,7 +514,7 @@ } gcc-4.0 { switch -exact ${type} { - cc { set ret [find_developer_tool gcc-4.0] } + cc - objc { set ret [find_developer_tool gcc-4.0] } cxx { set ret [find_developer_tool g++-4.0] } cpp { set ret [find_developer_tool cpp-4.0] } @@ -530,7 +522,7 @@ } gcc-4.2 { switch -exact ${type} { - cc { set ret [find_developer_tool gcc-4.2] } + cc - objc { set ret [find_developer_tool gcc-4.2] } cxx { set ret [find_developer_tool g++-4.2] } cpp { set ret [find_developer_tool cpp-4.2] } @@ -538,7 +530,7 @@ } llvm-gcc-4.2 { switch -exact ${type} { - cc { set ret [find_developer_tool llvm-gcc-4.2] } + cc - objc { set ret [find_developer_tool llvm-gcc-4.2] } cxx { set ret [find_developer_tool llvm-g++-4.2] } cpp { set ret [find_developer_tool llvm-cpp-4.2] } @@ -546,7 +538,7 @@ } clang { switch -exact ${type} { - cc { set ret [find_developer_tool clang] } + cc - objc { set ret [find_developer_tool clang] } cxx { set clangpp [find_developer_tool clang++] @@ -560,14 +552,14 @@ } apple-gcc-4.0 { switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc-apple-4.0 } + cc - objc { set ret ${prefix}/bin/gcc-apple-4.0 } cpp { set ret ${prefix}/bin/cpp-apple-4.0 } } } apple-gcc-4.2 { switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc-apple-4.2 } + cc - objc { set ret ${prefix}/bin/gcc-apple-4.2 } cpp { set ret ${prefix}/bin/cpp-apple-4.2 } cxx { set ret ${prefix}/bin/g++-apple-4.2 } @@ -575,95 +567,18 @@ } macports-gcc { switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc } + cc - objc { set ret ${prefix}/bin/gcc } cxx { set ret ${prefix}/bin/g++ } cpp { set ret ${prefix}/bin/cpp } - fc { set ret ${prefix}/bin/gfortran } - f77 { set ret ${prefix}/bin/gfortran } + fc - + f77 - f90 { set ret ${prefix}/bin/gfortran } } } - macports-gcc-4.2 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc-mp-4.2 } - objc { set ret ${prefix}/bin/gcc-mp-4.2 } - cxx { set ret ${prefix}/bin/g++-mp-4.2 } - cpp { set ret ${prefix}/bin/cpp-mp-4.2 } - fc { set ret ${prefix}/bin/gfortran-mp-4.2 } - f77 { set ret ${prefix}/bin/gfortran-mp-4.2 } - f90 { set ret ${prefix}/bin/gfortran-mp-4.2 } - } - } - macports-gcc-4.3 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc-mp-4.3 } - objc { set ret ${prefix}/bin/gcc-mp-4.3 } - cxx { set ret ${prefix}/bin/g++-mp-4.3 } - cpp { set ret ${prefix}/bin/cpp-mp-4.3 } - fc { set ret ${prefix}/bin/gfortran-mp-4.3 } - f77 { set ret ${prefix}/bin/gfortran-mp-4.3 } - f90 { set ret ${prefix}/bin/gfortran-mp-4.3 } - } - } - macports-gcc-4.4 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc-mp-4.4 } - objc { set ret ${prefix}/bin/gcc-mp-4.4 } - cxx { set ret ${prefix}/bin/g++-mp-4.4 } - cpp { set ret ${prefix}/bin/cpp-mp-4.4 } - fc { set ret ${prefix}/bin/gfortran-mp-4.4 } - f77 { set ret ${prefix}/bin/gfortran-mp-4.4 } - f90 { set ret ${prefix}/bin/gfortran-mp-4.4 } - } - } - macports-gcc-4.5 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc-mp-4.5 } - objc { set ret ${prefix}/bin/gcc-mp-4.5 } - cxx { set ret ${prefix}/bin/g++-mp-4.5 } - cpp { set ret ${prefix}/bin/cpp-mp-4.5 } - fc { set ret ${prefix}/bin/gfortran-mp-4.5 } - f77 { set ret ${prefix}/bin/gfortran-mp-4.5 } - f90 { set ret ${prefix}/bin/gfortran-mp-4.5 } - } - } - macports-gcc-4.6 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc-mp-4.6 } - objc { set ret ${prefix}/bin/gcc-mp-4.6 } - cxx { set ret ${prefix}/bin/g++-mp-4.6 } - cpp { set ret ${prefix}/bin/cpp-mp-4.6 } - fc { set ret ${prefix}/bin/gfortran-mp-4.6 } - f77 { set ret ${prefix}/bin/gfortran-mp-4.6 } - f90 { set ret ${prefix}/bin/gfortran-mp-4.6 } - } - } - macports-gcc-4.7 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc-mp-4.7 } - objc { set ret ${prefix}/bin/gcc-mp-4.7 } - cxx { set ret ${prefix}/bin/g++-mp-4.7 } - cpp { set ret ${prefix}/bin/cpp-mp-4.7 } - fc { set ret ${prefix}/bin/gfortran-mp-4.7 } - f77 { set ret ${prefix}/bin/gfortran-mp-4.7 } - f90 { set ret ${prefix}/bin/gfortran-mp-4.7 } - } - } - macports-gcc-4.8 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/gcc-mp-4.8 } - objc { set ret ${prefix}/bin/gcc-mp-4.8 } - cxx { set ret ${prefix}/bin/g++-mp-4.8 } - cpp { set ret ${prefix}/bin/cpp-mp-4.8 } - fc { set ret ${prefix}/bin/gfortran-mp-4.8 } - f77 { set ret ${prefix}/bin/gfortran-mp-4.8 } - f90 { set ret ${prefix}/bin/gfortran-mp-4.8 } - } - } macports-llvm-gcc-4.2 { switch -exact ${type} { - cc { set ret ${prefix}/bin/llvm-gcc-4.2 } + cc - objc { set ret ${prefix}/bin/llvm-gcc-4.2 } cxx { set ret ${prefix}/bin/llvm-g++-4.2 } cpp { set ret ${prefix}/bin/llvm-cpp-4.2 } @@ -671,90 +586,40 @@ } macports-clang { switch -exact ${type} { - cc { set ret ${prefix}/bin/clang } + cc - objc { set ret ${prefix}/bin/clang } cxx { set ret ${prefix}/bin/clang++ } } } - macports-clang-2.9 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/clang-mp-2.9 } - objc { set ret ${prefix}/bin/clang-mp-2.9 } - cxx { set ret ${prefix}/bin/clang++-mp-2.9 } + default { + if {[regexp {macports-clang-(.*)\.(.*)} $compiler -> major minor]} { + switch -exact ${type} { + cc - + objc { set ret ${prefix}/bin/clang-mp-${major}.${minor} } + cxx { set ret ${prefix}/bin/clang++-mp-${major}.${minor} } + } + } elseif {[regexp {macports-dragonegg-(.*)\.(.*)} $compiler -> major minor]} { + switch -exact ${type} { + cc - + objc { set ret ${prefix}/bin/dragonegg-${major}.${minor}-gcc } + cxx { set ret ${prefix}/bin/dragonegg-${major}.${minor}-g++ } + cpp { set ret ${prefix}/bin/dragonegg-${major}.${minor}-cpp } + fc - + f77 - + f90 { set ret ${prefix}/bin/dragonegg-${major}.${minor}-gfortran } + } + } elseif {[regexp {macports-gcc-(.*)\.(.*)} $compiler -> major minor]} { + switch -exact ${type} { + cc - + objc { set ret ${prefix}/bin/gcc-mp-${major}.${minor} } + cxx { set ret ${prefix}/bin/g++-mp-${major}.${minor} } + cpp { set ret ${prefix}/bin/cpp-mp-${major}.${minor} } + fc - + f77 - + f90 { set ret ${prefix}/bin/gfortran-mp-${major}.${minor} } + } } } - macports-clang-3.0 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/clang-mp-3.0 } - objc { set ret ${prefix}/bin/clang-mp-3.0 } - cxx { set ret ${prefix}/bin/clang++-mp-3.0 } - } - } - macports-clang-3.1 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/clang-mp-3.1 } - objc { set ret ${prefix}/bin/clang-mp-3.1 } - cxx { set ret ${prefix}/bin/clang++-mp-3.1 } - } - } - macports-clang-3.2 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/clang-mp-3.2 } - objc { set ret ${prefix}/bin/clang-mp-3.2 } - cxx { set ret ${prefix}/bin/clang++-mp-3.2 } - } - } - macports-clang-3.3 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/clang-mp-3.3 } - objc { set ret ${prefix}/bin/clang-mp-3.3 } - cxx { set ret ${prefix}/bin/clang++-mp-3.3 } - } - } - macports-dragonegg-3.0 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/dragonegg-3.0-gcc } - objc { set ret ${prefix}/bin/dragonegg-3.0-gcc } - cxx { set ret ${prefix}/bin/dragonegg-3.0-g++ } - cpp { set ret ${prefix}/bin/dragonegg-3.0-cpp } - fc { set ret ${prefix}/bin/dragonegg-3.0-gfortran } - f77 { set ret ${prefix}/bin/dragonegg-3.0-gfortran } - f90 { set ret ${prefix}/bin/dragonegg-3.0-gfortran } - } - } - macports-dragonegg-3.1 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/dragonegg-3.1-gcc } - objc { set ret ${prefix}/bin/dragonegg-3.1-gcc } - cxx { set ret ${prefix}/bin/dragonegg-3.1-g++ } - cpp { set ret ${prefix}/bin/dragonegg-3.1-cpp } - fc { set ret ${prefix}/bin/dragonegg-3.1-gfortran } - f77 { set ret ${prefix}/bin/dragonegg-3.1-gfortran } - f90 { set ret ${prefix}/bin/dragonegg-3.1-gfortran } - } - } - macports-dragonegg-3.2 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/dragonegg-3.2-gcc } - objc { set ret ${prefix}/bin/dragonegg-3.2-gcc } - cxx { set ret ${prefix}/bin/dragonegg-3.2-g++ } - cpp { set ret ${prefix}/bin/dragonegg-3.2-cpp } - fc { set ret ${prefix}/bin/dragonegg-3.2-gfortran } - f77 { set ret ${prefix}/bin/dragonegg-3.2-gfortran } - f90 { set ret ${prefix}/bin/dragonegg-3.2-gfortran } - } - } - macports-dragonegg-3.3 { - switch -exact ${type} { - cc { set ret ${prefix}/bin/dragonegg-3.3-gcc } - objc { set ret ${prefix}/bin/dragonegg-3.3-gcc } - cxx { set ret ${prefix}/bin/dragonegg-3.3-g++ } - cpp { set ret ${prefix}/bin/dragonegg-3.3-cpp } - fc { set ret ${prefix}/bin/dragonegg-3.3-gfortran } - f77 { set ret ${prefix}/bin/dragonegg-3.3-gfortran } - f90 { set ret ${prefix}/bin/dragonegg-3.3-gfortran } - } - } } return $ret } @@ -763,7 +628,7 @@ # Some of the compilers we use are provided by MacPorts itself; ensure we # automatically add a dependency when needed proc portconfigure::add_automatic_compiler_dependencies {} { - global configure.compiler portconfigure::compiler_name_map + global configure.compiler # The default value requires substitution before use. set compiler [subst ${configure.compiler}] @@ -773,7 +638,7 @@ ui_debug "Chosen compiler ${compiler} is provided by a port, adding dependency" - set compiler_port $compiler_name_map($compiler) + set compiler_port [portconfigure::compiler_port_name ${compiler}] set deptype "build" if {[string first "macports-gcc-" $compiler] == 0} { set deptype "lib" Modified: users/cal/base-sqlite-portindex/src/port1.0/portload.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/port1.0/portload.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/port1.0/portload.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -1,5 +1,5 @@ # et:ts=4 -# portsubmit.tcl +# portload.tcl # $Id$ # # Copyright (c) 2007, 2009, 2011 The MacPorts Project Deleted: users/cal/base-sqlite-portindex/src/port1.0/portsubmit.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/port1.0/portsubmit.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/port1.0/portsubmit.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -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: users/cal/base-sqlite-portindex/src/port1.0/portunload.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/port1.0/portunload.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/port1.0/portunload.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -1,5 +1,5 @@ # et:ts=4 -# portsubmit.tcl +# portunload.tcl # $Id$ # # Copyright (c) 2007, 2009, 2011 The MacPorts Project Modified: users/cal/base-sqlite-portindex/src/port1.0/portutil.tcl =================================================================== --- users/cal/base-sqlite-portindex/src/port1.0/portutil.tcl 2013-02-24 21:04:08 UTC (rev 103402) +++ users/cal/base-sqlite-portindex/src/port1.0/portutil.tcl 2013-02-24 21:10:34 UTC (rev 103403) @@ -1532,6 +1532,11 @@ } } + # Add ccache port for access to ${prefix}/bin/ccache binary + if [option configure.ccache] { + lappend deplist ccache + } + ui_debug "Tracemode will respect recursively collected port dependencies: [lsort $deplist]" if {[llength $deptypes] > 0} {tracelib setdeps $deplist}