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

[source_changes at macosforge.org]

Revision: 25385
          http://trac.macosforge.org/projects/macports/changeset/25385
Author:   jmpp at macports.org
Date:     2007-05-20 12:59:10 -0700 (Sun, 20 May 2007)

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

I move the deafult config dir, ${sysconfdir}/ports, to its new location, ${sysconfdir}/macports, and then reference that location
through the ${mpconfigdir} variable, which should naturally expand to ${sysconfdir}/macports by default... but not necessarily.
Therefore use ${sysconfdir}/macports all throughout.

Also, move sed patterns to stronger single quotes.

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

Modified: branches/dp2mp-move/base/Makefile.in
===================================================================
--- branches/dp2mp-move/base/Makefile.in	2007-05-20 19:55:55 UTC (rev 25384)
+++ branches/dp2mp-move/base/Makefile.in	2007-05-20 19:59:10 UTC (rev 25385)
@@ -56,24 +56,24 @@
 	[ ! -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
+	sed 's/etc\/ports/etc\/macports/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
+	mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.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
+	sed 's/db\/dports/macports/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
+	mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/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 && \
-	mv -v ${mpconfigdir}/sources.conf.tmp ${mpconfigdir}/sources.conf
+	sed 's/rsync.darwinports.org/rsync.macports.org/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
+	mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf
+	sed 's/rsync.darwinports.org/rsync.macports.org/g' ${sysconfdir}/macports/sources.conf > ${sysconfdir}/macports/sources.conf.tmp && \
+	mv -v ${sysconfdir}/macports/sources.conf.tmp ${sysconfdir}/macports/sources.conf
 
 # New default values for the base and ports trees are inserted into the macports.conf and sources.conf configuration files.
-	sed "s/dpupdate1\/base/release\/base/g" ${mpconfigdir}/macports.conf > ${mpconfigdir}/macports.conf.tmp && \
-	mv -v ${mpconfigdir}/macports.conf.tmp ${mpconfigdir}/macports.conf
-	sed "s/dpupdate\/dports/release\/ports\//g" ${mpconfigdir}/sources.conf > ${mpconfigdir}/sources.conf.tmp && \
-	mv -v ${mpconfigdir}/sources.conf.tmp ${mpconfigdir}/sources.conf
+	sed 's/dpupdate1\/base/release\/base/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
+	mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf
+	sed 's/dpupdate\/dports/release\/ports\//g' ${sysconfdir}/macports/sources.conf > ${sysconfdir}/macports/sources.conf.tmp && \
+	mv -v ${sysconfdir}/macports/sources.conf.tmp ${sysconfdir}/macports/sources.conf
 
 
 #something more?

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