[27618] trunk/base

[source_changes at macosforge.org]

Revision: 27618
          http://trac.macosforge.org/projects/macports/changeset/27618
Author:   jmpp at macports.org
Date:     2007-08-10 14:12:35 -0700 (Fri, 10 Aug 2007)

Log Message:
-----------
Sed rules taking care of dp based comments in the macports.conf file were wrecking havoc for those using /opt/dports or similar as their prefix, nuke them.

Modified Paths:
--------------
    trunk/base/Makefile.in
    trunk/base/portmgr/dmg/preflight

Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in	2007-08-10 20:57:11 UTC (rev 27617)
+++ trunk/base/Makefile.in	2007-08-10 21:12:35 UTC (rev 27618)
@@ -73,7 +73,6 @@
 ## 6) stray quotes are removed from the value of the rsync_options key in old conf files;
 ## 7) useless --delete option is removed from the default rsync flags (--delete is implied by --delete-after);
 ## 8) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
-## 9) 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.
 	[ ! \( -f ${sysconfdir}/macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || { \
 		mv -v ${sysconfdir}/macports/ports.conf ${sysconfdir}/macports/macports.conf.mpsaved; \
 		sed 's/etc\/ports/etc\/macports/g' ${sysconfdir}/macports/macports.conf.mpsaved > ${sysconfdir}/macports/macports.conf.tmp && \
@@ -92,8 +91,6 @@
 			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
 		sed 's/ ports.conf(5)/ macports.conf(5)/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/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
-			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
 	}
 
 # Check for existance of the main sources file and perform a couple of replacements on it, backing it up first:
@@ -116,7 +113,6 @@
 ## 6) stray quotes are removed from the value of the rsync_options key in old conf files;
 ## 7) useless --delete option is removed from the default rsync flags (--delete is implied by --delete-after);
 ## 8) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
-## 9) 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.
 	[ ! \( -f $${HOME}/.macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || { \
 		mv -v $${HOME}/.macports/ports.conf $${HOME}/.macports/macports.conf.mpsaved; \
 		sed 's/etc\/ports/etc\/macports/g' $${HOME}/.macports/macports.conf.mpsaved > $${HOME}/.macports/macports.conf.tmp && \
@@ -135,8 +131,6 @@
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
 		sed 's/ ports.conf(5)/ macports.conf(5)/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
-		sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
-			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
 	}
 
 # Upgrade success announcement (meaning we're done ;):

Modified: trunk/base/portmgr/dmg/preflight
===================================================================
--- trunk/base/portmgr/dmg/preflight	2007-08-10 20:57:11 UTC (rev 27617)
+++ trunk/base/portmgr/dmg/preflight	2007-08-10 21:12:35 UTC (rev 27618)
@@ -86,8 +86,6 @@
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
   sed 's/ ports.conf(5)/ macports.conf(5)/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
-  sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
-    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
 }
 
 [ ! \( -f /opt/local/etc/macports/sources.conf -a ! -f ${UPGRADECHECK} \) ] || {
@@ -116,8 +114,6 @@
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
   sed 's/ ports.conf(5)/ macports.conf(5)/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
-   sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
-    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
 }
 
 [ -f ${UPGRADECHECK} ] || {

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