[macports-base] branch master updated (efff712dc -> ef2013905)

[Joshua Root]

Joshua Root (jmroot) pushed a change to branch master
in repository macports-base.

    from efff712dc Update ChangeLog
     new 1f52c5afd Fix force activation of conflicting ports
     new ef2013905 Update ChangeLog

The 2 revisions listed above as "new" are entirely new to this
repository and will be described in separate emails.  The revisions
listed as "add" were already present in the repository and have only
been added to this reference.


Summary of changes:
 ChangeLog                     | 2 ++
 src/registry2.0/portimage.tcl | 8 +++++---
 2 files changed, 7 insertions(+), 3 deletions(-)