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

[source_changes at macosforge.org]

Revision: 25121
          http://trac.macosforge.org/projects/macports/changeset/25121
Author:   jmpp at macports.org
Date:     2007-05-14 07:09:09 -0700 (Mon, 14 May 2007)

Log Message:
-----------
Reordering of some of the upgrade rules: lets try to do as many directories deletions and renames first, then onto other stuff.

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

Modified: branches/dp2mp-move/base/Makefile.in
===================================================================
--- branches/dp2mp-move/base/Makefile.in	2007-05-14 14:07:33 UTC (rev 25120)
+++ branches/dp2mp-move/base/Makefile.in	2007-05-14 14:09:09 UTC (rev 25121)
@@ -30,6 +30,14 @@
 # be installed onto ${TCL_PACKAGE_DIR}/macports1.0 with new names.
 	[ ! -d ${TCL_PACKAGE_DIR}/darwinports1.0 ] || rm -vrf ${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
+
+# Main ${localstatedir}/db/dports directory (where installed ports live) is 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
+
 # Old version file can be safely deleted, as it was already used to start this upgrade
 # and a new one will be installed into the new location.
 	[ ! -f ${sysconfdir}/ports/dp_version ] || rm -vf ${sysconfdir}/ports/dp_version
@@ -40,13 +48,7 @@
 # Following that, the dir itself is renamed to its new name.
 	[ ! -d ${sysconfdir}/ports ] || mv -v ${sysconfdir}/ports ${sysconfdir}/macports
 
-# MacPorts base files in ${datadir} are safely removed as new ones are always installed.
-	[ ! -d ${datadir}/darwinports ] || rm -vrf ${datadir}/darwinports
 
-# Main ${localstatedir}/db/dports directory (where installed ports live) is 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
-
 # MacPorts rsyns server is replaced into the macpors.conf and sources.conf files.
 	sed -e "s/rsync.darwinports.org/rsync.macports.org/g" ${mpconfigdir}/macports.conf > ${mpconfigdir}/macports.conf.tmp && \
 	mv -v ${mpconfigdir}/macports.conf.tmp ${mpconfigdir}/macports.conf

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