September 2015 - macports-changes - lists.macosforge.org

[140690] branches/release_2_3
by jmr＠macports.org 30 Sep '15

30 Sep '15

Revision: 140690 https://trac.macports.org/changeset/140690 Author: jmr(a)macports.org Date: 2015-09-29 23:31:15 -0700 (Tue, 29 Sep 2015) Log Message: ----------- merge r138749 from trunk: reword variant mismatch message to make it clearer what is going on, and remove advice to use -f (it's not safe in general, and those sufficiently clueful to use it safely don't need to be told about it) Revision Links: -------------- https://trac.macports.org/changeset/138749 Modified Paths: -------------- branches/release_2_3/base/src/port1.0/portutil.tcl Property Changed: ---------------- branches/release_2_3/ branches/release_2_3/base/ branches/release_2_3/base/src/ Property changes on: branches/release_2_3 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276,128422,136965,137850,138461 + /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276,128422,136965,137850,138461,138749 Property changes on: branches/release_2_3/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,137850,138461,138530 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,137850,138461,138530,138749 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Property changes on: branches/release_2_3/base/src ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src:37343-46937 /branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138461,138530 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692 + /branches/gsoc08-privileges/base/src:37343-46937 /branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138461,138530,138749 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692 Modified: branches/release_2_3/base/src/port1.0/portutil.tcl =================================================================== --- branches/release_2_3/base/src/port1.0/portutil.tcl 2015-09-30 06:27:47 UTC (rev 140689) +++ branches/release_2_3/base/src/port1.0/portutil.tcl 2015-09-30 06:31:15 UTC (rev 140690) @@ -2132,7 +2132,8 @@ array set oldvariations {} if {[check_statefile_variants variations oldvariations $state_fd]} { - ui_error "Requested variants \"[canonicalize_variants [array get variations]]\" do not match original selection \"[canonicalize_variants [array get oldvariations]]\".\nPlease use the same variants again, perform 'port clean [option subport]' or specify the force option (-f)." + ui_error "Requested variants \"[canonicalize_variants [array get variations]]\" do not match those the build was started with: \"[canonicalize_variants [array get oldvariations]]\"." + ui_error "Please use the same variants again, or run 'port clean [option subport]' first to remove the existing partially completed build." set result 1 } elseif {!([info exists ports_dryrun] && $ports_dryrun eq "yes")} { # Write variations out to the statefile

1 0

[140689] branches/release_2_3
by jmr＠macports.org 30 Sep '15

30 Sep '15

Revision: 140689 https://trac.macports.org/changeset/140689 Author: jmr(a)macports.org Date: 2015-09-29 23:27:47 -0700 (Tue, 29 Sep 2015) Log Message: ----------- merge r138461 from trunk: make archivefetch fail when an archive was found to exist but failed to download, because dependencies are not calculated correctly for a from-source build in that situation Revision Links: -------------- https://trac.macports.org/changeset/138461 Modified Paths: -------------- branches/release_2_3/base/src/package1.0/portarchivefetch.tcl Property Changed: ---------------- branches/release_2_3/ branches/release_2_3/base/ branches/release_2_3/base/src/ Property changes on: branches/release_2_3 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276,128422,136965,137850 + /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276,128422,136965,137850,138461 Property changes on: branches/release_2_3/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,137850,138530 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,137850,138461,138530 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Property changes on: branches/release_2_3/base/src ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src:37343-46937 /branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138530 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692 + /branches/gsoc08-privileges/base/src:37343-46937 /branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138461,138530 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692 Modified: branches/release_2_3/base/src/package1.0/portarchivefetch.tcl =================================================================== --- branches/release_2_3/base/src/package1.0/portarchivefetch.tcl 2015-09-30 06:26:04 UTC (rev 140688) +++ branches/release_2_3/base/src/package1.0/portarchivefetch.tcl 2015-09-30 06:27:47 UTC (rev 140689) @@ -284,7 +284,7 @@ } return 0 } - if {[info exists ports_binary_only] && $ports_binary_only eq "yes"} { + if {([info exists ports_binary_only] && $ports_binary_only eq "yes") || [_archive_available]} { return -code error "archivefetch failed for [option subport] @[option version]_[option revision][option portvariants]" } else { return 0

1 0

[140688] branches/release_2_3
by jmr＠macports.org 30 Sep '15

30 Sep '15

Revision: 140688 https://trac.macports.org/changeset/140688 Author: jmr(a)macports.org Date: 2015-09-29 23:26:04 -0700 (Tue, 29 Sep 2015) Log Message: ----------- merge r137850 from trunk: fix incorrect use of 'array get' to 'array names' in action_search Revision Links: -------------- https://trac.macports.org/changeset/137850 Modified Paths: -------------- branches/release_2_3/base/src/port/port.tcl Property Changed: ---------------- branches/release_2_3/ branches/release_2_3/base/ branches/release_2_3/base/src/ Property changes on: branches/release_2_3 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276,128422,136965 + /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276,128422,136965,137850 Property changes on: branches/release_2_3/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,138530 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,137850,138530 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Property changes on: branches/release_2_3/base/src ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src:37343-46937 /branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,138530 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692 + /branches/gsoc08-privileges/base/src:37343-46937 /branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,137850,138530 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692 Modified: branches/release_2_3/base/src/port/port.tcl =================================================================== --- branches/release_2_3/base/src/port/port.tcl 2015-09-30 06:25:11 UTC (rev 140687) +++ branches/release_2_3/base/src/port/port.tcl 2015-09-30 06:26:04 UTC (rev 140688) @@ -3666,7 +3666,7 @@ set res {} set portfound 0 - foreach { opt } [array get filters] { + foreach { opt } [array names filters] { # Map from friendly name set opt [map_friendly_field_names $opt]

1 0

[140687] branches/release_2_3
by jmr＠macports.org 30 Sep '15

30 Sep '15

Revision: 140687 https://trac.macports.org/changeset/140687 Author: jmr(a)macports.org Date: 2015-09-29 23:25:11 -0700 (Tue, 29 Sep 2015) Log Message: ----------- merge r136965 from trunk: return macports-llvm-gcc-4.2 and apple-gcc-4.2 to the compiler fallback list on Yosemite now that they work Revision Links: -------------- https://trac.macports.org/changeset/136965 Modified Paths: -------------- branches/release_2_3/base/src/port1.0/portconfigure.tcl Property Changed: ---------------- branches/release_2_3/ branches/release_2_3/base/ branches/release_2_3/base/src/ Property changes on: branches/release_2_3 ___________________________________________________________________ Modified: svn:mergeinfo - /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276,128422 + /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900,128113,128274,128276,128422,136965 Property changes on: branches/release_2_3/base ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,138530 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 + /branches/gsoc08-privileges/base:37343-46937 /branches/gsoc09-logging/base:51231-60371 /branches/gsoc11-rev-upgrade/base:78828-88375 /branches/gsoc11-statistics/base:79520,79666 /branches/gsoc13-tests:106692-111324 /branches/universal-sanity/base:51872-52323 /branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,136965,138530 /users/perry/base-bugs_and_notes:45682-46060 /users/perry/base-select:44044-44692 Property changes on: branches/release_2_3/base/src ___________________________________________________________________ Modified: svn:mergeinfo - /branches/gsoc08-privileges/base/src:37343-46937 /branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,138530 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692 + /branches/gsoc08-privileges/base/src:37343-46937 /branches/gsoc09-logging/base/src:51231-60371 /branches/gsoc11-rev-upgrade/base/src:78828-88375 /branches/gsoc11-statistics/base/src:79520,79666 /branches/gsoc13-tests/src:106692-111324 /branches/universal-sanity/base/src:51872-52323 /branches/variant-descs-14482/base/src:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659 /trunk/base/src:118038-118039,118056,118085,118161,118559,118562-118569,118598-118599,118602-118603,118606-118607,118640,118735,119034,119169,119171,119175,119204,119297,119987,119992,120036,120038,120059-120060,120064,120067-120069,120074,120076,120127,120132,120142,120345,120382,120637,121311,121364,121451,121485,123652,124145-124146,124150,124216,125578,125621,125859,126475,126866,126868,126895,126900,128113,128274,128276,128422,134501-134502,134511,135851,136965,138530 /users/perry/base-bugs_and_notes/src:45682-46060 /users/perry/base-select/src:44044-44692 Modified: branches/release_2_3/base/src/port1.0/portconfigure.tcl =================================================================== --- branches/release_2_3/base/src/port1.0/portconfigure.tcl 2015-09-30 06:15:04 UTC (rev 140686) +++ branches/release_2_3/base/src/port1.0/portconfigure.tcl 2015-09-30 06:25:11 UTC (rev 140687) @@ -430,8 +430,6 @@ return $default_compilers } elseif {$xcodeversion eq "none" || $xcodeversion eq ""} { return {cc} - } elseif {[vercmp $xcodeversion 6.0] >= 0 && [vercmp $macosx_deployment_target 10.10] >= 0} { - return {clang macports-clang-3.4 macports-clang-3.3} } elseif {[vercmp $xcodeversion 5.0] >= 0} { return {clang macports-clang-3.4 macports-clang-3.3 macports-llvm-gcc-4.2 apple-gcc-4.2} } elseif {[vercmp $xcodeversion 4.3] >= 0} {

1 0

[140686] trunk/dports/sysutils/agrep/Portfile
by ryandesign＠macports.org 30 Sep '15

30 Sep '15

Revision: 140686 https://trac.macports.org/changeset/140686 Author: ryandesign(a)macports.org Date: 2015-09-29 23:15:04 -0700 (Tue, 29 Sep 2015) Log Message: ----------- agrep conflicts with glimpse Modified Paths: -------------- trunk/dports/sysutils/agrep/Portfile Modified: trunk/dports/sysutils/agrep/Portfile =================================================================== --- trunk/dports/sysutils/agrep/Portfile 2015-09-30 06:14:54 UTC (rev 140685) +++ trunk/dports/sysutils/agrep/Portfile 2015-09-30 06:15:04 UTC (rev 140686) @@ -6,7 +6,7 @@ name agrep version 2.04 revision 1 -conflicts tre +conflicts glimpse tre description agrep is similar to egrep. long_description agrep is similar to egrep $or grep or fgrep$, \

1 0

[140685] trunk/dports/textproc/glimpse/Portfile
by ryandesign＠macports.org 30 Sep '15

30 Sep '15

Revision: 140685 https://trac.macports.org/changeset/140685 Author: ryandesign(a)macports.org Date: 2015-09-29 23:14:54 -0700 (Tue, 29 Sep 2015) Log Message: ----------- glimpse conflicts with agrep Modified Paths: -------------- trunk/dports/textproc/glimpse/Portfile Modified: trunk/dports/textproc/glimpse/Portfile =================================================================== --- trunk/dports/textproc/glimpse/Portfile 2015-09-30 06:14:45 UTC (rev 140684) +++ trunk/dports/textproc/glimpse/Portfile 2015-09-30 06:14:54 UTC (rev 140685) @@ -4,7 +4,7 @@ PortSystem 1.0 name glimpse -conflicts tre +conflicts agrep tre version 4.18.6 revision 1 set distfile_date 20140926184454

1 0

[140684] trunk/dports/devel/tre/Portfile
by ryandesign＠macports.org 30 Sep '15

30 Sep '15

Revision: 140684 https://trac.macports.org/changeset/140684 Author: ryandesign(a)macports.org Date: 2015-09-29 23:14:45 -0700 (Tue, 29 Sep 2015) Log Message: ----------- tre conflicts with glimpse Modified Paths: -------------- trunk/dports/devel/tre/Portfile Modified: trunk/dports/devel/tre/Portfile =================================================================== --- trunk/dports/devel/tre/Portfile 2015-09-30 06:12:24 UTC (rev 140683) +++ trunk/dports/devel/tre/Portfile 2015-09-30 06:14:45 UTC (rev 140684) @@ -10,7 +10,7 @@ platforms darwin maintainers nomaintainer license BSD -conflicts agrep +conflicts agrep glimpse description TRE is a lightweight POSIX compliant regular expression library long_description TRE is a lightweight POSIX compliant regular expression library homepage http://laurikari.net/tre/

1 0

[140683] trunk/dports/security/libewf/Portfile
by ryandesign＠macports.org 30 Sep '15

30 Sep '15

Revision: 140683 https://trac.macports.org/changeset/140683 Author: ryandesign(a)macports.org Date: 2015-09-29 23:12:24 -0700 (Tue, 29 Sep 2015) Log Message: ----------- libewf: update to 20140608; add pkgconfig dependency; fix livecheck Modified Paths: -------------- trunk/dports/security/libewf/Portfile Modified: trunk/dports/security/libewf/Portfile =================================================================== --- trunk/dports/security/libewf/Portfile 2015-09-30 06:02:47 UTC (rev 140682) +++ trunk/dports/security/libewf/Portfile 2015-09-30 06:12:24 UTC (rev 140683) @@ -2,10 +2,9 @@ # $Id$ PortSystem 1.0 +PortGroup github 1.0 -name libewf -version 20131230 -revision 2 +github.setup libyal libewf 20140608 categories security platforms darwin maintainers nomaintainer @@ -19,13 +18,13 @@ Libewf allows you to read and write media information \ within the EWF files. -homepage http://libewf.sourceforge.net/ -homepage http://code.google.com/p/libewf/ master_sites https://googledrive.com/host/0B3fBvzttpiiSMTdoaVExWWNsRjg/ -checksums rmd160 3b9d24feba48a9db96576eeecf84e88942552406 \ - sha256 e4ffe1b538cb496ca043ab0f738487828babe33285f29b4ce1cbe115af83a92d +checksums rmd160 bd86f502d9e196dde0de81753595b7b34daa545f \ + sha256 d14030ce6122727935fbd676d0876808da1e112721f3cb108564a4d9bf73da71 +depends_build port:pkgconfig + depends_lib port:bzip2 \ port:gettext \ port:libiconv \ @@ -33,13 +32,14 @@ path:lib/pkgconfig/fuse.pc:osxfuse \ port:zlib -configure.args --with-bzip2 \ - --with-libfuse \ - --with-openssl \ - --with-zlib \ +configure.args --with-bzip2=${prefix} \ + --with-libfuse=${prefix} \ + --with-openssl=${prefix} \ + --with-zlib=${prefix} \ --without-libbfio \ --without-libcaes \ --without-libcdata \ + --without-libcdatetime \ --without-libcerror \ --without-libcfile \ --without-libclocale \ @@ -54,8 +54,12 @@ --without-libfvalue \ --without-libhmac \ --without-libmfdata \ - --without-libmsdev \ - --without-libmsraw \ --without-libodraw \ + --without-libsmdev \ + --without-libsmraw \ --without-libuna \ --without-libuuid + +livecheck.type regex +livecheck.url [lindex ${master_sites} 0] +livecheck.regex ${name}-(\[0-9.\]+)${extract.suffix}

1 0

[140682] trunk/base/src/port1.0/porttrace.tcl
by jmr＠macports.org 30 Sep '15

30 Sep '15

Revision: 140682 https://trac.macports.org/changeset/140682 Author: jmr(a)macports.org Date: 2015-09-29 23:02:47 -0700 (Tue, 29 Sep 2015) Log Message: ----------- avoid error due to calling realpath on nonexistent files Modified Paths: -------------- trunk/base/src/port1.0/porttrace.tcl Modified: trunk/base/src/port1.0/porttrace.tcl =================================================================== --- trunk/base/src/port1.0/porttrace.tcl 2015-09-30 05:50:10 UTC (rev 140681) +++ trunk/base/src/port1.0/porttrace.tcl 2015-09-30 06:02:47 UTC (rev 140682) @@ -71,7 +71,11 @@ # path component intact. This will, for instance, prevent /tmp from # being resolved to /private/tmp. # Use realpath to avoid this behavior. - set normalizedPath [realpath $path] + set normalizedPath [file normalize $path] + # realpath only works on files that exist + if {![catch {file type $normalizedPath}]} { + set normalizedPath [realpath $normalizedPath] + } lappend sndbxlst "[string map $mapping $path]=$action" if {$normalizedPath ne $path} { lappend sndbxlst "[string map $mapping $normalizedPath]=$action"

1 0

[140681] trunk/dports/security/libewf/Portfile
by ryandesign＠macports.org 30 Sep '15

30 Sep '15

Revision: 140681 https://trac.macports.org/changeset/140681 Author: ryandesign(a)macports.org Date: 2015-09-29 22:50:10 -0700 (Tue, 29 Sep 2015) Log Message: ----------- libewf: add dependencies on bzip2, gettext, libiconv, zlib; revbump; add configure args to ensure we use only bundled copies of helper libraries Modified Paths: -------------- trunk/dports/security/libewf/Portfile Modified: trunk/dports/security/libewf/Portfile =================================================================== --- trunk/dports/security/libewf/Portfile 2015-09-30 04:44:21 UTC (rev 140680) +++ trunk/dports/security/libewf/Portfile 2015-09-30 05:50:10 UTC (rev 140681) @@ -5,7 +5,7 @@ name libewf version 20131230 -revision 1 +revision 2 categories security platforms darwin maintainers nomaintainer @@ -26,5 +26,36 @@ checksums rmd160 3b9d24feba48a9db96576eeecf84e88942552406 \ sha256 e4ffe1b538cb496ca043ab0f738487828babe33285f29b4ce1cbe115af83a92d -depends_lib path:lib/libssl.dylib:openssl \ - path:lib/pkgconfig/fuse.pc:osxfuse +depends_lib port:bzip2 \ + port:gettext \ + port:libiconv \ + path:lib/libssl.dylib:openssl \ + path:lib/pkgconfig/fuse.pc:osxfuse \ + port:zlib + +configure.args --with-bzip2 \ + --with-libfuse \ + --with-openssl \ + --with-zlib \ + --without-libbfio \ + --without-libcaes \ + --without-libcdata \ + --without-libcerror \ + --without-libcfile \ + --without-libclocale \ + --without-libcnotify \ + --without-libcpath \ + --without-libcsplit \ + --without-libcstring \ + --without-libcsystem \ + --without-libcthreads \ + --without-libfcache \ + --without-libfdata \ + --without-libfvalue \ + --without-libhmac \ + --without-libmfdata \ + --without-libmsdev \ + --without-libmsraw \ + --without-libodraw \ + --without-libuna \ + --without-libuuid

1 0