[24399] trunk/base/src/port1.0

[source_changes at macosforge.org]

Revision: 24399
          http://trac.macosforge.org/projects/macports/changeset/24399
Author:   jberry at macports.org
Date:     2007-04-23 19:40:44 -0700 (Mon, 23 Apr 2007)

Log Message:
-----------
Use autoconfigured path to mtree in destroot phase.

Modified Paths:
--------------
    trunk/base/src/port1.0/port_autoconf.tcl.in
    trunk/base/src/port1.0/portdestroot.tcl

Modified: trunk/base/src/port1.0/port_autoconf.tcl.in
===================================================================
--- trunk/base/src/port1.0/port_autoconf.tcl.in	2007-04-24 01:55:13 UTC (rev 24398)
+++ trunk/base/src/port1.0/port_autoconf.tcl.in	2007-04-24 02:40:44 UTC (rev 24399)
@@ -33,6 +33,7 @@
 namespace eval portutil::autoconf {
 	variable cvs_path "@CVS@"
 	variable rsync_path "@RSYNC@"
+	variable mtree_path "@MTREE@"
 	variable xar_path "@XAR@"
 	variable tar_command "@TAR_CMD@"
 	variable have_launchd "@HAVE_LAUNCHD@"

Modified: trunk/base/src/port1.0/portdestroot.tcl
===================================================================
--- trunk/base/src/port1.0/portdestroot.tcl	2007-04-24 01:55:13 UTC (rev 24398)
+++ trunk/base/src/port1.0/portdestroot.tcl	2007-04-24 02:40:44 UTC (rev 24399)
@@ -85,6 +85,7 @@
     ui_msg "$UI_PREFIX [format [msgcat::mc "Staging %s into destroot"] ${portname}]"
 
     set oldmask [umask ${destroot.umask}]
+    set mtree ${portutil::autoconf::mtree_path}
     
     if { ${destroot.clean} == "yes" } {
 	system "rm -Rf \"${destroot}\""
@@ -92,10 +93,10 @@
     
     file mkdir "${destroot}"
     if { ${os.platform} == "darwin" } {
-	system "cd \"${destroot}\" && mtree -e -U -f ${portresourcepath}/install/macosx.mtree"
+	system "cd \"${destroot}\" && ${mtree} -e -U -f ${portresourcepath}/install/macosx.mtree"
     }
     file mkdir "${destroot}/${prefix}"
-    system "cd \"${destroot}/${prefix}\" && mtree -e -U -f ${portresourcepath}/install/prefix.mtree"
+    system "cd \"${destroot}/${prefix}\" && ${mtree} -e -U -f ${portresourcepath}/install/prefix.mtree"
 }
 
 proc destroot_main {args} {

-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070423/232ab937/attachment.html