Changeset 42567


Ignore:
Timestamp:
Nov 24, 2008, 9:14:55 AM (12 years ago)
Author:
blb@…
Message:

Merged revisions 41015-41016,41030,41056,41068,41097,41123,41157,41166-41167,41170,41174-41175,41249,41379,41388-41389,41396,41404,41478-41479,41511-41512,41522-41527,41541,41573-41575,41595,41603,41637-41639,41650-41651,41655,41701-41702,41742,41841,41850,41854-41855,41907,41978,42055,42061,42134,42484 via svnmerge from
https://svn.macports.org/repository/macports/trunk/base

........

r41015 | afb@… | 2008-10-20 16:56:28 -0600 (Mon, 20 Oct 2008) | 2 lines


make tclobjc package conditional

........

r41016 | afb@… | 2008-10-20 16:57:00 -0600 (Mon, 20 Oct 2008) | 2 lines


regenerate configure

........

r41030 | afb@… | 2008-10-21 01:27:26 -0600 (Tue, 21 Oct 2008) | 2 lines


update changelog for r41015

........

r41056 | raimue@… | 2008-10-21 08:35:03 -0600 (Tue, 21 Oct 2008) | 3 lines


port/port.tcl:
Remove empty TODO tag

........

r41068 | blb@… | 2008-10-21 22:19:29 -0600 (Tue, 21 Oct 2008) | 2 lines


mirror_sites.tcl - clean out a couple more bad mirrors, found via distcheck

........

r41097 | devans@… | 2008-10-22 17:03:00 -0600 (Wed, 22 Oct 2008) | 2 lines


mirror_sites.tcl: add definition for gimp mirror site.

........

r41123 | jmr@… | 2008-10-24 02:48:57 -0600 (Fri, 24 Oct 2008) | 3 lines


Change documentation of uninstall --recursive to --follow-dependents, to match
the change made to the code in r36160.

........

r41157 | jmr@… | 2008-10-26 06:56:11 -0600 (Sun, 26 Oct 2008) | 2 lines


Apply global variants for all targets (#11897)

........

r41166 | blb@… | 2008-10-26 18:01:47 -0600 (Sun, 26 Oct 2008) | 2 lines


ChangeLog - there will be no 1.6.1, so those changes will also be in 1.7.0

........

r41167 | blb@… | 2008-10-26 19:07:22 -0600 (Sun, 26 Oct 2008) | 2 lines


ChangeLog - add closed 1.7.0 milestone tickets not already noted

........

r41170 | ryandesign@… | 2008-10-26 19:32:41 -0600 (Sun, 26 Oct 2008) | 2 lines


portlint.tcl: No longer nitpick whitespace or patchfile names unless the nitpick option is enabled. There is currently no way to enable this option. A future revision should provide a way to do so. See issue #14799.

........

r41174 | ryandesign@… | 2008-10-26 19:48:47 -0600 (Sun, 26 Oct 2008) | 2 lines


Set svn:eol-style to native on tcl files.

........

r41175 | ryandesign@… | 2008-10-26 19:49:23 -0600 (Sun, 26 Oct 2008) | 2 lines


Set svn:keywords to Id on tcl files

........

r41249 | pguyot@… | 2008-10-29 03:17:40 -0600 (Wed, 29 Oct 2008) | 2 lines


Add support for +universal variants with the xcode portgroup

........

r41379 | jmr@… | 2008-10-31 23:49:19 -0600 (Fri, 31 Oct 2008) | 2 lines


Document the new Norwegian mirror in the relevant config files.

........

r41388 | afb@… | 2008-11-01 04:20:52 -0600 (Sat, 01 Nov 2008) | 2 lines


make sure to expand default prefix (from NONE)

........

r41389 | afb@… | 2008-11-01 04:21:17 -0600 (Sat, 01 Nov 2008) | 2 lines


regenerate configure

........

r41396 | raimue@… | 2008-11-01 13:12:44 -0600 (Sat, 01 Nov 2008) | 4 lines


port/port.tcl:
Add proc wraplabel which outputs a wrapped string with a label. Use the new
wrapping code for output of deps, platforms and maintainers.

........

r41404 | raimue@… | 2008-11-01 16:39:42 -0600 (Sat, 01 Nov 2008) | 3 lines


port1.0/portlivecheck.tcl:
Fix livecheck if using https with invalid certificates, passive ftp, or username and password

........

r41478 | toby@… | 2008-11-03 23:37:10 -0700 (Mon, 03 Nov 2008) | 2 lines


set CURLOPT_MAXREDIRS to 50 to avoid infinite redirection

........

r41479 | jmr@… | 2008-11-03 23:49:20 -0700 (Mon, 03 Nov 2008) | 2 lines


Add new Norwegian distfiles mirror.

........

r41511 | blb@… | 2008-11-04 19:50:05 -0700 (Tue, 04 Nov 2008) | 2 lines


lint command - add --nitpick option; ticket #14799

........

r41512 | blb@… | 2008-11-04 20:18:28 -0700 (Tue, 04 Nov 2008) | 2 lines


port.1 - document --nitpick option added in r41511

........

r41522 | pguyot@… | 2008-11-05 06:33:22 -0700 (Wed, 05 Nov 2008) | 2 lines


Fixed expectations in tests to reflect changes in the code (obviously tests are simply not run)

........

r41523 | pguyot@… | 2008-11-05 06:35:27 -0700 (Wed, 05 Nov 2008) | 2 lines


Add a test that was sleeping on my disk, and that illustrates a buggy behaviour with variants

........

r41524 | pguyot@… | 2008-11-05 06:41:54 -0700 (Wed, 05 Nov 2008) | 2 lines


Include the forgotten test

........

r41525 | pguyot@… | 2008-11-05 06:42:13 -0700 (Wed, 05 Nov 2008) | 2 lines


Partial fix for test trace

........

r41526 | pguyot@… | 2008-11-05 06:45:07 -0700 (Wed, 05 Nov 2008) | 2 lines


Handle new syntax for dependencies, to allow work for dependencies to happen on trunk/ where ports lie, while base/ is frozen for most users (cf bug #126)

........

r41527 | pguyot@… | 2008-11-05 07:38:06 -0700 (Wed, 05 Nov 2008) | 2 lines


Fix switch statement (put comment before the statement) and add a test to check for that

........

r41541 | ryandesign@… | 2008-11-05 15:21:41 -0700 (Wed, 05 Nov 2008) | 2 lines


port.1: --nitpick also checks patchfile names

........

r41573 | ryandesign@… | 2008-11-06 03:44:45 -0700 (Thu, 06 Nov 2008) | 2 lines


portutil.tcl: Fix reinplace for filenames containing spaces; fixes #17098

........

r41574 | ryandesign@… | 2008-11-06 03:50:06 -0700 (Thu, 06 Nov 2008) | 2 lines


ChangeLog: Add note for issue #17098

........

r41575 | ryandesign@… | 2008-11-06 03:52:18 -0700 (Thu, 06 Nov 2008) | 2 lines


ChangeLog: Remove trailing whitespace.

........

r41595 | blb@… | 2008-11-06 13:43:18 -0700 (Thu, 06 Nov 2008) | 2 lines


ChangeLog - note port lint improvements from #14799

........

r41603 | blb@… | 2008-11-06 19:48:44 -0700 (Thu, 06 Nov 2008) | 8 lines


base/src/pextlib1.0/Pextlib.c - this should get the edge case issues of
the Tcl environment bug (#13930); basically, looping through environ while
unsetting stuff changes environ, so not all variables are caught.
clearenv() if it becomes a standard would be best for this, but is not
available everywhere (including Mac OS X/Darwin), so instead use a simple
technique that has been found to work on a number of various platforms (see
<http://lists.freebsd.org/pipermail/freebsd-stable/2008-June/043136.html>).

........

r41637 | blb@… | 2008-11-07 14:00:43 -0700 (Fri, 07 Nov 2008) | 2 lines


pextlib1.0/tests/unsetenv.tcl - remove some spaces on empty lines

........

r41638 | blb@… | 2008-11-07 14:06:17 -0700 (Fri, 07 Nov 2008) | 4 lines


pextlib1.0/tests/unsetenv.tcl - add test for verifying 'unsetenv *' does
empty out the environment; use 'error' instead of 'exit' so the cause for
a failure is shown

........

r41639 | blb@… | 2008-11-07 14:09:31 -0700 (Fri, 07 Nov 2008) | 5 lines


pextlib1.0/Pextlib.c - it turns out Tcl gets a little confused when items
in the environment are removed (either via the complete clear or using
unsetenv()), so we need to force Tcl to sync back with the environment
after changing it (follow up to #13930)

........

r41650 | blb@… | 2008-11-08 02:05:33 -0700 (Sat, 08 Nov 2008) | 8 lines


pextlib1.0/Pextlib.c - move away from "environ = calloc(1, sizeof(char *));"
as that appears to tickle some memory bug on Mac OS X 10.4 tclsh which then
causes apparently-random crashes. Instead, create a list of which variables
are set in the environment, storing in a Tcl list (since that's much easier
for a dynamic list like this), then loop through that list and unsetenv()
each one. No crashing on 10.3-10.5 and tests/unsetenv.tcl pass (hopefully
final bit for #13930).

........

r41651 | afb@… | 2008-11-08 02:33:01 -0700 (Sat, 08 Nov 2008) | 2 lines


use clearenv(3) where available

........

r41655 | toby@… | 2008-11-08 03:50:42 -0700 (Sat, 08 Nov 2008) | 5 lines


SystemCmd:

  • fix major leak (circbuf only freed when command exited non-zero)
  • fix fd leak
  • minor refactoring

........

r41701 | ryandesign@… | 2008-11-09 02:25:36 -0700 (Sun, 09 Nov 2008) | 2 lines


portindex.tcl: Generate the port index in a temporary file first, then replace the PortIndex file all at once; fixes #16234

........

r41702 | ryandesign@… | 2008-11-09 02:28:13 -0700 (Sun, 09 Nov 2008) | 2 lines


ChangeLog: update for issue #16234 (atomic PortIndex regeneration)

........

r41742 | raimue@… | 2008-11-09 19:43:42 -0700 (Sun, 09 Nov 2008) | 4 lines


pextlib1.0/tests/curl.tcl:
The old password protected file no longer exists, use another file from the
same server.

........

r41841 | toby@… | 2008-11-10 19:43:25 -0700 (Mon, 10 Nov 2008) | 2 lines


make setrlimit stop complaining

........

r41850 | ryandesign@… | 2008-11-11 01:44:01 -0700 (Tue, 11 Nov 2008) | 2 lines


portimage.tcl: fix typo in comment

........

r41854 | ryandesign@… | 2008-11-11 02:23:45 -0700 (Tue, 11 Nov 2008) | 2 lines


Registry: Properly handle ports whose version evaluates to 0; see #16740

........

r41855 | ryandesign@… | 2008-11-11 02:27:17 -0700 (Tue, 11 Nov 2008) | 2 lines


receipt_flat.tcl: fix typo in error message

........

r41907 | ryandesign@… | 2008-11-11 21:42:24 -0700 (Tue, 11 Nov 2008) | 2 lines


preflight: fix typo in dp2mp-move code introduced in r26518.

........

r41978 | ryandesign@… | 2008-11-12 16:59:39 -0700 (Wed, 12 Nov 2008) | 2 lines


ChangeLog: add note for ticket #16740

........

r42055 | blb@… | 2008-11-14 00:12:06 -0700 (Fri, 14 Nov 2008) | 2 lines


ChangeLog - note change from ticket #12288

........

r42061 | toby@… | 2008-11-14 01:54:14 -0700 (Fri, 14 Nov 2008) | 2 lines


leak fix

........

r42134 | blb@… | 2008-11-15 18:00:02 -0700 (Sat, 15 Nov 2008) | 2 lines


fetch/mirror_sites.tcl - fix path for a CPAN mirror, ticket #17262

........

r42484 | mcalhoun@… | 2008-11-21 19:54:44 -0700 (Fri, 21 Nov 2008) | 3 lines


group/perl5-1.0.tcl: Change perl dependency from path:...:perl5.8 to path:bin/perl:perl5 (see #16830).
bin/perl is used instead of the full path until #17182 is fixed.

........

Location:
branches/variant-descs-14482/base
Files:
44 edited
9 copied

Legend:

Unmodified
Added
Removed
  • branches/variant-descs-14482/base

  • branches/variant-descs-14482/base/ChangeLog

    r40953 r42567  
    55
    66
    7 Unreleased:
     7Release 1.7.0 (unreleased):
     8    - Improve error message when "upgrade outdated" is used (#12288)
     9
     10    - Properly handle ports whose version evaluates to 0 (#16740, ryandesign)
     11
     12    - PortIndex is now regenerated atomically (#16234, blb & ryandesign)
     13
     14    - Improve upon 'port lint' usage by not being too overbearing unless
     15      --nitpick is used (#14799)
     16
     17    - Fix reinplace when the filename contains spaces (#17098, ryandesign)
     18
     19    - Fix python port group issues (#15226)
     20
     21    - Make sure global variants (from variants.conf) are applied to all
     22      phases (#11897)
     23
     24    - Allow configuring --without-objc-runtime --without-objc-foundation,
     25      for building on platforms without Foundation like +puredarwin (r41015)
     26
    827    - Changes in loading of configuration files. Currently the global
    928      configuration file is loaded first, then user defined one (if present),
     
    1231
    1332    - Ruby port group now accepts a new (optional) last parameter for the
    14       ruby.setup command, "implementation". It is "ruby" by default, and 
     33      ruby.setup command, "implementation". It is "ruby" by default, and
    1534      can be set to "ruby19". It names the ruby-implementing port, and can
    16       possibly support still other rubys in the future. (#15912, febeling 
     35      possibly support still other rubys in the future. (#15912, febeling
    1736      in 38683)
    18        
     37
    1938    - Don't use build.nice for complex build.cmd commands (#16091)
    2039
     
    2746      deactivating/uninstalling would cause all the port's files to be left
    2847      behind. (#11759, jmr/raimue in r37349, 37621)
    29    
     48
    3049    - The non-verbose output for the build phase no longer shows what target
    3150      was used. This makes the build phase consistent with the other phases
     
    139158      destroot (mww in r31954).
    140159
    141 
    142 Release 1.6.1 (unreleased):
    143 
    144160    - If checksum is mismatched, and in verbose mode, present a corrected pre-fabricated checksum statement
    145161      to make it easy to update a port (jberry in r32441).
     
    207223    - New SourceForge.jp mirrors list (r30484).
    208224
    209     - Display warnings when using old versions of Mac OS X and Xcode Tools 
     225    - Display warnings when using old versions of Mac OS X and Xcode Tools
    210226      (#12794, afb in r30338 & r30477)
    211227
     
    352368      Also add ldindex. Works like lindex, but deletes the element from the list.
    353369      Documented in portfile.7 (eridius r26034).
    354    
     370
    355371    - Add global methods try and throw. Implemented based on the specification
    356372      in TIP #89. Documented in portfile.7 (eridius r25979).
     
    399415      Also allow `port info` to default to current directory if no name is provided
    400416      (eridius r25255).
    401    
     417
    402418    - Add -E flag to reinplace, does the same thing as in sed (eridius r25251).
    403419
     
    430446
    431447    - Remove bundled xar. (jberry r24913).
    432    
     448
    433449    - Tighten checking of port name in depspecs. neither + nor / is allowed.
    434450      (jberry r24929, r24934, r24940).
    435      
     451
    436452    - Restore ability for portindex lines to contain carriage returns, allowing
    437453      fields such as descriptions to contain line breaks. Note that any portindex
    438454      containing such entries will not be readable by a recent version of macports.
    439455      (jberry r25146)
    440      
     456
    441457    - Add support for descriptions on variants:
    442458         * The syntax follows the syntax for variant depends, etc.
     
    445461           should be backwards compatible. Variant descriptions are stored,
    446462           keyed by the variant name, in a new portinfo array named "variant_desc".
    447    
     463
    448464        Example:
    449465
     
    451467                configure.args-append   --do-this --do-that
    452468            }
    453            
     469
    454470        (jberry r25147)
    455        
     471
    456472    - Only look for, or create, ~/.macports user directory if the HOME environment
    457473      variable is defined. (jberry r25177)
    458    
     474
    459475
    460476Release 1.4.40 (7-May-2007, tagged at r24909 by jberry):
     
    495511    - Fixed a potential crasher in fs-traverse when showing error message
    496512      (ticket #11827, eridius r24396, thanks sfiera).
    497    
     513
    498514    - Fixed a bug where livecheck failed on ports that do not define a homepage
    499515      (ticket #11818, pguyot r24319).
     
    507523      phase. This fixes an unwanted warning when activating ports that depend
    508524      on teTeX (pguyot r24199).
    509      
     525
    510526    - Support for mpwa submit through "port submit".
    511527      This work is in progress. (jberry)
     
    513529       - Start to build portpkg.xar and meta data, hijacking Kevin's
    514530         portsubmit.tcl. (r24195-24196).
    515          
     531
    516532    - Revise error messages in port image activation to use syntax that
    517533      matches port(1). (jberry r24543, r24548).
     
    519535    - Create new interp variable prefix_frozen, which is available to port phases
    520536      even when the Portfile redefines prefix. (jberry r24848-r24849)
    521      
     537
    522538    - Search for prefix-relative commands in prefix_frozen rather than prefix.
    523539      Affects port submit (xar) and port fetch (svn). (jberry r24849)
    524540
    525541    - Always create a ~/.macports user directory if it doesn't yet exist. (jberry r24831)
    526    
     542
    527543    - Move port(1) readline history file to ~/.macports/history (jberry r24832, r24843)
    528544
     
    532548      launchd enable flag which caused reversion to systemstarter in 1.4.2.
    533549      (jberry r24151).
    534      
     550
    535551    - add functions 'backup' and 'lipo' along with some description
    536552      to be used for lipo-based universal variants, tested with openssl.
     
    560576    - Improvements on livecheck: fixed a report bug, improved ruby group
    561577      default behavior (pguyot in r24026 and r24018)
    562      
     578
    563579    - Remove xar from the build. xar doesn't build on panther due to
    564580      a libxml2 lib too old for xar requirements. We'll find another
    565581      way to deal with xar, perhaps by requiring users to install the
    566582      xar port when they need its services. (jberry r24107:r24108)
    567      
     583
    568584    - Remove configure switch for building launchd support. (jberry r24107:r24108)
    569    
     585
    570586    - Remove compatibility upgrade for conf files from
    571587      darwinports 1.1 to 1.2. (jberry r24106).
     
    706722    - Changed Makefile logic to reconfigure/regenerate files when templates
    707723      are modified. (pguyot)
    708    
     724
    709725    - Trace now forbids renaming files and directories as well as removing
    710726      directories outside the sandbox. (pguyot)
     
    712728    - Allow additional inserted libraries by keeping DYLD_INSERT_LIBRARIES
    713729      variable. (pguyot)
    714      
     730
    715731    - Change some UI strings and documentation to read MacPorts, rather than
    716732      DarwinPorts. The project is adopting the new name "MacPorts", and will
     
    730746    - Fixed a bug, introduced in 1.3, that prevented -f selfupdate from forcing
    731747      a build of the fetched sources. (jberry)
    732      
     748
    733749    - Fixed a bug, introduced in 1.3, that prevented -u uninstall from working.
    734750      (jberry)
     
    738754
    739755    - Added a new test case for a cvs+remote patch file bug. (pguyot)
    740    
     756
    741757    - Added ruby gems support for ruby group. (rcavanaugh & pguyot)
    742758
    743759    - Trace now forbids creation of directories outside the sandbox. (pguyot)
    744    
     760
    745761    - Additions to man page for port(1): (jberry)
    746762       * new port options -F, -i, -x, -p
    747763       * mention interactive and batch modes
    748764       * document extensions to info command.
    749    
     765
    750766    - Archive mode is now disabled by default. (landonf)
    751767
     
    753769      archive if found, an uninstall && install combination needed up till
    754770      now to pick it up. (jmpp)
    755    
     771
    756772Release 1.3 (27-Jul-2006):
    757773
     
    767783
    768784    - Fixed several problems with iteration on ports. (jberry)
    769    
     785
    770786    - Fixed a bug where curl LDFLAGS weren't properly propagated. (landonf)
    771    
     787
    772788    - Fixed a bug where location update routine invoked when installing DP did
    773789      not take the DESTDIR variable into account. (jmpp)
     
    775791    - Fixed a bug where patchfiles specifications could not have suffixes to
    776792      indicate the master site. (pguyot)
    777    
     793
    778794    - Fixed spelling in port(1) man page. (Bugzilla 8103) (pjenvey & jberry)
    779    
     795
    780796    - Fixed a typo and another problem in messages generated by port command.
    781797      (Bugzilla 6706 & 6712) (deric & jmpp)
    782    
     798
    783799    - Fixed a typo in ports.conf. (matt & jmpp)
    784    
     800
    785801    - Fixed several problems with launchd support (Bugzilla 8372 & 10041)
    786802      (jberry)
     
    789805      informative compilation error if libcrypto and libmd cannot be found.
    790806      (landonf)
    791    
     807
    792808    - Fixed a bug where thread2.6 Tcl library wasn't installed where DP is
    793809      installed. (jmpp)
     
    795811    - Fixed a bug in xcode PortGroup which prevented the use of a custom
    796812      project path. (pguyot)
    797    
     813
    798814    - Fixed a bug in xcode PortGroup which made destroot to fail when there
    799815      were spaces in the install path. (pguyot)
     
    801817    - Fixed a bug in portfetch.tcl which failed to fetch patches when using
    802818      CVS or SVN. (Bugzilla 5269) (yeled)
    803    
     819
    804820    - Added new command 'delete' for use in Portfiles instead of
    805821      'file delete' and 'system "rm.."' (mww)
     
    807823    - Added more information to porthier(7) about ${prefix}/var/db/dports.
    808824      (olegb)
    809    
     825
    810826    - Updated Gnome, KDE and SourceForge mirror lists. (Bugzilla 8045, 9152)
    811827      (rwhood, blb, olegb & pguyot)
     
    819835
    820836    - Discover path to rsync at autoconf time. (jberry)
    821    
     837
    822838    - Mark CVS, TAR, GNUTAR, and RSYNC as additional precious variables that can
    823839      be overridden in configure environment at time of configure to customize
     
    829845    - Set timeouts for curl transfers.  Some connections to sketchy mirror sites
    830846      can hang forever otherwise. (jkh)
    831    
     847
    832848    - Shortened the time to upgrade with archive mode on by using archive as the
    833849      target. (Bugzilla #7891) (dluke & jberry)
     
    846862
    847863    - Added new native commands to handle privileges chores. (jberry)
    848    
     864
    849865    - Add batch/interactive mode. In interactive mode, use readline when it's available.
    850866      Command and portname completion is available in interactive mode, as is readline
    851867      history. (jberry) 2005-11-07,08
    852    
     868
    853869        * Add new option -F <filename> which specifies a command file to be
    854870          read and processed. Multiple such options may be given to provide
    855871          multiple command files. If filename is "-", then stdin is read.
    856      
     872
    857873        * Option -i is equivilant to -F -, which forces processing of standard
    858874          input following any commands given as arguments.
    859          
     875
    860876        * If port is invoked as portf, an -F is assumed as an implicit first
    861877          argument (so the real first argument is taken as a command file to
    862878          be processed). This should allow the use of a shebang line such as:
    863879            #!/usr/bin/env portf
    864            
     880
    865881        * Commands starting with # are treated as comments.
    866        
     882
    867883        * Install a symbolic link /opt/local/bin/portf --> /opt/local/bin/port.
    868        
     884
    869885        * New command "cd" is useful to change to a new directory/port while in
    870886          interactive/batch mode.
    871          
     887
    872888        * Multiple commands on a single line may be separated by a ';'
    873        
     889
    874890        * Global command options may now be specified following a particular
    875891          command; they will apply only to that command rather than to all
    876892          command invocations. This is important for batch/interactive mode.
    877        
     893
    878894    - Add new option -p, which ignores errors while processing within a command.
    879895      (this subsumes some of the work that -f was previously overloaded to do).
    880896      (jberry).
    881    
     897
    882898    - Add new option -x, which exits immediately on errors while in batch mode (
    883899      otherwise we don't exit on errors in batch mode). (jberry)
    884    
     900
    885901    - Refactoring of port(1) to cast actions into distinct action procs. Adds
    886902      the new action_array which is used for action dispatch, and also to generate
    887903      the list of possible commands for help and command completion. (jberry)
    888    
     904
    889905    - Initial version of portmirror binary to build a mirror of distfiles.
    890906      (pguyot)
    891907
    892908    - Improvements and fixes to the tests. (pguyot)
    893    
     909
    894910    - Added a new option (checksum.skip=yes) to bypass the checksum phase. This
    895911      option is mostly useful on the command line to test older distfiles.
     
    898914    - Added dependencies for rpm on virtual packages representing releases of
    899915      MacOS X. (mww)
    900      
     916
    901917    - Add to port the ability to query for specific meta-data fields.
    902918      For instance: port info --maintainer --name category:java
     
    910926      Fields which are actually lists (such as depends_lib) are displayed comma-separated.
    911927      (jberry) 2006-02-16
    912      
     928
    913929Release 1.2.1 (10-Apr-2006):
    914930
     
    920936        ./configure CFLAGS='-arch ppc -arch i386' SHLIB_LDFLAGS='-arch ppc -arch i386'
    921937                                        backported from HEAD (jberry)
    922                                        
     938
    923939    - Add a hack in order attempt to detect when a sourceforge mirror
    924940      is actually returning an error page. If this is detected, proceed
     
    939955    - Enhance port command such that targets that require a port to be
    940956      specified will now all default to a port in current directory. (jberry)
    941      
     957
    942958    - Enhance port command to allow multiple ports per invocation.
    943       Where previously one said "port install porta; port install portb", 
     959      Where previously one said "port install porta; port install portb",
    944960      one can now say "port install porta portb". (jberry)
    945      
     961
    946962    - Enhance port command to allow use of shell-like glob patterns for
    947963      port selection. When a glob pattern is found, the group of ports
    948964      matching the glob pattern is substituted. (jberry)
    949      
     965
    950966    - Enhance port command to allow use of "pseudo" portnames to specify
    951967      groups of ports.
     
    955971      Currently defined pseudo portnames are:
    956972        current, all, installed, uninstalled, active, inactive, outdated.
    957      
     973
    958974      Additional pseudo portnames can be used to select ports based on a
    959975      regex pattern match against certain criteria. Each port selector is
     
    963979      platforms:, platform:, name:, long_description:, maintainers:, maintainer:,
    964980      categories:, category:, version:, and revision: (jberry)
    965      
     981
    966982    - Enhance port command to allow use of set expressions to combine
    967983      ports or groups of ports.
    968984      Supported operators are "and", "or", "not", "!", "(", ")". (jberry)
    969      
     985
    970986    - Enhance port command to allow a port to be specified through a file:
    971987      url instead of via portname. This function was previously available
    972988      though the -D and -u options, which make less sense now that multiple
    973989      ports can be specified to a target. (jberry)
    974      
     990
    975991    - Under Tiger, startupitems are now by default generated for launchd
    976992      rather than systemstarter. (jberry)
    977      
     993
    978994    - Add new startupitem keys startupitem.executable, startupitem.logfile,
    979995      startupitem.logevents, startupitem.pidfile, supported for both
    980996      systemstarter and launchd. (jberry)
    981      
     997
    982998    - New Test framework. Running make test from base/tests/ will test
    983999      several features of port(1) including syntax of Portfiles. New tests
     
    10141030
    10151031    - Snazzy new ChangeLog file
    1016    
     1032
    10171033    - Add new actions for port(1): help (get help about port),
    10181034      echo (the expanded arguments),
     
    10221038      file (emit path to the port's Portfile)
    10231039      (jberry)
    1024      
     1040
    10251041    - On make install, upgrade ports.conf and sources.conf to change rsync.opendarwin.org
    10261042      to rsync.darwinports.org. This is now our preferred rsync hostname.
     
    10321048
    10331049    (information not here).
    1034    
     1050
    10351051Release 1.0:
    1036    
     1052
    10371053    (information not here).
  • branches/variant-descs-14482/base/aclocal.m4

    r40953 r42567  
    365365    AC_ARG_WITH(applications-dir,[AC_HELP_STRING([--with-applications-dir], [Applications installation directory.])], MPAPPLICATIONSDIR=${withval})
    366366
     367    oldprefix=$prefix
     368    if test "x$prefix" = "xNONE" ; then
     369        prefix=$ac_default_prefix
     370    fi
    367371    AC_MSG_CHECKING([for Applications installation directory])
    368372
     
    377381        AC_MSG_RESULT([$MPAPPLICATIONSDIR])
    378382    AC_SUBST(MPAPPLICATIONSDIR)
     383    prefix=$oldprefix
    379384])
    380385
     
    386391    AC_ARG_WITH(frameworks-dir,[AC_HELP_STRING([--with-frameworks-dir], [Frameworks installation directory.])], MPFRAMEWORKSDIR=${withval})
    387392
     393    oldprefix=$prefix
     394    if test "x$prefix" = "xNONE" ; then
     395        prefix=$ac_default_prefix
     396    fi
    388397    AC_MSG_CHECKING([for Frameworks installation directory])
    389398
     
    394403        AC_MSG_RESULT([$MPFRAMEWORKSDIR])
    395404    AC_SUBST(MPFRAMEWORKSDIR)
     405    prefix=$oldprefix
    396406])
    397407
  • branches/variant-descs-14482/base/configure

    r40953 r42567  
    774774TCL_DEFS
    775775TCL_CC
     776CONDITIONAL_PACKAGES
    776777OUR_INCLUDED_PACKAGES
    777778prefix_expanded
     
    44654466
    44664467
     4468# Determine if we want to install conditional packages
     4469CONDITIONAL_PACKAGES=
     4470
    44674471# Foundation checks
    44684472
     
    54965500                        apple)
    54975501                                ;;
     5502                        no)
     5503                                ;;
    54985504                        *)
    54995505                                { { echo "$as_me:$LINENO: error: ${with_objc_runtime} is not a valid argument to --with-objc-runtime. Please specify either \"GNU\" or \"apple\"" >&5
     
    55105516ac_compiler_gnu=$ac_cv_objc_compiler_gnu
    55115517
     5518
     5519        if test x"${with_objc_runtime}" != x"no"; then
    55125520
    55135521        # Check for common header, objc/objc.h
     
    59755983        fi
    59765984
     5985        fi
     5986
    59775987        # Apple runtime is prefered
    59785988        if test x"${mp_cv_objc_runtime_apple}" = x"yes"; then
     
    59966006_ACEOF
    59976007
     6008        elif test x"${with_objc_runtime}" = x"no"; then
     6009                        OBJC_RUNTIME="none"
     6010                        { echo "$as_me:$LINENO: Not using Objective-C runtime" >&5
     6011echo "$as_me: Not using Objective-C runtime" >&6;}
    59986012        else
    59996013                        { { echo "$as_me:$LINENO: error: Could not locate a working Objective-C runtime.
     
    60406054                        apple)
    60416055                                ;;
     6056                        no)
     6057                                ;;
    60426058                        *)
    60436059                                { { echo "$as_me:$LINENO: error: ${with_objc_foundation} is not a valid argument to --with-objc-foundation. Please specify either \"GNU\" or \"apple\"" >&5
     
    60546070ac_compiler_gnu=$ac_cv_objc_compiler_gnu
    60556071
     6072
     6073        if test x"${with_objc_foundation}" != x"no"; then
    60566074
    60576075        if test x"${with_objc_foundation}" == x || test x"${with_objc_foundation}" == x"apple"; then
     
    62526270        fi
    62536271
     6272        fi
     6273
    62546274        # NeXT Foundation is prefered
    62556275        if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
     
    62776297                { echo "$as_me:$LINENO: Using GNUstep Foundation library" >&5
    62786298echo "$as_me: Using GNUstep Foundation library" >&6;}
     6299        elif test x"${with_objc_foundation}" = x"no"; then
     6300                OBJC_FOUNDATION="none"
     6301                { echo "$as_me:$LINENO: Not using Foundation implementation" >&5
     6302echo "$as_me: Not using Foundation implementation" >&6;}
    62796303        else
    62806304                { { echo "$as_me:$LINENO: error: Could not find a working Foundation implementation" >&5
     
    62956319
    62966320
     6321
     6322# tclobjc requires objc (runtime and foundation) support
     6323if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
     6324        CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
     6325fi
    62976326
    62986327
     
    68206849
    68216850
     6851    oldprefix=$prefix
     6852    if test "x$prefix" = "xNONE" ; then
     6853        prefix=$ac_default_prefix
     6854    fi
    68226855    { echo "$as_me:$LINENO: checking for Applications installation directory" >&5
    68236856echo $ECHO_N "checking for Applications installation directory... $ECHO_C" >&6; }
     
    68346867echo "${ECHO_T}$MPAPPLICATIONSDIR" >&6; }
    68356868
     6869    prefix=$oldprefix
    68366870
    68376871
     
    68456879
    68466880
     6881    oldprefix=$prefix
     6882    if test "x$prefix" = "xNONE" ; then
     6883        prefix=$ac_default_prefix
     6884    fi
    68476885    { echo "$as_me:$LINENO: checking for Frameworks installation directory" >&5
    68486886echo $ECHO_N "checking for Frameworks installation directory... $ECHO_C" >&6; }
     
    68556893echo "${ECHO_T}$MPFRAMEWORKSDIR" >&6; }
    68566894
     6895    prefix=$oldprefix
    68576896
    68586897
     
    87928831
    87938832
    8794 for ac_func in bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile
     8833
     8834for ac_func in bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv
    87958835do
    87968836as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
     
    1234012380SHLIB_CFLAGS=${TCL_SHLIB_CFLAGS}
    1234112381SHLIB_SUFFIX=${TCL_SHLIB_SUFFIX}
     12382
    1234212383
    1234312384
     
    1321213253TCL_DEFS!$TCL_DEFS$ac_delim
    1321313254TCL_CC!$TCL_CC$ac_delim
     13255CONDITIONAL_PACKAGES!$CONDITIONAL_PACKAGES$ac_delim
    1321413256OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
    1321513257prefix_expanded!$prefix_expanded$ac_delim
     
    1322013262_ACEOF
    1322113263
    13222   if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
     13264  if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
    1322313265    break
    1322413266  elif $ac_last_try; then
  • branches/variant-descs-14482/base/configure.ac

    r40953 r42567  
    116116MP_COMPILER_ATTRIBUTE_LF_PRIVATE
    117117
     118# Determine if we want to install conditional packages
     119CONDITIONAL_PACKAGES=
     120
    118121# Foundation checks
    119122ACX_PTHREAD
    120123MP_OBJC_RUNTIME
    121124MP_OBJC_FOUNDATION
     125
     126# tclobjc requires objc (runtime and foundation) support
     127if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
     128        CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
     129fi
    122130
    123131MP_PROG_DAEMONDO
     
    161169AC_FUNC_FORK
    162170AC_FUNC_STRERROR_R
    163 AC_CHECK_FUNCS([bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile])
     171AC_CHECK_FUNCS([bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv])
    164172MP_CHECK_READLINK_IS_P1003_1A
    165173
     
    369377AC_SUBST(TCL_STUB_LIB_SPEC)
    370378AC_SUBST(TCL_CC)
     379AC_SUBST(CONDITIONAL_PACKAGES)
    371380AC_SUBST(OUR_INCLUDED_PACKAGES)
    372381
  • branches/variant-descs-14482/base/doc/macports.conf.in

    r37509 r42567  
    7171portautoclean           yes
    7272
    73 # Rsync server to fetch MacPorts sources from
     73# Rsync server to fetch MacPorts sources from. Note that this is only used
     74# for selfupdate. The source(s) for the ports tree are set in sources.conf.
     75# Known mirrors at time of writing (see http://trac.macports.org/wiki/Mirrors
     76# for the current list):
     77#   rsync.macports.org        - California, USA (master)
     78#   trd.no.rsync.macports.org - Trondheim, Norway
    7479rsync_server            rsync.macports.org
    7580
  • branches/variant-descs-14482/base/doc/port.1

    r40953 r42567  
    291291.Fl u .
    292292To recursively uninstall all dependents of this port, use
    293 .Fl -recursive .
     293.Fl -follow-dependents .
    294294.Pp
    295295For example:
     
    297297.Dl "port uninstall vim"
    298298.Dl "port -u uninstall"
    299 .Dl "port uninstall --recursive python24"
     299.Dl "port uninstall --follow-dependents python24"
    300300.Ss activate
    301301Activate the installed
     
    481481Verifies Portfile for
    482482.Ar portname .
     483To nitpick about whitespace and patchfile names, use
     484.Fl -nitpick .
    483485.Ss archive
    484486Archive the port for a later
  • branches/variant-descs-14482/base/doc/portgroup.7

    r40953 r42567  
    136136.Sy Example:
    137137.Dl xcode.destroot.type framework
     138.br
    138139.It Ic xcode.destroot.path
    139140Where to install the build product.
     
    157158.Bd -literal -offset indent -compact
    158159xcode.destroot.settings SKIP_INSTALL=NO
     160.Ed
     161.It Ic xcode.universal.settings
     162Settings passed to the xcode build tool when the +universal variant is selected. These settings should be in the X=Y form.
     163.br
     164.Sy Type:
     165.Em optional
     166.br
     167.Sy Default:
     168.Bd -literal -offset indent -compact
     169ARCHS="${universal_archs}" MACOSX_DEPLOYMENT_TARGET=${universal_target}
     170.Ed
     171.It Ic xcode.universal.sdk
     172SDK to use when the +universal variant is selected. The argument may be an absolute path to an SDK, or the canonical name of an SDK.
     173.br
     174.Sy Type:
     175.Em optional
     176.br
     177.Sy Default:
     178.Bd -literal -offset indent -compact
     179${universal_sysroot}
    159180.Ed
    160181.El
  • branches/variant-descs-14482/base/doc/sources.conf

    r41458 r42567  
    2020
    2121
    22 #  To get the ports tree from the MacPorts rsync.macports.org server use:
    23 #  rsync://rsync.macports.org/release/ports/
     22#  To get the ports tree from the master MacPorts server in California, USA use:
     23#      rsync://rsync.macports.org/release/ports/
     24#  To get it from the mirror in Trondheim, Norway use:
     25#      rsync://trd.no.rsync.macports.org/release/ports/
     26#  A current list of mirrors is available at http://trac.macports.org/wiki/Mirrors
    2427rsync://rsync.macports.org/release/ports/ [default]
  • branches/variant-descs-14482/base/m4/foundation.m4

    r40953 r42567  
    8888                        apple)
    8989                                ;;
     90                        no)
     91                                ;;
    9092                        *)
    9193                                AC_MSG_ERROR([${with_objc_runtime} is not a valid argument to --with-objc-runtime. Please specify either "GNU" or "apple"])
     
    9698        AC_LANG_PUSH([Objective C])
    9799
     100        if test x"${with_objc_runtime}" != x"no"; then
     101       
    98102        # Check for common header, objc/objc.h
    99103        AC_CHECK_HEADERS([objc/objc.h], ,[AC_MSG_ERROR([Can't locate Objective C runtime headers])])
     
    223227        fi
    224228
     229        fi
     230
    225231        # Apple runtime is prefered
    226232        if test x"${mp_cv_objc_runtime_apple}" = x"yes"; then
     
    234240                        AC_MSG_NOTICE([Using GNU Objective-C runtime])
    235241                        AC_DEFINE([GNU_RUNTIME], 1, [Define if using the GNU Objective-C runtime and compiler.])
     242        elif test x"${with_objc_runtime}" = x"no"; then
     243                        OBJC_RUNTIME="none"
     244                        AC_MSG_NOTICE([Not using Objective-C runtime])
    236245        else
    237246                        AC_MSG_FAILURE([Could not locate a working Objective-C runtime.])
     
    294303                        apple)
    295304                                ;;
     305                        no)
     306                                ;;
    296307                        *)
    297308                                AC_MSG_ERROR([${with_objc_foundation} is not a valid argument to --with-objc-foundation. Please specify either "GNU" or "apple"])
     
    302313        AC_LANG_PUSH([Objective C])
    303314
     315        if test x"${with_objc_foundation}" != x"no"; then
     316       
    304317        if test x"${with_objc_foundation}" == x || test x"${with_objc_foundation}" == x"apple"; then
    305318                # '@<:@' = '['
     
    398411        fi
    399412
     413        fi
     414       
    400415        # NeXT Foundation is prefered
    401416        if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
     
    413428                AC_DEFINE([GNUSTEP_FOUNDATION], 1, [Define if using the GNUstep Foundation library])
    414429                AC_MSG_NOTICE([Using GNUstep Foundation library])
     430        elif test x"${with_objc_foundation}" = x"no"; then
     431                OBJC_FOUNDATION="none"
     432                AC_MSG_NOTICE([Not using Foundation implementation])
    415433        else
    416434                AC_MSG_ERROR([Could not find a working Foundation implementation])
  • branches/variant-descs-14482/base/portmgr/dmg/preflight

    r32397 r42567  
    4545[ ! -d /Library/Tcl/darwinports1.0 ] || rm -rf /Library/Tcl/darwinports1.0
    4646
    47 [ ! -d /opt/local/share/darwinports ] || rm -rf /opt/local/darwinports
     47[ ! -d /opt/local/share/darwinports ] || rm -rf /opt/local/share/darwinports
    4848
    4949[ ! -f /opt/local/etc/ports/dp_version ] || rm -vf /opt/local/etc/ports/dp_version
  • branches/variant-descs-14482/base/setupenv.bash.in

    • Property svn:mergeinfo changed (with no actual effect on merging)
  • branches/variant-descs-14482/base/src/Makefile.in

    r31491 r42567  
    88                        registry2.0 \
    99                        darwintracelib1.0 \
    10                         tclobjc1.0
     10                        @CONDITIONAL_PACKAGES@
    1111SUBDIR=         ${TCLPKG} @PATHCONF@ port programs
    1212
  • branches/variant-descs-14482/base/src/config.h.in

    r28743 r42567  
    1818/* Define to 1 if you have the `bzero' function. */
    1919#undef HAVE_BZERO
     20
     21/* Define to 1 if you have the `clearenv' function. */
     22#undef HAVE_CLEARENV
    2023
    2124/* Define to 1 if you have the `copyfile' function. */
  • branches/variant-descs-14482/base/src/pextlib1.0/Pextlib.c

    r40953 r42567  
    221221        Tcl_Obj *errbuf;
    222222        Tcl_Obj *tcl_result;
    223 
    224         if (objc != 2 && objc != 3) {
    225                 Tcl_WrongNumArgs(interp, 1, objv, "command");
    226                 return TCL_ERROR;
    227         }
    228        
    229         if (objc == 3) {
     223        int read_failed, status;
     224
     225        /* usage: system [-notty] command */
     226        if (objc == 2) {
     227                cmdstring = Tcl_GetString(objv[1]);
     228        } else if (objc == 3) {
    230229                char *arg = Tcl_GetString(objv[1]);
    231230                cmdstring = Tcl_GetString(objv[2]);
    232231
    233                 if (!strcmp(arg, "-notty")) {
     232                if (strcmp(arg, "-notty") == 0) {
    234233                        osetsid = 1;
    235234                } else {
     
    240239                }
    241240        } else {
    242                 cmdstring = Tcl_GetString(objv[1]);
    243         }
    244 
    245         if (pipe(fdset) == -1)
    246                 return TCL_ERROR;
     241                Tcl_WrongNumArgs(interp, 1, objv, "command");
     242                return TCL_ERROR;
     243        }
    247244
    248245        /*
     
    250247         * popen() itself is not used because stderr is also desired.
    251248         */
     249        if (pipe(fdset) != 0) {
     250                return TCL_ERROR;
     251        }
     252
    252253        pid = fork();
    253         if (pid == -1)
    254                 return TCL_ERROR;
    255         if (pid == 0) {
     254        switch (pid) {
     255        case -1: /* error */
     256                return TCL_ERROR;
     257                break;
     258        case 0: /* child */
    256259                close(fdset[0]);
     260
    257261                if ((nullfd = open(_PATH_DEVNULL, O_RDONLY)) == -1)
    258262                        _exit(1);
     
    272276                execve("/bin/sh", args, environ);
    273277                _exit(1);
    274         }
     278                break;
     279        default: /* parent */
     280                break;
     281        }
     282
    275283        close(fdset[1]);
    276         pdes = fdopen(fdset[0], "r");
    277284
    278285        /* read from simulated popen() pipe */
     286        read_failed = 0;
    279287        pos = 0;
    280288        bzero(circbuf, sizeof(circbuf));
     289        pdes = fdopen(fdset[0], "r");
    281290        while ((buf = fgetln(pdes, &linelen)) != NULL) {
    282291                char *sbuf;
     
    299308
    300309                if (sbuf == NULL) {
    301                         for (fline = pos; pos < fline + CBUFSIZ; pos++) {
    302                                 if (circbuf[pos % CBUFSIZ].len != 0)
    303                                         free(circbuf[pos % CBUFSIZ].line);
    304                         }
    305                         return TCL_ERROR;
     310                        read_failed = 1;
     311                        break;
    306312                }
    307313
     
    313319                circbuf[pos].len = slen;
    314320
    315                 if (pos++ == CBUFSIZ - 1)
     321                if (pos++ == CBUFSIZ - 1) {
    316322                        pos = 0;
    317                 ret = ui_info(interp, sbuf);
    318                 if (ret != TCL_OK) {
    319                         for (fline = pos; pos < fline + CBUFSIZ; pos++) {
    320                                 if (circbuf[pos % CBUFSIZ].len != 0)
    321                                         free(circbuf[pos % CBUFSIZ].line);
    322                         }
    323                         return ret;
     323                }
     324
     325                if (ui_info(interp, sbuf) != TCL_OK) {
     326                        read_failed = 1;
     327                        break;
    324328                }
    325329        }
    326330        fclose(pdes);
    327331
    328         if (wait(&ret) != pid)
    329                 return TCL_ERROR;
    330         if (WIFEXITED(ret)) {
    331                 if (WEXITSTATUS(ret) == 0)
    332                         return TCL_OK;
    333                 else {
     332        status = TCL_ERROR;
     333
     334        if (wait(&ret) == pid && WIFEXITED(ret) && !read_failed) {
     335                /* Normal exit, and reading from the pipe didn't fail. */
     336                if (WEXITSTATUS(ret) == 0) {
     337                        status = TCL_OK;
     338                } else {
    334339                        /* Copy the contents of the circular buffer to errbuf */
    335340                        Tcl_Obj* errorCode;
     
    345350                                /* Re-add previously stripped newline */
    346351                                Tcl_AppendToObj(errbuf, "\n", 1);
    347                                 free(circbuf[pos % CBUFSIZ].line);
    348352                        }
    349353
     
    363367                        Tcl_AppendObjToObj(tcl_result, errbuf);
    364368                        Tcl_SetObjResult(interp, tcl_result);
    365                         return TCL_ERROR;
    366                 }
    367         } else
    368                 return TCL_ERROR;
     369                }
     370        }
     371
     372        /* Cleanup. */
     373        close(fdset[0]);
     374        for (fline = 0; fline < CBUFSIZ; fline++) {
     375                if (circbuf[fline].len != 0) {
     376                        free(circbuf[fline].line);
     377                }
     378        }
     379
     380        return status;
    369381}
    370382
     
    10041016
    10051017        newmode = getmode(set, 0);
     1018        free(set);
    10061019
    10071020        oldmode = umask(newmode);
     
    11331146    char *equals;
    11341147    size_t len;
     1148    Tcl_Obj *tclList;
     1149    int listLength;
     1150    Tcl_Obj **listArray;
     1151    int loopCounter;
    11351152   
    11361153    if (objc != 2) {
     
    11461163
    11471164    if (strcmp(name, "*") == 0) {
     1165#ifndef HAVE_CLEARENV
     1166        /* unset all current environment variables; it'd be best to use
     1167           clearenv() but that is not yet standardized, instead use Tcl's
     1168           list capability to easily build an array of strings for each
     1169           env name, then loop through that list to unsetenv() each one */
     1170        tclList = Tcl_NewListObj( 0, NULL );
     1171        Tcl_IncrRefCount( tclList );
    11481172        /* unset all current environment variables */
    11491173        for (envp = environ; *envp != NULL; envp++) {
     
    11511175            if (equals != NULL) {
    11521176                len = equals - *envp;
    1153                 name = malloc(len+1);
    1154                 if (name != NULL) {
    1155                     memcpy(name, *envp, len);
    1156                     name[len] = '\0';
    1157                     (void) unsetenv(name);
    1158                     free(name);
    1159                 }
     1177                Tcl_ListObjAppendElement(interp, tclList, Tcl_NewStringObj(*envp, len));
    11601178            }
    11611179        }
     1180        Tcl_ListObjGetElements(interp, tclList, &listLength, &listArray);
     1181        for (loopCounter = 0; loopCounter < listLength; loopCounter++) {
     1182            unsetenv(Tcl_GetString(listArray[loopCounter]));
     1183        }
     1184        Tcl_DecrRefCount( tclList );
     1185#else
     1186        clearenv();
     1187#endif
    11621188    } else {
    11631189        (void) unsetenv(name);
    11641190    }
     1191    /* Tcl appears to become out of sync with the environment when we
     1192       unset things, eg, 'info exists env(CC)' will succeed where
     1193       'puts $env(CC)' will fail since it doesn't actually exist after
     1194       being unset here.  This forces Tcl to resync to the current state
     1195       (don't care about the actual result, so reset it) */
     1196    Tcl_Eval(interp, "array get env");
     1197    Tcl_ResetResult(interp);
    11651198
    11661199    return TCL_OK;
  • branches/variant-descs-14482/base/src/pextlib1.0/curl.c

    r34422 r42567  
    270270                }
    271271
     272                /* --max-redirs option, same default as curl command line */
     273                theCurlCode = curl_easy_setopt(theHandle, CURLOPT_MAXREDIRS, 50);
     274                if (theCurlCode != CURLE_OK) {
     275                        theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
     276                        break;
     277                }
     278
    272279                /* -f option */
    273280                theCurlCode = curl_easy_setopt(theHandle, CURLOPT_FAILONERROR, 1);
     
    515522                /* -L option */
    516523                theCurlCode = curl_easy_setopt(theHandle, CURLOPT_FOLLOWLOCATION, 1);
     524                if (theCurlCode != CURLE_OK) {
     525                        theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
     526                        break;
     527                }
     528
     529                /* --max-redirs option, same default as curl command line */
     530                theCurlCode = curl_easy_setopt(theHandle, CURLOPT_MAXREDIRS, 50);
    517531                if (theCurlCode != CURLE_OK) {
    518532                        theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
     
    688702                /* -L option */
    689703                theCurlCode = curl_easy_setopt(theHandle, CURLOPT_FOLLOWLOCATION, 1);
     704                if (theCurlCode != CURLE_OK) {
     705                        theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
     706                        break;
     707                }
     708
     709                /* --max-redirs option, same default as curl command line */
     710                theCurlCode = curl_easy_setopt(theHandle, CURLOPT_MAXREDIRS, 50);
    690711                if (theCurlCode != CURLE_OK) {
    691712                        theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
  • branches/variant-descs-14482/base/src/pextlib1.0/tests/curl.tcl

    r34080 r42567  
    2929       
    3030        # use -u
    31         curl fetch -u "I accept www.opensource.org/licenses/cpl:." http://www.research.att.com/~gsf/download/tgz/ast-ksh.2008-02-02.tgz $tempfile
    32         test {[md5 file $tempfile] == "d2a71e320fbaa7a0fd950a27c7e4b099"}
     31        curl fetch -u "I accept www.opensource.org/licenses/cpl:." http://www.research.att.com/~gsf/download/tgz/sfio.2005-02-01.tgz $tempfile
     32        test {[md5 file $tempfile] == "48f45c7c77c23ab0ccca48c22b3870de"}
    3333       
    3434        file delete -force $tempfile
  • branches/variant-descs-14482/base/src/pextlib1.0/tests/unsetenv.tcl

    r37509 r42567  
    44proc main {pextlibname} {
    55    load $pextlibname
    6    
     6
    77    global env
    88    puts [array get env]
    9    
     9
    1010    array unset env *
    1111    puts [array get env]
    12    
     12    if {[array size env] > 0} {
     13        puts "note: your TclUnsetEnv is broken... (need to use unsetenv too)"
     14    }
    1315    unsetenv *
    1416    puts [array get env]
     17    if {[array size env] > 0} {
     18        error "env not empty as expected"
     19    }
    1520
    1621
     
    2328    unsetenv CC
    2429    if {[info exists env(CC)]} {
    25         exit 1
     30        error "CC still set in env"
    2631    }
    2732}
  • branches/variant-descs-14482/base/src/pextlib1.0/tracelib.c

    r37509 r42567  
    4545#include <errno.h>
    4646#include <pthread.h>
     47#include <limits.h>
    4748#include "tracelib.h"
    4849
     
    365366       
    366367        rl.rlim_cur=rl.rlim_max=RLIM_INFINITY;
     368#if defined(__APPLE__) && defined(OPEN_MAX)
     369        if (OPEN_MAX < rl.rlim_cur)
     370                rl.rlim_cur = OPEN_MAX;
     371#endif
    367372        if(setrlimit(RLIMIT_NOFILE, &rl)==-1)
    368373        {
  • branches/variant-descs-14482/base/src/port/port.tcl

    r40953 r42567  
    3535# POSSIBILITY OF SUCH DAMAGE.
    3636
    37 #
    38 # TODO:
    39 #
    40 
    4137catch {source \
    4238    [file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
     
    492488    lappend lines $newline
    493489    return [join $lines "\n"]
     490}
     491
     492##
     493# Wraps a line at a specified width with a label in front
     494#
     495# @see wrap
     496#
     497# @param label label for output
     498# @param string input string
     499# @param maxlen text width (0 defaults to current terminal width)
     500# @return wrapped string
     501proc wraplabel {label string maxlen {indent ""}} {
     502    append label ": [string repeat " " [expr [string length $indent] - [string length "$label: "]]]"
     503    return "$label[wrap $string $maxlen $indent 0]"
    494504}
    495505
     
    14811491                    set joiner ", "
    14821492                }
    1483                 puts -nonewline "Variants:    "
    1484                 puts [wrap $vars 0 [string repeat " " 13] 0]
     1493                puts [wraplabel "Variants" $vars 0 [string repeat " " 13]]
    14851494            }
    14861495            puts ""
     
    14931502            }
    14941503            if {[info exists portinfo(homepage)]} {
    1495                 puts "Homepage:    $portinfo(homepage)"
     1504                puts [wraplabel "Homepage" $portinfo(homepage) 0 [string repeat " " 13]]
    14961505            }
    14971506            puts ""
    14981507            # Emit build, library, and runtime dependencies
     1508            # For wrapping, indent output at 22 chars
     1509            set label_len 22
    14991510            foreach {key title} {
    15001511                depends_build "Build Dependencies"
     
    15031514            } {
    15041515                if {[info exists portinfo($key)]} {
    1505                     puts -nonewline "$title: "
     1516                    set depstr ""
    15061517                    set joiner ""
    15071518                    foreach d $portinfo($key) {
    15081519                        if {[macports::ui_isset ports_verbose]} {
    1509                             puts -nonewline "$joiner$d"
     1520                            append depstr "$joiner$d"
    15101521                        } else {
    1511                             puts -nonewline "$joiner[lindex [split $d :] end]"
     1522                            append depstr "$joiner[lindex [split $d :] end]"
    15121523                        }
    15131524                        set joiner ", "
    15141525                    }
    15151526                    set nodeps false
    1516                     puts ""
     1527                    puts [wraplabel $title $depstr 0 [string repeat " " $label_len]]
    15171528                }
    15181529            }
    15191530               
    1520             if {[info exists portinfo(platforms)]} { puts "Platforms: [join $portinfo(platforms) ", "]"}
     1531            if {[info exists portinfo(platforms)]} {
     1532                puts [wraplabel "Platforms" [join $portinfo(platforms) ", "] 0 [string repeat " " $label_len]]
     1533            }
    15211534            if {[info exists portinfo(maintainers)]} {
    1522                 puts "Maintainers: [unobscure_maintainers $portinfo(maintainers)]"
     1535                puts [wraplabel "Maintainers" [unobscure_maintainers $portinfo(maintainers)] 0 [string repeat " " $label_len]]
    15231536            }
    15241537        }
     
    24592472        }
    24602473       
    2461         # If this is the install target, add any global_variations to the variations
     2474        # Add any global_variations to the variations
    24622475        # specified for the port
    2463         if { $target == "install" } {
    2464             foreach { variation value } [array get global_variations] {
    2465                 if { ![info exists variations($variation)] } {
    2466                     set variations($variation) $value
    2467                 }
     2476        foreach { variation value } [array get global_variations] {
     2477            if { ![info exists variations($variation)] } {
     2478                set variations($variation) $value
    24682479            }
    24692480        }
     
    26872698    clean       {all archive dist work}
    26882699    mirror      {new}
     2700    lint        {nitpick}
    26892701}
    26902702
  • branches/variant-descs-14482/base/src/port/portindex.tcl

    r34393 r42567  
    137137
    138138puts "Creating software index in $outdir"
    139 set fd [open [file join $outdir PortIndex] w]
     139set tempportindex [mktemp "/tmp/mports.portindex.XXXXXXXX"]
     140set fd [open $tempportindex w]
    140141mporttraverse pindex $directory
    141142close $fd
     143file rename -force $tempportindex [file join $outdir PortIndex]
    142144puts "\nTotal number of ports parsed:\t$stats(total)\
    143145      \nPorts successfully parsed:\t[expr $stats(total) - $stats(failed)]\t\
  • branches/variant-descs-14482/base/src/port1.0/portdepends.tcl

    r24940 r42567  
    3535
    3636# define options
    37 options depends_build depends_run depends_lib
     37options depends_build depends_run depends_lib depends
    3838# Export options via PortInfo
    3939options_export depends_build depends_lib depends_run
     
    4343option_proc depends_lib validate_depends_options
    4444
     45# New option for the new dependency. We generate a warning because we don't handle this yet.
     46option_proc depends validate_depends_options_new
     47
     48set_ui_prefix
     49
    4550proc validate_depends_options {option action {value ""}} {
    4651    global targets
     
    4853                set {
    4954                        foreach depspec $value {
     55                            # port syntax accepts colon-separated junk that we do not understand yet.
    5056                                switch -regex $depspec {
    5157                                        ^(lib|bin|path):([-A-Za-z0-9_/.${}^?+()|\\\\]+):([-._A-Za-z0-9]+)$ {}
    52                                         ^(port):([-._A-Za-z0-9]+)$ {}
     58                                        ^(port)(:.+)?:([-._A-Za-z0-9]+)$ {}
    5359                                        default { return -code error [format [msgcat::mc "invalid depspec: %s"] $depspec] }
    5460                                }
     
    5763    }
    5864}
     65
     66proc validate_depends_options_new {option action {value ""}} {
     67    ui_warn [msgcat::mc "depends option is not handled yet"]
     68}
  • branches/variant-descs-14482/base/src/port1.0/portdistfiles.tcl

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id
    r37509 r42567  
    11# -*- coding: utf-8; mode: tcl; tab-width: 4; indent-tabs-mode: nil; c-basic-offset: 4 -*- vim:fenc=utf-8:filetype=tcl:et:sw=4:ts=4:sts=4
    22# portdistfiles.tcl
    3 # $Id: portdistfiles.tcl $
     3# $Id$
    44#
    55# Copyright (c) 2008 MacPorts Project
  • branches/variant-descs-14482/base/src/port1.0/portlint.tcl

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id
    r41044 r42567  
    11# et:ts=4
    22# portlint.tcl
    3 # $Id: portlint.tcl $
     3# $Id$
    44
    55package provide portlint 1.0
     
    147147
    148148proc lint_main {args} {
    149         global UI_PREFIX portname portpath porturl
     149        global UI_PREFIX portname portpath porturl ports_lint_nitpick
    150150        set portfile ${portpath}/Portfile
    151151        set portdirs [split ${portpath} /]
     
    161161    ###################################################################
    162162    ui_debug "$portfile"
     163   
     164    if {[info exists ports_lint_nitpick] && $ports_lint_nitpick eq "yes"} {
     165        set nitpick true
     166    } else {
     167        set nitpick false
     168    }
    163169
    164170    set topline_number 1
     
    178184        set line [gets $f]
    179185        if {[eof $f]} {
    180             seek $f -1 end
    181             set last [read $f 1]
    182             if {![string match "\n" $last]} {
    183                 ui_warn "Line $lineno has missing newline (at end of file)"
    184                 incr warnings
     186            if {$nitpick} {
     187                seek $f -1 end
     188                set last [read $f 1]
     189                if {![string match "\n" $last]} {
     190                    ui_warn "Line $lineno has missing newline (at end of file)"
     191                    incr warnings
     192                }
    185193            }
    186194            close $f
     
    199207        }
    200208
    201         if {$require_blank && ($line != "")} {
     209        if {$nitpick && $require_blank && ($line != "")} {
    202210            ui_warn "Line $lineno should be a newline (after $require_after)"
    203211            incr warnings
     
    205213        set require_blank false
    206214
    207         if {[regexp {\S[ \t]+$} $line]} {
     215        if {$nitpick && [regexp {\S[ \t]+$} $line]} {
    208216            # allow indented blank lines between blocks of code and such
    209217            ui_warn "Line $lineno has trailing whitespace before newline"
     
    488496    }
    489497
    490     if {[info exists patchfiles]} {
     498    if {$nitpick && [info exists patchfiles]} {
    491499        foreach patchfile $patchfiles {
    492500            if {![string match "patch-*.diff" $patchfile] && [file exists "$portpath/files/$patchfile"]} {
  • branches/variant-descs-14482/base/src/port1.0/portlivecheck.tcl

    r37509 r42567  
    5757proc livecheck_main {args} {
    5858    global livecheck.url livecheck.check livecheck.md5 livecheck.regex livecheck.name livecheck.distname livecheck.version
     59    global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert
    5960    global homepage portname portpath workpath
    6061    global master_sites name distfiles
     
    105106        set livecheck.name $name
    106107    }
     108
     109    # Copied over from portfetch in parts
     110    set fetch_options {}
     111        if {[string length ${fetch.user}] || [string length ${fetch.password}]} {
     112                lappend fetch_options -u
     113                lappend fetch_options "${fetch.user}:${fetch.password}"
     114        }
     115        if {${fetch.use_epsv} != "yes"} {
     116                lappend fetch_options "--disable-epsv"
     117        }
     118        if {${fetch.ignore_sslcert} != "no"} {
     119                lappend fetch_options "--ignore-ssl-cert"
     120        }
    107121
    108122    # Perform the check depending on the type.
     
    163177            # single and multiline regex
    164178            ui_debug "Fetching ${livecheck.url}"
    165             if {[catch {curl fetch ${livecheck.url} $tempfile} error]} {
     179            if {[catch {eval curl fetch $fetch_options {${livecheck.url}} $tempfile} error]} {
    166180                ui_error "cannot check if $portname was updated ($error)"
    167181                set updated -1
     
    212226        "md5" {
    213227            ui_debug "Fetching ${livecheck.url}"
    214             if {[catch {curl fetch ${livecheck.url} $tempfile} error]} {
     228            if {[catch {eval curl fetch $fetch_options {${livecheck.url}} $tempfile} error]} {
    215229                ui_error "cannot check if $portname was updated ($error)"
    216230                set updated -1
  • branches/variant-descs-14482/base/src/port1.0/portload.tcl

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id
    r31500 r42567  
    11# et:ts=4
    22# portsubmit.tcl
    3 # $Id: portsubmit.tcl 26177 2007-06-15 10:11:22Z jmpp@macports.org $
     3# $Id$
    44#
    55# Copyright (c) 2007 MacPorts Project
  • branches/variant-descs-14482/base/src/port1.0/portunload.tcl

    • Property svn:eol-style set to native
    • Property svn:keywords set to Id
    r31500 r42567  
    11# et:ts=4
    22# portsubmit.tcl
    3 # $Id: portsubmit.tcl 26177 2007-06-15 10:11:22Z jmpp@macports.org $
     3# $Id$
    44#
    55# Copyright (c) 2007 MacPorts Project
  • branches/variant-descs-14482/base/src/port1.0/portutil.tcl

    r41403 r42567  
    800800            set tmpfd [lindex $tmpfile 0]
    801801            # Set tmpfile to only the file name
    802             set tmpfile [lindex $tmpfile 1]
     802            set tmpfile [join [lrange $tmpfile 1 end]]
    803803        }
    804804   
     
    17151715        ui_debug "using xmkmf, so not adding the default universal variant"
    17161716        return no
    1717     } elseif {[exists use_configure] && ![option use_configure]} {
     1717    } elseif {[exists use_configure] && ![option use_configure] && ![exists xcode.universal.settings]} {
     1718        # Allow +universal if port uses xcode portgroup.
    17181719        ui_debug "not using configure, so not adding the default universal variant"
    17191720        return no
  • branches/variant-descs-14482/base/src/port1.0/resources/fetch/mirror_sites.tcl

    r40953 r42567  
    6868}
    6969
     70set portfetch::mirror_sites::sites(gimp) {
     71    ftp://ftp.gimp.org/pub/
     72    ftp://ftp.gtk.org/pub/
     73    http://ftp.gtk.org/pub/
     74    http://gimp.mirrors.hoobly.com/
     75    ftp://gd.tuwien.ac.at/graphics/gimp/
     76    http://ftp.iut-bm.univ-fcomte.fr/gimp/
     77    http://gimp.krecio.pl/
     78    ftp://ftp.gwdg.de/pub/misc/grafik/gimp/
     79    http://ftp.gwdg.de/pub/misc/grafik/gimp/
     80    ftp://ftp.esat.net/mirrors/ftp.gimp.org/pub/
     81    http://ftp.esat.net/mirrors/ftp.gimp.org/pub/
     82    ftp://ftp.u-aizu.ac.jp/pub/graphics/tools/gimp/
     83    ftp://ftp.snt.utwente.nl/pub/software/gimp/
     84    http://ftp.snt.utwente.nl/pub/software/gimp/
     85    ftp://ftp.sai.msu.su/pub/unix/graphics/gimp/mirror/
     86    ftp://ftp.acc.umu.se/pub/gimp/
     87}
     88
    7089set portfetch::mirror_sites::sites(gnome) {
    7190    ftp://ftp.cse.buffalo.edu/pub/Gnome/
     
    106125    http://mirror.aarnet.edu.au/pub/GNU/
    107126    ftp://ftp.unicamp.br/pub/gnu/
    108     http://gnu.glug-nith.org/
    109127    ftp://ftp.gnu.org/gnu/
    110128    http://ftp.gnu.org/gnu/
     
    182200set portfetch::mirror_sites::sites(macports_distfiles) {
    183201    http://distfiles.macports.org/:mirror
     202    http://trd.no.distfiles.macports.org/:mirror
    184203}
    185204
     
    216235    ftp://ftp.cs.colorado.edu/pub/perl/CPAN/modules/by-module/
    217236    ftp://cpan.pop-mg.com.br/pub/CPAN/modules/by-module/
    218     ftp://ftp.is.co.za/programming/perl/CPAN/modules/by-module/
     237    ftp://ftp.is.co.za/programming/perl/modules/by-module/
    219238    ftp://ftp.chg.ru/pub/lang/perl/CPAN/modules/by-module/
    220239    http://mirror.internode.on.net/pub/cpan/modules/by-module/
     
    273292    http://switch.dl.sourceforge.net/
    274293    http://nchc.dl.sourceforge.net/
    275     http://jaist.dl.sourceforge.net/
    276294    http://internode.dl.sourceforge.net/
    277295    http://transact.dl.sourceforge.net/
  • branches/variant-descs-14482/base/src/port1.0/resources/group/perl5-1.0.tcl

    r29930 r42567  
    8686    dist_subdir         perl5
    8787
    88     depends_lib     path:${perl5.bin}:perl5.8
     88    depends_lib     path:[string range ${perl5.bin} [string length ${prefix}/] end]:perl5
    8989
    9090    configure.cmd       ${perl5.bin}
  • branches/variant-descs-14482/base/src/port1.0/resources/group/xcode-1.0.tcl

    r37509 r42567  
    5454# build and destroot parameters use the following parameters:
    5555#  PortGroup specific parameters:
    56 #   xcode.project           name (or path relative to build.dir) of the xcode
    57 #                           project. Default is "" meaning let xcodebuild figure it
    58 #                           out.
    59 #   xcode.configuration     xcode buildstyle/configuration. Default is Deployment.
    60 #   xcode.target            if present, overrides build.target and destroot.target
    61 #   xcode.build.settings    additional settings passed to $xcodebuildcmd (in
    62 #                           the X=Y form)
    63 #   xcode.destroot.type     install type (application or framework). Default is
    64 #                           application. This setting overrides xcode.destroot.path.
    65 #   xcode.destroot.path     install path (INSTALL_PATH setting value).
    66 #   xcode.destroot.settings additional settings passed to $xcodebuildcmd (in
    67 #                           the X=Y form)
     56#   xcode.project            name (or path relative to build.dir) of the xcode
     57#                            project. Default is "" meaning let xcodebuild figure it
     58#                            out.
     59#   xcode.configuration      xcode buildstyle/configuration. Default is Deployment.
     60#   xcode.target             if present, overrides build.target and destroot.target
     61#   xcode.build.settings     additional settings passed to $xcodebuildcmd (in
     62#                            the X=Y form)
     63#   xcode.destroot.type      install type (application or framework). Default is
     64#                            application. This setting overrides xcode.destroot.path.
     65#   xcode.destroot.path      install path (INSTALL_PATH setting value).
     66#   xcode.destroot.settings  additional settings passed to $xcodebuildcmd (in
     67#                            the X=Y form)
     68#   xcode.universal.settings settings passed to $xcodebuildcmd when the +universal
     69#                            variant is selected. Defaults to ARCHS="${universal_archs}"
     70#                            MACOSX_DEPLOYMENT_TARGET=${universal_target}.
     71#   xcode.universal.sdk      sdk to use when the +universal variant is selected.
     72#                            Defaults to ${universal_sysroot}. If set to the empty
     73#                            list, no sdk option will be passed to xcodebuild.
    6874#
    6975#  Usual parameters:
     
    114120default xcode.destroot.settings ""
    115121
     122options xcode.universal.settings
     123default xcode.universal.settings {ARCHS=\"${universal_archs}\"\ MACOSX_DEPLOYMENT_TARGET=${universal_target}}
     124options xcode.universal.sdk
     125default xcode.universal.sdk {${universal_sysroot}}
     126
    116127namespace eval xcode {}
    117128
     
    258269    set xcode_project_arg [xcode::get_project_arg ${xcode.project}]
    259270    set xcode_build_args "OBJROOT=build/ SYMROOT=build/"
     271
     272    if {[variant_isset universal]} {
     273        set xcode_build_args "$xcode_build_args ${xcode.universal.settings}"
     274        if {"${xcode.universal.sdk}" != ""} {
     275            set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
     276        }
     277    }
    260278   
    261279    # iterate on targets if there is any, do -alltargets otherwise.
     
    292310    set xcode_build_args "OBJROOT=build/ SYMROOT=build/"
    293311   
     312    if {[variant_isset universal]} {
     313        set xcode_build_args "$xcode_build_args ${xcode.universal.settings}"
     314        if {"${xcode.universal.sdk}" != ""} {
     315            set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
     316        }
     317    }
     318
    294319    # iterate on targets if there is any, do -alltargets otherwise.
    295320    if {"$xcode_targets" == ""} {
  • branches/variant-descs-14482/base/src/registry1.0/portimage.tcl

    r37509 r42567  
    4242# Port Images are basically just installations of the destroot of a port into
    4343# ${macports::registry.path}/software/${name}/${version}_${revision}${variants}
    44 # They allow the user to instal multiple versions of the same port, treating
     44# They allow the user to install multiple versions of the same port, treating
    4545# each revision and each different combination of variants as a "version".
    4646
  • branches/variant-descs-14482/base/src/registry1.0/receipt_flat.tcl

    r40953 r42567  
    9999#
    100100# Open an existing entry and return its reference number.
    101 proc open_entry {name {version 0} {revision 0} {variants ""}} {
     101proc open_entry {name {version ""} {revision 0} {variants ""}} {
    102102        global macports::registry.installtype
    103103        global macports::registry.path
     
    111111               
    112112                if {![string length $receipt_file]} {
    113                         if { $version != 0 } {
     113                        if { $version != "" } {
    114114                                return -code error "Registry error: ${name} @${version}_${revision}${variants} not registered as installed."
    115115                        } else {
     
    119119               
    120120                # Extract the version from the path.
    121                 if { $version == 0 } {
     121                if { $version == "" } {
    122122                        set theFileName [file tail $receipt_file]
    123123                        regexp "^$name-(.*)\$" $theFileName match version
     
    126126                # If version wasn't specified, find out the version number.  This will
    127127                # depend on which installtype mode we're in, "direct" or "image"       
    128                 if { $version == 0 } {
     128                if { $version == "" } {
    129129                        # xxx: If we're in image mode, we really should have had the
    130130                        # version given to us.  How should we handle this?
     
    155155                close $receipt_handle
    156156        } else {
    157                 return -code error "Registry error: receipt for ${name} @${version}_${revision}${variants} seems to be compressed, but bzip2 couln't be found."
     157                return -code error "Registry error: receipt for ${name} @${version}_${revision}${variants} seems to be compressed, but bzip2 couldn't be found."
    158158        }
    159159
  • branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl

    r26177 r42567  
    5050
    5151# Open an existing entry and place it in the receipt_list
    52 proc open_entry {name {version 0} {revision 0} {variants ""}} {
     52proc open_entry {name {version ""} {revision 0} {variants ""}} {
    5353        return -1
    5454}
  • branches/variant-descs-14482/base/src/registry1.0/registry.tcl

    r40953 r42567  
    112112
    113113# Open a registry entry.
    114 proc open_entry {name {version 0} {revision 0} {variants ""}} {
     114proc open_entry {name {version ""} {revision 0} {variants ""}} {
    115115        global macports::registry.format
    116116
  • branches/variant-descs-14482/base/src/registry2.0/portimage.tcl

    r37509 r42567  
    4444# Port Images are basically just installations of the destroot of a port into
    4545# ${macports::registry.path}/software/${name}/${version}_${revision}${variants}
    46 # They allow the user to instal multiple versions of the same port, treating
     46# They allow the user to install multiple versions of the same port, treating
    4747# each revision and each different combination of variants as a "version".
    4848#
  • branches/variant-descs-14482/base/tests/Makefile

    r37509 r42567  
    11include ../Mk/macports.autoconf.mk
    22
    3 TESTS?=checksums-1 cvs-and-patchsites envvariables site-tags trace universal universal-2 xcodeversion dependencies-c case-insensitive-deactivate
     3TESTS?=checksums-1 cvs-and-patchsites envvariables site-tags trace universal universal-2 xcodeversion dependencies-c dependencies-d dependencies-e case-insensitive-deactivate variants
    44
    55PWD=$(shell pwd)
  • branches/variant-descs-14482/base/tests/test/checksums-1/master

    r19376 r42567  
    33--->  Extracting checksum
    44--->  Configuring checksum
    5 --->  Building checksum with target all
     5--->  Building checksum
    66--->  Testing checksum
  • branches/variant-descs-14482/base/tests/test/cvs-and-patchsites/master

    r23553 r42567  
    44--->  Extracting cvs-and-patchsites
    55--->  Configuring cvs-and-patchsites
    6 --->  Building cvs-and-patchsites with target all
     6--->  Building cvs-and-patchsites
    77--->  Testing cvs-and-patchsites
  • branches/variant-descs-14482/base/tests/test/dependencies-c/master

    r37509 r42567  
    33--->  Extracting dependencies-b
    44--->  Configuring dependencies-b
    5 --->  Building dependencies-b with target all
     5--->  Building dependencies-b
    66--->  Staging dependencies-b into destroot
    77--->  Installing dependencies-b @1_0
     
    1212--->  Extracting dependencies-a
    1313--->  Configuring dependencies-a
    14 --->  Building dependencies-a with target all
     14--->  Building dependencies-a
    1515--->  Staging dependencies-a into destroot
    1616--->  Installing dependencies-a @1_0+i_want_b
     
    2121--->  Extracting dependencies-c
    2222--->  Configuring dependencies-c
    23 --->  Building dependencies-c with target all
     23--->  Building dependencies-c
    2424--->  Testing dependencies-c
  • branches/variant-descs-14482/base/tests/test/envvariables/master

    r19376 r42567  
    33--->  Extracting envvariables
    44--->  Configuring envvariables
    5 --->  Building envvariables with target all
     5--->  Building envvariables
    66--->  Testing envvariables
    77A
  • branches/variant-descs-14482/base/tests/test/site-tags/master

    r19376 r42567  
    11--->  Fetching site-tags
     2--->  Attempting to fetch app-bm.tar.gz from http://distfiles.macports.org/site-tags
    23--->  Attempting to fetch app-bm.tar.gz from http://www.douglas.stebila.ca/code/vim/app/
     4--->  Attempting to fetch doc.tar.gz from http://distfiles.macports.org/site-tags
    35--->  Attempting to fetch doc.tar.gz from http://www.douglas.stebila.ca/code/vim/doc/
    46--->  Verifying checksum(s) for site-tags
    57--->  Extracting site-tags
    68--->  Configuring site-tags
    7 --->  Building site-tags with target all
     9--->  Building site-tags
    810--->  Testing site-tags
  • branches/variant-descs-14482/base/tests/test/trace/master

    r19376 r42567  
    33--->  Extracting trace
    44--->  Configuring trace
    5 --->  Building trace with target all
     5--->  Building trace
    66--->  Testing trace
    77Warning: A creation/deletion/modification was attempted outside sandbox: PWD/create-trace
  • branches/variant-descs-14482/base/tests/test/xcodeversion/master

    r19376 r42567  
    33--->  Extracting xcodeversion
    44--->  Configuring xcodeversion
    5 --->  Building xcodeversion with target all
     5--->  Building xcodeversion
    66--->  Testing xcodeversion
    77xcodeversion = 2.1
Note: See TracChangeset for help on using the changeset viewer.