[27893] branches/release_1_5/base

[source_changes at macosforge.org]

Revision: 27893
          http://trac.macosforge.org/projects/macports/changeset/27893
Author:   jmpp at macports.org
Date:     2007-08-15 12:48:34 -0700 (Wed, 15 Aug 2007)

Log Message:
-----------
Merged revisions 26683-26692,26695-26708,26712-26718,26720,26724-26729,26732-26736,26738-26743,26745-26752,26754-26764,26766-26803,26805,26807-26808,26810,26815-26828,26830-26841,26843-26849,26852-26862,26867-26869,26871-26902,26904-26920,26922-26936,26938-26939,26941,26943-26975,26977-27017,27019-27020,27023,27027-27042,27045-27052,27054-27064,27066-27078,27081-27109,27111-27121,27123-27126,27128-27139,27141-27198,27200,27203-27294,27298-27312,27314-27378,27380-27404,27406-27414,27416-27509,27511-27517,27529-27616,27619,27623-27641,27643,27645-27646,27648-27708,27712-27718,27721-27772,27774-27778,27780-27822,27827-27849,27851-27874,27877-27886,27888,27890-27892 via svnmerge from 
http://svn.macports.org/repository/macports/trunk/base

........
  r27892 | jmpp at macports.org | 2007-08-15 15:44:13 -0400 (Wed, 15 Aug 2007) | 6 lines
  
  
  Add www to the hierarchy as it is listed as a valid mtree entry in base/src/port1.0/portdestroot.tcl.
  Also, add src in the latter, which lists allowed paths explicitly instead of raeding prefix.mtree to
  figure them out (wouldn't that be a better approach?)
........

Modified Paths:
--------------
    branches/release_1_5/base/doc/prefix.mtree.in
    branches/release_1_5/base/src/port1.0/portdestroot.tcl

Property Changed:
----------------
    branches/release_1_5/base/


Property changes on: branches/release_1_5/base
___________________________________________________________________
Name: svnmerge-integrated
   - /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27710,27712-27824,27827-27889
   + /trunk/base:1-26681,26683-26803,26805,26807-26812,26814-26864,26867-27517,27529-27620,27622-27710,27712-27824,27827-27892

Modified: branches/release_1_5/base/doc/prefix.mtree.in
===================================================================
--- branches/release_1_5/base/doc/prefix.mtree.in	2007-08-15 19:44:13 UTC (rev 27892)
+++ branches/release_1_5/base/doc/prefix.mtree.in	2007-08-15 19:48:34 UTC (rev 27893)
@@ -245,4 +245,6 @@
             ..
         ..
     ..
+    www
+    ..
 ..

Modified: branches/release_1_5/base/src/port1.0/portdestroot.tcl
===================================================================
--- branches/release_1_5/base/src/port1.0/portdestroot.tcl	2007-08-15 19:44:13 UTC (rev 27892)
+++ branches/release_1_5/base/src/port1.0/portdestroot.tcl	2007-08-15 19:48:34 UTC (rev 27893)
@@ -229,7 +229,7 @@
 		ui_debug "checking for mtree violations"
 		set mtree_violation "no"
 
-		set prefixPaths [list bin etc include lib libexec sbin share var www Applications Developer Library]
+		set prefixPaths [list bin etc include lib libexec sbin share src var www Applications Developer Library]
 
 		set pathsToCheck [list /]
 		while {[llength $pathsToCheck] > 0} {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070815/443fafcf/attachment.html