[126901] branches/release_2_3

[jmr at macports.org]

Revision: 126901
          https://trac.macports.org/changeset/126901
Author:   jmr at macports.org
Date:     2014-10-16 18:24:39 -0700 (Thu, 16 Oct 2014)
Log Message:
-----------
merge r126900 from trunk:
 allow Xcode 6.0.1 on Yosemite, since 6.1 hasn't appeared yet

Revision Links:
--------------
    https://trac.macports.org/changeset/126900

Modified Paths:
--------------
    branches/release_2_3/base/src/port1.0/portutil.tcl

Property Changed:
----------------
    branches/release_2_3/
    branches/release_2_3/base/


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
   + /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868,126900


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
/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
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_2_3/base/src/port1.0/portutil.tcl	2014-10-17 01:23:30 UTC (rev 126900)
+++ branches/release_2_3/base/src/port1.0/portutil.tcl	2014-10-17 01:24:39 UTC (rev 126901)
@@ -3239,8 +3239,8 @@
                 set rec 6.0.1
             }
             default {
-                set min 6.1
-                set ok 6.1
+                set min 6.0.1
+                set ok 6.0.1
                 set rec 6.1
             }
         }
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141016/a3d0f431/attachment.html>