[42567] branches/variant-descs-14482/base
blb at macports.org
blb at macports.org
Mon Nov 24 01:14:56 PST 2008
Revision: 42567
http://trac.macports.org/changeset/42567
Author: blb at macports.org
Date: 2008-11-24 01:14:55 -0800 (Mon, 24 Nov 2008)
Log 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 at macports.org | 2008-10-20 16:56:28 -0600 (Mon, 20 Oct 2008) | 2 lines
make tclobjc package conditional
........
r41016 | afb at macports.org | 2008-10-20 16:57:00 -0600 (Mon, 20 Oct 2008) | 2 lines
regenerate configure
........
r41030 | afb at macports.org | 2008-10-21 01:27:26 -0600 (Tue, 21 Oct 2008) | 2 lines
update changelog for r41015
........
r41056 | raimue at macports.org | 2008-10-21 08:35:03 -0600 (Tue, 21 Oct 2008) | 3 lines
port/port.tcl:
Remove empty TODO tag
........
r41068 | blb at macports.org | 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 at macports.org | 2008-10-22 17:03:00 -0600 (Wed, 22 Oct 2008) | 2 lines
mirror_sites.tcl: add definition for gimp mirror site.
........
r41123 | jmr at macports.org | 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 at macports.org | 2008-10-26 06:56:11 -0600 (Sun, 26 Oct 2008) | 2 lines
Apply global variants for all targets (#11897)
........
r41166 | blb at macports.org | 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 at macports.org | 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 at macports.org | 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 at macports.org | 2008-10-26 19:48:47 -0600 (Sun, 26 Oct 2008) | 2 lines
Set svn:eol-style to native on tcl files.
........
r41175 | ryandesign at macports.org | 2008-10-26 19:49:23 -0600 (Sun, 26 Oct 2008) | 2 lines
Set svn:keywords to Id on tcl files
........
r41249 | pguyot at kallisys.net | 2008-10-29 03:17:40 -0600 (Wed, 29 Oct 2008) | 2 lines
Add support for +universal variants with the xcode portgroup
........
r41379 | jmr at macports.org | 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 at macports.org | 2008-11-01 04:20:52 -0600 (Sat, 01 Nov 2008) | 2 lines
make sure to expand default prefix (from NONE)
........
r41389 | afb at macports.org | 2008-11-01 04:21:17 -0600 (Sat, 01 Nov 2008) | 2 lines
regenerate configure
........
r41396 | raimue at macports.org | 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 at macports.org | 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 at macports.org | 2008-11-03 23:37:10 -0700 (Mon, 03 Nov 2008) | 2 lines
set CURLOPT_MAXREDIRS to 50 to avoid infinite redirection
........
r41479 | jmr at macports.org | 2008-11-03 23:49:20 -0700 (Mon, 03 Nov 2008) | 2 lines
Add new Norwegian distfiles mirror.
........
r41511 | blb at macports.org | 2008-11-04 19:50:05 -0700 (Tue, 04 Nov 2008) | 2 lines
lint command - add --nitpick option; ticket #14799
........
r41512 | blb at macports.org | 2008-11-04 20:18:28 -0700 (Tue, 04 Nov 2008) | 2 lines
port.1 - document --nitpick option added in r41511
........
r41522 | pguyot at kallisys.net | 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 at kallisys.net | 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 at kallisys.net | 2008-11-05 06:41:54 -0700 (Wed, 05 Nov 2008) | 2 lines
Include the forgotten test
........
r41525 | pguyot at kallisys.net | 2008-11-05 06:42:13 -0700 (Wed, 05 Nov 2008) | 2 lines
Partial fix for test trace
........
r41526 | pguyot at kallisys.net | 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 at kallisys.net | 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 at macports.org | 2008-11-05 15:21:41 -0700 (Wed, 05 Nov 2008) | 2 lines
port.1: --nitpick also checks patchfile names
........
r41573 | ryandesign at macports.org | 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 at macports.org | 2008-11-06 03:50:06 -0700 (Thu, 06 Nov 2008) | 2 lines
ChangeLog: Add note for issue #17098
........
r41575 | ryandesign at macports.org | 2008-11-06 03:52:18 -0700 (Thu, 06 Nov 2008) | 2 lines
ChangeLog: Remove trailing whitespace.
........
r41595 | blb at macports.org | 2008-11-06 13:43:18 -0700 (Thu, 06 Nov 2008) | 2 lines
ChangeLog - note port lint improvements from #14799
........
r41603 | blb at macports.org | 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 at macports.org | 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 at macports.org | 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 at macports.org | 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 at macports.org | 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 at macports.org | 2008-11-08 02:33:01 -0700 (Sat, 08 Nov 2008) | 2 lines
use clearenv(3) where available
........
r41655 | toby at macports.org | 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 at macports.org | 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 at macports.org | 2008-11-09 02:28:13 -0700 (Sun, 09 Nov 2008) | 2 lines
ChangeLog: update for issue #16234 (atomic PortIndex regeneration)
........
r41742 | raimue at macports.org | 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 at macports.org | 2008-11-10 19:43:25 -0700 (Mon, 10 Nov 2008) | 2 lines
make setrlimit stop complaining
........
r41850 | ryandesign at macports.org | 2008-11-11 01:44:01 -0700 (Tue, 11 Nov 2008) | 2 lines
portimage.tcl: fix typo in comment
........
r41854 | ryandesign at macports.org | 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 at macports.org | 2008-11-11 02:27:17 -0700 (Tue, 11 Nov 2008) | 2 lines
receipt_flat.tcl: fix typo in error message
........
r41907 | ryandesign at macports.org | 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 at macports.org | 2008-11-12 16:59:39 -0700 (Wed, 12 Nov 2008) | 2 lines
ChangeLog: add note for ticket #16740
........
r42055 | blb at macports.org | 2008-11-14 00:12:06 -0700 (Fri, 14 Nov 2008) | 2 lines
ChangeLog - note change from ticket #12288
........
r42061 | toby at macports.org | 2008-11-14 01:54:14 -0700 (Fri, 14 Nov 2008) | 2 lines
leak fix
........
r42134 | blb at macports.org | 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 at macports.org | 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.
........
Modified Paths:
--------------
branches/variant-descs-14482/base/ChangeLog
branches/variant-descs-14482/base/aclocal.m4
branches/variant-descs-14482/base/configure
branches/variant-descs-14482/base/configure.ac
branches/variant-descs-14482/base/doc/macports.conf.in
branches/variant-descs-14482/base/doc/port.1
branches/variant-descs-14482/base/doc/portgroup.7
branches/variant-descs-14482/base/doc/sources.conf
branches/variant-descs-14482/base/m4/foundation.m4
branches/variant-descs-14482/base/portmgr/dmg/preflight
branches/variant-descs-14482/base/src/Makefile.in
branches/variant-descs-14482/base/src/config.h.in
branches/variant-descs-14482/base/src/pextlib1.0/Pextlib.c
branches/variant-descs-14482/base/src/pextlib1.0/curl.c
branches/variant-descs-14482/base/src/pextlib1.0/tests/curl.tcl
branches/variant-descs-14482/base/src/pextlib1.0/tests/unsetenv.tcl
branches/variant-descs-14482/base/src/pextlib1.0/tracelib.c
branches/variant-descs-14482/base/src/port/port.tcl
branches/variant-descs-14482/base/src/port/portindex.tcl
branches/variant-descs-14482/base/src/port1.0/portdepends.tcl
branches/variant-descs-14482/base/src/port1.0/portdistfiles.tcl
branches/variant-descs-14482/base/src/port1.0/portlint.tcl
branches/variant-descs-14482/base/src/port1.0/portlivecheck.tcl
branches/variant-descs-14482/base/src/port1.0/portload.tcl
branches/variant-descs-14482/base/src/port1.0/portunload.tcl
branches/variant-descs-14482/base/src/port1.0/portutil.tcl
branches/variant-descs-14482/base/src/port1.0/resources/fetch/mirror_sites.tcl
branches/variant-descs-14482/base/src/port1.0/resources/group/perl5-1.0.tcl
branches/variant-descs-14482/base/src/port1.0/resources/group/xcode-1.0.tcl
branches/variant-descs-14482/base/src/registry1.0/portimage.tcl
branches/variant-descs-14482/base/src/registry1.0/receipt_flat.tcl
branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl
branches/variant-descs-14482/base/src/registry1.0/registry.tcl
branches/variant-descs-14482/base/src/registry2.0/portimage.tcl
branches/variant-descs-14482/base/tests/Makefile
branches/variant-descs-14482/base/tests/test/checksums-1/master
branches/variant-descs-14482/base/tests/test/cvs-and-patchsites/master
branches/variant-descs-14482/base/tests/test/dependencies-c/master
branches/variant-descs-14482/base/tests/test/envvariables/master
branches/variant-descs-14482/base/tests/test/site-tags/master
branches/variant-descs-14482/base/tests/test/trace/master
branches/variant-descs-14482/base/tests/test/xcodeversion/master
Added Paths:
-----------
branches/variant-descs-14482/base/tests/test/dependencies-d/
branches/variant-descs-14482/base/tests/test/dependencies-d/Portfile
branches/variant-descs-14482/base/tests/test/dependencies-d/master
branches/variant-descs-14482/base/tests/test/dependencies-e/
branches/variant-descs-14482/base/tests/test/dependencies-e/Portfile
branches/variant-descs-14482/base/tests/test/dependencies-e/master
branches/variant-descs-14482/base/tests/test/variants/
branches/variant-descs-14482/base/tests/test/variants/Portfile
branches/variant-descs-14482/base/tests/test/variants/master
Removed Paths:
-------------
branches/variant-descs-14482/base/tests/test/dependencies-d/Portfile
branches/variant-descs-14482/base/tests/test/dependencies-d/master
branches/variant-descs-14482/base/tests/test/dependencies-e/Portfile
branches/variant-descs-14482/base/tests/test/dependencies-e/master
branches/variant-descs-14482/base/tests/test/variants/Portfile
branches/variant-descs-14482/base/tests/test/variants/master
Property Changed:
----------------
branches/variant-descs-14482/base/
branches/variant-descs-14482/base/setupenv.bash.in
branches/variant-descs-14482/base/src/port1.0/portdistfiles.tcl
branches/variant-descs-14482/base/src/port1.0/portlint.tcl
branches/variant-descs-14482/base/src/port1.0/portload.tcl
branches/variant-descs-14482/base/src/port1.0/portunload.tcl
Property changes on: branches/variant-descs-14482/base
___________________________________________________________________
Modified: svnmerge-integrated
- /trunk/base:1-40952
+ /trunk/base:1-42566
Modified: svn:mergeinfo
- /trunk/base:38101-40952
+ /trunk/base:38101-40952,41015-42484
Modified: branches/variant-descs-14482/base/ChangeLog
===================================================================
--- branches/variant-descs-14482/base/ChangeLog 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/ChangeLog 2008-11-24 09:14:55 UTC (rev 42567)
@@ -4,18 +4,37 @@
###
-Unreleased:
+Release 1.7.0 (unreleased):
+ - Improve error message when "upgrade outdated" is used (#12288)
+
+ - Properly handle ports whose version evaluates to 0 (#16740, ryandesign)
+
+ - PortIndex is now regenerated atomically (#16234, blb & ryandesign)
+
+ - Improve upon 'port lint' usage by not being too overbearing unless
+ --nitpick is used (#14799)
+
+ - Fix reinplace when the filename contains spaces (#17098, ryandesign)
+
+ - Fix python port group issues (#15226)
+
+ - Make sure global variants (from variants.conf) are applied to all
+ phases (#11897)
+
+ - Allow configuring --without-objc-runtime --without-objc-foundation,
+ for building on platforms without Foundation like +puredarwin (r41015)
+
- Changes in loading of configuration files. Currently the global
configuration file is loaded first, then user defined one (if present),
PORTSRC environment variable is loaded last. Last defined value is used
for each configuration option. (#16329, contributed by Adam Byrtek)
- Ruby port group now accepts a new (optional) last parameter for the
- ruby.setup command, "implementation". It is "ruby" by default, and
+ ruby.setup command, "implementation". It is "ruby" by default, and
can be set to "ruby19". It names the ruby-implementing port, and can
- possibly support still other rubys in the future. (#15912, febeling
+ possibly support still other rubys in the future. (#15912, febeling
in 38683)
-
+
- Don't use build.nice for complex build.cmd commands (#16091)
- The buildmakejobs setting now also affects ports using the scons build
@@ -26,7 +45,7 @@
manner. This fixes a bug where giving the name with incorrect case when
deactivating/uninstalling would cause all the port's files to be left
behind. (#11759, jmr/raimue in r37349, 37621)
-
+
- The non-verbose output for the build phase no longer shows what target
was used. This makes the build phase consistent with the other phases
which also do not show details. If details are desired, the debug or
@@ -138,9 +157,6 @@
- Add 'merge' function for merging multiple (single arch) destroots into one (universal)
destroot (mww in r31954).
-
-Release 1.6.1 (unreleased):
-
- If checksum is mismatched, and in verbose mode, present a corrected pre-fabricated checksum statement
to make it easy to update a port (jberry in r32441).
@@ -206,7 +222,7 @@
- New SourceForge.jp mirrors list (r30484).
- - Display warnings when using old versions of Mac OS X and Xcode Tools
+ - Display warnings when using old versions of Mac OS X and Xcode Tools
(#12794, afb in r30338 & r30477)
- Remove configure.macosx_deployment_target, add global macosx_deployment_target
@@ -351,7 +367,7 @@
lappend (in fact lpush is just lappend) and do what they sound like.
Also add ldindex. Works like lindex, but deletes the element from the list.
Documented in portfile.7 (eridius r26034).
-
+
- Add global methods try and throw. Implemented based on the specification
in TIP #89. Documented in portfile.7 (eridius r25979).
@@ -398,7 +414,7 @@
This allows information about variants to be displayed (eg. dependencies).
Also allow `port info` to default to current directory if no name is provided
(eridius r25255).
-
+
- Add -E flag to reinplace, does the same thing as in sed (eridius r25251).
- Add support for [nosync] flag in sources.conf to prevent a source from syncing
@@ -429,34 +445,34 @@
the incorrect behaviour of delete seen in #11862 (eridius r25003).
- Remove bundled xar. (jberry r24913).
-
+
- Tighten checking of port name in depspecs. neither + nor / is allowed.
(jberry r24929, r24934, r24940).
-
+
- Restore ability for portindex lines to contain carriage returns, allowing
fields such as descriptions to contain line breaks. Note that any portindex
containing such entries will not be readable by a recent version of macports.
(jberry r25146)
-
+
- Add support for descriptions on variants:
* The syntax follows the syntax for variant depends, etc.
* Descriptions for variants are entirely optional
* The change to the portindex format to allow variant descriptions
should be backwards compatible. Variant descriptions are stored,
keyed by the variant name, in a new portinfo array named "variant_desc".
-
+
Example:
variant myvariant description "This variant does this and that" {
configure.args-append --do-this --do-that
}
-
+
(jberry r25147)
-
+
- Only look for, or create, ~/.macports user directory if the HOME environment
variable is defined. (jberry r25177)
-
+
Release 1.4.40 (7-May-2007, tagged at r24909 by jberry):
- Note the bump in version naming. To leave ourselves lots of room in our versioning
@@ -494,7 +510,7 @@
- Fixed a potential crasher in fs-traverse when showing error message
(ticket #11827, eridius r24396, thanks sfiera).
-
+
- Fixed a bug where livecheck failed on ports that do not define a homepage
(ticket #11818, pguyot r24319).
@@ -506,24 +522,24 @@
- Trace mode now take dependencies into account when executing the activate
phase. This fixes an unwanted warning when activating ports that depend
on teTeX (pguyot r24199).
-
+
- Support for mpwa submit through "port submit".
This work is in progress. (jberry)
- Expose autoconf XAR variable as portutil::autoconf::xar_path. (r24194).
- Start to build portpkg.xar and meta data, hijacking Kevin's
portsubmit.tcl. (r24195-24196).
-
+
- Revise error messages in port image activation to use syntax that
matches port(1). (jberry r24543, r24548).
- Create new interp variable prefix_frozen, which is available to port phases
even when the Portfile redefines prefix. (jberry r24848-r24849)
-
+
- Search for prefix-relative commands in prefix_frozen rather than prefix.
Affects port submit (xar) and port fetch (svn). (jberry r24849)
- Always create a ~/.macports user directory if it doesn't yet exist. (jberry r24831)
-
+
- Move port(1) readline history file to ~/.macports/history (jberry r24832, r24843)
Release 1.4.3 (17-Apr-2007):
@@ -531,7 +547,7 @@
- Fix bug in launchd support, introduced in 1.4.2. Remove remnants of
launchd enable flag which caused reversion to systemstarter in 1.4.2.
(jberry r24151).
-
+
- add functions 'backup' and 'lipo' along with some description
to be used for lipo-based universal variants, tested with openssl.
These functions should be considered test only for the time being,
@@ -559,14 +575,14 @@
- Improvements on livecheck: fixed a report bug, improved ruby group
default behavior (pguyot in r24026 and r24018)
-
+
- Remove xar from the build. xar doesn't build on panther due to
a libxml2 lib too old for xar requirements. We'll find another
way to deal with xar, perhaps by requiring users to install the
xar port when they need its services. (jberry r24107:r24108)
-
+
- Remove configure switch for building launchd support. (jberry r24107:r24108)
-
+
- Remove compatibility upgrade for conf files from
darwinports 1.1 to 1.2. (jberry r24106).
@@ -705,13 +721,13 @@
- Changed Makefile logic to reconfigure/regenerate files when templates
are modified. (pguyot)
-
+
- Trace now forbids renaming files and directories as well as removing
directories outside the sandbox. (pguyot)
- Allow additional inserted libraries by keeping DYLD_INSERT_LIBRARIES
variable. (pguyot)
-
+
- Change some UI strings and documentation to read MacPorts, rather than
DarwinPorts. The project is adopting the new name "MacPorts", and will
be using the macports.org domain in the future.
@@ -729,7 +745,7 @@
- Fixed a bug, introduced in 1.3, that prevented -f selfupdate from forcing
a build of the fetched sources. (jberry)
-
+
- Fixed a bug, introduced in 1.3, that prevented -u uninstall from working.
(jberry)
@@ -737,22 +753,22 @@
with global variables in port base code. (pguyot)
- Added a new test case for a cvs+remote patch file bug. (pguyot)
-
+
- Added ruby gems support for ruby group. (rcavanaugh & pguyot)
- Trace now forbids creation of directories outside the sandbox. (pguyot)
-
+
- Additions to man page for port(1): (jberry)
* new port options -F, -i, -x, -p
* mention interactive and batch modes
* document extensions to info command.
-
+
- Archive mode is now disabled by default. (landonf)
- The upgrade target now properly detects and uses a matching binary
archive if found, an uninstall && install combination needed up till
now to pick it up. (jmpp)
-
+
Release 1.3 (27-Jul-2006):
- Fixed a bug where only the first word of configuration settings (in
@@ -766,47 +782,47 @@
mode. (Bugzilla 7719, 7721) (dluke & jberry)
- Fixed several problems with iteration on ports. (jberry)
-
+
- Fixed a bug where curl LDFLAGS weren't properly propagated. (landonf)
-
+
- Fixed a bug where location update routine invoked when installing DP did
not take the DESTDIR variable into account. (jmpp)
- Fixed a bug where patchfiles specifications could not have suffixes to
indicate the master site. (pguyot)
-
+
- Fixed spelling in port(1) man page. (Bugzilla 8103) (pjenvey & jberry)
-
+
- Fixed a typo and another problem in messages generated by port command.
(Bugzilla 6706 & 6712) (deric & jmpp)
-
+
- Fixed a typo in ports.conf. (matt & jmpp)
-
+
- Fixed several problems with launchd support (Bugzilla 8372 & 10041)
(jberry)
- Fixed a bug preventing the use of libmd for checksums and added an
informative compilation error if libcrypto and libmd cannot be found.
(landonf)
-
+
- Fixed a bug where thread2.6 Tcl library wasn't installed where DP is
installed. (jmpp)
- Fixed a bug in xcode PortGroup which prevented the use of a custom
project path. (pguyot)
-
+
- Fixed a bug in xcode PortGroup which made destroot to fail when there
were spaces in the install path. (pguyot)
- Fixed a bug in portfetch.tcl which failed to fetch patches when using
CVS or SVN. (Bugzilla 5269) (yeled)
-
+
- Added new command 'delete' for use in Portfiles instead of
'file delete' and 'system "rm.."' (mww)
- Added more information to porthier(7) about ${prefix}/var/db/dports.
(olegb)
-
+
- Updated Gnome, KDE and SourceForge mirror lists. (Bugzilla 8045, 9152)
(rwhood, blb, olegb & pguyot)
@@ -818,7 +834,7 @@
and defined the default for perl5 group. (pguyot)
- Discover path to rsync at autoconf time. (jberry)
-
+
- Mark CVS, TAR, GNUTAR, and RSYNC as additional precious variables that can
be overridden in configure environment at time of configure to customize
the location of these tools. Note that these tools are not found in the dp
@@ -828,7 +844,7 @@
- Set timeouts for curl transfers. Some connections to sketchy mirror sites
can hang forever otherwise. (jkh)
-
+
- Shortened the time to upgrade with archive mode on by using archive as the
target. (Bugzilla #7891) (dluke & jberry)
@@ -845,59 +861,59 @@
overwritten.
- Added new native commands to handle privileges chores. (jberry)
-
+
- Add batch/interactive mode. In interactive mode, use readline when it's available.
Command and portname completion is available in interactive mode, as is readline
history. (jberry) 2005-11-07,08
-
+
* Add new option -F <filename> which specifies a command file to be
read and processed. Multiple such options may be given to provide
multiple command files. If filename is "-", then stdin is read.
-
+
* Option -i is equivilant to -F -, which forces processing of standard
input following any commands given as arguments.
-
+
* If port is invoked as portf, an -F is assumed as an implicit first
argument (so the real first argument is taken as a command file to
be processed). This should allow the use of a shebang line such as:
#!/usr/bin/env portf
-
+
* Commands starting with # are treated as comments.
-
+
* Install a symbolic link /opt/local/bin/portf --> /opt/local/bin/port.
-
+
* New command "cd" is useful to change to a new directory/port while in
interactive/batch mode.
-
+
* Multiple commands on a single line may be separated by a ';'
-
+
* Global command options may now be specified following a particular
command; they will apply only to that command rather than to all
command invocations. This is important for batch/interactive mode.
-
+
- Add new option -p, which ignores errors while processing within a command.
(this subsumes some of the work that -f was previously overloaded to do).
(jberry).
-
+
- Add new option -x, which exits immediately on errors while in batch mode (
otherwise we don't exit on errors in batch mode). (jberry)
-
+
- Refactoring of port(1) to cast actions into distinct action procs. Adds
the new action_array which is used for action dispatch, and also to generate
the list of possible commands for help and command completion. (jberry)
-
+
- Initial version of portmirror binary to build a mirror of distfiles.
(pguyot)
- Improvements and fixes to the tests. (pguyot)
-
+
- Added a new option (checksum.skip=yes) to bypass the checksum phase. This
option is mostly useful on the command line to test older distfiles.
(jberry)
- Added dependencies for rpm on virtual packages representing releases of
MacOS X. (mww)
-
+
- Add to port the ability to query for specific meta-data fields.
For instance: port info --maintainer --name category:java
When specific fields are given, the legacy generalized info is not presented, and vis-versa.
@@ -909,7 +925,7 @@
those: (such as allowing category instead of categories).
Fields which are actually lists (such as depends_lib) are displayed comma-separated.
(jberry) 2006-02-16
-
+
Release 1.2.1 (10-Apr-2006):
- Changes to darwinports build infrastructure to allow for build of
@@ -919,7 +935,7 @@
fat, configure as follows:
./configure CFLAGS='-arch ppc -arch i386' SHLIB_LDFLAGS='-arch ppc -arch i386'
backported from HEAD (jberry)
-
+
- Add a hack in order attempt to detect when a sourceforge mirror
is actually returning an error page. If this is detected, proceed
to the next mirror. backported from HEAD (jberry)
@@ -938,15 +954,15 @@
- Enhance port command such that targets that require a port to be
specified will now all default to a port in current directory. (jberry)
-
+
- Enhance port command to allow multiple ports per invocation.
- Where previously one said "port install porta; port install portb",
+ Where previously one said "port install porta; port install portb",
one can now say "port install porta portb". (jberry)
-
+
- Enhance port command to allow use of shell-like glob patterns for
port selection. When a glob pattern is found, the group of ports
matching the glob pattern is substituted. (jberry)
-
+
- Enhance port command to allow use of "pseudo" portnames to specify
groups of ports.
When one of these pseudo portnames is specified on the command line,
@@ -954,7 +970,7 @@
Currently defined pseudo portnames are:
current, all, installed, uninstalled, active, inactive, outdated.
-
+
Additional pseudo portnames can be used to select ports based on a
regex pattern match against certain criteria. Each port selector is
a name, followed by a colon, followed by the desired regex pattern.
@@ -962,23 +978,23 @@
variants:, variant:, description:, portdir:, homepage:, epoch:,
platforms:, platform:, name:, long_description:, maintainers:, maintainer:,
categories:, category:, version:, and revision: (jberry)
-
+
- Enhance port command to allow use of set expressions to combine
ports or groups of ports.
Supported operators are "and", "or", "not", "!", "(", ")". (jberry)
-
+
- Enhance port command to allow a port to be specified through a file:
url instead of via portname. This function was previously available
though the -D and -u options, which make less sense now that multiple
ports can be specified to a target. (jberry)
-
+
- Under Tiger, startupitems are now by default generated for launchd
rather than systemstarter. (jberry)
-
+
- Add new startupitem keys startupitem.executable, startupitem.logfile,
startupitem.logevents, startupitem.pidfile, supported for both
systemstarter and launchd. (jberry)
-
+
- New Test framework. Running make test from base/tests/ will test
several features of port(1) including syntax of Portfiles. New tests
can easily be added by simply creating new directories in base/tests/
@@ -1013,7 +1029,7 @@
that have taken place since 1.1 ("bunch of developers ;-);
- Snazzy new ChangeLog file
-
+
- Add new actions for port(1): help (get help about port),
echo (the expanded arguments),
cat (the contents of the Portfiles from the specified ports),
@@ -1021,7 +1037,7 @@
dir (emit path to the port's directory),
file (emit path to the port's Portfile)
(jberry)
-
+
- On make install, upgrade ports.conf and sources.conf to change rsync.opendarwin.org
to rsync.darwinports.org. This is now our preferred rsync hostname.
Likewise, rename the rsync destination directories in ${prefix}/var/db/dports/sources
@@ -1031,7 +1047,7 @@
Release 1.1:
(information not here).
-
+
Release 1.0:
-
+
(information not here).
Modified: branches/variant-descs-14482/base/aclocal.m4
===================================================================
--- branches/variant-descs-14482/base/aclocal.m4 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/aclocal.m4 2008-11-24 09:14:55 UTC (rev 42567)
@@ -364,6 +364,10 @@
AC_ARG_WITH(applications-dir,[AC_HELP_STRING([--with-applications-dir], [Applications installation directory.])], MPAPPLICATIONSDIR=${withval})
+ oldprefix=$prefix
+ if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+ fi
AC_MSG_CHECKING([for Applications installation directory])
if test "x$MPAPPLICATIONSDIR" = "x" ; then
@@ -376,6 +380,7 @@
AC_MSG_RESULT([$MPAPPLICATIONSDIR])
AC_SUBST(MPAPPLICATIONSDIR)
+ prefix=$oldprefix
])
# MP_PATH_FRAMEWORKS
@@ -385,6 +390,10 @@
AC_ARG_WITH(frameworks-dir,[AC_HELP_STRING([--with-frameworks-dir], [Frameworks installation directory.])], MPFRAMEWORKSDIR=${withval})
+ oldprefix=$prefix
+ if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+ fi
AC_MSG_CHECKING([for Frameworks installation directory])
if test "x$MPFRAMEWORKSDIR" = "x" ; then
@@ -393,6 +402,7 @@
AC_MSG_RESULT([$MPFRAMEWORKSDIR])
AC_SUBST(MPFRAMEWORKSDIR)
+ prefix=$oldprefix
])
Modified: branches/variant-descs-14482/base/configure
===================================================================
--- branches/variant-descs-14482/base/configure 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/configure 2008-11-24 09:14:55 UTC (rev 42567)
@@ -773,6 +773,7 @@
SHLIB_SUFFIX
TCL_DEFS
TCL_CC
+CONDITIONAL_PACKAGES
OUR_INCLUDED_PACKAGES
prefix_expanded
MPCONFIGDIR_EXPANDED
@@ -4464,6 +4465,9 @@
+# Determine if we want to install conditional packages
+CONDITIONAL_PACKAGES=
+
# Foundation checks
@@ -5495,6 +5499,8 @@
;;
apple)
;;
+ no)
+ ;;
*)
{ { echo "$as_me:$LINENO: error: ${with_objc_runtime} is not a valid argument to --with-objc-runtime. Please specify either \"GNU\" or \"apple\"" >&5
echo "$as_me: error: ${with_objc_runtime} is not a valid argument to --with-objc-runtime. Please specify either \"GNU\" or \"apple\"" >&2;}
@@ -5510,6 +5516,8 @@
ac_compiler_gnu=$ac_cv_objc_compiler_gnu
+ if test x"${with_objc_runtime}" != x"no"; then
+
# Check for common header, objc/objc.h
for ac_header in objc/objc.h
@@ -5974,6 +5982,8 @@
mp_cv_objc_runtime_gnu="no"
fi
+ fi
+
# Apple runtime is prefered
if test x"${mp_cv_objc_runtime_apple}" = x"yes"; then
OBJC_RUNTIME="APPLE_RUNTIME"
@@ -5995,6 +6005,10 @@
#define GNU_RUNTIME 1
_ACEOF
+ elif test x"${with_objc_runtime}" = x"no"; then
+ OBJC_RUNTIME="none"
+ { echo "$as_me:$LINENO: Not using Objective-C runtime" >&5
+echo "$as_me: Not using Objective-C runtime" >&6;}
else
{ { echo "$as_me:$LINENO: error: Could not locate a working Objective-C runtime.
See \`config.log' for more details." >&5
@@ -6039,6 +6053,8 @@
;;
apple)
;;
+ no)
+ ;;
*)
{ { echo "$as_me:$LINENO: error: ${with_objc_foundation} is not a valid argument to --with-objc-foundation. Please specify either \"GNU\" or \"apple\"" >&5
echo "$as_me: error: ${with_objc_foundation} is not a valid argument to --with-objc-foundation. Please specify either \"GNU\" or \"apple\"" >&2;}
@@ -6054,6 +6070,8 @@
ac_compiler_gnu=$ac_cv_objc_compiler_gnu
+ if test x"${with_objc_foundation}" != x"no"; then
+
if test x"${with_objc_foundation}" == x || test x"${with_objc_foundation}" == x"apple"; then
# '[' = '['
# ']' = ']'
@@ -6251,6 +6269,8 @@
ac_cv_objc_foundation_gnustep="no"
fi
+ fi
+
# NeXT Foundation is prefered
if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
OBJC_FOUNDATION="Apple"
@@ -6276,6 +6296,10 @@
{ echo "$as_me:$LINENO: Using GNUstep Foundation library" >&5
echo "$as_me: Using GNUstep Foundation library" >&6;}
+ elif test x"${with_objc_foundation}" = x"no"; then
+ OBJC_FOUNDATION="none"
+ { echo "$as_me:$LINENO: Not using Foundation implementation" >&5
+echo "$as_me: Not using Foundation implementation" >&6;}
else
{ { echo "$as_me:$LINENO: error: Could not find a working Foundation implementation" >&5
echo "$as_me: error: Could not find a working Foundation implementation" >&2;}
@@ -6295,7 +6319,12 @@
+# tclobjc requires objc (runtime and foundation) support
+if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
+ CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
+fi
+
FRAMEWORK_LIBS="-framework CoreFoundation"
{ echo "$as_me:$LINENO: checking for CoreFoundation framework" >&5
@@ -6819,6 +6848,10 @@
fi
+ oldprefix=$prefix
+ if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+ fi
{ echo "$as_me:$LINENO: checking for Applications installation directory" >&5
echo $ECHO_N "checking for Applications installation directory... $ECHO_C" >&6; }
@@ -6833,6 +6866,7 @@
{ echo "$as_me:$LINENO: result: $MPAPPLICATIONSDIR" >&5
echo "${ECHO_T}$MPAPPLICATIONSDIR" >&6; }
+ prefix=$oldprefix
@@ -6844,6 +6878,10 @@
fi
+ oldprefix=$prefix
+ if test "x$prefix" = "xNONE" ; then
+ prefix=$ac_default_prefix
+ fi
{ echo "$as_me:$LINENO: checking for Frameworks installation directory" >&5
echo $ECHO_N "checking for Frameworks installation directory... $ECHO_C" >&6; }
@@ -6854,6 +6892,7 @@
{ echo "$as_me:$LINENO: result: $MPFRAMEWORKSDIR" >&5
echo "${ECHO_T}$MPFRAMEWORKSDIR" >&6; }
+ prefix=$oldprefix
# Check for universal options
@@ -8791,7 +8830,8 @@
-for ac_func in bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile
+
+for ac_func in bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv
do
as_ac_var=`echo "ac_cv_func_$ac_func" | $as_tr_sh`
{ echo "$as_me:$LINENO: checking for $ac_func" >&5
@@ -12354,6 +12394,7 @@
+
# misc variables that need to be expanded for substitution into tcl
oldprefix=$prefix
@@ -13211,6 +13252,7 @@
SHLIB_SUFFIX!$SHLIB_SUFFIX$ac_delim
TCL_DEFS!$TCL_DEFS$ac_delim
TCL_CC!$TCL_CC$ac_delim
+CONDITIONAL_PACKAGES!$CONDITIONAL_PACKAGES$ac_delim
OUR_INCLUDED_PACKAGES!$OUR_INCLUDED_PACKAGES$ac_delim
prefix_expanded!$prefix_expanded$ac_delim
MPCONFIGDIR_EXPANDED!$MPCONFIGDIR_EXPANDED$ac_delim
@@ -13219,7 +13261,7 @@
LTLIBOBJS!$LTLIBOBJS$ac_delim
_ACEOF
- if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 66; then
+ if test `sed -n "s/.*$ac_delim\$/X/p" conf$$subs.sed | grep -c X` = 67; then
break
elif $ac_last_try; then
{ { echo "$as_me:$LINENO: error: could not make $CONFIG_STATUS" >&5
Modified: branches/variant-descs-14482/base/configure.ac
===================================================================
--- branches/variant-descs-14482/base/configure.ac 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/configure.ac 2008-11-24 09:14:55 UTC (rev 42567)
@@ -115,11 +115,19 @@
MP_COMPILER_ATTRIBUTE_UNUSED
MP_COMPILER_ATTRIBUTE_LF_PRIVATE
+# Determine if we want to install conditional packages
+CONDITIONAL_PACKAGES=
+
# Foundation checks
ACX_PTHREAD
MP_OBJC_RUNTIME
MP_OBJC_FOUNDATION
+# tclobjc requires objc (runtime and foundation) support
+if test x$OBJC_RUNTIME != xnone -a x$OBJC_FOUNDATION != xnone; then
+ CONDITIONAL_PACKAGES="tclobjc1.0 $CONDITIONAL_PACKAGES"
+fi
+
MP_PROG_DAEMONDO
#MP_PROG_XAR
@@ -160,7 +168,7 @@
AC_FUNC_CLOSEDIR_VOID
AC_FUNC_FORK
AC_FUNC_STRERROR_R
-AC_CHECK_FUNCS([bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile])
+AC_CHECK_FUNCS([bzero memset dup2 regcomp strdup strerror strtol fgetln lockf flock setmode strcasecmp strncasecmp strlcpy copyfile clearenv])
MP_CHECK_READLINK_IS_P1003_1A
AC_ARG_WITH(x11-prefix, [AC_HELP_STRING([--with-x11-prefix=PREFIX], [use PREFIX as the X11 base dir (default autodetect)])], [ x11prefix="$withval" ] )
@@ -368,6 +376,7 @@
AC_SUBST(TCL_DEFS)
AC_SUBST(TCL_STUB_LIB_SPEC)
AC_SUBST(TCL_CC)
+AC_SUBST(CONDITIONAL_PACKAGES)
AC_SUBST(OUR_INCLUDED_PACKAGES)
# misc variables that need to be expanded for substitution into tcl
Modified: branches/variant-descs-14482/base/doc/macports.conf.in
===================================================================
--- branches/variant-descs-14482/base/doc/macports.conf.in 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/doc/macports.conf.in 2008-11-24 09:14:55 UTC (rev 42567)
@@ -70,7 +70,12 @@
# Set whether to automatically execute "clean" after "install" of ports
portautoclean yes
-# Rsync server to fetch MacPorts sources from
+# Rsync server to fetch MacPorts sources from. Note that this is only used
+# for selfupdate. The source(s) for the ports tree are set in sources.conf.
+# Known mirrors at time of writing (see http://trac.macports.org/wiki/Mirrors
+# for the current list):
+# rsync.macports.org - California, USA (master)
+# trd.no.rsync.macports.org - Trondheim, Norway
rsync_server rsync.macports.org
# Rsync directory from which to pull the base/ component (infrastructure) of MacPorts
Modified: branches/variant-descs-14482/base/doc/port.1
===================================================================
--- branches/variant-descs-14482/base/doc/port.1 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/doc/port.1 2008-11-24 09:14:55 UTC (rev 42567)
@@ -290,13 +290,13 @@
To uninstall all installed but inactive ports, use
.Fl u .
To recursively uninstall all dependents of this port, use
-.Fl -recursive .
+.Fl -follow-dependents .
.Pp
For example:
.Pp
.Dl "port uninstall vim"
.Dl "port -u uninstall"
-.Dl "port uninstall --recursive python24"
+.Dl "port uninstall --follow-dependents python24"
.Ss activate
Activate the installed
.Ar portname .
@@ -480,6 +480,8 @@
.Ss lint
Verifies Portfile for
.Ar portname .
+To nitpick about whitespace and patchfile names, use
+.Fl -nitpick .
.Ss archive
Archive the port for a later
.Ar unarchive .
Modified: branches/variant-descs-14482/base/doc/portgroup.7
===================================================================
--- branches/variant-descs-14482/base/doc/portgroup.7 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/doc/portgroup.7 2008-11-24 09:14:55 UTC (rev 42567)
@@ -135,6 +135,7 @@
.br
.Sy Example:
.Dl xcode.destroot.type framework
+.br
.It Ic xcode.destroot.path
Where to install the build product.
.br
@@ -157,6 +158,26 @@
.Bd -literal -offset indent -compact
xcode.destroot.settings SKIP_INSTALL=NO
.Ed
+.It Ic xcode.universal.settings
+Settings passed to the xcode build tool when the +universal variant is selected. These settings should be in the X=Y form.
+.br
+.Sy Type:
+.Em optional
+.br
+.Sy Default:
+.Bd -literal -offset indent -compact
+ARCHS="${universal_archs}" MACOSX_DEPLOYMENT_TARGET=${universal_target}
+.Ed
+.It Ic xcode.universal.sdk
+SDK 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.
+.br
+.Sy Type:
+.Em optional
+.br
+.Sy Default:
+.Bd -literal -offset indent -compact
+${universal_sysroot}
+.Ed
.El
.Sh STANDARD PORTFILE VARIABLES AFFECTING XCODE PORTGROUP
The following standard Portfile variables actually affect
Modified: branches/variant-descs-14482/base/doc/sources.conf
===================================================================
--- branches/variant-descs-14482/base/doc/sources.conf 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/doc/sources.conf 2008-11-24 09:14:55 UTC (rev 42567)
@@ -19,6 +19,9 @@
# So keep "file://" URLs above other URL types.
-# To get the ports tree from the MacPorts rsync.macports.org server use:
-# rsync://rsync.macports.org/release/ports/
+# To get the ports tree from the master MacPorts server in California, USA use:
+# rsync://rsync.macports.org/release/ports/
+# To get it from the mirror in Trondheim, Norway use:
+# rsync://trd.no.rsync.macports.org/release/ports/
+# A current list of mirrors is available at http://trac.macports.org/wiki/Mirrors
rsync://rsync.macports.org/release/ports/ [default]
Modified: branches/variant-descs-14482/base/m4/foundation.m4
===================================================================
--- branches/variant-descs-14482/base/m4/foundation.m4 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/m4/foundation.m4 2008-11-24 09:14:55 UTC (rev 42567)
@@ -87,6 +87,8 @@
;;
apple)
;;
+ no)
+ ;;
*)
AC_MSG_ERROR([${with_objc_runtime} is not a valid argument to --with-objc-runtime. Please specify either "GNU" or "apple"])
;;
@@ -95,6 +97,8 @@
AC_LANG_PUSH([Objective C])
+ if test x"${with_objc_runtime}" != x"no"; then
+
# Check for common header, objc/objc.h
AC_CHECK_HEADERS([objc/objc.h], ,[AC_MSG_ERROR([Can't locate Objective C runtime headers])])
@@ -222,6 +226,8 @@
mp_cv_objc_runtime_gnu="no"
fi
+ fi
+
# Apple runtime is prefered
if test x"${mp_cv_objc_runtime_apple}" = x"yes"; then
OBJC_RUNTIME="APPLE_RUNTIME"
@@ -233,6 +239,9 @@
OBJC_RUNTIME_FLAGS="-fgnu-runtime"
AC_MSG_NOTICE([Using GNU Objective-C runtime])
AC_DEFINE([GNU_RUNTIME], 1, [Define if using the GNU Objective-C runtime and compiler.])
+ elif test x"${with_objc_runtime}" = x"no"; then
+ OBJC_RUNTIME="none"
+ AC_MSG_NOTICE([Not using Objective-C runtime])
else
AC_MSG_FAILURE([Could not locate a working Objective-C runtime.])
fi
@@ -293,6 +302,8 @@
;;
apple)
;;
+ no)
+ ;;
*)
AC_MSG_ERROR([${with_objc_foundation} is not a valid argument to --with-objc-foundation. Please specify either "GNU" or "apple"])
;;
@@ -301,6 +312,8 @@
AC_LANG_PUSH([Objective C])
+ if test x"${with_objc_foundation}" != x"no"; then
+
if test x"${with_objc_foundation}" == x || test x"${with_objc_foundation}" == x"apple"; then
# '@<:@' = '['
# '@:>@' = ']'
@@ -397,6 +410,8 @@
ac_cv_objc_foundation_gnustep="no"
fi
+ fi
+
# NeXT Foundation is prefered
if test x"${ac_cv_objc_foundation_apple}" == x"yes"; then
OBJC_FOUNDATION="Apple"
@@ -412,6 +427,9 @@
OBJC_FOUNDATION_LDFLAGS="${GNUSTEP_LDFLAGS}"
AC_DEFINE([GNUSTEP_FOUNDATION], 1, [Define if using the GNUstep Foundation library])
AC_MSG_NOTICE([Using GNUstep Foundation library])
+ elif test x"${with_objc_foundation}" = x"no"; then
+ OBJC_FOUNDATION="none"
+ AC_MSG_NOTICE([Not using Foundation implementation])
else
AC_MSG_ERROR([Could not find a working Foundation implementation])
fi
Modified: branches/variant-descs-14482/base/portmgr/dmg/preflight
===================================================================
--- branches/variant-descs-14482/base/portmgr/dmg/preflight 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/portmgr/dmg/preflight 2008-11-24 09:14:55 UTC (rev 42567)
@@ -44,7 +44,7 @@
[ ! -d /Library/Tcl/darwinports1.0 ] || rm -rf /Library/Tcl/darwinports1.0
-[ ! -d /opt/local/share/darwinports ] || rm -rf /opt/local/darwinports
+[ ! -d /opt/local/share/darwinports ] || rm -rf /opt/local/share/darwinports
[ ! -f /opt/local/etc/ports/dp_version ] || rm -vf /opt/local/etc/ports/dp_version
Property changes on: branches/variant-descs-14482/base/setupenv.bash.in
___________________________________________________________________
Modified: svn:mergeinfo
-
+ /trunk/base/setupenv.bash.in:41015-42484
Modified: branches/variant-descs-14482/base/src/Makefile.in
===================================================================
--- branches/variant-descs-14482/base/src/Makefile.in 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/Makefile.in 2008-11-24 09:14:55 UTC (rev 42567)
@@ -7,7 +7,7 @@
registry1.0 \
registry2.0 \
darwintracelib1.0 \
- tclobjc1.0
+ @CONDITIONAL_PACKAGES@
SUBDIR= ${TCLPKG} @PATHCONF@ port programs
all::
Modified: branches/variant-descs-14482/base/src/config.h.in
===================================================================
--- branches/variant-descs-14482/base/src/config.h.in 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/config.h.in 2008-11-24 09:14:55 UTC (rev 42567)
@@ -18,6 +18,9 @@
/* Define to 1 if you have the `bzero' function. */
#undef HAVE_BZERO
+/* Define to 1 if you have the `clearenv' function. */
+#undef HAVE_CLEARENV
+
/* Define to 1 if you have the `copyfile' function. */
#undef HAVE_COPYFILE
Modified: branches/variant-descs-14482/base/src/pextlib1.0/Pextlib.c
===================================================================
--- branches/variant-descs-14482/base/src/pextlib1.0/Pextlib.c 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/pextlib1.0/Pextlib.c 2008-11-24 09:14:55 UTC (rev 42567)
@@ -220,17 +220,16 @@
pid_t pid;
Tcl_Obj *errbuf;
Tcl_Obj *tcl_result;
+ int read_failed, status;
- if (objc != 2 && objc != 3) {
- Tcl_WrongNumArgs(interp, 1, objv, "command");
- return TCL_ERROR;
- }
-
- if (objc == 3) {
+ /* usage: system [-notty] command */
+ if (objc == 2) {
+ cmdstring = Tcl_GetString(objv[1]);
+ } else if (objc == 3) {
char *arg = Tcl_GetString(objv[1]);
cmdstring = Tcl_GetString(objv[2]);
- if (!strcmp(arg, "-notty")) {
+ if (strcmp(arg, "-notty") == 0) {
osetsid = 1;
} else {
tcl_result = Tcl_NewStringObj("bad option ", -1);
@@ -239,21 +238,26 @@
return TCL_ERROR;
}
} else {
- cmdstring = Tcl_GetString(objv[1]);
+ Tcl_WrongNumArgs(interp, 1, objv, "command");
+ return TCL_ERROR;
}
- if (pipe(fdset) == -1)
- return TCL_ERROR;
-
/*
* Fork a child to run the command, in a popen() like fashion -
* popen() itself is not used because stderr is also desired.
*/
+ if (pipe(fdset) != 0) {
+ return TCL_ERROR;
+ }
+
pid = fork();
- if (pid == -1)
+ switch (pid) {
+ case -1: /* error */
return TCL_ERROR;
- if (pid == 0) {
+ break;
+ case 0: /* child */
close(fdset[0]);
+
if ((nullfd = open(_PATH_DEVNULL, O_RDONLY)) == -1)
_exit(1);
dup2(nullfd, STDIN_FILENO);
@@ -271,13 +275,18 @@
args[3] = NULL;
execve("/bin/sh", args, environ);
_exit(1);
+ break;
+ default: /* parent */
+ break;
}
+
close(fdset[1]);
- pdes = fdopen(fdset[0], "r");
/* read from simulated popen() pipe */
+ read_failed = 0;
pos = 0;
bzero(circbuf, sizeof(circbuf));
+ pdes = fdopen(fdset[0], "r");
while ((buf = fgetln(pdes, &linelen)) != NULL) {
char *sbuf;
int slen;
@@ -298,11 +307,8 @@
}
if (sbuf == NULL) {
- for (fline = pos; pos < fline + CBUFSIZ; pos++) {
- if (circbuf[pos % CBUFSIZ].len != 0)
- free(circbuf[pos % CBUFSIZ].line);
- }
- return TCL_ERROR;
+ read_failed = 1;
+ break;
}
memcpy(sbuf, buf, linelen);
@@ -312,25 +318,24 @@
circbuf[pos].line = sbuf;
circbuf[pos].len = slen;
- if (pos++ == CBUFSIZ - 1)
+ if (pos++ == CBUFSIZ - 1) {
pos = 0;
- ret = ui_info(interp, sbuf);
- if (ret != TCL_OK) {
- for (fline = pos; pos < fline + CBUFSIZ; pos++) {
- if (circbuf[pos % CBUFSIZ].len != 0)
- free(circbuf[pos % CBUFSIZ].line);
- }
- return ret;
}
+
+ if (ui_info(interp, sbuf) != TCL_OK) {
+ read_failed = 1;
+ break;
+ }
}
fclose(pdes);
- if (wait(&ret) != pid)
- return TCL_ERROR;
- if (WIFEXITED(ret)) {
- if (WEXITSTATUS(ret) == 0)
- return TCL_OK;
- else {
+ status = TCL_ERROR;
+
+ if (wait(&ret) == pid && WIFEXITED(ret) && !read_failed) {
+ /* Normal exit, and reading from the pipe didn't fail. */
+ if (WEXITSTATUS(ret) == 0) {
+ status = TCL_OK;
+ } else {
/* Copy the contents of the circular buffer to errbuf */
Tcl_Obj* errorCode;
errbuf = Tcl_NewStringObj(NULL, 0);
@@ -344,7 +349,6 @@
/* Re-add previously stripped newline */
Tcl_AppendToObj(errbuf, "\n", 1);
- free(circbuf[pos % CBUFSIZ].line);
}
/* set errorCode [list CHILDSTATUS <pid> <code>] */
@@ -362,10 +366,18 @@
Tcl_AppendToObj(tcl_result, "\nCommand output: ", -1);
Tcl_AppendObjToObj(tcl_result, errbuf);
Tcl_SetObjResult(interp, tcl_result);
- return TCL_ERROR;
}
- } else
- return TCL_ERROR;
+ }
+
+ /* Cleanup. */
+ close(fdset[0]);
+ for (fline = 0; fline < CBUFSIZ; fline++) {
+ if (circbuf[fline].len != 0) {
+ free(circbuf[fline].line);
+ }
+ }
+
+ return status;
}
int SudoCmd(ClientData clientData UNUSED, Tcl_Interp *interp, int objc, Tcl_Obj *CONST objv[])
@@ -1003,6 +1015,7 @@
}
newmode = getmode(set, 0);
+ free(set);
oldmode = umask(newmode);
@@ -1132,6 +1145,10 @@
char **envp;
char *equals;
size_t len;
+ Tcl_Obj *tclList;
+ int listLength;
+ Tcl_Obj **listArray;
+ int loopCounter;
if (objc != 2) {
Tcl_WrongNumArgs(interp, 1, objv, "name");
@@ -1145,23 +1162,39 @@
}
if (strcmp(name, "*") == 0) {
+#ifndef HAVE_CLEARENV
+ /* unset all current environment variables; it'd be best to use
+ clearenv() but that is not yet standardized, instead use Tcl's
+ list capability to easily build an array of strings for each
+ env name, then loop through that list to unsetenv() each one */
+ tclList = Tcl_NewListObj( 0, NULL );
+ Tcl_IncrRefCount( tclList );
/* unset all current environment variables */
for (envp = environ; *envp != NULL; envp++) {
equals = strchr(*envp, '=');
if (equals != NULL) {
len = equals - *envp;
- name = malloc(len+1);
- if (name != NULL) {
- memcpy(name, *envp, len);
- name[len] = '\0';
- (void) unsetenv(name);
- free(name);
- }
+ Tcl_ListObjAppendElement(interp, tclList, Tcl_NewStringObj(*envp, len));
}
}
+ Tcl_ListObjGetElements(interp, tclList, &listLength, &listArray);
+ for (loopCounter = 0; loopCounter < listLength; loopCounter++) {
+ unsetenv(Tcl_GetString(listArray[loopCounter]));
+ }
+ Tcl_DecrRefCount( tclList );
+#else
+ clearenv();
+#endif
} else {
(void) unsetenv(name);
}
+ /* Tcl appears to become out of sync with the environment when we
+ unset things, eg, 'info exists env(CC)' will succeed where
+ 'puts $env(CC)' will fail since it doesn't actually exist after
+ being unset here. This forces Tcl to resync to the current state
+ (don't care about the actual result, so reset it) */
+ Tcl_Eval(interp, "array get env");
+ Tcl_ResetResult(interp);
return TCL_OK;
}
Modified: branches/variant-descs-14482/base/src/pextlib1.0/curl.c
===================================================================
--- branches/variant-descs-14482/base/src/pextlib1.0/curl.c 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/pextlib1.0/curl.c 2008-11-24 09:14:55 UTC (rev 42567)
@@ -269,6 +269,13 @@
break;
}
+ /* --max-redirs option, same default as curl command line */
+ theCurlCode = curl_easy_setopt(theHandle, CURLOPT_MAXREDIRS, 50);
+ if (theCurlCode != CURLE_OK) {
+ theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
+ break;
+ }
+
/* -f option */
theCurlCode = curl_easy_setopt(theHandle, CURLOPT_FAILONERROR, 1);
if (theCurlCode != CURLE_OK) {
@@ -519,6 +526,13 @@
break;
}
+ /* --max-redirs option, same default as curl command line */
+ theCurlCode = curl_easy_setopt(theHandle, CURLOPT_MAXREDIRS, 50);
+ if (theCurlCode != CURLE_OK) {
+ theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
+ break;
+ }
+
/* -f option */
theCurlCode = curl_easy_setopt(theHandle, CURLOPT_FAILONERROR, 1);
if (theCurlCode != CURLE_OK) {
@@ -692,6 +706,13 @@
break;
}
+ /* --max-redirs option, same default as curl command line */
+ theCurlCode = curl_easy_setopt(theHandle, CURLOPT_MAXREDIRS, 50);
+ if (theCurlCode != CURLE_OK) {
+ theResult = SetResultFromCurlErrorCode(interp, theCurlCode);
+ break;
+ }
+
/* -f option */
theCurlCode = curl_easy_setopt(theHandle, CURLOPT_FAILONERROR, 1);
if (theCurlCode != CURLE_OK) {
Modified: branches/variant-descs-14482/base/src/pextlib1.0/tests/curl.tcl
===================================================================
--- branches/variant-descs-14482/base/src/pextlib1.0/tests/curl.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/pextlib1.0/tests/curl.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -28,8 +28,8 @@
test {[md5 file $tempfile] == "a4b0f4a5fbd8bec23002ad8023e01729"}
# use -u
- 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
- test {[md5 file $tempfile] == "d2a71e320fbaa7a0fd950a27c7e4b099"}
+ curl fetch -u "I accept www.opensource.org/licenses/cpl:." http://www.research.att.com/~gsf/download/tgz/sfio.2005-02-01.tgz $tempfile
+ test {[md5 file $tempfile] == "48f45c7c77c23ab0ccca48c22b3870de"}
file delete -force $tempfile
}
Modified: branches/variant-descs-14482/base/src/pextlib1.0/tests/unsetenv.tcl
===================================================================
--- branches/variant-descs-14482/base/src/pextlib1.0/tests/unsetenv.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/pextlib1.0/tests/unsetenv.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -3,15 +3,20 @@
proc main {pextlibname} {
load $pextlibname
-
+
global env
puts [array get env]
-
+
array unset env *
puts [array get env]
-
+ if {[array size env] > 0} {
+ puts "note: your TclUnsetEnv is broken... (need to use unsetenv too)"
+ }
unsetenv *
puts [array get env]
+ if {[array size env] > 0} {
+ error "env not empty as expected"
+ }
set env(CC) "gcc"
@@ -22,7 +27,7 @@
}
unsetenv CC
if {[info exists env(CC)]} {
- exit 1
+ error "CC still set in env"
}
}
Modified: branches/variant-descs-14482/base/src/pextlib1.0/tracelib.c
===================================================================
--- branches/variant-descs-14482/base/src/pextlib1.0/tracelib.c 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/pextlib1.0/tracelib.c 2008-11-24 09:14:55 UTC (rev 42567)
@@ -44,6 +44,7 @@
#include <stdarg.h>
#include <errno.h>
#include <pthread.h>
+#include <limits.h>
#include "tracelib.h"
static char * name;
@@ -364,6 +365,10 @@
interp=in;
rl.rlim_cur=rl.rlim_max=RLIM_INFINITY;
+#if defined(__APPLE__) && defined(OPEN_MAX)
+ if (OPEN_MAX < rl.rlim_cur)
+ rl.rlim_cur = OPEN_MAX;
+#endif
if(setrlimit(RLIMIT_NOFILE, &rl)==-1)
{
ui_warn("setrlimit failed (%d)", errno);
Modified: branches/variant-descs-14482/base/src/port/port.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port/port.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port/port.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -34,10 +34,6 @@
# ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE
# POSSIBILITY OF SUCH DAMAGE.
-#
-# TODO:
-#
-
catch {source \
[file join "@TCL_PACKAGE_DIR@" macports1.0 macports_fastload.tcl]}
package require macports
@@ -493,6 +489,20 @@
return [join $lines "\n"]
}
+##
+# Wraps a line at a specified width with a label in front
+#
+# @see wrap
+#
+# @param label label for output
+# @param string input string
+# @param maxlen text width (0 defaults to current terminal width)
+# @return wrapped string
+proc wraplabel {label string maxlen {indent ""}} {
+ append label ": [string repeat " " [expr [string length $indent] - [string length "$label: "]]]"
+ return "$label[wrap $string $maxlen $indent 0]"
+}
+
proc unobscure_maintainers { list } {
set result {}
foreach m $list {
@@ -1480,8 +1490,7 @@
append vars "$joiner$mod$v"
set joiner ", "
}
- puts -nonewline "Variants: "
- puts [wrap $vars 0 [string repeat " " 13] 0]
+ puts [wraplabel "Variants" $vars 0 [string repeat " " 13]]
}
puts ""
if {[info exists portinfo(long_description)]} {
@@ -1492,34 +1501,38 @@
}
}
if {[info exists portinfo(homepage)]} {
- puts "Homepage: $portinfo(homepage)"
+ puts [wraplabel "Homepage" $portinfo(homepage) 0 [string repeat " " 13]]
}
puts ""
# Emit build, library, and runtime dependencies
+ # For wrapping, indent output at 22 chars
+ set label_len 22
foreach {key title} {
depends_build "Build Dependencies"
depends_lib "Library Dependencies"
depends_run "Runtime Dependencies"
} {
if {[info exists portinfo($key)]} {
- puts -nonewline "$title: "
+ set depstr ""
set joiner ""
foreach d $portinfo($key) {
if {[macports::ui_isset ports_verbose]} {
- puts -nonewline "$joiner$d"
+ append depstr "$joiner$d"
} else {
- puts -nonewline "$joiner[lindex [split $d :] end]"
+ append depstr "$joiner[lindex [split $d :] end]"
}
set joiner ", "
}
set nodeps false
- puts ""
+ puts [wraplabel $title $depstr 0 [string repeat " " $label_len]]
}
}
- if {[info exists portinfo(platforms)]} { puts "Platforms: [join $portinfo(platforms) ", "]"}
+ if {[info exists portinfo(platforms)]} {
+ puts [wraplabel "Platforms" [join $portinfo(platforms) ", "] 0 [string repeat " " $label_len]]
+ }
if {[info exists portinfo(maintainers)]} {
- puts "Maintainers: [unobscure_maintainers $portinfo(maintainers)]"
+ puts [wraplabel "Maintainers" [unobscure_maintainers $portinfo(maintainers)] 0 [string repeat " " $label_len]]
}
}
set separator "--\n"
@@ -2458,13 +2471,11 @@
set porturl $portinfo(porturl)
}
- # If this is the install target, add any global_variations to the variations
+ # Add any global_variations to the variations
# specified for the port
- if { $target == "install" } {
- foreach { variation value } [array get global_variations] {
- if { ![info exists variations($variation)] } {
- set variations($variation) $value
- }
+ foreach { variation value } [array get global_variations] {
+ if { ![info exists variations($variation)] } {
+ set variations($variation) $value
}
}
@@ -2686,6 +2697,7 @@
variants {index}
clean {all archive dist work}
mirror {new}
+ lint {nitpick}
}
##
Modified: branches/variant-descs-14482/base/src/port/portindex.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port/portindex.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port/portindex.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -136,9 +136,11 @@
}
puts "Creating software index in $outdir"
-set fd [open [file join $outdir PortIndex] w]
+set tempportindex [mktemp "/tmp/mports.portindex.XXXXXXXX"]
+set fd [open $tempportindex w]
mporttraverse pindex $directory
close $fd
+file rename -force $tempportindex [file join $outdir PortIndex]
puts "\nTotal number of ports parsed:\t$stats(total)\
\nPorts successfully parsed:\t[expr $stats(total) - $stats(failed)]\t\
\nPorts failed:\t\t\t$stats(failed)\n"
Modified: branches/variant-descs-14482/base/src/port1.0/portdepends.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portdepends.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/portdepends.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -34,7 +34,7 @@
package require portutil 1.0
# define options
-options depends_build depends_run depends_lib
+options depends_build depends_run depends_lib depends
# Export options via PortInfo
options_export depends_build depends_lib depends_run
@@ -42,17 +42,27 @@
option_proc depends_run validate_depends_options
option_proc depends_lib validate_depends_options
+# New option for the new dependency. We generate a warning because we don't handle this yet.
+option_proc depends validate_depends_options_new
+
+set_ui_prefix
+
proc validate_depends_options {option action {value ""}} {
global targets
switch $action {
set {
foreach depspec $value {
+ # port syntax accepts colon-separated junk that we do not understand yet.
switch -regex $depspec {
^(lib|bin|path):([-A-Za-z0-9_/.${}^?+()|\\\\]+):([-._A-Za-z0-9]+)$ {}
- ^(port):([-._A-Za-z0-9]+)$ {}
+ ^(port)(:.+)?:([-._A-Za-z0-9]+)$ {}
default { return -code error [format [msgcat::mc "invalid depspec: %s"] $depspec] }
}
}
}
}
}
+
+proc validate_depends_options_new {option action {value ""}} {
+ ui_warn [msgcat::mc "depends option is not handled yet"]
+}
Modified: branches/variant-descs-14482/base/src/port1.0/portdistfiles.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portdistfiles.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/portdistfiles.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,6 +1,6 @@
# -*- 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
# portdistfiles.tcl
-# $Id: portdistfiles.tcl $
+# $Id$
#
# Copyright (c) 2008 MacPorts Project
# All rights reserved.
Property changes on: branches/variant-descs-14482/base/src/port1.0/portdistfiles.tcl
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: branches/variant-descs-14482/base/src/port1.0/portlint.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portlint.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/portlint.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,6 +1,6 @@
# et:ts=4
# portlint.tcl
-# $Id: portlint.tcl $
+# $Id$
package provide portlint 1.0
package require portutil 1.0
@@ -146,7 +146,7 @@
}
proc lint_main {args} {
- global UI_PREFIX portname portpath porturl
+ global UI_PREFIX portname portpath porturl ports_lint_nitpick
set portfile ${portpath}/Portfile
set portdirs [split ${portpath} /]
set last [llength $portdirs]
@@ -160,6 +160,12 @@
###################################################################
ui_debug "$portfile"
+
+ if {[info exists ports_lint_nitpick] && $ports_lint_nitpick eq "yes"} {
+ set nitpick true
+ } else {
+ set nitpick false
+ }
set topline_number 1
set require_blank false
@@ -177,11 +183,13 @@
while {1} {
set line [gets $f]
if {[eof $f]} {
- seek $f -1 end
- set last [read $f 1]
- if {![string match "\n" $last]} {
- ui_warn "Line $lineno has missing newline (at end of file)"
- incr warnings
+ if {$nitpick} {
+ seek $f -1 end
+ set last [read $f 1]
+ if {![string match "\n" $last]} {
+ ui_warn "Line $lineno has missing newline (at end of file)"
+ incr warnings
+ }
}
close $f
break
@@ -198,13 +206,13 @@
set require_blank false
}
- if {$require_blank && ($line != "")} {
+ if {$nitpick && $require_blank && ($line != "")} {
ui_warn "Line $lineno should be a newline (after $require_after)"
incr warnings
}
set require_blank false
- if {[regexp {\S[ \t]+$} $line]} {
+ if {$nitpick && [regexp {\S[ \t]+$} $line]} {
# allow indented blank lines between blocks of code and such
ui_warn "Line $lineno has trailing whitespace before newline"
incr warnings
@@ -487,7 +495,7 @@
ui_info "OK: Portfile directory matches port name"
}
- if {[info exists patchfiles]} {
+ if {$nitpick && [info exists patchfiles]} {
foreach patchfile $patchfiles {
if {![string match "patch-*.diff" $patchfile] && [file exists "$portpath/files/$patchfile"]} {
ui_warn "Patchfile $patchfile does not follow the source patch naming policy \"patch-*.diff\""
Property changes on: branches/variant-descs-14482/base/src/port1.0/portlint.tcl
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: branches/variant-descs-14482/base/src/port1.0/portlivecheck.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portlivecheck.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/portlivecheck.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -56,6 +56,7 @@
proc livecheck_main {args} {
global livecheck.url livecheck.check livecheck.md5 livecheck.regex livecheck.name livecheck.distname livecheck.version
+ global fetch.user fetch.password fetch.use_epsv fetch.ignore_sslcert
global homepage portname portpath workpath
global master_sites name distfiles
@@ -105,6 +106,19 @@
set livecheck.name $name
}
+ # Copied over from portfetch in parts
+ set fetch_options {}
+ if {[string length ${fetch.user}] || [string length ${fetch.password}]} {
+ lappend fetch_options -u
+ lappend fetch_options "${fetch.user}:${fetch.password}"
+ }
+ if {${fetch.use_epsv} != "yes"} {
+ lappend fetch_options "--disable-epsv"
+ }
+ if {${fetch.ignore_sslcert} != "no"} {
+ lappend fetch_options "--ignore-ssl-cert"
+ }
+
# Perform the check depending on the type.
switch ${livecheck.check} {
"freshmeat" {
@@ -162,7 +176,7 @@
"regexm" {
# single and multiline regex
ui_debug "Fetching ${livecheck.url}"
- if {[catch {curl fetch ${livecheck.url} $tempfile} error]} {
+ if {[catch {eval curl fetch $fetch_options {${livecheck.url}} $tempfile} error]} {
ui_error "cannot check if $portname was updated ($error)"
set updated -1
} else {
@@ -211,7 +225,7 @@
}
"md5" {
ui_debug "Fetching ${livecheck.url}"
- if {[catch {curl fetch ${livecheck.url} $tempfile} error]} {
+ if {[catch {eval curl fetch $fetch_options {${livecheck.url}} $tempfile} error]} {
ui_error "cannot check if $portname was updated ($error)"
set updated -1
} else {
Modified: branches/variant-descs-14482/base/src/port1.0/portload.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portload.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/portload.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,6 +1,6 @@
# et:ts=4
# portsubmit.tcl
-# $Id: portsubmit.tcl 26177 2007-06-15 10:11:22Z jmpp at macports.org $
+# $Id$
#
# Copyright (c) 2007 MacPorts Project
# Copyright (c) 2007 James D. Berry
Property changes on: branches/variant-descs-14482/base/src/port1.0/portload.tcl
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: branches/variant-descs-14482/base/src/port1.0/portunload.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portunload.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/portunload.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,6 +1,6 @@
# et:ts=4
# portsubmit.tcl
-# $Id: portsubmit.tcl 26177 2007-06-15 10:11:22Z jmpp at macports.org $
+# $Id$
#
# Copyright (c) 2007 MacPorts Project
# Copyright (c) 2007 James D. Berry
Property changes on: branches/variant-descs-14482/base/src/port1.0/portunload.tcl
___________________________________________________________________
Added: svn:keywords
+ Id
Added: svn:eol-style
+ native
Modified: branches/variant-descs-14482/base/src/port1.0/portutil.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portutil.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/portutil.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -799,7 +799,7 @@
# Extract the Tcl Channel number
set tmpfd [lindex $tmpfile 0]
# Set tmpfile to only the file name
- set tmpfile [lindex $tmpfile 1]
+ set tmpfile [join [lrange $tmpfile 1 end]]
}
set cmdline $portutil::autoconf::sed_command
@@ -1714,7 +1714,8 @@
} elseif {[exists use_xmkmf] && [option use_xmkmf]} {
ui_debug "using xmkmf, so not adding the default universal variant"
return no
- } elseif {[exists use_configure] && ![option use_configure]} {
+ } elseif {[exists use_configure] && ![option use_configure] && ![exists xcode.universal.settings]} {
+ # Allow +universal if port uses xcode portgroup.
ui_debug "not using configure, so not adding the default universal variant"
return no
} elseif {![exists os.universal_supported] || ![option os.universal_supported]} {
Modified: branches/variant-descs-14482/base/src/port1.0/resources/fetch/mirror_sites.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/resources/fetch/mirror_sites.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/resources/fetch/mirror_sites.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -67,6 +67,25 @@
ftp://ftp.FreeBSD.org/pub/FreeBSD/ports/local-distfiles/:nosubdir
}
+set portfetch::mirror_sites::sites(gimp) {
+ ftp://ftp.gimp.org/pub/
+ ftp://ftp.gtk.org/pub/
+ http://ftp.gtk.org/pub/
+ http://gimp.mirrors.hoobly.com/
+ ftp://gd.tuwien.ac.at/graphics/gimp/
+ http://ftp.iut-bm.univ-fcomte.fr/gimp/
+ http://gimp.krecio.pl/
+ ftp://ftp.gwdg.de/pub/misc/grafik/gimp/
+ http://ftp.gwdg.de/pub/misc/grafik/gimp/
+ ftp://ftp.esat.net/mirrors/ftp.gimp.org/pub/
+ http://ftp.esat.net/mirrors/ftp.gimp.org/pub/
+ ftp://ftp.u-aizu.ac.jp/pub/graphics/tools/gimp/
+ ftp://ftp.snt.utwente.nl/pub/software/gimp/
+ http://ftp.snt.utwente.nl/pub/software/gimp/
+ ftp://ftp.sai.msu.su/pub/unix/graphics/gimp/mirror/
+ ftp://ftp.acc.umu.se/pub/gimp/
+}
+
set portfetch::mirror_sites::sites(gnome) {
ftp://ftp.cse.buffalo.edu/pub/Gnome/
http://www.gtlib.cc.gatech.edu/pub/gnome/
@@ -105,7 +124,6 @@
http://mirror.pacific.net.au/pub1/gnu/gnu/
http://mirror.aarnet.edu.au/pub/GNU/
ftp://ftp.unicamp.br/pub/gnu/
- http://gnu.glug-nith.org/
ftp://ftp.gnu.org/gnu/
http://ftp.gnu.org/gnu/
ftp://ftp.gnu.org/old-gnu/
@@ -181,6 +199,7 @@
set portfetch::mirror_sites::sites(macports_distfiles) {
http://distfiles.macports.org/:mirror
+ http://trd.no.distfiles.macports.org/:mirror
}
set portfetch::mirror_sites::sites(openbsd) {
@@ -215,7 +234,7 @@
ftp://ftp.auckland.ac.nz/pub/perl/CPAN/modules/by-module/
ftp://ftp.cs.colorado.edu/pub/perl/CPAN/modules/by-module/
ftp://cpan.pop-mg.com.br/pub/CPAN/modules/by-module/
- ftp://ftp.is.co.za/programming/perl/CPAN/modules/by-module/
+ ftp://ftp.is.co.za/programming/perl/modules/by-module/
ftp://ftp.chg.ru/pub/lang/perl/CPAN/modules/by-module/
http://mirror.internode.on.net/pub/cpan/modules/by-module/
http://cpan.mirrors.ilisys.com.au/modules/by-module/
@@ -272,7 +291,6 @@
http://surfnet.dl.sourceforge.net/
http://switch.dl.sourceforge.net/
http://nchc.dl.sourceforge.net/
- http://jaist.dl.sourceforge.net/
http://internode.dl.sourceforge.net/
http://transact.dl.sourceforge.net/
http://optusnet.dl.sourceforge.net/
Modified: branches/variant-descs-14482/base/src/port1.0/resources/group/perl5-1.0.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/resources/group/perl5-1.0.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/resources/group/perl5-1.0.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -85,7 +85,7 @@
distname ${perl5.module}-${vers}
dist_subdir perl5
- depends_lib path:${perl5.bin}:perl5.8
+ depends_lib path:[string range ${perl5.bin} [string length ${prefix}/] end]:perl5
configure.cmd ${perl5.bin}
configure.pre_args Makefile.PL
Modified: branches/variant-descs-14482/base/src/port1.0/resources/group/xcode-1.0.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/resources/group/xcode-1.0.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/port1.0/resources/group/xcode-1.0.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -53,18 +53,24 @@
#
# build and destroot parameters use the following parameters:
# PortGroup specific parameters:
-# xcode.project name (or path relative to build.dir) of the xcode
-# project. Default is "" meaning let xcodebuild figure it
-# out.
-# xcode.configuration xcode buildstyle/configuration. Default is Deployment.
-# xcode.target if present, overrides build.target and destroot.target
-# xcode.build.settings additional settings passed to $xcodebuildcmd (in
-# the X=Y form)
-# xcode.destroot.type install type (application or framework). Default is
-# application. This setting overrides xcode.destroot.path.
-# xcode.destroot.path install path (INSTALL_PATH setting value).
-# xcode.destroot.settings additional settings passed to $xcodebuildcmd (in
-# the X=Y form)
+# xcode.project name (or path relative to build.dir) of the xcode
+# project. Default is "" meaning let xcodebuild figure it
+# out.
+# xcode.configuration xcode buildstyle/configuration. Default is Deployment.
+# xcode.target if present, overrides build.target and destroot.target
+# xcode.build.settings additional settings passed to $xcodebuildcmd (in
+# the X=Y form)
+# xcode.destroot.type install type (application or framework). Default is
+# application. This setting overrides xcode.destroot.path.
+# xcode.destroot.path install path (INSTALL_PATH setting value).
+# xcode.destroot.settings additional settings passed to $xcodebuildcmd (in
+# the X=Y form)
+# xcode.universal.settings settings passed to $xcodebuildcmd when the +universal
+# variant is selected. Defaults to ARCHS="${universal_archs}"
+# MACOSX_DEPLOYMENT_TARGET=${universal_target}.
+# xcode.universal.sdk sdk to use when the +universal variant is selected.
+# Defaults to ${universal_sysroot}. If set to the empty
+# list, no sdk option will be passed to xcodebuild.
#
# Usual parameters:
# destroot where to destroot the project.
@@ -113,6 +119,11 @@
options xcode.destroot.settings
default xcode.destroot.settings ""
+options xcode.universal.settings
+default xcode.universal.settings {ARCHS=\"${universal_archs}\"\ MACOSX_DEPLOYMENT_TARGET=${universal_target}}
+options xcode.universal.sdk
+default xcode.universal.sdk {${universal_sysroot}}
+
namespace eval xcode {}
# Some utility functions.
@@ -257,6 +268,13 @@
set xcode_configuration_arg [xcode::get_configuration_arg ${xcode.configuration}]
set xcode_project_arg [xcode::get_project_arg ${xcode.project}]
set xcode_build_args "OBJROOT=build/ SYMROOT=build/"
+
+ if {[variant_isset universal]} {
+ set xcode_build_args "$xcode_build_args ${xcode.universal.settings}"
+ if {"${xcode.universal.sdk}" != ""} {
+ set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
+ }
+ }
# iterate on targets if there is any, do -alltargets otherwise.
if {"$xcode_targets" == ""} {
@@ -291,6 +309,13 @@
${xcode.destroot.path} ${xcode.destroot.type}]
set xcode_build_args "OBJROOT=build/ SYMROOT=build/"
+ if {[variant_isset universal]} {
+ set xcode_build_args "$xcode_build_args ${xcode.universal.settings}"
+ if {"${xcode.universal.sdk}" != ""} {
+ set xcode_build_args "-sdk ${xcode.universal.sdk} $xcode_build_args"
+ }
+ }
+
# iterate on targets if there is any, do -alltargets otherwise.
if {"$xcode_targets" == ""} {
xcode::destroot_one_target \
Modified: branches/variant-descs-14482/base/src/registry1.0/portimage.tcl
===================================================================
--- branches/variant-descs-14482/base/src/registry1.0/portimage.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/registry1.0/portimage.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -41,7 +41,7 @@
#
# Port Images are basically just installations of the destroot of a port into
# ${macports::registry.path}/software/${name}/${version}_${revision}${variants}
-# They allow the user to instal multiple versions of the same port, treating
+# They allow the user to install multiple versions of the same port, treating
# each revision and each different combination of variants as a "version".
#
# From there, the user can "activate" a port image. This creates {sym,hard}links for
Modified: branches/variant-descs-14482/base/src/registry1.0/receipt_flat.tcl
===================================================================
--- branches/variant-descs-14482/base/src/registry1.0/receipt_flat.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/registry1.0/receipt_flat.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -98,7 +98,7 @@
##
#
# Open an existing entry and return its reference number.
-proc open_entry {name {version 0} {revision 0} {variants ""}} {
+proc open_entry {name {version ""} {revision 0} {variants ""}} {
global macports::registry.installtype
global macports::registry.path
@@ -110,7 +110,7 @@
set receipt_file [get_head_entry_receipt_path $name $version]
if {![string length $receipt_file]} {
- if { $version != 0 } {
+ if { $version != "" } {
return -code error "Registry error: ${name} @${version}_${revision}${variants} not registered as installed."
} else {
return -code error "Registry error: ${name} not registered as installed."
@@ -118,14 +118,14 @@
}
# Extract the version from the path.
- if { $version == 0 } {
+ if { $version == "" } {
set theFileName [file tail $receipt_file]
regexp "^$name-(.*)\$" $theFileName match version
}
} else {
# If version wasn't specified, find out the version number. This will
# depend on which installtype mode we're in, "direct" or "image"
- if { $version == 0 } {
+ if { $version == "" } {
# xxx: If we're in image mode, we really should have had the
# version given to us. How should we handle this?
set x [glob -nocomplain [file join ${receipt_path} *]]
@@ -154,7 +154,7 @@
set receipt_contents [read $receipt_handle]
close $receipt_handle
} else {
- return -code error "Registry error: receipt for ${name} @${version}_${revision}${variants} seems to be compressed, but bzip2 couln't be found."
+ return -code error "Registry error: receipt for ${name} @${version}_${revision}${variants} seems to be compressed, but bzip2 couldn't be found."
}
set ref [new_entry]
Modified: branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl
===================================================================
--- branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/registry1.0/receipt_sqlite.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -49,7 +49,7 @@
}
# Open an existing entry and place it in the receipt_list
-proc open_entry {name {version 0} {revision 0} {variants ""}} {
+proc open_entry {name {version ""} {revision 0} {variants ""}} {
return -1
}
Modified: branches/variant-descs-14482/base/src/registry1.0/registry.tcl
===================================================================
--- branches/variant-descs-14482/base/src/registry1.0/registry.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/registry1.0/registry.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -111,7 +111,7 @@
}
# Open a registry entry.
-proc open_entry {name {version 0} {revision 0} {variants ""}} {
+proc open_entry {name {version ""} {revision 0} {variants ""}} {
global macports::registry.format
return [${macports::registry.format}::open_entry $name $version $revision $variants]
Modified: branches/variant-descs-14482/base/src/registry2.0/portimage.tcl
===================================================================
--- branches/variant-descs-14482/base/src/registry2.0/portimage.tcl 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/src/registry2.0/portimage.tcl 2008-11-24 09:14:55 UTC (rev 42567)
@@ -43,7 +43,7 @@
#
# Port Images are basically just installations of the destroot of a port into
# ${macports::registry.path}/software/${name}/${version}_${revision}${variants}
-# They allow the user to instal multiple versions of the same port, treating
+# They allow the user to install multiple versions of the same port, treating
# each revision and each different combination of variants as a "version".
#
# From there, the user can "activate" a port image. This creates {sym,hard}links for
Modified: branches/variant-descs-14482/base/tests/Makefile
===================================================================
--- branches/variant-descs-14482/base/tests/Makefile 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/tests/Makefile 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,6 +1,6 @@
include ../Mk/macports.autoconf.mk
-TESTS?=checksums-1 cvs-and-patchsites envvariables site-tags trace universal universal-2 xcodeversion dependencies-c case-insensitive-deactivate
+TESTS?=checksums-1 cvs-and-patchsites envvariables site-tags trace universal universal-2 xcodeversion dependencies-c dependencies-d dependencies-e case-insensitive-deactivate variants
PWD=$(shell pwd)
Modified: branches/variant-descs-14482/base/tests/test/checksums-1/master
===================================================================
--- branches/variant-descs-14482/base/tests/test/checksums-1/master 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/tests/test/checksums-1/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -2,5 +2,5 @@
---> Verifying checksum(s) for checksum
---> Extracting checksum
---> Configuring checksum
----> Building checksum with target all
+---> Building checksum
---> Testing checksum
Modified: branches/variant-descs-14482/base/tests/test/cvs-and-patchsites/master
===================================================================
--- branches/variant-descs-14482/base/tests/test/cvs-and-patchsites/master 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/tests/test/cvs-and-patchsites/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -3,5 +3,5 @@
---> Verifying checksum(s) for cvs-and-patchsites
---> Extracting cvs-and-patchsites
---> Configuring cvs-and-patchsites
----> Building cvs-and-patchsites with target all
+---> Building cvs-and-patchsites
---> Testing cvs-and-patchsites
Modified: branches/variant-descs-14482/base/tests/test/dependencies-c/master
===================================================================
--- branches/variant-descs-14482/base/tests/test/dependencies-c/master 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/tests/test/dependencies-c/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -2,7 +2,7 @@
---> Verifying checksum(s) for dependencies-b
---> Extracting dependencies-b
---> Configuring dependencies-b
----> Building dependencies-b with target all
+---> Building dependencies-b
---> Staging dependencies-b into destroot
---> Installing dependencies-b @1_0
---> Activating dependencies-b @1_0
@@ -11,7 +11,7 @@
---> Verifying checksum(s) for dependencies-a
---> Extracting dependencies-a
---> Configuring dependencies-a
----> Building dependencies-a with target all
+---> Building dependencies-a
---> Staging dependencies-a into destroot
---> Installing dependencies-a @1_0+i_want_b
---> Activating dependencies-a @1_0+i_want_b
@@ -20,5 +20,5 @@
---> Verifying checksum(s) for dependencies-c
---> Extracting dependencies-c
---> Configuring dependencies-c
----> Building dependencies-c with target all
+---> Building dependencies-c
---> Testing dependencies-c
Property changes on: branches/variant-descs-14482/base/tests/test/dependencies-d
___________________________________________________________________
Added: svn:ignore
+ output
Added: svn:mergeinfo
+
Deleted: branches/variant-descs-14482/base/tests/test/dependencies-d/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-d/Portfile 2008-11-22 02:54:44 UTC (rev 42484)
+++ branches/variant-descs-14482/base/tests/test/dependencies-d/Portfile 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,33 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-name dependencies-d
-version 1
-categories test
-maintainers pguyot at kallisys.net
-description Test port for dependencies
-homepage http://www.macports.org/
-platforms darwin
-
-long_description ${description}
-
-fetch {}
-checksum {}
-extract {}
-configure {}
-build {}
-destroot {
- system "touch ${destroot}${prefix}/lib/${name}"
-}
-
-# Check that macports doesn't chunk on this junk.
-# This might mean this port depends on port dependencies-a without variant
-# i_want_b (which is a default variant).
-depends_lib port:-i_want_b:dependencies-a
-
-# Check that macports doesn't chunk on this junk, but just generates a warning.
-depends {configure {dependencies-a +i_want_b >= 1}}
-
-test {
-# testing consists in processing dependencies
-}
Copied: branches/variant-descs-14482/base/tests/test/dependencies-d/Portfile (from rev 42484, trunk/base/tests/test/dependencies-d/Portfile)
===================================================================
--- branches/variant-descs-14482/base/tests/test/dependencies-d/Portfile (rev 0)
+++ branches/variant-descs-14482/base/tests/test/dependencies-d/Portfile 2008-11-24 09:14:55 UTC (rev 42567)
@@ -0,0 +1,33 @@
+# $Id$
+
+PortSystem 1.0
+name dependencies-d
+version 1
+categories test
+maintainers pguyot at kallisys.net
+description Test port for dependencies
+homepage http://www.macports.org/
+platforms darwin
+
+long_description ${description}
+
+fetch {}
+checksum {}
+extract {}
+configure {}
+build {}
+destroot {
+ system "touch ${destroot}${prefix}/lib/${name}"
+}
+
+# Check that macports doesn't chunk on this junk.
+# This might mean this port depends on port dependencies-a without variant
+# i_want_b (which is a default variant).
+depends_lib port:-i_want_b:dependencies-a
+
+# Check that macports doesn't chunk on this junk, but just generates a warning.
+depends {configure {dependencies-a +i_want_b >= 1}}
+
+test {
+# testing consists in processing dependencies
+}
Deleted: branches/variant-descs-14482/base/tests/test/dependencies-d/master
===================================================================
--- trunk/base/tests/test/dependencies-d/master 2008-11-22 02:54:44 UTC (rev 42484)
+++ branches/variant-descs-14482/base/tests/test/dependencies-d/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,26 +0,0 @@
-Warning: depends option is not handled yet
-Warning: depends option is not handled yet
----> Fetching dependencies-b
----> Verifying checksum(s) for dependencies-b
----> Extracting dependencies-b
----> Configuring dependencies-b
----> Building dependencies-b
----> Staging dependencies-b into destroot
----> Installing dependencies-b @1_0
----> Activating dependencies-b @1_0
----> Cleaning dependencies-b
----> Fetching dependencies-a
----> Verifying checksum(s) for dependencies-a
----> Extracting dependencies-a
----> Configuring dependencies-a
----> Building dependencies-a
----> Staging dependencies-a into destroot
----> Installing dependencies-a @1_0+i_want_b
----> Activating dependencies-a @1_0+i_want_b
----> Cleaning dependencies-a
----> Fetching dependencies-d
----> Verifying checksum(s) for dependencies-d
----> Extracting dependencies-d
----> Configuring dependencies-d
----> Building dependencies-d
----> Testing dependencies-d
Copied: branches/variant-descs-14482/base/tests/test/dependencies-d/master (from rev 42484, trunk/base/tests/test/dependencies-d/master)
===================================================================
--- branches/variant-descs-14482/base/tests/test/dependencies-d/master (rev 0)
+++ branches/variant-descs-14482/base/tests/test/dependencies-d/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -0,0 +1,26 @@
+Warning: depends option is not handled yet
+Warning: depends option is not handled yet
+---> Fetching dependencies-b
+---> Verifying checksum(s) for dependencies-b
+---> Extracting dependencies-b
+---> Configuring dependencies-b
+---> Building dependencies-b
+---> Staging dependencies-b into destroot
+---> Installing dependencies-b @1_0
+---> Activating dependencies-b @1_0
+---> Cleaning dependencies-b
+---> Fetching dependencies-a
+---> Verifying checksum(s) for dependencies-a
+---> Extracting dependencies-a
+---> Configuring dependencies-a
+---> Building dependencies-a
+---> Staging dependencies-a into destroot
+---> Installing dependencies-a @1_0+i_want_b
+---> Activating dependencies-a @1_0+i_want_b
+---> Cleaning dependencies-a
+---> Fetching dependencies-d
+---> Verifying checksum(s) for dependencies-d
+---> Extracting dependencies-d
+---> Configuring dependencies-d
+---> Building dependencies-d
+---> Testing dependencies-d
Property changes on: branches/variant-descs-14482/base/tests/test/dependencies-e
___________________________________________________________________
Added: svn:ignore
+ output
Added: svn:mergeinfo
+
Deleted: branches/variant-descs-14482/base/tests/test/dependencies-e/Portfile
===================================================================
--- trunk/base/tests/test/dependencies-e/Portfile 2008-11-22 02:54:44 UTC (rev 42484)
+++ branches/variant-descs-14482/base/tests/test/dependencies-e/Portfile 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,32 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-name dependencies-e
-version 1
-categories test
-maintainers pguyot at kallisys.net
-description Test port for dependencies
-homepage http://www.macports.org/
-platforms darwin
-
-long_description ${description}
-
-fetch {}
-checksum {}
-extract {}
-configure {}
-build {}
-destroot {
- system "touch ${destroot}${prefix}/lib/${name}"
-}
-
-depends_build \
- port:docbook-xml-4.1.2 \
- port:docbook-xml-4.2 \
- port:docbook-xml-4.3 \
- port:docbook-xml-4.4 \
- port:docbook-xml-4.5
-
-test {
-# testing consists in processing dependencies
-}
Copied: branches/variant-descs-14482/base/tests/test/dependencies-e/Portfile (from rev 42484, trunk/base/tests/test/dependencies-e/Portfile)
===================================================================
--- branches/variant-descs-14482/base/tests/test/dependencies-e/Portfile (rev 0)
+++ branches/variant-descs-14482/base/tests/test/dependencies-e/Portfile 2008-11-24 09:14:55 UTC (rev 42567)
@@ -0,0 +1,32 @@
+# $Id$
+
+PortSystem 1.0
+name dependencies-e
+version 1
+categories test
+maintainers pguyot at kallisys.net
+description Test port for dependencies
+homepage http://www.macports.org/
+platforms darwin
+
+long_description ${description}
+
+fetch {}
+checksum {}
+extract {}
+configure {}
+build {}
+destroot {
+ system "touch ${destroot}${prefix}/lib/${name}"
+}
+
+depends_build \
+ port:docbook-xml-4.1.2 \
+ port:docbook-xml-4.2 \
+ port:docbook-xml-4.3 \
+ port:docbook-xml-4.4 \
+ port:docbook-xml-4.5
+
+test {
+# testing consists in processing dependencies
+}
Deleted: branches/variant-descs-14482/base/tests/test/dependencies-e/master
===================================================================
--- trunk/base/tests/test/dependencies-e/master 2008-11-22 02:54:44 UTC (rev 42484)
+++ branches/variant-descs-14482/base/tests/test/dependencies-e/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,2 +0,0 @@
-Error: Dependency 'docbook-xml-4.1.2' not found.
-Error: Status 1 encountered during processing.
Copied: branches/variant-descs-14482/base/tests/test/dependencies-e/master (from rev 42484, trunk/base/tests/test/dependencies-e/master)
===================================================================
--- branches/variant-descs-14482/base/tests/test/dependencies-e/master (rev 0)
+++ branches/variant-descs-14482/base/tests/test/dependencies-e/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -0,0 +1,2 @@
+Error: Dependency 'docbook-xml-4.1.2' not found.
+Error: Status 1 encountered during processing.
Modified: branches/variant-descs-14482/base/tests/test/envvariables/master
===================================================================
--- branches/variant-descs-14482/base/tests/test/envvariables/master 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/tests/test/envvariables/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -2,7 +2,7 @@
---> Verifying checksum(s) for envvariables
---> Extracting envvariables
---> Configuring envvariables
----> Building envvariables with target all
+---> Building envvariables
---> Testing envvariables
A
B
Modified: branches/variant-descs-14482/base/tests/test/site-tags/master
===================================================================
--- branches/variant-descs-14482/base/tests/test/site-tags/master 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/tests/test/site-tags/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,8 +1,10 @@
---> Fetching site-tags
+---> Attempting to fetch app-bm.tar.gz from http://distfiles.macports.org/site-tags
---> Attempting to fetch app-bm.tar.gz from http://www.douglas.stebila.ca/code/vim/app/
+---> Attempting to fetch doc.tar.gz from http://distfiles.macports.org/site-tags
---> Attempting to fetch doc.tar.gz from http://www.douglas.stebila.ca/code/vim/doc/
---> Verifying checksum(s) for site-tags
---> Extracting site-tags
---> Configuring site-tags
----> Building site-tags with target all
+---> Building site-tags
---> Testing site-tags
Modified: branches/variant-descs-14482/base/tests/test/trace/master
===================================================================
--- branches/variant-descs-14482/base/tests/test/trace/master 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/tests/test/trace/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -2,7 +2,7 @@
---> Verifying checksum(s) for trace
---> Extracting trace
---> Configuring trace
----> Building trace with target all
+---> Building trace
---> Testing trace
Warning: A creation/deletion/modification was attempted outside sandbox: PWD/create-trace
Warning: A creation/deletion/modification was attempted outside sandbox: PWD/create-trace-modenv
Deleted: branches/variant-descs-14482/base/tests/test/variants/Portfile
===================================================================
--- trunk/base/tests/test/variants/Portfile 2008-11-22 02:54:44 UTC (rev 42484)
+++ branches/variant-descs-14482/base/tests/test/variants/Portfile 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,42 +0,0 @@
-# $Id$
-
-PortSystem 1.0
-name variants
-version 1
-categories test
-maintainers pguyot at kallisys.net
-description Test port for variants logic
-homepage http://www.macports.org/
-platforms darwin
-
-long_description ${description}
-
-fetch {}
-checksum {}
-extract {}
-configure {}
-build {}
-destroot {
- system "touch ${destroot}${prefix}/lib/${name}"
-}
-
-test {
- # test is actually installing this.
-}
-
-use_configure no
-
-# We override universal variant.
-variant universal {
- puts "Universal Variant"
-}
-
-# We define the utopia platform twice
-platform utopia {
- puts "Utopia platform -- 1"
-}
-platform utopia {
- puts "Utopia platform -- 2"
-}
-
-default_variants +utopia
Copied: branches/variant-descs-14482/base/tests/test/variants/Portfile (from rev 42484, trunk/base/tests/test/variants/Portfile)
===================================================================
--- branches/variant-descs-14482/base/tests/test/variants/Portfile (rev 0)
+++ branches/variant-descs-14482/base/tests/test/variants/Portfile 2008-11-24 09:14:55 UTC (rev 42567)
@@ -0,0 +1,42 @@
+# $Id$
+
+PortSystem 1.0
+name variants
+version 1
+categories test
+maintainers pguyot at kallisys.net
+description Test port for variants logic
+homepage http://www.macports.org/
+platforms darwin
+
+long_description ${description}
+
+fetch {}
+checksum {}
+extract {}
+configure {}
+build {}
+destroot {
+ system "touch ${destroot}${prefix}/lib/${name}"
+}
+
+test {
+ # test is actually installing this.
+}
+
+use_configure no
+
+# We override universal variant.
+variant universal {
+ puts "Universal Variant"
+}
+
+# We define the utopia platform twice
+platform utopia {
+ puts "Utopia platform -- 1"
+}
+platform utopia {
+ puts "Utopia platform -- 2"
+}
+
+default_variants +utopia
Deleted: branches/variant-descs-14482/base/tests/test/variants/master
===================================================================
--- trunk/base/tests/test/variants/master 2008-11-22 02:54:44 UTC (rev 42484)
+++ branches/variant-descs-14482/base/tests/test/variants/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -1,8 +0,0 @@
-Utopia platform -- 1
-Utopia platform -- 2
----> Fetching variants
----> Verifying checksum(s) for variants
----> Extracting variants
----> Configuring variants
----> Building variants
----> Testing variants
Copied: branches/variant-descs-14482/base/tests/test/variants/master (from rev 42484, trunk/base/tests/test/variants/master)
===================================================================
--- branches/variant-descs-14482/base/tests/test/variants/master (rev 0)
+++ branches/variant-descs-14482/base/tests/test/variants/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -0,0 +1,8 @@
+Utopia platform -- 1
+Utopia platform -- 2
+---> Fetching variants
+---> Verifying checksum(s) for variants
+---> Extracting variants
+---> Configuring variants
+---> Building variants
+---> Testing variants
Modified: branches/variant-descs-14482/base/tests/test/xcodeversion/master
===================================================================
--- branches/variant-descs-14482/base/tests/test/xcodeversion/master 2008-11-24 07:51:38 UTC (rev 42566)
+++ branches/variant-descs-14482/base/tests/test/xcodeversion/master 2008-11-24 09:14:55 UTC (rev 42567)
@@ -2,7 +2,7 @@
---> Verifying checksum(s) for xcodeversion
---> Extracting xcodeversion
---> Configuring xcodeversion
----> Building xcodeversion with target all
+---> Building xcodeversion
---> Testing xcodeversion
xcodeversion = 2.1
xcodebuildcmd = xcodebuild
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081124/ff7dda74/attachment-0001.html>
More information about the macports-changes
mailing list