[41463] branches/variant-descs-14482/base

[blb at macports.org]

Revision: 41463
          http://trac.macports.org/changeset/41463
Author:   blb at macports.org
Date:     2008-11-03 17:14:49 -0800 (Mon, 03 Nov 2008)
Log Message:
-----------
Move the install/ subdir (containing the mtree files) into .../share/macports
from the resources dir (the mtree contains a bit of install-time info, so it
shouldn't be with the resources stuff in the port tree)

Modified Paths:
--------------
    branches/variant-descs-14482/base/doc/Makefile
    branches/variant-descs-14482/base/src/port1.0/portdestroot.tcl

Modified: branches/variant-descs-14482/base/doc/Makefile
===================================================================
--- branches/variant-descs-14482/base/doc/Makefile	2008-11-04 01:12:28 UTC (rev 41462)
+++ branches/variant-descs-14482/base/doc/Makefile	2008-11-04 01:14:49 UTC (rev 41463)
@@ -58,9 +58,9 @@
 	for m in ${MAN5}; do rm -f ${INSTALLDIR}/share/man/man5/$$m ; done
 	for m in ${MAN7}; do rm -f ${INSTALLDIR}/share/man/man7/$$m ; done
 
-	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/macports/resources/port1.0/install
-	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/macports/resources/port1.0/install/
-	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/macports/resources/port1.0/install/
+	$(INSTALL) -d -o ${DSTUSR} -g ${DSTGRP} -m ${DSTMODE} ${INSTALLDIR}/share/macports/install
+	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 prefix.mtree ${INSTALLDIR}/share/macports/install/
+	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 644 macosx.mtree ${INSTALLDIR}/share/macports/install/
 	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 port.1.gz ${INSTALLDIR}/share/man/man1
 	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 macports.conf.5.gz ${INSTALLDIR}/share/man/man5
 	$(INSTALL) -o ${DSTUSR} -g ${DSTGRP} -m 444 portfile.7.gz ${INSTALLDIR}/share/man/man7

Modified: branches/variant-descs-14482/base/src/port1.0/portdestroot.tcl
===================================================================
--- branches/variant-descs-14482/base/src/port1.0/portdestroot.tcl	2008-11-04 01:12:28 UTC (rev 41462)
+++ branches/variant-descs-14482/base/src/port1.0/portdestroot.tcl	2008-11-04 01:14:49 UTC (rev 41463)
@@ -86,7 +86,7 @@
 }
 
 proc destroot_start {args} {
-    global UI_PREFIX prefix portname porturl destroot os.platform destroot.clean
+    global UI_PREFIX prefix portname porturl destroot os.platform destroot.clean portsharepath
     global destroot::oldmask destroot.umask
     
     ui_msg "$UI_PREFIX [format [msgcat::mc "Staging %s into destroot"] ${portname}]"
@@ -100,10 +100,10 @@
     
     file mkdir "${destroot}"
     if { ${os.platform} == "darwin" } {
-        system "cd \"${destroot}\" && ${mtree} -e -U -f [getportresourcepath $porturl port1.0/install/macosx.mtree]"
+        system "cd \"${destroot}\" && ${mtree} -e -U -f [file join ${portsharepath} install macosx.mtree]"
     }
     file mkdir "${destroot}/${prefix}"
-    system "cd \"${destroot}/${prefix}\" && ${mtree} -e -U -f [getportresourcepath $porturl port1.0/install/prefix.mtree]"
+    system "cd \"${destroot}/${prefix}\" && ${mtree} -e -U -f [file join ${portsharepath} install prefix.mtree]"
 }
 
 proc destroot_main {args} {
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.macosforge.org/pipermail/macports-changes/attachments/20081103/8dcb6bcd/attachment-0001.html>