Changeset 42662


Ignore:
Timestamp:
Nov 28, 2008, 11:18:50 PM (12 years ago)
Author:
raimue@…
Message:

Merged revisions 34469,34852,34854-34855,34900,36952-36956,37507-37508,37511-37512,41040,41042-41046,41138-41139,41142-41143,41145,41151,41403,41458,41462-41463,42575,42626,42640-42641,42659 via svnmerge from
https://svn.macosforge.org/repository/macports/branches/variant-descs-14482/base

........

r34469 | raimue@… | 2008-02-26 07:08:09 +0100 (Tue, 26 Feb 2008) | 3 lines


port/port.tcl:
Reading from .config/variant_descriptions actually works

........

r34852 | raimue@… | 2008-03-09 02:45:22 +0100 (Sun, 09 Mar 2008) | 4 lines


macports1.0/macports.tcl:
New API: macports::getsourceconfigdir
Returns the path to .config for a porturl.

........

r34854 | raimue@… | 2008-03-09 03:11:27 +0100 (Sun, 09 Mar 2008) | 3 lines


port/port.tcl:
Use new API macports::getsourceconfigdir

........

r34855 | raimue@… | 2008-03-09 03:12:54 +0100 (Sun, 09 Mar 2008) | 3 lines


port/port.tcl:
Treat variant descriptions as strings to avoid problems with braces

........

r34900 | raimue@… | 2008-03-10 16:54:25 +0100 (Mon, 10 Mar 2008) | 3 lines


port/port.tcl:
Rename variable

........

r36952 | raimue@… | 2008-05-21 04:20:27 +0200 (Wed, 21 May 2008) | 3 lines


port/port.tcl:
Remove get_variant_desc, this will now be done in port1.0/portutil.tcl instead

........

r36953 | raimue@… | 2008-05-21 04:22:04 +0200 (Wed, 21 May 2008) | 3 lines


macports1.0/macports.tcl:
Give the worker access to variable porturl and proc getsourceconfigdir

........

r36954 | raimue@… | 2008-05-21 04:23:37 +0200 (Wed, 21 May 2008) | 3 lines


port1.0/tests:
Fix the portutil test after r36953

........

r36955 | raimue@… | 2008-05-21 05:01:11 +0200 (Wed, 21 May 2008) | 3 lines


macports1.0/macports.tcl:
Give worker access to getprotocol and getportdir as they are needed for getsourceconfigdir

........

r36956 | raimue@… | 2008-05-21 05:02:23 +0200 (Wed, 21 May 2008) | 3 lines


port1.0/portutil.tcl:
New proc variant_desc, reads global variant description file

........

r37507 | raimue@… | 2008-06-10 16:04:54 +0200 (Tue, 10 Jun 2008) | 4 lines


port1.0/portutil.tcl:
Don't warn about a missing description if it is set global,
but warn if the variant overrides the global description

........

r37508 | raimue@… | 2008-06-10 16:14:03 +0200 (Tue, 10 Jun 2008) | 3 lines


macports1.0/macports.tcl:
Use .resources instead of .config as it is a bit clearer, see #14553

........

r37511 | raimue@… | 2008-06-10 17:22:12 +0200 (Tue, 10 Jun 2008) | 5 lines


port1.0/portutil.tcl:
Switch back to this format:
name {description}
So this could be easily extended if ever needed.

........

r37512 | raimue@… | 2008-06-10 17:27:48 +0200 (Tue, 10 Jun 2008) | 3 lines


port1.0/portutil.tcl:
Add a warning if global variant description file could not be opened

........

r41040 | raimue@… | 2008-10-21 13:06:39 +0200 (Tue, 21 Oct 2008) | 4 lines


macports/macport.tcl:

  • New flag "default" for sources to indicate fallback for resources (group)
  • Add parameter to getsourceconfigdir to get path for a requested file

........

r41042 | raimue@… | 2008-10-21 13:11:44 +0200 (Tue, 21 Oct 2008) | 3 lines


macports1.0/macports.tcl:
Rename getsourceconfigdir to getportresourcepath

........

r41043 | raimue@… | 2008-10-21 13:15:16 +0200 (Tue, 21 Oct 2008) | 3 lines


port1.0/portutil.tcl:
Use getportresourcepath for the group files

........

r41044 | raimue@… | 2008-10-21 13:19:47 +0200 (Tue, 21 Oct 2008) | 3 lines


port1.0/portlint.tcl:
Use getresourcepath for group files

........

r41045 | raimue@… | 2008-10-21 13:20:36 +0200 (Tue, 21 Oct 2008) | 3 lines


port1.0/portmain.tcl:
Add a note that we should get rid of $portresourcepath in favor of [getportresourcepath]

........

r41046 | raimue@… | 2008-10-21 13:40:29 +0200 (Tue, 21 Oct 2008) | 3 lines


port1.0/portutil.tcl:
Missed one instance of getsourceconfigdir

........

r41138 | raimue@… | 2008-10-25 20:52:50 +0200 (Sat, 25 Oct 2008) | 3 lines


port1.0/portutil.tcl:
Use getportresourcepath for global variant descriptions

........

r41139 | raimue@… | 2008-10-25 21:23:15 +0200 (Sat, 25 Oct 2008) | 3 lines


port1.0/portmain.tcl:
Correct XXX tag

........

r41142 | raimue@… | 2008-10-25 23:11:30 +0200 (Sat, 25 Oct 2008) | 3 lines


port1.0/portfetch.tcl:
Use getportresourcepath

........

r41143 | raimue@… | 2008-10-25 23:12:04 +0200 (Sat, 25 Oct 2008) | 3 lines


port1.0/portdestroot.tcl:
Use getportresourcepath

........

r41145 | raimue@… | 2008-10-26 00:04:15 +0200 (Sun, 26 Oct 2008) | 3 lines


macports1.0/macports.tcl:
Fix a problem with URLs not using the file protocol

........

r41151 | raimue@… | 2008-10-26 03:09:54 +0100 (Sun, 26 Oct 2008) | 3 lines


macports1.0/macports.tcl:
Fix issues introduced in r41145, the file exists check was wrong

........

r41403 | raimue@… | 2008-11-01 22:59:21 +0100 (Sat, 01 Nov 2008) | 3 lines


port1.0/portutil.tcl:
Add a debug output which group files are used

........

r41458 | blb@… | 2008-11-03 22:58:28 +0100 (Mon, 03 Nov 2008) | 2 lines


Add [default] tag and description to sources.conf

........

r41462 | blb@… | 2008-11-04 02:12:28 +0100 (Tue, 04 Nov 2008) | 2 lines


No longer need to install resources with base

........

r41463 | blb@… | 2008-11-04 02:14:49 +0100 (Tue, 04 Nov 2008) | 4 lines


Move the install/ subdir (containing the mtree files) into .../share/macports
from the resources dir (the mtree contains a bit of install-time info, so it
shouldn't be with the resources stuff in the port tree)

........

r42575 | blb@… | 2008-11-25 01:53:05 +0100 (Tue, 25 Nov 2008) | 3 lines


Add script to handle upgrades through configure/make/make install and
the package, so [default] is added as appropriate to sources.conf

........

r42626 | raimue@… | 2008-11-27 02:21:15 +0100 (Thu, 27 Nov 2008) | 3 lines


package1.0/portpkg.tcl, package1.0/portmpkg.tcl:
Remove portresourcepath and use [getportresourcepath] instead

........

r42640 | raimue@… | 2008-11-27 11:49:32 +0100 (Thu, 27 Nov 2008) | 3 lines


package1.0/portrpm.tcl, package1.0/portsrpm.tcl:
Remove reference to portresurcepath which is not used at all

........

r42641 | raimue@… | 2008-11-27 11:52:12 +0100 (Thu, 27 Nov 2008) | 3 lines


port1.0/portmain.tcl:
Remove definition of portresourcepath as it is not used any more

........

r42659 | raimue@… | 2008-11-28 16:44:30 +0100 (Fri, 28 Nov 2008) | 3 lines


macports1.0/macports.tcl:
Rename portresourcepath from .resources to _resources

........

Location:
trunk/base
Files:
20 edited
1 copied

Legend:

Unmodified
Added
Removed
  • trunk/base

  • trunk/base/Makefile.in

    r40159 r42662  
    4141# Remove duplicate entries from the dependency map (could occur with 1.6 and earlier):
    4242        $(TCLSH) src/dep_map_clean.tcl ${TCL_PACKAGE_DIR}
     43# Add [default] tag to the central MacPorts repository, if it isn't already
     44        $(TCLSH) src/upgrade_sources_conf_default.tcl ${prefix}
    4345        @echo ""; echo "Congratulations, you have successfully installed the MacPorts system. To get the Portfiles and update the system, run:"; echo ""
    4446        @echo "sudo port -v selfupdate"; echo ""
  • trunk/base/doc/Makefile

    r38101 r42662  
    5959        for m in ${MAN7}; do rm -f ${INSTALLDIR}/share/man/man7/$$m ; done
    6060
    61         $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/macports/resources/port1.0/install
    62         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/macports/resources/port1.0/install/
    63         $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/macports/resources/port1.0/install/
     61        $(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/macports/install
     62        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/macports/install/
     63        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/macports/install/
    6464        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz ${INSTALLDIR}/share/man/man1
    6565        $(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports.conf.5.gz ${INSTALLDIR}/share/man/man5
  • trunk/base/doc/sources.conf

    r41379 r42662  
    55#  the example below that points to your local ports directory:
    66#  Example: file:///Users/landonf/misc/MacPorts/ports
     7
     8#  The default MacPorts repository should always be tagged [default]
     9#  for proper functionality of various resources (port groups, mirror
     10#  sites, etc).  If you switch it from the rsync:// URL, be sure to keep
     11#  it tagged [default].
    712
    813#  To prevent a source from synchronizing when `port sync` is used,
     
    2025#      rsync://trd.no.rsync.macports.org/release/ports/
    2126#  A current list of mirrors is available at http://trac.macports.org/wiki/Mirrors
    22 rsync://rsync.macports.org/release/ports/
     27rsync://rsync.macports.org/release/ports/ [default]
  • trunk/base/portmgr/dmg/postflight

    r40142 r42662  
    6262    # Remove any duplicates from the dep map (could occur with 1.6 and earlier)
    6363    ${TCLSH} dep_map_clean.tcl ${TCL_PACKAGE_DIR}
     64    # Add [default] tag to the central MacPorts repository, if it isn't already
     65    ${TCLSH} upgrade_sources_conf_default.tcl ${PREFIX}
    6466}
    6567
  • trunk/base/src/dep_map_clean.tcl

    • Property svn:keywords set to Id
  • trunk/base/src/macports1.0/macports.tcl

    r40834 r42662  
    4949    variable user_options "submitter_name submitter_email submitter_key"
    5050    variable portinterp_options "\
    51         portdbpath portpath portbuildpath auto_path prefix prefix_frozen x11prefix portsharepath \
     51        portdbpath porturl portpath portbuildpath auto_path prefix prefix_frozen x11prefix portsharepath \
    5252        registry.path registry.format registry.installtype portarchivemode portarchivepath \
    5353        portarchivetype portautoclean porttrace portverbose destroot_umask rsync_server \
     
    328328    global macports::registry.path
    329329    global macports::sources
     330    global macports::sources_default
    330331    global macports::sources_conf
    331332    global macports::destroot_umask
     
    419420                set flags [split $flags ,]
    420421                foreach flag $flags {
    421                     if {[lsearch -exact [list nosync] $flag] == -1} {
     422                    if {[lsearch -exact [list nosync default] $flag] == -1} {
    422423                        ui_warn "$sources_conf source '$line' specifies invalid flag '$flag'"
     424                    }
     425                    if {$flag == "default"} {
     426                        set sources_default [concat [list $url] $flags]
    423427                    }
    424428                }
     
    706710}
    707711
    708 proc macports::worker_init {workername portpath portbuildpath options variations} {
     712proc macports::worker_init {workername portpath porturl portbuildpath options variations} {
    709713    global macports::portinterp_options macports::portinterp_deferred_options registry.installtype
    710714
     
    745749    $workername alias macports_create_thread macports::create_thread
    746750    $workername alias getportworkpath_from_buildpath macports::getportworkpath_from_buildpath
     751    $workername alias getportresourcepath macports::getportresourcepath
     752    $workername alias getprotocol macports::getprotocol
     753    $workername alias getportdir macports::getportdir
    747754
    748755    # New Registry/Receipts stuff
     
    894901}
    895902
     903##
     904# Get the path to the _resources directory of the source
     905#
     906# @param url port url
     907# @return path to the _resources directory or the path to the fallback
     908proc macports::getportresourcepath {url {path ""}} {
     909    global macports::sources_default
     910
     911    set protocol [getprotocol $url]
     912
     913    switch -- ${protocol} {
     914        file {
     915            set proposedpath [file normalize [file join [getportdir $url] .. ..]]
     916        }
     917    }
     918
     919    # append requested path
     920    set proposedpath [file join $proposedpath _resources $path]
     921
     922    if {![file exists $proposedpath]} {
     923        # fallback
     924        set default_source_url [lindex ${sources_default} 0]
     925        if {[getprotocol $default_source_url] == "file"} {
     926            set proposedpath [getportdir $default_source_url]
     927        } else {
     928            set proposedpath [getsourcepath $default_source_url]
     929        }
     930
     931        # append requested path
     932        set proposedpath [file join $proposedpath _resources $path]
     933    }
     934
     935    return $proposedpath
     936}
     937
    896938# dportopen
    897939# Deprecated version of the new mportopen proc, listed here as backwards
     
    951993    ditem_key $mport refcnt 1
    952994   
    953     macports::worker_init $workername $portpath [macports::getportbuildpath $portpath] $options $variations
     995    macports::worker_init $workername $portpath $porturl [macports::getportbuildpath $portpath] $options $variations
    954996
    955997    $workername eval source Portfile
  • trunk/base/src/package1.0/portmpkg.tcl

    r30781 r42662  
    110110
    111111proc package_mpkg {portname portversion portrevision} {
    112     global portdbpath destpath workpath prefix portresourcepath description package.destpath package.flat long_description homepage depends_run depends_lib
     112    global portdbpath destpath workpath prefix porturl description package.destpath package.flat long_description homepage depends_run depends_lib
    113113
    114114        set pkgpath ${package.destpath}/${portname}-${portversion}.pkg
     
    147147    }
    148148    write_welcome_html ${mpkgpath}/Contents/Resources/Welcome.html $portname $portversion $pkg_long_description $pkg_description $pkg_homepage
    149     file copy -force -- ${portresourcepath}/package/background.tiff ${mpkgpath}/Contents/Resources/background.tiff
     149    file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${mpkgpath}/Contents/Resources/background.tiff
    150150
    151151        return 0
  • trunk/base/src/package1.0/portpkg.tcl

    r32116 r42662  
    6161
    6262proc package_pkg {portname portversion portrevision} {
    63     global UI_PREFIX portdbpath destpath workpath prefix portresourcepath description package.destpath package.flat long_description homepage portpath
     63    global UI_PREFIX portdbpath destpath workpath prefix description package.destpath package.flat long_description homepage portpath porturl
    6464    global os.version os.major
    6565
     
    9090    }
    9191    write_welcome_html ${resourcepath}/${language}.lproj/Welcome.html $portname $portversion $pkg_long_description $pkg_description $pkg_homepage
    92     file copy -force -- ${portresourcepath}/package/background.tiff ${resourcepath}/${language}.lproj/background.tiff
     92    file copy -force -- [getportresourcepath $porturl "port1.0/package/background.tiff"] ${resourcepath}/${language}.lproj/background.tiff
    9393
    9494    foreach dir {etc var tmp} {
  • trunk/base/src/package1.0/portrpm.tcl

    r26737 r42662  
    5252
    5353proc rpm_pkg {portname portversion portrevision} {
    54     global UI_PREFIX package.destpath portdbpath destpath workpath prefix portresourcepath categories maintainers description long_description homepage epoch portpath
     54    global UI_PREFIX package.destpath portdbpath destpath workpath prefix categories maintainers description long_description homepage epoch portpath
    5555        global os.platform os.arch os.version os.major
    5656   
  • trunk/base/src/package1.0/portsrpm.tcl

    r31442 r42662  
    5353
    5454proc srpm_pkg {portname portversion portrevision} {
    55     global UI_PREFIX package.destpath portdbpath destpath workpath distpath prefix portresourcepath categories maintainers description long_description homepage epoch portpath distfiles fetch_urls
     55    global UI_PREFIX package.destpath portdbpath destpath workpath distpath prefix categories maintainers description long_description homepage epoch portpath distfiles fetch_urls
    5656        global os.platform os.arch os.version os.major
    5757   
  • trunk/base/src/port/port.tcl

    r41511 r42662  
    21072107            puts "$portname has the variants:"
    21082108            foreach v $portinfo(variants) {
    2109                 if {[info exists descs($v)]} {
    2110                     puts "\t$v: [join [string trim $descs($v)]]"
     2109                if {[info exists descs($v)] && $descs($v) != ""} {
     2110                    puts "\t$v: [string trim $descs($v)]"
    21112111                } else {
    21122112                    puts "\t$v"
  • trunk/base/src/port1.0/Makefile

    r35249 r42662  
    88        portdistcheck.tcl portmirror.tcl portload.tcl portunload.tcl \
    99        portdistfiles.tcl
    10 
    11 SUBDIR=         resources
    1210
    1311include ../../Mk/macports.subdir.mk
  • trunk/base/src/port1.0/portdestroot.tcl

    r36914 r42662  
    8787
    8888proc destroot_start {args} {
    89     global UI_PREFIX prefix portname destroot portresourcepath os.platform destroot.clean
     89    global UI_PREFIX prefix portname porturl destroot os.platform destroot.clean portsharepath
    9090    global destroot::oldmask destroot.umask
    9191   
     
    101101    file mkdir "${destroot}"
    102102    if { ${os.platform} == "darwin" } {
    103         system "cd \"${destroot}\" && ${mtree} -e -U -f ${portresourcepath}/install/macosx.mtree"
     103        system "cd \"${destroot}\" && ${mtree} -e -U -f [file join ${portsharepath} install macosx.mtree]"
    104104    }
    105105    file mkdir "${destroot}/${prefix}"
    106     system "cd \"${destroot}/${prefix}\" && ${mtree} -e -U -f ${portresourcepath}/install/prefix.mtree"
     106    system "cd \"${destroot}/${prefix}\" && ${mtree} -e -U -f [file join ${portsharepath} install prefix.mtree]"
    107107}
    108108
  • trunk/base/src/port1.0/portfetch.tcl

    r40894 r42662  
    101101default global_mirror_site "macports_distfiles"
    102102default mirror_sites.listfile {"mirror_sites.tcl"}
    103 default mirror_sites.listpath {"${portresourcepath}/fetch/"}
     103default mirror_sites.listpath {"port1.0/fetch"}
    104104
    105105# Option-executed procedures
     
    174174# pre-registered set of sites, and if so, return them.
    175175proc mirror_sites {mirrors tag subdir} {
    176     global UI_PREFIX portname portresourcepath mirror_sites.listfile mirror_sites.listpath dist_subdir
    177     source ${mirror_sites.listpath}${mirror_sites.listfile}
     176    global UI_PREFIX portname porturl mirror_sites.listfile mirror_sites.listpath dist_subdir
     177
     178    source [getportresourcepath $porturl [file join ${mirror_sites.listpath} ${mirror_sites.listfile}]]
     179
    178180    if {![info exists portfetch::mirror_sites::sites($mirrors)]} {
    179181        ui_warn "[format [msgcat::mc "No mirror sites on file for class %s"] $mirrors]"
  • trunk/base/src/port1.0/portlint.tcl

    r41511 r42662  
    147147
    148148proc lint_main {args} {
    149         global UI_PREFIX portname portpath portresourcepath ports_lint_nitpick
     149        global UI_PREFIX portname portpath porturl ports_lint_nitpick
    150150        set portfile ${portpath}/Portfile
    151151        set portdirs [split ${portpath} /]
     
    155155        incr last -1
    156156        set portcatdir [lindex $portdirs $last]
    157         set groupdir ${portresourcepath}/group
    158157
    159158        set warnings 0
     
    318317    if (!$seen_portgroup) {
    319318        # PortGroup is optional, so missing is OK
    320     }  elseif {![file exists $groupdir/$portgroup-$portgroupversion.tcl]} {
     319    }  elseif {![file exists [getportresourcepath $porturl "port1.0/group/${portgroup}-${portgroupversion}.tcl"]]} {
    321320        ui_error "Unknown PortGroup: $portgroup-$portgroupversion"
    322321        incr errors
     
    417416                # don't warn about missing descriptions for global variants
    418417                if {[lsearch -exact $local_variants $variantname] != -1 &&
    419                     [lsearch -exact $lint_variants $variantname] == -1} {
     418                    [lsearch -exact $lint_variants $variantname] == -1 &&
     419                    [variant_desc $porturl $variantname] == ""} {
    420420                    ui_warn "Variant $variantname does not have a description"
    421421                    incr warnings
     
    423423                } elseif {$variantdesc == ""} {
    424424                    set variantdesc "(pre-defined variant)"
     425                }
     426            } else {
     427                if {[variant_desc $porturl $variantname] != ""} {
     428                    ui_warn "Variant $variantname overrides global description"
     429                    incr warnings
    425430                }
    426431            }
  • trunk/base/src/port1.0/portmain.tcl

    r40803 r42662  
    5353option_proc default_variants handle_default_variants
    5454
    55 # Hard coded version number for resource location
    56 default portresourcepath {[file join $portsharepath resources/port1.0]}
    5755default distpath {[file join $portdbpath distfiles]}
    5856default workpath {[getportworkpath_from_buildpath $portbuildpath]}
  • trunk/base/src/port1.0/portutil.tcl

    r41573 r42662  
    413413# Portfile level procedure to provide support for declaring variants
    414414proc variant {args} {
    415     global all_variants PortInfo
     415    global all_variants PortInfo porturl
    416416   
    417417    set len [llength $args]
     
    451451        lappend PortInfo(variants) $variant_provides
    452452        set vdesc [join [ditem_key $ditem description]]
     453
     454        # read global variant description, if none given
     455        if {$vdesc == ""} {
     456            set vdesc [variant_desc $porturl $variant_provides]
     457        }
     458
    453459        if {$vdesc != ""} {
    454460            lappend PortInfo(variant_desc) $variant_provides $vdesc
     
    537543
    538544    return 0
     545}
     546
     547##
     548# Get description for a variant from global descriptions file
     549#
     550# @param porturl url to a port
     551# @param variant name
     552# @return description from descriptions file or an empty string
     553proc variant_desc {porturl variant} {
     554    global variant_descs_global
     555
     556    set descfile [getportresourcepath $porturl variant_descriptions.conf]
     557    if {![info exists variant_descs_global($descfile)]} {
     558        set variant_descs_global($descfile) yes
     559
     560        if {[file exists $descfile]} {
     561            if {[catch {set fd [open $descfile r]} err]} {
     562                ui_warn "Could not open global variant description file: $err"
     563                return ""
     564            }
     565            set lineno 0
     566            while {[gets $fd line] >= 0} {
     567                incr lineno
     568                set name [lindex $line 0]
     569                set desc [lindex $line 1]
     570                if {$name != "" && $desc != ""} {
     571                    set variant_descs_global(${descfile}_$name) $desc
     572                } else {
     573                    ui_warn "Invalid variant description in $descfile at line $lineno"
     574                }
     575            }
     576            close $fd
     577        }
     578    }
     579
     580    if {[info exists variant_descs_global(${descfile}_${variant})]} {
     581        return $variant_descs_global(${descfile}_${variant})
     582    } else {
     583        return ""
     584    }
    539585}
    540586
     
    19862032# Use a specified group/version.
    19872033proc PortGroup {group version} {
    1988     global portresourcepath
    1989 
    1990     set groupFile ${portresourcepath}/group/${group}-${version}.tcl
     2034    global porturl
     2035
     2036    set groupFile [getportresourcepath $porturl "port1.0/group/${group}-${version}.tcl"]
    19912037
    19922038    if {[file exists $groupFile]} {
     2039        ui_debug "Using group file $groupFile"
    19932040        uplevel "source $groupFile"
    19942041    } else {
  • trunk/base/src/port1.0/tests/portutil.tcl

    r26223 r42662  
    6868    # so we shall oblige
    6969    set workername [interp create]
    70     macports::worker_init $workername {} [macports::getportbuildpath {}] {} {}
     70    macports::worker_init $workername {} {} [macports::getportbuildpath {}] {} {}
    7171    $workername alias scriptname info script
    7272    set body {
  • trunk/base/tests/sources.conf

    r26177 r42662  
    11# To enable your local ports repository, uncomment and customize the
    22# following line to point at your local ports directory
    3 file:///tmp/macports-tests/ports
     3file:///tmp/macports-tests/ports [default]
Note: See TracChangeset for help on using the changeset viewer.