[25166] branches/dp2mp-move/base/Makefile.in

[source_changes at macosforge.org]

Revision: 25166
          http://trac.macosforge.org/projects/macports/changeset/25166
Author:   jmpp at macports.org
Date:     2007-05-15 01:07:52 -0700 (Tue, 15 May 2007)

Log Message:
-----------

 * Some echo formatting at the top;

 * Silence rm output in first two very loud rules;

 * When relocating base and ports trees, first create the needed directory structure
   (cause all of this is executing prior to the real installation routine) and then
   delete the cruft;

 * Provide a similar upgrading rule for those users who download base through the
   dpupdate/base module, i.e. trunk.

Modified Paths:
--------------
    branches/dp2mp-move/base/Makefile.in

Modified: branches/dp2mp-move/base/Makefile.in
===================================================================
--- branches/dp2mp-move/base/Makefile.in	2007-05-15 07:32:16 UTC (rev 25165)
+++ branches/dp2mp-move/base/Makefile.in	2007-05-15 08:07:52 UTC (rev 25166)
@@ -26,22 +26,32 @@
 
 upgrade:
 	@echo "Upgrading your existing MacPorts installation to the new layout."
+	@echo ""
 # We can safely delete the ${TCL_PACKAGE_DIR}/darwinports1.0 dir as files in it are always overwritten and will now
 # be installed onto ${TCL_PACKAGE_DIR}/macports1.0 with new names.
-	[ ! -d ${TCL_PACKAGE_DIR}/darwinports1.0 ] || rm -vrf ${TCL_PACKAGE_DIR}/darwinports1.0
+	[ ! -d ${TCL_PACKAGE_DIR}/darwinports1.0 ] || rm -rf ${TCL_PACKAGE_DIR}/darwinports1.0
 
 # MacPorts base files in ${datadir} are also safely removed as new ones are always installed,
 # and onto a their new location in this case too.
-	[ ! -d ${datadir}/darwinports ] || rm -vrf ${datadir}/darwinports
+	[ ! -d ${datadir}/darwinports ] || rm -rf ${datadir}/darwinports
 
 # Move the default base sources to the new layout.
-	[ ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1 ] || mv -v \
-	${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1 ${localstatedir}/db/dports/sources/rsync.macports.org/release/base
+	[ ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1/base ] || { mkdir -pv \
+	${localstatedir}/db/dports/sources/rsync.macports.org/release && mv -v \
+	${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1/base ${localstatedir}/db/dports/sources/rsync.macports.org/release/ && \
+	rm -rf ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1 ; }
 
 # Move the default ports tree to the new layout.
-	[ ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ] || mv -v \
-	${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ${localstatedir}/db/dports/sources/rsync.macports.org/release/ports
+	[ ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ] || { mkdir -pv \
+	${localstatedir}/db/dports/sources/rsync.macports.org/release && mv -v \
+	${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ${localstatedir}/db/dports/sources/rsync.macports.org/release/ports ; }
 
+# Some people also have base sources fetched from the rsync module corresponding to trunk, so lets move that too just in case.
+	[ ! -d ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate/base ] || { mkdir -pv \
+	${localstatedir}/db/dports/sources/rsync.macports.org/unstable && mv -v \
+	${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate/base ${localstatedir}/db/dports/sources/rsync.macports.org/unstable/ && \
+	rm -rf ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate ; }
+
 # Main ${localstatedir}/db/dports directory (where installed ports live) is then moved to its new location.
 #####this needs a lot of testing *WITH* installed ports!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
 	[ ! -d ${localstatedir}/db/dports ] || mv -v ${localstatedir}/db/dports ${localstatedir}/macports

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