Changeset 81367

Timestamp:

07/29/11 17:18:23 (4 years ago)

Author:

jmr@…

Message:

merge r81119 from trunk:

update supported OS and Xcode versions

Location:

branches/release_2_0

Files:

• . (modified) (1 prop)
• base (modified) (1 prop)
• base/configure (modified) (1 diff)
• base/configure.ac (modified) (1 diff)
• base/portmgr/fedora/macports.spec (modified) (1 prop)
• base/src/pextlib1.0/sha2.c (modified) (1 prop)
• base/src/pextlib1.0/sha2.h (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.c (modified) (1 prop)
• base/src/pextlib1.0/sha256cmd.h (modified) (1 prop)
• base/src/port1.0/portutil.tcl (modified) (1 diff)
• base/src/registry2.0/receipt_sqlite.tcl (modified) (1 prop)

branches/release_2_0/base/configure

@@ -2929 +2929 @@
                   Please upgrade at http://store.apple.com/" "$LINENO" 5
     ;;
-  10.4.[0-9]|10.4.10|10.5.[0-7]|10.6.[0-6])
+  10.4.[0-9]|10.4.10|10.5.[0-7]|10.6.[0-7])
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Mac OS X is out of date" >&5
 $as_echo "$as_me: WARNING: This version of Mac OS X is out of date" >&2;}

branches/release_2_0/base/configure.ac

@@ -33 +33 @@
                   Please upgrade at http://store.apple.com/])
     ;;
-  10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-6]])
+  10.4.[[0-9]]|10.4.10|10.5.[[0-7]]|10.6.[[0-7]])
     AC_MSG_WARN([This version of Mac OS X is out of date])
     AC_MSG_WARN([Please run Software Update to update it])

branches/release_2_0/base/src/port1.0/portutil.tcl

@@ -2690 +2690 @@
                 set rec 3.1.4
             }
-            default {
+            10.6 {
                 set min 3.2
                 set ok 3.2
                 set rec 3.2.6
+            }
+            default {
+                set min 4.1
+                set ok 4.1
+                set rec 4.1
             }
         }