Changeset 27618


Ignore:
Timestamp:
Aug 10, 2007, 9:12:35 PM (12 years ago)
Author:
jmpp@…
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.

Location:
trunk/base
Files:
2 edited

Legend:

Unmodified
Added
Removed
  • trunk/base/Makefile.in

    r26811 r27618  
    7474## 7) useless --delete option is removed from the default rsync flags (--delete is implied by --delete-after);
    7575## 8) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
    76 ## 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.
    7776        [ ! \( -f ${sysconfdir}/macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || { \
    7877                mv -v ${sysconfdir}/macports/ports.conf ${sysconfdir}/macports/macports.conf.mpsaved; \
     
    9291                        mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
    9392                sed 's/ ports.conf(5)/ macports.conf(5)/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
    94                         mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
    95                 sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' ${sysconfdir}/macports/macports.conf > ${sysconfdir}/macports/macports.conf.tmp && \
    9693                        mv -v ${sysconfdir}/macports/macports.conf.tmp ${sysconfdir}/macports/macports.conf; \
    9794        }
     
    117114## 7) useless --delete option is removed from the default rsync flags (--delete is implied by --delete-after);
    118115## 8) references to the old ports.conf(5) man page are updated to the new macports.conf(5) page;
    119 ## 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.
    120116        [ ! \( -f $${HOME}/.macports/ports.conf -a ! -f ${UPGRADECHECK} \) ] || { \
    121117                mv -v $${HOME}/.macports/ports.conf $${HOME}/.macports/macports.conf.mpsaved; \
     
    135131                        mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    136132                sed 's/ ports.conf(5)/ macports.conf(5)/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    137                         mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    138                 sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' $${HOME}/.macports/macports.conf > $${HOME}/.macports/macports.conf.tmp && \
    139133                        mv -v $${HOME}/.macports/macports.conf.tmp $${HOME}/.macports/macports.conf; \
    140134        }
  • trunk/base/portmgr/dmg/preflight

    r26533 r27618  
    8787  sed 's/ ports.conf(5)/ macports.conf(5)/g' /opt/local/etc/macports/macports.conf > /opt/local/etc/macports/macports.conf.tmp && \
    8888    mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
    89   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 && \
    90     mv -v /opt/local/etc/macports/macports.conf.tmp /opt/local/etc/macports/macports.conf
    9189}
    9290
     
    117115  sed 's/ ports.conf(5)/ macports.conf(5)/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
    118116    mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
    119    sed 's/[Dd]\(arwin\)\{0,1\}[Pp]\(orts\)\{0,1\}/MacPorts/g' ${HOME}/.macports/macports.conf > ${HOME}/.macports/macports.conf.tmp && \
    120     mv -v ${HOME}/.macports/macports.conf.tmp ${HOME}/.macports/macports.conf
    121117}
    122118
Note: See TracChangeset for help on using the changeset viewer.