[25163] branches/dp2mp-move/base/Makefile.in
source_changes at macosforge.org
source_changes at macosforge.org
Tue May 15 00:08:52 PDT 2007
Revision: 25163
http://trac.macosforge.org/projects/macports/changeset/25163
Author: jmpp at macports.org
Date: 2007-05-15 00:08:52 -0700 (Tue, 15 May 2007)
Log Message:
-----------
* Source trees (base and ports) upgrade rules need to happen first inside the db/dports skeleton,
which we later on move in turn to the new layout;
* Reorder some of the sed rules into what seems like a more logical sequence;
* Rename the upgrade target to plain "upgrade", so that the same approach can
be used in the future (with a different set of rules, of course) if need be.
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:00:21 UTC (rev 25162)
+++ branches/dp2mp-move/base/Makefile.in 2007-05-15 07:08:52 UTC (rev 25163)
@@ -24,7 +24,7 @@
echo "Source tree not configured. Use ./configure" ; \
fi
-dp2mpUpgrade:
+upgrade:
@echo "Upgrading your existing MacPorts installation to the new layout."
# 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.
@@ -36,11 +36,11 @@
# 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}/macports/sources/rsync.macports.org/release/base
+ ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate1 ${localstatedir}/db/dports/sources/rsync.macports.org/release/base
# 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}/macports/sources/rsync.macports.org/release/ports
+ ${localstatedir}/db/dports/sources/rsync.rsync.darwinports.org_dpupdate_dports ${localstatedir}/db/dports/sources/rsync.macports.org/release/ports
# 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!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
@@ -56,8 +56,15 @@
# Following that, the dir itself is renamed to its new name.
[ ! -d ${sysconfdir}/ports ] || mv -v ${sysconfdir}/ports ${sysconfdir}/macports
+# New default path up to the configuration files (referenced through other variables) is inserted into the macports.conf file.
+ sed "s/etc\/ports/etc\/macports/g" ${mpconfigdir}/macports.conf > ${mpconfigdir}/macports.conf.tmp && \
+ mv -v ${mpconfigdir}/macports.conf.tmp ${mpconfigdir}/macports.conf
-# MacPorts rsyns server is replaced into the macpors.conf and sources.conf files.
+# New default value for the portdbpath variable is inserted into the macports.conf file.
+ sed "s/db\/dports/macports/g" ${mpconfigdir}/macports.conf > ${mpconfigdir}/macports.conf.tmp && \
+ mv -v ${mpconfigdir}/macports.conf.tmp ${mpconfigdir}/macports.conf
+
+# MacPorts rsync server is replaced into the macpors.conf and sources.conf files.
sed "s/rsync.darwinports.org/rsync.macports.org/g" ${mpconfigdir}/macports.conf > ${mpconfigdir}/macports.conf.tmp && \
mv -v ${mpconfigdir}/macports.conf.tmp ${mpconfigdir}/macports.conf
sed "s/rsync.darwinports.org/rsync.macports.org/g" ${mpconfigdir}/sources.conf > ${mpconfigdir}/sources.conf.tmp && \
@@ -69,15 +76,7 @@
sed "s/dpupdate\/dports/release\/ports/g" ${mpconfigdir}/sources.conf > ${mpconfigdir}/sources.conf.tmp && \
mv -v ${mpconfigdir}/sources.conf.tmp ${mpconfigdir}/sources.conf
-# New default value for the portdbpath variable is inserted into the macports.conf file.
- sed "s/db\/dports/macports/g" ${mpconfigdir}/macports.conf > ${mpconfigdir}/macports.conf.tmp && \
- mv -v ${mpconfigdir}/macports.conf.tmp ${mpconfigdir}/macports.conf
-# New default path up to the configuration files (referenced through other variables) is inserted into the macports.conf file.
- sed "s/etc\/ports/etc\/macports/g" ${mpconfigdir}/macports.conf > ${mpconfigdir}/macports.conf.tmp && \
- mv -v ${mpconfigdir}/macports.conf.tmp ${mpconfigdir}/macports.conf
-
-
#something more?
####
@@ -89,7 +88,7 @@
# -)
####
-install:: dp2mpUpgrade
+install:: upgrade
#The order of installation targets having been reversed between this Makefile and Mk/macports.subdir.mk to
#get the upgrade target working in the best way possible, this informational text below ends up hidden
#among lots of output. Therefore I need to find somewhere to put it, so that it's seen as it used to be.
-------------- next part --------------
An HTML attachment was scrubbed...
URL: http://lists.macosforge.org/pipermail/macports-changes/attachments/20070515/db4a8c23/attachment.html
More information about the macports-changes
mailing list