[126870] branches/release_2_3

[jmr at macports.org]

Revision: 126870
          https://trac.macports.org/changeset/126870
Author:   jmr at macports.org
Date:     2014-10-16 11:39:37 -0700 (Thu, 16 Oct 2014)
Log Message:
-----------
merge r126868 from trunk:
 update current OS and Xcode versions

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

Modified Paths:
--------------
    branches/release_2_3/base/configure.ac
    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
   + /trunk:118056,118085,118161,118640,118735,119034,119204,119297,120127,120132,120142,120345,120637,121311,121364,121451,123652,125578,125621,125859,126866,126868


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,125578,125621,125859,126866
/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,125578,125621,125859,126866,126868
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_3/base/configure.ac
===================================================================
--- branches/release_2_3/base/configure.ac	2014-10-16 18:37:12 UTC (rev 126869)
+++ branches/release_2_3/base/configure.ac	2014-10-16 18:39:37 UTC (rev 126870)
@@ -33,11 +33,11 @@
     AC_MSG_ERROR([This version of Mac OS X is not supported
                   Please upgrade at http://store.apple.com/])
     ;;
-  10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]]|10.7.[[0-4]]|10.8.[[0-4]])
+  10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]]|10.7.[[0-4]]|10.8.[[0-4]]|10.9.[[0-4]])
     AC_MSG_WARN([This version of Mac OS X is out of date])
     AC_MSG_WARN([Please run Software Update to update it])
     ;;
-  10.4*|10.5*|10.6*|10.7*|10.8*|10.9*)
+  10.4*|10.5*|10.6*|10.7*|10.8*|10.9*|10.10*)
     dnl Supported version
     ;;
   *)
@@ -87,7 +87,7 @@
     AC_MSG_WARN([This version of Xcode Tools is out of date])
     AC_MSG_WARN([Please consider upgrading as some ports fail compiling])
     ;;
-  2.*|3.*|4.*|5.*)
+  2.*|3.*|4.*|5.*|6.*)
     dnl Supported version
     ;;
   *)

Modified: branches/release_2_3/base/src/port1.0/portutil.tcl
===================================================================
--- branches/release_2_3/base/src/port1.0/portutil.tcl	2014-10-16 18:37:12 UTC (rev 126869)
+++ branches/release_2_3/base/src/port1.0/portutil.tcl	2014-10-16 18:39:37 UTC (rev 126870)
@@ -3233,11 +3233,16 @@
                 set ok 4.4
                 set rec 4.6.3
             }
-            default {
+            10.9 {
                 set min 5.0.1
                 set ok 5.0.1
-                set rec 5.0.1
+                set rec 6.0.1
             }
+            default {
+                set min 6.1
+                set ok 6.1
+                set rec 6.1
+            }
         }
         if {$xcodeversion eq "none"} {
             ui_warn "Xcode does not appear to be installed; most ports will likely fail to build."
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <https://lists.macosforge.org/pipermail/macports-changes/attachments/20141016/4b80987f/attachment-0001.html>