[26497] trunk/base/Makefile.in

[source_changes at macosforge.org]

Revision: 26497
          http://trac.macosforge.org/projects/macports/changeset/26497
Author:   jmpp at macports.org
Date:     2007-06-26 10:29:22 -0700 (Tue, 26 Jun 2007)

Log Message:
-----------
Delete useless --delete rsync flag from our main conf file if there, it's implied by --delete-after.

Modified Paths:
--------------
    trunk/base/Makefile.in

Modified: trunk/base/Makefile.in
===================================================================
--- trunk/base/Makefile.in	2007-06-26 17:23:46 UTC (rev 26496)
+++ trunk/base/Makefile.in	2007-06-26 17:29:22 UTC (rev 26497)
@@ -71,8 +71,9 @@
 ## 4) new default value for the base tree;
 ## 5) new default value for trunk's base sources for users who have it (some do);
 ## 6) stray quotes are removed from the value of the rsync_options key in old conf files;
-## 7) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
-## 8) 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.
+## 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 && \
@@ -87,6 +88,8 @@
 			mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
 		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; \
+		sed 's/ --delete //' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
+			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 && \
@@ -111,8 +114,9 @@
 ## 4) new default value for the base tree;
 ## 5) new default value for trunk's base sources for users who have it (some do);
 ## 6) stray quotes are removed from the value of the rsync_options key in old conf files;
-## 7) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
-## 8) 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.
+## 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 && \
@@ -127,6 +131,8 @@
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
 		sed '/^rsync_options/s/"\(.*\)"/\1/' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
 			mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
+		sed 's/ --delete //' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
+			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 && \

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