[55673] branches/images-and-archives/base

blb at macports.org blb at macports.org
Sun Aug 16 16:34:01 PDT 2009 

Revision: 55673
          http://trac.macports.org/changeset/55673
Author:   blb at macports.org
Date:     2009-08-16 16:33:59 -0700 (Sun, 16 Aug 2009)
Log Message:
-----------
Merge from trunk

Modified Paths:
--------------
    branches/images-and-archives/base/HACKING
    branches/images-and-archives/base/configure
    branches/images-and-archives/base/configure.ac

Property Changed:
----------------
    branches/images-and-archives/base/


Property changes on: branches/images-and-archives/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/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:50249-55524
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692
   + /branches/gsoc08-privileges/base:37343-46937
/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:50249-55672
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/images-and-archives/base/HACKING
===================================================================
--- branches/images-and-archives/base/HACKING	2009-08-16 21:53:39 UTC (rev 55672)
+++ branches/images-and-archives/base/HACKING	2009-08-16 23:33:59 UTC (rev 55673)
@@ -1,6 +1,6 @@
 # Project naming and copyright attribution:
 
- *  "The MacPorts Project" is the string that shall be used whereever
+ *  "The MacPorts Project" is the string that shall be used wherever
     there's a need to reference our project name, such as in copyright
     notices.
 
@@ -23,7 +23,7 @@
 
  *  Commits with user-visible affect made to the "base" component of the
     repository should be accompanied by a corresponding entry in the
-    base/ChanegeLog file, with references to pertitent Trac ticket
+    base/ChangeLog file, with references to pertinent Trac ticket
     numbers and svn commit revisions where appropriate.
 
  *  Such entries to the ChangeLog need not be full duplications of their

Modified: branches/images-and-archives/base/configure
===================================================================
--- branches/images-and-archives/base/configure	2009-08-16 21:53:39 UTC (rev 55672)
+++ branches/images-and-archives/base/configure	2009-08-16 23:33:59 UTC (rev 55673)
@@ -2885,19 +2885,17 @@
 fi
 
 case "$MACOSX_VERSION" in
-  10.0*|10.1*|10.2*)
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Mac OS X is not supported" >&5
-$as_echo "$as_me: WARNING: This version of Mac OS X is not supported" >&2;}
-    { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please upgrade at http://store.apple.com/" >&5
-$as_echo "$as_me: WARNING: Please upgrade at http://store.apple.com/" >&2;}
+  10.0*|10.1*|10.2*|10.3*)
+    as_fn_error "This version of Mac OS X is not supported
+                  Please upgrade at http://store.apple.com/" "$LINENO" 5
     ;;
-  10.1.[0-4]|10.2.[0-7]|10.3.[0-8]|10.4.[0-9]|10.4.10|10.5.[0-6])
+  10.4.[0-9]|10.4.10|10.5.[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;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please run Software Update to update it" >&5
 $as_echo "$as_me: WARNING: Please run Software Update to update it" >&2;}
     ;;
-  10.3*|10.4*|10.5*)
+  10.4*|10.5*|10.6*)
         ;;
   *)
     ;;
@@ -2929,19 +2927,19 @@
 fi
 
 case "$XCODE_VERSION" in
-  1.[0-1]*|2.[0-1]*)
+  1.*|2.[0-1]*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Xcode Tools is not supported" >&5
 $as_echo "$as_me: WARNING: This version of Xcode Tools is not supported" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please upgrade at http://connect.apple.com/" >&5
 $as_echo "$as_me: WARNING: Please upgrade at http://connect.apple.com/" >&2;}
     ;;
-  1.[2-4]*|2.[2-3]*|3.[0]*)
+  2.[2-3]*|3.[0]*)
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: This version of Xcode Tools is out of date" >&5
 $as_echo "$as_me: WARNING: This version of Xcode Tools is out of date" >&2;}
     { $as_echo "$as_me:${as_lineno-$LINENO}: WARNING: Please consider upgrading as some ports fail compiling" >&5
 $as_echo "$as_me: WARNING: Please consider upgrading as some ports fail compiling" >&2;}
     ;;
-  1.5*|2.4*|3.*)
+  2.*|3.*)
         ;;
   *)
     ;;

Modified: branches/images-and-archives/base/configure.ac
===================================================================
--- branches/images-and-archives/base/configure.ac	2009-08-16 21:53:39 UTC (rev 55672)
+++ branches/images-and-archives/base/configure.ac	2009-08-16 23:33:59 UTC (rev 55673)
@@ -28,15 +28,15 @@
 fi
 
 case "$MACOSX_VERSION" in
-  10.0*|10.1*|10.2*)
-    AC_MSG_WARN([This version of Mac OS X is not supported])
-    AC_MSG_WARN([Please upgrade at http://store.apple.com/])
+  10.0*|10.1*|10.2*|10.3*)
+    AC_MSG_ERROR([This version of Mac OS X is not supported
+                  Please upgrade at http://store.apple.com/])
     ;;
-  10.1.[[0-4]]|10.2.[[0-7]]|10.3.[[0-8]]|10.4.[[0-9]]|10.4.10|10.5.[[0-6]])
+  10.4.[[0-9]]|10.4.10|10.5.[[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])
     ;;
-  10.3*|10.4*|10.5*)
+  10.4*|10.5*|10.6*)
     dnl Supported version
     ;;
   *)
@@ -65,15 +65,15 @@
 fi
 
 case "$XCODE_VERSION" in
-  1.[[0-1]]*|2.[[0-1]]*)
+  1.*|2.[[0-1]]*)
     AC_MSG_WARN([This version of Xcode Tools is not supported])
     AC_MSG_WARN([Please upgrade at http://connect.apple.com/])
     ;;
-  1.[[2-4]]*|2.[[2-3]]*|3.[[0]]*)
+  2.[[2-3]]*|3.[[0]]*)
     AC_MSG_WARN([This version of Xcode Tools is out of date])
     AC_MSG_WARN([Please consider upgrading as some ports fail compiling])
     ;;
-  1.5*|2.4*|3.*)
+  2.*|3.*)
     dnl Supported version
     ;;
   *)
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20090816/96a2d40b/attachment.html>

More information about the macports-changes mailing list