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

[source_changes at macosforge.org]

Revision: 25390
          http://trac.macosforge.org/projects/macports/changeset/25390
Author:   jmpp at macports.org
Date:     2007-05-20 15:20:50 -0700 (Sun, 20 May 2007)

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

Add a rule at the end of the upgrade target to move any remaining variantions of the 'darwinports' string,
which at that moment (after having run many other reinaplace rules) should remain only in comments (if at all),
to the MacPorts name. Thanks again to sfiera and Raim in #MacPorts for the help in getting the regex together.

Also improve the explanatory comment for the rsync_options upgrading rule.

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

Modified: branches/dp2mp-move/base/Makefile.in
===================================================================
--- branches/dp2mp-move/base/Makefile.in	2007-05-20 21:14:45 UTC (rev 25389)
+++ branches/dp2mp-move/base/Makefile.in	2007-05-20 22:20:50 UTC (rev 25390)
@@ -75,13 +75,20 @@
 	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
 
-# Stray quotes are removed from the rsync_options in old conf files
+# Stray quotes are removed from the value of the rsync_options key in old conf files
 	sed '/^rsync_options/s/"\(.*\)"/\1/' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
 	mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf
 
 
 #something more?
 
+# Finally, move remaining instances of any form of our new name (which by this time should only remain in comments, if at all) to our new name
+	sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
+	mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf
+	sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' ${sysconfdir}/macports/sources.conf > ${sysconfdir}/macports/sources.conf.tmp && \
+	mv -v ${sysconfdir}/macports/sources.conf.tmp ${sysconfdir}/macports/sources.conf
+
+
 ####
 # NOTES:
 #    -) should we use the ${DESTDIR} sandbox?

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