[107677] branches/release_2_2

[jmr at macports.org]

Revision: 107677
          https://trac.macports.org/changeset/107677
Author:   jmr at macports.org
Date:     2013-07-03 23:54:28 -0700 (Wed, 03 Jul 2013)
Log Message:
-----------
merge r107527 from trunk:
 Default to delete_la_files being on for Mavericks, this will require rebuilding on Mavericks

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

Modified Paths:
--------------
    branches/release_2_2/base/src/macports1.0/macports.tcl

Property Changed:
----------------
    branches/release_2_2/
    branches/release_2_2/base/


Property changes on: branches/release_2_2
___________________________________________________________________
Modified: svn:mergeinfo
   - /trunk:107106,107465
   + /trunk:107106,107465,107527


Property changes on: branches/release_2_2/base
___________________________________________________________________
Modified: svn:mergeinfo
   - /branches/gsoc08-privileges/base:37343-46937
/branches/gsoc09-logging/base:51231-60371
/branches/gsoc11-rev-upgrade/base:78828-88375
/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:106802,106807,106809,107106,107465
/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/universal-sanity/base:51872-52323
/branches/variant-descs-14482/base:34469-34855,34900-37508,37511-37512,41040-41463,42575-42626,42640-42659
/trunk/base:106802,106807,106809,107106,107465,107527
/users/perry/base-bugs_and_notes:45682-46060
/users/perry/base-select:44044-44692

Modified: branches/release_2_2/base/src/macports1.0/macports.tcl
===================================================================
--- branches/release_2_2/base/src/macports1.0/macports.tcl	2013-07-04 06:54:02 UTC (rev 107676)
+++ branches/release_2_2/base/src/macports1.0/macports.tcl	2013-07-04 06:54:28 UTC (rev 107677)
@@ -956,7 +956,11 @@
         set macports::revupgrade_mode "rebuild"
     }
     if {![info exists macports::delete_la_files]} {
-        set macports::delete_la_files no
+        if {$os_platform eq "darwin" && $os_major >= 13} {
+            set macports::delete_la_files yes
+        } else {
+            set macports::delete_la_files no
+        }
     }
     if {![info exists macports::global_options(ports_rev-upgrade_id-loadcmd-check)]
          && [info exists macports::revupgrade_check_id_loadcmds]} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20130703/0c440cb2/attachment-0001.html>